rhoconnect 3.2.0.beta1 → 3.2.0.beta2

data/installer/utils/nix_install_test.rb

@@ -60,27 +60,27 @@ def compile_stack_info
   # Append the rest of the file name according to distribution
   if @user == 'ubuntu'
 
-    @dist = { :flavor => "ubuntu",
-              :package => "rhoconnect_#{Constants::RC_VERSION}_all.deb",
-              :local_file => "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
-              :pkg_mgr => 'dpkg',
-              :pkg_type => 'DEB',
-              :pkg_repo => 'apt-get',
-              :deps => Constants::DEB_DEPS,
+    @dist = { :flavor =>        "ubuntu",
+              :package =>       "rhoconnect_#{Constants::RC_VERSION}_all.deb",
+              :local_file =>    "#{local_file}rhoconnect_#{Constants::RC_VERSION}_all.deb",
+              :pkg_mgr =>       'dpkg',
+              :pkg_type =>      'DEB',
+              :pkg_repo =>      'apt-get',
+              :deps =>          Constants::DEB_DEPS,
               :repo_src_file => '/etc/apt/sources.list',
-              :repo_str => '\n' +
+              :repo_str =>      '\n' +
                                 '# This is the repository for rhoconnect packages\n' +
                                 "deb http://#{BUCKET}.s3.amazonaws.com/#{channel}/deb rhoconnect main" }
   elsif @user == 'root'
-    @dist = { :flavor => "centos",
-              :package => "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
-              :local_file => "#{local_file}rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
-              :pkg_mgr => 'rpm',
-              :pkg_type => 'RPM',
-              :pkg_repo => 'yum',
-              :deps => Constants::RPM_DEPS,
+    @dist = { :flavor =>        "centos",
+              :package =>       "rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
+              :local_file =>    "#{local_file}rhoconnect-#{Constants::RC_VERSION}.noarch.rpm",
+              :pkg_mgr =>       'rpm',
+              :pkg_type =>      'RPM',
+              :pkg_repo =>      'yum',
+              :deps =>          Constants::RPM_DEPS,
               :repo_src_file => '/etc/yum.repos.d/rhoconnect.repo',
-              :repo_str => '[rhoconnect]\n' +
+              :repo_str =>      '[rhoconnect]\n' +
                                 'name=Rhoconnect\n' +
                                 "baseurl=http://#{BUCKET}.s3.amazonaws.com/#{channel}/rpm" +
                                 '\nenabled=1\n' +
@@ -103,7 +103,8 @@ end #create_ec2_instance
 # Retrieves the access key and secret access key from the above specified file.
 def get_access_keys
   lines = IO.readlines Constants::ACCESS_KEY_FILE
-  @access_key = lines.first.strip.split("=")[1]
+
+  @access_key        = lines.first.strip.split("=")[1]
   @secret_access_key = lines.last.strip.split("=")[1]
 end #get_access_keys
 
@@ -223,13 +224,12 @@ def check_rc_service
   puts "Checking RC service."
   request = nil #Defined outside block as to not limit the scope of request to the do block.
   2.times do
-    request = Net::HTTP.get_response(@host, '/')
+    request = Net::HTTP.get_response(@host, '/console/')
   end #do
 
   puts "Code: #{request.code} Message: #{request.message}"
 
-  if request.code == '200' or
-     request.code == '302'
+  if request.code.to_s < '400'
     puts "Rhoconnect service up!"
   else
     puts "Failed to connect to rhoconnect service."

data/installer/utils/package_upload/repos.rake

@@ -18,7 +18,7 @@ task "build:repos", :build_type, :build_number do |t, args|
 
   # CONSTANTS
 
-  RHOCONNECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..', '..'))
+  RHOCONNECT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', '..'))
 
   PKG_DIR         = case build_type
                     when 'release'
@@ -125,4 +125,4 @@ task "build:repos", :build_type, :build_number do |t, args|
     cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{PKG_DIR}/#{dir} #{BUCKET}" 
   end #do
   cmd "sudo ruby ./installer/utils/package_upload/s3_upload.rb #{PKG_DIR}/SHA1 #{BUCKET}"
-end #build:repos
+end #build:repos

data/installer/utils/package_upload/s3_single_file.rb

@@ -0,0 +1,57 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'aws/s3'
+
+# Constants
+
+FILE      = File.expand_path(ARGV[0])
+BUCKET    = ARGV[1]
+USER_DATA = `wget -q -O - http://169.254.169.254/latest/user-data`.split("\n")
+
+# Methods
+
+# Retrieves S3 credential information
+def get_keys
+   access_key = USER_DATA[0].to_s.strip
+   secret_access_key = USER_DATA[1].to_s.strip
+   keys = { :access_key_id => access_key,
+            :secret_access_key => secret_access_key}
+end #get_keys
+
+# Establishes S3 connection
+def establish_s3_connection
+  @s3_connection = AWS::S3::Base.establish_connection!(get_keys)
+end #establish_s3_connection
+
+# Uploads given file to the specified S3 bucket
+def upload
+  # Upload the given file
+  AWS::S3::S3Object.store( FILE,
+                           open( FILE ),
+                           BUCKET,
+                           :access => :public_read )
+
+  # display the URL of the file just uploaded
+  puts AWS::S3::S3Object.url_for((file), BUCKET)[/[^?]+/]
+end #upload
+
+# Script
+
+begin
+  establish_s3_connection
+rescue => e
+  puts "Error Connecting to S3!!"
+  puts e.inspect
+  puts e.backtrace
+  exit 1
+end #begin
+
+begin
+  upload 
+rescue => e
+  puts "Error Uploading files!!"
+  puts e.inspect
+  puts e.backtrace
+  exit 3
+end #begin

data/lib/rhoconnect/client_sync.rb

@@ -25,7 +25,7 @@ module Rhoconnect
           key,value = op,cud_params[op]
           processed += _receive_cud(key,value) if value
         end
-        @source_sync.process_cud if processed > 0
+        @source_sync.process_cud
       end
     end
     

data/lib/rhoconnect/jobs/bulk_data_job.rb

@@ -6,48 +6,42 @@ module Rhoconnect
     @queue = :bulk_data
     
     def self.perform(params)
-      bulk_data = nil
-      begin
-        bulk_data = BulkData.load(params["data_name"]) if BulkData.is_exist?(params["data_name"])
-        if bulk_data
-          timer = start_timer('starting bulk data process')
-          bulk_data.process_sources
-          timer = lap_timer('process_sources',timer)
-          ts = Time.now.to_i.to_s
-          create_sqlite_data_file(bulk_data,ts)
-          timer = lap_timer('create_sqlite_data_file',timer)
-          log "bulk_data.dbfile:  #{bulk_data.dbfile}"
-          create_hsql_data_file(bulk_data,ts) if Rhoconnect.blackberry_bulk_sync
-          lap_timer('create_hsql_data_file',timer)
-          log "finished bulk data process"
-          #bulk_data.state = :completed
-          #bulk_data.refresh_time = Time.now.to_i + Rhoconnect.bulk_sync_poll_interval
-        else
-          raise Exception.new("No bulk data found for #{params["data_name"]}")
-        end
-      rescue Exception => e
-        bulk_data.delete if bulk_data
-        log "Bulk data job raised: #{e.message}"
-        log e.backtrace.join("\n")
-        raise e
+      do_bulk_job(params) do |bulk_data|
+        timer = start_timer('starting bulk data process')
+        bulk_data.process_sources
+        timer = lap_timer('process_sources',timer)
+        ts = Time.now.to_i.to_s
+        create_sqlite_data_file(bulk_data,ts)
+        timer = lap_timer('create_sqlite_data_file',timer)
+        log "bulk_data.dbfile:  #{bulk_data.dbfile}"
+        create_hsql_data_file(bulk_data,ts) if Rhoconnect.blackberry_bulk_sync
+        lap_timer('create_hsql_data_file',timer)
+        log "finished bulk data process"
       end
     end
 
     def self.after_perform_x(*args)
       log "BulkDataJob.after_perform_x hook called ..."
       params = args[0] # 1st parameter is bulk data
+      do_bulk_job(params) do |bulk_data|
+        bulk_data.state = :completed
+        bulk_data.refresh_time = Time.now.to_i + Rhoconnect.bulk_sync_poll_interval
+        log "BulkDataJob.after_perform_x hook set data state to complete."
+      end
+    end
+
+    def self.do_bulk_job(params)
+      bulk_data = nil
       begin
         bulk_data = BulkData.load(params["data_name"]) if BulkData.is_exist?(params["data_name"])
         if bulk_data
-          bulk_data.state = :completed
-          bulk_data.refresh_time = Time.now.to_i + Rhoconnect.bulk_sync_poll_interval
-          log "BulkDataJob.after_perform_x hook set data state to complete."
+          yield bulk_data
         else
           raise Exception.new("No bulk data found for #{params["data_name"]}")
         end
       rescue Exception => e
         bulk_data.delete if bulk_data
-        log "Bulk data after_perform_x raised: #{e.message}"
+        log "Bulk data job raised: #{e.message}"
         log e.backtrace.join("\n")
         raise e
       end
@@ -131,19 +125,23 @@ module Rhoconnect
       str[0..-2]
     end
     
+    # #2354: Bulk sync not updating sources table
+    # last_inserted_size +
+    # last_deleted_size
+    # backend_refresh_time +
     def self.populate_sources_table(db,sources_refs) 
       db.transaction do |database|
         database.prepare("insert into sources
-          (source_id,name,sync_priority,partition,sync_type,source_attribs,metadata,schema,blob_attribs,associations) 
-          values (?,?,?,?,?,?,?,?,?,?)") do |stmt|
+          (source_id,name,sync_priority,partition,sync_type,source_attribs,metadata,schema,blob_attribs,associations,last_inserted_size,backend_refresh_time) 
+          values (?,?,?,?,?,?,?,?,?,?,?,?)") do |stmt|
           sources_refs.each do |source_name,ref|
             s = ref[:source]
             stmt.execute(s.source_id,s.name,s.priority,s.partition_type.to_s,
-              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many)
+              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many,s.get_value(:md_size),s.read_state.refresh_time)
           end
         end
       end
-    end  
+    end
     
     def self.create_sqlite_data_file(bulk_data,ts)
       sources_refs = {}

data/lib/rhoconnect/jobs/ping_job.rb

@@ -10,12 +10,20 @@ module Rhoconnect
       phone_ids = []
       user_ids = params['user_id']
       user_ids = [user_ids] unless user_ids.is_a? Array
+      errors = []
       user_ids.each do |user|
-        ping_by_user user, params, device_pins, phone_ids
+        user_errors = ping_by_user user, params, device_pins, phone_ids
+        errors = errors + user_errors if user_errors
+      end
+      if errors.size != 0
+        joined_err = errors.join '\n'
+        raise joined_err
       end
     end
     
     def self.ping_by_user(user_id, params, device_pins, phone_ids)
+      # all errors are recorded here
+      errors = []
       user = User.load(user_id)
       user.clients.members.each do |client_id|
         client = Client.load(client_id,{:source_name => '*'})
@@ -40,7 +48,11 @@ module Rhoconnect
             klass = Object.const_get(camelize(client.device_type.downcase))
             if klass
               params['vibrate'] = params['vibrate'].to_s
-              klass.ping(params) 
+              begin
+                klass.ping(params) 
+              rescue Exception => e
+                errors << e
+              end
             end
           else
             log "Dropping ping request for client_id '#{client_id}' because it's already in user's device pin or phone_id list."
@@ -49,6 +61,7 @@ module Rhoconnect
           log "Skipping ping for non-registered client_id '#{client_id}'..."
         end
       end
+      errors
     end
   end
 end

data/lib/rhoconnect/server.rb

@@ -79,6 +79,9 @@ module Rhoconnect
       end  
 
       def login
+        if params[:login].nil? or params[:login].empty? 
+          return false
+        end
         if params[:login] == 'rhoadmin'
           user = User.authenticate(params[:login], params[:password])
         elsif current_app and current_app.can_authenticate? and params[:login]

data/lib/rhoconnect/tasks.rb

@@ -1,7 +1,6 @@
 require 'zip/zip'
 require 'uri'
 $:.unshift File.dirname(__FILE__)
-require 'console/rhoconnect_api'
 require 'utilities'
 
 DEPRECATION_MSG =  "\n" + 
@@ -14,7 +13,6 @@ puts DEPRECATION_MSG if $0.include? 'rake'
 
 namespace :rhoconnect do
   include Utilities
-  include RhoconnectApi
   
   task :config do
     $settings = load_settings(File.join('settings','settings.yml'))
@@ -41,7 +39,7 @@ namespace :rhoconnect do
   task :reset => :config do
     confirm = ask " Are you sure? Resetting will remove all data!\n It will also return an error code to all\n existing devices when they connect! (yes/no): "
     if confirm == 'yes'
-      RhoconnectApi.reset($url,$token) 
+      RestClient.post("#{$url}/api/admin/reset", { :api_token => $token })
       puts "Database reset."
     else
       puts "Cancelling."
@@ -62,7 +60,7 @@ namespace :rhoconnect do
     end
     puts ''
     begin
-      $token = RhoconnectApi.get_token($url,login,password)
+      $token = RestClient.post("#{$url}/api/admin/login", { :login => login, :password => password})
     rescue
       puts "Login failed."
       exit
@@ -90,20 +88,20 @@ namespace :rhoconnect do
       exit
     end
     puts ''
-    RhoconnectApi.create_user($url,$token,login,password)
+    RestClient.post("#{$url}/api/user/create_user", { :api_token => $token, :attributes => {:login => login, :password => password}})
   end
   
   desc "Deletes a user from rhoconnect"
   task :delete_user => :config do
     login = ask "user to delete: "
-    RhoconnectApi.delete_user($url,$token,login)
+    RestClient.post("#{$url}/api/user/delete_user", { :api_token => $token, :user_id => login })
   end
   
   desc "Deletes a device from rhoconnect"
   task :delete_device => :config do
     user_id = ask "device's user_id: "
     device_id = ask "device to delete: "
-    RhoconnectApi.delete_client($url,$token,user_id,device_id)
+    RestClient.post("#{$url}/api/client/delete_client", { :api_token => $token, :user_id => user_id, :client_id => device_id})
   end
   
   desc "Sets the admin password"

data/lib/rhoconnect/user.rb

@@ -14,6 +14,7 @@ module Rhoconnect
         
     class << self
       def create(fields={})
+        raise ArgumentError.new("Empty login") if (fields[:login].nil? or fields[:login].empty?)
         raise ArgumentError.new("Reserved user id #{fields[:login]}") if fields[:login] && fields[:login] == '__shared__'
         fields[:id] = fields[:login]
         user = super(fields)      

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.2.0.beta1'
+  VERSION = '3.2.0.beta2'
 end

data/lib/rhoconnect/web-console/models/adapter.js

@@ -12,6 +12,7 @@ var Adapter = Backbone.Model.extend({
 	},
 	
 	set_adapter: function(adapter_url){
+		var adapter_url = adapter_url;
 		$.ajax({
 			type: 'POST',
 			url: '/api/source/save_adapter',
@@ -19,6 +20,7 @@ var Adapter = Backbone.Model.extend({
 			success: function(model, resp){
 		  		$(".setadapter-status")[0].firstChild.className = "label label-success";
 				$(".setadapter-status")[0].firstChild.innerHTML = "success";
+				$('#input_adapter').val(adapter_url);
 			},
 			error: function(resp){
 				if(resp.status == 422){

data/lib/rhoconnect/web-console/models/client.js

@@ -80,26 +80,4 @@ var Client = Backbone.Model.extend({
 			}
 		})
 	}
-	
-	// get_device: function(device_id){
-	// 	$.ajax({
-	// 		type: 'POST',
-	// 		url: '/api/client/get_client_params',
-	// 		data: {api_token : this.get('api_token'), client_id : device_id},
-	// 		success: function(resp){
-	// 			var r = JSON.parse(resp)
-	// 			data = "";
-	// 			$.each(r, function(index,value){
-	// 				if(value.value != null && value.value != "")
-	// 					data += "<tr><td>" + value.name + "</td><td>" + value.value + "</td></tr>"
-	// 			})
-	// 			
-	// 			$('#device-table tr:last').after(data);
-	// 		},
-	// 		error: function(resp){
-	// 			$('#showdevice-alert')[0].innerHTML = resp.responseText;
-	// 	        $('#showdevice-alert').css('display','block');
-	// 		}
-	// 	})
-	// }
 })

data/lib/rhoconnect/web-console/models/source.js

@@ -53,7 +53,7 @@ var Source = Backbone.Model.extend({
 			$('#source-table tr:last').after(adapters);
 		}
 		else{
-			var license_text = "License to  " + resp["licensee"] + 
+			var license_text = "Licensed to  " + resp["licensee"] + 
 				" on " + resp["issued"] + ", available " + 
 				resp["available"] + " out of " + 
 				resp['seats'] + " devices"

data/lib/rhoconnect/web-console/templates/index.erb

@@ -4,7 +4,8 @@
 	<title>RhoConnect Console</title>
 	
 	<link rel="stylesheet" href='public/bootstrap.css' type="text/css" media="screen" />
-	<script language="javascript" type="text/javascript" src='public/jquery-1.7.1.min.js'></script>
+    <!-- <script language="javascript" type="text/javascript" src='application.js'></script> -->
+    <script language="javascript" type="text/javascript" src='public/jquery-1.7.1.min.js'></script>
 	<script language="javascript" type="text/javascript" src='public/underscore.js'></script>
 	<script language="javascript" type="text/javascript" src='public/backbone.js'></script>
 	<script language="javascript" type="text/javascript" src='public/rhoconnect-web.js'></script>

data/lib/rhoconnect/web-console/views/home.js

@@ -48,7 +48,28 @@ App.Views.Home = Backbone.View.extend({
 	    out += "<table id='source-table' class='table table-bordered'><thead><tr><th><h3>App partition sources</h3></th></tr></thead>"
 		out += "</table></div>"
 		out += "<div class='span4 pull-right'><h3>Sync Server URL</h3><code style='margin:0'>http://"+domain+"</code></br>";
-		out += "<em style='margin-top:5px'>Paste this url into your client app configuration to sync with this RhoConnect instance.</em></div>"
+		out += "<em style='margin-top:5px'>Paste this url into your client app configuration to sync with this RhoConnect instance.</em></div>";
+		out += "<div class='span12' style='margin-top:20px'><h2>Getting Started with RhoConnect</h2>";
+		out += "<ol style='font-size:18px;margin-top:20px'><li>The Home Screen</li>";
+		out += "<ul style='margin:20px'>"
+		out += "<li>Sync Server URL<p style='margin-top:5px'> This url is the domain of this page appended with 'application'.  This is a convenience function as you will need to paste this url into your rhodes app to sync with rhoconnect</p></li>"
+		out += "<li>App partition sources</li><p style='margin-top:5px'>This is a list of all your source adapters partitioned by :app.  Click on the source links to view the attributes and document key/values stored in redis</p>"
+		out += "<li><a class='btn btn-danger'>Reset</a> button</li>"
+		out += "<p style='margin-top:5px'>The reset button will clear the redis db of all data.  <b><em>Be careful when reseting the db as you will lose all your user information and document data.</em></b></p>"
+		out += "</ul>"
+		out += "<li>Server Doc</li>";
+		out += 	"<p style='margin:10px'>Enter a dbkey to view the stored value in redis.  You can also set and delete doc values here.</p>"
+		out += "<li>Users</li>"
+		out += "<p style='margin:10px'>View a list of registered users here.  You can also create,delete and ping users.  Viewing a particular user will allow you to view source apdapters partitioned by user as well as that users registered devices."
+		out += "<li>Settings</li><ul style='margin:20px'><li>Change Admin Password</li><p style='margin-top:10px'>By default the admin password is blank.  Here you can change the admin password.</p>"
+		out += "<li>API Token</li><p>View your RhoConnect API Token.  This token needs to be included in all API calls made to RhoConnect</p>"
+		out += "<li>Plugin Settings</li><p style='margin-top:10px'>If you are using Dynamic Adapters (opposed to source adapters) with <a href='http://docs.rhomobile.com/rhoconnect/plugin-intro' target='_blank'>RhoConnect Plugins</a>, you will need to "
+		out += "define your backend app URL here.  For example, if I am using the plugin rhoconnect-rb with my rails app, I would put the URL http://myrailsapp.com here. <em><b>This value needs to be set in order to use RhoConnect Plugins.</b></em></p></ul>"
+		out += "<li>Statistics</li>"
+		out += "<p style='margin-top:10px'>If you do not see a link to Statistics, it is not enabled in your config.ru file.  By default Rhoconnect apps will have this line <code>Rhoconnect::Server.enable  :stats</code> commented out. "
+		out += "Older versions of Rhoconnect will not have this line in the config.ru file at all.  Uncomment or add the line above to enable Statistics.  The Statistics tab will have different graphs to measure metrics/performance for Rhoconnect.</p>"
+		out += "</ol></div>"
+		
         $(this.el).html(out);
         $('#main_content').html(this.el);
 		return this

data/lib/rhoconnect/web-console/views/set_adapter.js

@@ -5,27 +5,26 @@ App.Views.SetAdapter = Backbone.View.extend({
 	},
 	
     initialize: function() {
-		this.render("",domain);
+	    this.render()
 		this.model.get_adapter();
     },
 
 	set_adapter: function(e){
 		e.preventDefault();
 		var adapter_url = $('#input_adapter').val();
-		var domain = $('input#domain').val();
-		this.render(adapter_url,domain);
+		this.render(adapter_url);
 		$(".setadapter-status")[0].firstChild.className = "label label-warning";
 		$(".setadapter-status")[0].firstChild.innerHTML = "loading...";
 		$(".setadapter-status").css("visibility","visible");
 		this.delegateEvents();
-		this.model.set_adapter(adapter_url, self);
+		this.model.set_adapter(adapter_url);
 	},
 	
-    render: function(adapter_url,domain) {
+    render: function() {
         $('#secondary-nav').css('display','block');
 		out  = "<h3>Backend App URL</h3>";
 	    out += "<form style='margin:0'>";
-	    out += "<input id='input_adapter' type='text' name='adapter_url' value='"+adapter_url+"' class='input-xlarge' placeholder='Enter Adapter URL' style='margin:0'/>";
+	    out += "<input id='input_adapter' type='text' name='adapter_url' value='' class='input-xlarge' placeholder='Enter Adapter URL' style='margin:0'/>";
 	    out += "<input type='submit' value='Submit' class='btn btn-primary' style='margin-left:10px'/><div class='setadapter-status' style='display:inline;margin-left:10px;visibility:hidden'><span class=''></span></div>";
 	    out += "</form>";
 	

data/rhoconnect.gemspec

@@ -48,5 +48,6 @@ Gem::Specification.new do |s|
   s.add_dependency('resque', '~> 1.20.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')
-  s.add_dependency('thor', '~> 0.14.6')  
+  s.add_dependency('thor', '~> 0.14.6')
+  s.add_dependency('thin', '~> 1.3.1')
 end

data/spec/api/source/fast_insert_spec.rb

@@ -22,7 +22,7 @@ describe "RhoconnectApiFastInsert" do
         :user_id => @u.id, :source_id => @s_fields[:name], :data => incorrect_insert
       last_response.should be_ok
       data['3'].merge!(incorrect_insert['3'])
-      verify_result(@s.docname(:md) => data,@s.docname(:md_size)=>'4')
+      verify_result(@s.docname(:md_size)=>'4')
     end
   end  
 end

data/spec/api/user/create_user_spec.rb

@@ -12,5 +12,15 @@ describe "RhoconnectApiCreateUser" do
         params[:attributes][:password]).login.should == params[:attributes][:login]
       @a.users.members.sort.should == [@u.login, params[:attributes][:login]]
     end
-  end  
+  end 
+  
+  it_should_behave_like "ApiHelper" do
+    it "should not create user with empty login" do
+      params = {:api_token => @api_token,
+        :attributes => {:login => '', :password => ''}}
+      post "/api/user/create_user", params
+      last_response.should_not be_ok
+      User.is_exist?('').should == false
+    end
+  end 
 end