Merge branch 'master' of github.com:magnolia-fan/BeatHaven

rails/app/controllers/track_controller.rb

@@ -2,12 +2,6 @@ class TrackController < ApplicationController
   require 'net/http'
   require 'uri'
   def listen
-    render :json => YAML.load_file("#{RAILS_ROOT}/config/vk_accounts.yml")
-  end
-  
-  private
-  
-  def fetchSearch q
     
   end
 end

rails/app/models/invite.rb

@@ -0,0 +1,9 @@
+class Invite
+  include Mongoid::Document
+  store_in :invites
+  
+  key :referer, Integer,
+  key :email,   String,
+  key :code,    String,
+  key :senton,  Datetime
+end

rails/app/models/user.rb

@@ -0,0 +1,12 @@
+class User
+  include Mongoid::Document
+  store_in :users
+  
+  key :name,      String,
+  key :password,  String,
+  key :email,     String,
+  key :regdate,   Datetime,
+  key :invites,   Integer,
+  key :referer,   Integer,
+  key :active,    Integer
+end

rails/config/mongoid.yml

@@ -1,5 +1,6 @@
 defaults: &defaults
-  host: localhost
+  host: 192.168.0.100
+  port: 27017
   # slaves:
   #   - host: slave1.local
   #     port: 27018

rails/test/fixtures/users.yml

@@ -0,0 +1,19 @@
+# Read about fixtures at http://ar.rubyonrails.org/classes/Fixtures.html
+
+one:
+  name: 
+  password: 
+  email: 
+  regdate: 
+  invites: 
+  referer: 
+  active: 1
+
+two:
+  name: 
+  password: 
+  email: 
+  regdate: 
+  invites: 
+  referer: 
+  active: 1

rails/test/unit/user_test.rb

@@ -0,0 +1,8 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # Replace this with your real tests.
+  test "the truth" do
+    assert true
+  end
+end