rhoconnect 4.0.0.beta.12 → 4.0.0.beta.24

data/spec/apps/rhotestapp/models/ruby/sample_adapter.rb

@@ -25,29 +25,38 @@ class SampleAdapter < SourceAdapter
     super
   end
   
-  def validate(operation,operation_hashes,client_ids)
+  def validate(operation,operation_data,client_ids)
     invalid_meta = {}
     used_ids = {}
-    operation_hashes.each_with_index do |operation_hash,index|
+    operation_data.each_with_index do |client_operation_data,index|
       client_id = client_ids[index]
-      operation_hash.each do |key,value|
-        if value['force_duplicate_error'] == '1'
-          invalid_meta[index] ||= {}
-          invalid_meta[index][key] ||= {}
-          invalid_meta[index][key][:error] = "Error during #{operation}: object confict detected"
-        end
-        if value['duplicate_of_cid']
-          invalid_meta[index] ||= {}
-          invalid_meta[index][key] ||= {}
-          invalid_meta[index][key][:duplicate_of] = true
-          master_client_id = value['duplicate_of_cid']
-          master_key = value['duplicate_of_key']
-          master_index = value['duplicate_of_queue_index'].to_i
+      client_operation_data.each do |source_operation_entry|
+        source_id = source_operation_entry[0]
+        list_of_objs = source_operation_entry[1]
+        list_of_objs.each_with_index do |obj_entry, objindex|
+          key = obj_entry[0]
+          objvalue = obj_entry[1]
+          if objvalue['force_duplicate_error'] == '1'
+            invalid_meta[index] ||= {}
+            invalid_meta[index][source_id] ||= {}
+            invalid_meta[index][source_id][objindex] ||= {}
+            invalid_meta[index][source_id][objindex][:error] = "Error during #{operation}: object confict detected"
+          end
+          if objvalue['duplicate_of_cid']
+            invalid_meta[index] ||= {}
+            invalid_meta[index][source_id] ||= {}
+            invalid_meta[index][source_id][objindex] ||= {}
+            invalid_meta[index][source_id][objindex][:duplicate_of] = true
+            master_client_id = objvalue['duplicate_of_cid']
+            master_objindex = objvalue['duplicate_of_entry_index'].to_i
+            master_index = objvalue['duplicate_of_queue_index'].to_i
           
-          invalid_meta[master_index] ||= {}
-          invalid_meta[master_index][master_key] ||= {}
-          invalid_meta[master_index][master_key][:duplicates] ||= []
-          invalid_meta[master_index][master_key][:duplicates] <<  {:client_id => client_id, :key => key, :value => value}
+            invalid_meta[master_index] ||= {}
+            invalid_meta[master_index][source_id] ||= {}
+            invalid_meta[master_index][source_id][master_objindex] ||= {}
+            invalid_meta[master_index][source_id][master_objindex][:duplicates] ||= []
+            invalid_meta[master_index][source_id][master_objindex][:duplicates] <<  {:client_id => client_id, :key => key, :value => objvalue}
+          end
         end
       end
     end
@@ -72,6 +81,12 @@ class SampleAdapter < SourceAdapter
     raise SourceAdapterServerErrorException.new("Error delete record") if delete_hash['id'] == ERROR
     Store.put_data('test_delete_storage',{delete_hash['id']=>delete_hash},true)
   end
+
+  # This is not correect (tempfile should not be used)
+  # but - for specs - it is sufficient
+  def store_blob(obj,field_name,blob)
+    blob[:tempfile].path if blob[:tempfile]
+  end
  
   def logoff
     @result = Store.get_data('test_db_storage')

data/spec/async_spec.rb

@@ -1,7 +1,7 @@
 require File.join(File.dirname(__FILE__),'api','api_helper')
 
 # these specs are executed only with Async support
-if RUBY_VERSION =~ /1.9/  and not defined?(JRUBY_VERSION)
+if not defined?(JRUBY_VERSION)
   describe "BasicEventMachineTest with Threads" do
     it_should_behave_like "ApiHelper" do 
       it "should run EventMachine gracefully and schedule callback execution in thread" do

data/spec/cli/cli_spec.rb

@@ -1,35 +1,44 @@
 require 'rspec'
 require 'thor'
-require 'tmpdir' 
+require 'tmpdir'
+
+require_relative '../../lib/rhoconnect'
+include Rhoconnect
+
+require_relative '../../commands/utilities/redis_runner'
+require_relative "../../lib/rhoconnect/utilities"
+include Utilities
+
+RHOCONNECT_PORT  = 9292
+REDIS_SERVER_URL = "localhost:6379"
+PUSH_SERVER_URL  = "http://someappname@localhost:8675/"
+API_TOKEN        = "my-rhoconnect-token"
 
 describe "RhoconnectCommandLineInterface" do
-  RHOCONNECT_PORT  = 9292
-  REDIS_SERVER_URL = "localhost:6379"
-  PUSH_SERVER_URL  = "http://someappname@localhost:8675/"
-  API_TOKEN        = "my-rhoconnect-token"
-  
   class Execute < Thor
-    no_tasks do
+    no_tasks {
       def self.define_task(&block)
         Execute.class_eval(&block)
       end
-      # Disable dtach usage
+
+      # Disable dtach usage for rspec examples
       def dtach_installed?
         false
-      end    
+      end
+    }
+  end
+
+  tasks = [ 'generators', 'rhoconnect', 'redis' ]
+  unless windows?
+    tasks << 'dtach'
+    tasks << 'rhoconnect_attach' unless jruby?
+  end
+  tasks << if jruby? then "rhoconnect_war" else "rhoconnect_console" end
+  tasks << 'rhoconnect_spec' if File.exists?(File.join(Dir.pwd,'Gemfile'))
+  tasks.each do |dir|
+    Dir.glob(File.join(File.dirname(__FILE__),  "..", "..", "commands", "#{dir}", "*.rb")) do |file|
+      require file
     end
-    
-    require_relative '../../lib/rhoconnect'  
-    require_relative "../../lib/rhoconnect/utilities"
-    
-    require_relative "../../commands/utilities/utilities"
-    require_relative "../../commands/utilities/redis_runner"
-    require_relative "../../commands/rhoconnect/config"
-    require_relative "../../commands/rhoconnect/start"
-    require_relative "../../commands/rhoconnect/stop"
-    require_relative "../../commands/rhoconnect/version"
-    include Utilities
-    
   end
 
   before(:all) do
@@ -39,18 +48,29 @@ describe "RhoconnectCommandLineInterface" do
   end
 
   after(:each) do
-    pid = `cat /tmp/rhoconnect.pid` if File.exist?("/tmp/rhoconnect.pid")      
-    puts "\nExecuting 'rhoconnect stop' command ..." if pid    
-    Execute.start ["stop"] # 'rhoconnect stop'    
+    pid = `cat /tmp/rhoconnect.pid` if File.exist?("/tmp/rhoconnect.pid")
+    puts "\nExecuting 'rhoconnect stop' command ..." if pid
+    Execute.start ["stop"] # 'rhoconnect stop'
     File.exist?("/tmp/rhoconnect.pid").should == false
-    `ps -p #{pid} -o pid=`.should be_empty if pid    
+    `ps -p #{pid} -o pid=`.should be_empty if pid
   end
-  
+
   after(:all) do
     Dir.chdir @cur_dir
     FileUtils.remove_entry @tmpdir
   end
 
+  it "'rhoconnect help' cmd should display list of available commands" do
+    begin
+      out = StringIO.new
+      $stdout = out
+      Execute.start ["help"] # 'rhoconnect help'
+    ensure
+      $stdout = STDOUT
+    end
+    out.string.strip.should start_with "Commands:"
+  end
+
   it "'rhoconnect version' cmd should display gem version" do
     begin
       out = StringIO.new
@@ -58,13 +78,31 @@ describe "RhoconnectCommandLineInterface" do
       Execute.start ["version"] # 'rhoconnect version'
     ensure
       $stdout = STDOUT
-    end 
+    end
     out.string.strip.should == Rhoconnect::VERSION
   end
-  
+
+  it "'rhoconnect routes' cmd should display list of available routes" do
+    begin
+      @prev_dir = Dir.pwd
+      @appdir = File.join(File.dirname(__FILE__),  "..", "apps", "rhotestapp")
+      puts " we have here #{@appdir}"
+      Dir.chdir @appdir
+      out = StringIO.new
+      $stdout = out
+      Execute.start ["routes"] # 'rhoconnect routes'
+    ensure
+      $stdout = STDOUT
+      Dir.chdir @prev_dir
+    end
+    out.string.strip.should include("SampleAdapterController: /app/v1/SampleAdapter")
+    out.string.strip.should include("FixedSchemaAdapterController: /app/v1/FixedSchemaAdapter")
+    out.string.strip.should_not include("FooAdapterController: /app/v1/FooAdapter")
+  end
+
   it "'rhoconnect start' cmd should start blank app from any directory" do
     thread = Thread.new do
-      puts "Executing 'rhoconnect start' command ..."            
+      puts "Executing 'rhoconnect start' command ..."
       # Array of params expected
       Execute.start ["start"] # 'rhoconnect start'
     end
@@ -73,11 +111,11 @@ describe "RhoconnectCommandLineInterface" do
       raise "'rhoconnect start' failed to start with exception" if thread.status.nil?
       break if File.exist?("/tmp/rhoconnect.pid")
     end
-    
+
     File.exist?("/tmp/rhoconnect.pid").should == true
     pid = `cat /tmp/rhoconnect.pid`
     puts "Rhoconnect app is running with pid=#{pid}"
     `ps -p #{pid} -o pid=`.should_not be_empty
   end
-  
+
 end

data/spec/client_sync_spec.rb

@@ -7,7 +7,6 @@ describe "ClientSync" do
       params = {'create'=>{'1'=>@product1}}
       @c.source_name = 'Product2'
       # create handler
-      params = {:p_size => 2}
       lv = lambda { @model.create(@params[:create_object]) }
       @model = Rhoconnect::Model::Base.create(@s2)
       @cs1 = Rhoconnect::Handler::Changes::Runner.new(['create'],@model,@c,lv,params)
@@ -44,7 +43,7 @@ describe "ClientSync" do
     end
     
     it "should handle receive cud that triggers processing of the previously queued data" do
-      queued_create_data = {'1'=>@product1}
+      queued_create_data = [[@s.name, [['1', @product1]]]]
       set_source_queue_state(@s, {:create => queued_create_data}, @c.id)
       verify_source_queue_data(@s, {:create => [queued_create_data],
                           :update => [],
@@ -54,6 +53,21 @@ describe "ClientSync" do
                           :update => [],
                           :delete => []})
     end
+
+    it "should handle receive cud from the custom queue_key that triggers processing of the previously queued data" do
+      queue_key = "post:/my_custom_create_route"
+      queue_name = "create:#{queue_key}"
+      Source.define_valid_queues([queue_name])
+      queued_create_data = [[@s.name, [['1', @product1]]]]
+      set_source_queue_state(@s, {queue_name => queued_create_data}, @c.id)
+      verify_source_queue_data(@s, {queue_name => [queued_create_data]})
+      @cud_handler.params[:queue_key] = queue_key
+      @cud_handler.engine.params[:queue_key] = queue_key
+      @cud_handler.operations = ["create"]
+      @cud_handler.engine.operations = ["create"]
+      @cud_handler.run
+      verify_source_queue_data(@s, {queue_name => []})
+    end
     
     it "should handle receive cud with pass through" do
       params = {'create'=>{'1'=>@product1},'update'=>{'2'=>@product2},'delete'=>{'3'=>@product3}}
@@ -61,10 +75,7 @@ describe "ClientSync" do
 
       rhcud = lambda { @model.send params[:operation].to_sym, params["#{params[:operation]}_object".to_sym] }
       @cud_handler = Rhoconnect::Handler::Changes::PassThroughRunner.new(['create','update','delete'],@model,@c,rhcud,params)
-      @cud_handler.run
-      verify_source_queue_data(@s, {:create => [],
-                          :update => [],
-                          :delete => []})
+      JSON.parse(@cud_handler.run).should == {"processed" => ['1', '2', '3']}
     end
     
     it "should handle exeptions in receive cud with pass through" do
@@ -72,10 +83,7 @@ describe "ClientSync" do
       @s.pass_through = 'true'
       rhcud = lambda { @model.send params[:operation].to_sym, params["#{params[:operation]}_object".to_sym] }
       @cud_handler = Rhoconnect::Handler::Changes::PassThroughRunner.new(['create','update','delete'],@model,@c,rhcud,params)
-      @cud_handler.run
-      verify_source_queue_data(@s, {:create => [],
-                          :update => [],
-                          :delete => []})
+      JSON.parse(@cud_handler.run).should == {"error" => {"message" => "undefined method `[]' for nil:NilClass" }, "processed" => []}
     end
 
     it "should handle send cud" do
@@ -237,9 +245,11 @@ describe "ClientSync" do
           error_objs = add_error_object({},"Error delete record")
           op_data = {'delete'=>error_objs}
           @cud_handler.params = op_data
+          @cud_handler.operations = ["delete"]
+          @cud_handler.engine.operations = ["delete"]
           @cud_handler.run
           @sync_handler.run.should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
-            {"delete-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>error_objs[ERROR]}}]      
+            {"delete-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>error_objs[ERROR]}}] 
         end
 
         it "should send cud errors only once" do
@@ -247,17 +257,19 @@ describe "ClientSync" do
           error_objs = add_error_object({},"Error delete record")
           op_data = {'delete'=>error_objs}
           @cud_handler.params = op_data
+          @cud_handler.operations = ["delete"]
+          @cud_handler.engine.operations = ["delete"]
           @cud_handler.run
           @sync_handler.run.should == [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},
             {"delete-error"=>{"#{ERROR}-error"=>{"message"=>msg},ERROR=>error_objs[ERROR]}}]
           verify_result(@c.docname(:delete_errors) => {})
-          @sync_handler.run.should ==   [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},{}]
+          @sync_handler.run.should ==   [{'version'=>Rhoconnect::SYNC_VERSION},{"token"=>""}, {"count"=>0}, {"progress_count"=>0}, {"total_count"=>0},{}]   
         end
 
         
       end
       
-      it "should handle receive_cud" do
+      it "should handle receive_cud and perform proper operation on the md and cd" do
         set_doc_state(@s, :md => {'3'=>@product3})
         set_doc_state(@c, :cd => {'3'=>@product3})
         params = {'create'=>{'1'=>@product1},
@@ -269,6 +281,9 @@ describe "ClientSync" do
                             :delete => []})
         verify_doc_result(@s, :md => {})
         verify_doc_result(@c, :cd => {})
+        verify_source_queue_data(@s2, {:create => [],
+                          :update => [],
+                          :delete => []})
       end
 
       it "should handle send_cud with query_params" do
@@ -598,6 +613,8 @@ describe "ClientSync" do
   def receive_and_send_cud(operation)
     msg = "Error #{operation} record"
     op_data = {operation=>{ERROR=>{'an_attribute'=>msg,'name'=>'wrongname'}}}
+    @cud_handler.operations = [operation]
+    @cud_handler.engine.operations = [operation]
     @cud_handler.params = op_data
     @cud_handler.run 
     if operation == 'update'

data/spec/controllers/js_base_spec.rb

@@ -7,6 +7,10 @@ describe "Rhoconnect::Controller::JsBase" do
   include Rhoconnect
 
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
+    def app
+      @app ||= Rack::URLMap.new Rhoconnect.url_map
+    end
+
     before(:each) do
       Rhoconnect::Server.set :environment, :test
       Rhoconnect::Server.set :secret, "secure!"
@@ -15,10 +19,6 @@ describe "Rhoconnect::Controller::JsBase" do
       do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
     end
 
-    def app
-      @app ||= Rack::URLMap.new Rhoconnect.url_map
-    end
-
     after(:each) do
       Rhoconnect::Node.kill_process
     end
@@ -72,6 +72,12 @@ describe "Rhoconnect::Controller::JsBase" do
       last_response.should be_ok
     end
 
+    it "should call route that overrides default option" do
+      get '/app/v1/JsSample/no_client_route', {}
+      last_response.should be_ok
+      last_response.body.should == 'no client required!'
+    end
+
     it "should upload blob in multipart post" do
       file1,file2 = 'upload1.txt'
       @product1['txtfile-rhoblob'] = file1

data/spec/jobs/source_job_spec.rb

@@ -16,7 +16,7 @@ describe "SourceJob" do
     it "should perform process_cud" do
       expected = {'backend_id'=>@product1}
       @product1['link'] = 'abc'
-      @s.push_queue(:create, @c.id, {'1'=>@product1})
+      @s.push_queue(:create, @c.id, [[@s.name, [['1', @product1]]]])
       SourceJob.perform('cud',@s.id,@s.app_id,@s.user_id,nil)
       verify_source_queue_data(@s, :create => [])
       verify_doc_result(@s, {:md => expected,

data/spec/models/{js_model_spec.rb → js_base_spec.rb}

@@ -21,18 +21,6 @@ describe "Rhoconnect::Model::JsBase" do
       Source.valid_doctypes.delete('tmpdoc'.to_sym)
     end
 
-    it "should call model's create method"
-
-    it "should call model's update method"
-
-    it "should call model's delete method"
-
-    it "should call model's query method"
-
-    it "should call model's login method"
-
-    it "should call model's logoff method"
-
     it "should call js model method explicitly" do
       js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
       res = js.login
@@ -60,13 +48,75 @@ describe "Rhoconnect::Model::JsBase" do
       js.get_data('tmpdoc').should == data
     end
 
+    it "should test non-nil result from query" do
+      data = {'1' => {'name' => 'iPhone'}}
+      js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+      js.do_query(test_non_hash: true)
+      js.get_data(:md).should == {}
+    end
+
     it "should call getData for a model" do
       data = {'1' => {'name' => 'iPhone'}}
       js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
-      res = js.do_query
+      js.do_query
       js.testGetModelData.should == data
     end
 
+    it "should call partitionName for a model" do
+      JsSample.partition_name('testuser').should == 'testuser_partition'
+    end
+
+    context "exceptions" do
+      it "should raise ruby Rhoconnect::Model::Exception" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.testRaiseException
+        }.should raise_error(Rhoconnect::Model::Exception, /some custom message/)
+      end
+
+      it "should raise ruby Rhoconnect::Model::LoginException" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.testRaiseLoginException
+        }.should raise_error(Rhoconnect::Model::LoginException, /some login message/)
+      end
+
+      it "should raise ruby Rhoconnect::Model::LogoffException" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.testRaiseLogoffException
+        }.should raise_error(Rhoconnect::Model::LogoffException, /some logoff message/)
+      end
+
+      it "should raise ruby Rhoconnect::Model::ServerTimeoutException" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.testRaiseTimeoutException
+        }.should raise_error(Rhoconnect::Model::ServerTimeoutException, /some timeout message/)
+      end
+
+      it "should raise ruby Rhoconnect::Model::ServerErrorException" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.testRaiseErrorException
+        }.should raise_error(Rhoconnect::Model::ServerErrorException, /some error message/)
+      end
+
+      it "should raise ruby Rhoconnect::Model::ObjectConflictErrorException" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.testRaiseConflictException
+        }.should raise_error(Rhoconnect::Model::ObjectConflictErrorException, /some object conflict message/)
+      end
+
+      it "should raise an exception during a regular adapter method" do
+        js = JsSample.new(Source.load('JsSample', {:app_id => @a.id, :user_id => @u.id}))
+        lambda {
+          js.do_query(raise_an_error: true)
+        }.should raise_error(Rhoconnect::Model::ServerErrorException, /query error occured/)
+      end
+    end
+
     context "Store" do
       it "should call getValue" do
         Store.put_value('foo', 'bar')