rhoconnect 4.0.4 → 5.1.1

data/spec/controllers/js_base_spec.rb

@@ -6,151 +6,157 @@ describe "Rhoconnect::Controller::JsBase" do
   include Rack::Test::Methods
   include Rhoconnect
 
-  it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
-    def app
-      @app = Rack::URLMap.new Rhoconnect.url_map
-    end
+  include_examples "SharedRhoconnectHelper", :rhoconnect_data => true
+
+  def app
+    @app = Rack::URLMap.new Rhoconnect.url_map
+  end
 
-    def remove_application_controller
-      Object.send(:remove_const, :ApplicationController) rescue nil
+  def remove_application_controller
+    Object.send(:remove_const, :ApplicationController) rescue nil
+  end
+
+  after(:all) do
+    Rhoconnect.use_node = false
+  end
+
+  def bootstrap_rhoconnect(jsapp = false)
+    Rhoconnect::Server.set :environment, :test
+    Rhoconnect::Server.set :secret, "secure!"
+    Rhoconnect.use_node = true
+    if jsapp
+      Rhoconnect.bootstrap(get_jstestapp_path)
+    else
+      Rhoconnect.bootstrap(get_testapp_path)
+    end
+    # reload ruby controllers
+    Dir[File.join(Rhoconnect.app_directory,'controllers','ruby','*.rb')].each do |controller_file|
+      load controller_file
+    end
+    # reload ruby models
+    Dir[File.join(Rhoconnect.app_directory,'models','ruby','*.rb')].each do |model_file|
+      load model_file
     end
+  end
 
+  describe "ApplicationController" do
     after(:all) do
-      Rhoconnect.use_node = false
-    end
-
-    def bootstrap_rhoconnect(jsapp = false)
-      Rhoconnect::Server.set :environment, :test
-      Rhoconnect::Server.set :secret, "secure!"
-      Rhoconnect.use_node = true
-      if jsapp
-        Rhoconnect.bootstrap(get_jstestapp_path)
-      else
-        Rhoconnect.bootstrap(get_testapp_path)
-      end
-      # reload ruby controllers
-      Dir[File.join(Rhoconnect.app_directory,'controllers','ruby','*.rb')].each do |controller_file|
-        load controller_file
-      end
-      # reload ruby models
-      Dir[File.join(Rhoconnect.app_directory,'models','ruby','*.rb')].each do |model_file|
-        load model_file
-      end
-    end
-
-    describe "ApplicationController" do
-      after(:each) do
-        Rhoconnect.remove_from_url_map(ApplicationController)
-        remove_application_controller
-      end
-
-      it "should call Store api in ApplicationController" do
-        Rhoconnect.remove_from_url_map(ApplicationController)
-        remove_application_controller
-        bootstrap_rhoconnect(true)
-        do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => 'storeapitest', "password" => 'testpass'
-        Store.get_value('loginkey').should == 'storeapitest'
-      end
-    end
-
-    describe "Named Controller" do
-
-      before(:each) do
-        bootstrap_rhoconnect
-        do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
-      end
-
-      it "should get / of js controller with route overridden" do
-        get '/app/v1/JsSample', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        last_response.should be_ok
-        body = JSON.parse(last_response.body)
-        body[2]['count'].should == 1
-        body.last['insert'].should == {'1' => {'name' => 'iPhone'}}
-      end
-
-      it "should get /custom_route of js controller" do
-        get '/app/v1/JsSample/custom_route', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        last_response.body.should == 'testuser'
-      end
-
-      it "should get /source from custom route" do
-        get '/app/v1/JsSample/custom_route2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        last_response.body.should == 'JsSample'
-      end
-
-      it "should get stash_result from js model" do
-        pending "stash_result not supported yet"
-        get '/app/v1/JsSample/custom_route3',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        res = JSON.parse(last_response.body)
-        res[2]["count"].should == 1
-      end
-
-      it "should register sync route" do
-        get '/app/v1/Sample2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        res = JSON.parse(last_response.body)
-        res[2]["count"].should == 1
-      end
-
-      it "should post to js controller" do
-        hsh = {'1'=>{'name'=>'testname','price'=>'$199'}}
-        post '/app/v1/JsSample',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        last_response.should be_ok
-      end
-
-      it "should put to js controller" do
-        put '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        last_response.body.should == ''
-      end
-
-      it "should delete to js controller" do
-        @c1 = Client.create({:user_id => @u.id,:app_id => @a.id},{:source_name => 'JsSample'})
-        set_doc_state(@c1, :cd => @data)
-        delete '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c1.id}
-        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
-        @product1['_id'] = 'tempobj1'
-        cud = {'create'=>{'1'=>{'name'=>'hello'}},
-          :blob_fields => ['txtfile-rhoblob']}.to_json
-        post "/app/#{Rhoconnect::API_VERSION}/JsSample",
-            {:cud => cud,'txtfile-rhoblob-1' =>
-              Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream")},
-              {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        last_response.should be_ok
-        get "/app/#{Rhoconnect::API_VERSION}/JsSample", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
-        json = JSON.parse(last_response.body)
-        json[5]['links'].should == { "1" => { "l" => "blob_created" } }
-        json[5]['delete'].should == { "blob_created" => { "name" => "hello", "txtfile-rhoblob" => "blob_created" } }
-      end
-
-      it "should push_objects to js controller" do
-        s = Source.load('JsSample', @s_params)
-        data = {'1' => @product1, '2' => @product2, '3' => @product3}
-        post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_objects",
-          {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-        last_response.should be_ok
-        verify_doc_result(s, {:md => data, :md_size=>'3'})
-      end
-
-      it "should push_deletes to js controller" do
-        data = {'1' => @product1, '2' => @product2, '3' => @product3}
-        s = Source.load('JsSample',@s_params)
-        set_doc_state(s, {:md => data, :md_size => '3'})
-        data.delete('2')
-        post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_deletes",
-          {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
-        last_response.should be_ok
-        verify_doc_result(s, {:md => data, :md_size=>'2'})
-      end
+      Rhoconnect.remove_from_url_map(ApplicationController)
+      remove_application_controller
+    end
+
+    it "should call Store api in ApplicationController" do
+      Rhoconnect.remove_from_url_map(ApplicationController)
+      remove_application_controller
+      bootstrap_rhoconnect(true)
+      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => 'storeapitest', "password" => 'testpass'
+      Store.get_value('loginkey').should == 'storeapitest'
+    end
+
+    it "should use user defined :node_channel_timeout value for test environment" do
+      Rhoconnect.remove_from_url_map(ApplicationController)
+      remove_application_controller
+      bootstrap_rhoconnect(true)
+      Rhoconnect::NodeChannel.timeout.should == 60
+    end
+  end
+
+  describe "Named Controller" do
+    before(:each) do
+      bootstrap_rhoconnect
+      do_post "/rc/#{Rhoconnect::API_VERSION}/app/login", "login" => @u.login, "password" => 'testpass'
+    end
+
+    it "should get / of js controller with route overridden" do
+      get '/app/v1/JsSample', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+      body = JSON.parse(last_response.body)
+      body[2]['count'].should == 1
+      body.last['insert'].should == {'1' => {'name' => 'iPhone'}}
+    end
+
+    it "should get /custom_route of js controller" do
+      get '/app/v1/JsSample/custom_route', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.body.should == 'testuser'
+    end
+
+    it "should get /source from custom route" do
+      get '/app/v1/JsSample/custom_route2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.body.should == 'JsSample'
+    end
+
+    it "should get stash_result from js model" do
+      pending "stash_result not supported yet"
+      get '/app/v1/JsSample/custom_route3',{}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      res = JSON.parse(last_response.body)
+      res[2]["count"].should == 1
+    end
+
+    it "should register sync route" do
+      get '/app/v1/Sample2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      res = JSON.parse(last_response.body)
+      res[2]["count"].should == 1
+    end
+
+    it "should post to js controller" do
+      hsh = {'1'=>{'name'=>'testname','price'=>'$199'}}
+      post '/app/v1/JsSample',hsh, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+    end
+
+    it "should put to js controller" do
+      put '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.body.should == ''
+    end
+
+    it "should delete to js controller" do
+      @c1 = Client.create({:user_id => @u.id,:app_id => @a.id},{:source_name => 'JsSample'})
+      set_doc_state(@c1, :cd => @data)
+      delete '/app/v1/JsSample/2', {}, {Rhoconnect::CLIENT_ID_HEADER => @c1.id}
+      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
+      @product1['_id'] = 'tempobj1'
+      cud = {'create'=>{'1'=>{'name'=>'hello'}},
+        :blob_fields => ['txtfile-rhoblob']}.to_json
+      post "/app/#{Rhoconnect::API_VERSION}/JsSample",
+          {:cud => cud,'txtfile-rhoblob-1' =>
+            Rack::Test::UploadedFile.new(File.join(File.dirname(__FILE__),'..','testdata',file1), "application/octet-stream")},
+            {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      last_response.should be_ok
+      get "/app/#{Rhoconnect::API_VERSION}/JsSample", {}, {Rhoconnect::CLIENT_ID_HEADER => @c.id}
+      json = JSON.parse(last_response.body)
+      json[5]['links'].should == { "1" => { "l" => "blob_created" } }
+      json[5]['delete'].should == { "blob_created" => { "name" => "hello", "txtfile-rhoblob" => "blob_created" } }
+    end
+
+    it "should push_objects to js controller" do
+      s = Source.load('JsSample', @s_params)
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_objects",
+        {:user_id => @u.id, :objects => data}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_doc_result(s, {:md => data, :md_size=>'3'})
+    end
+
+    it "should push_deletes to js controller" do
+      data = {'1' => @product1, '2' => @product2, '3' => @product3}
+      s = Source.load('JsSample',@s_params)
+      set_doc_state(s, {:md => data, :md_size => '3'})
+      data.delete('2')
+      post "/app/#{Rhoconnect::API_VERSION}/JsSample/push_deletes",
+        {:user_id => @u.id, :objects => ['2']}, {Rhoconnect::API_TOKEN_HEADER => @api_token}
+      last_response.should be_ok
+      verify_doc_result(s, {:md => data, :md_size=>'2'})
     end
   end
 end

data/spec/doc/doc_spec.rb

@@ -5,11 +5,11 @@ require 'rspec/autorun'
 require File.join(File.dirname(__FILE__),'..','spec_helper')
 require File.join(File.dirname(__FILE__),'..','..','lib','rhoconnect','server.rb')
 
-describe "Protocol" do  
+describe "Protocol" do
   include Rack::Test::Methods
-  include Rhoconnect  
+  include Rhoconnect
   include TestHelpers
-  
+
   let(:test_app_name) { 'application' }
 
   let(:source) { 'Product' }
@@ -17,10 +17,10 @@ describe "Protocol" do
   let(:client_id)  { 1 }
   let(:product1) { {'name' => 'iPhone', 'brand' => 'Apple', 'price' => '199.99'} }
   let(:product2) { {'name' => 'G2', 'brand' => 'Android', 'price' => '99.99'} }
-  let(:product3) { {'name' => 'Fuze', 'brand' => 'HTC', 'price' => '299.99'} }  
+  let(:product3) { {'name' => 'Fuze', 'brand' => 'HTC', 'price' => '299.99'} }
   let(:product4) { {'name' => 'Droid', 'brand' => 'Android', 'price' => '249.99'} }
   let(:products)     { {'1' => product1,'2' => product2,'3'=> product3} }
-  
+
   before(:all) do
     Rhoconnect.bootstrap(get_testapp_path) do |rhoconnect|
       rhoconnect.vendor_directory = File.join(File.dirname(__FILE__),'..','vendor')
@@ -31,21 +31,20 @@ describe "Protocol" do
     Store.create
     Store.flush_all
   end
-  
-  #  it_should_behave_like "DBObjectsHelper"
+
   before(:each) do
     @a_fields = { :name => test_app_name }
     # @a = App.create(@a_fields)
     @a = (App.load(test_app_name) || App.create(@a_fields))
     @u_fields = {:login => 'testuser'}
-    @u = User.create(@u_fields) 
+    @u = User.create(@u_fields)
     @u.password = 'testpass'
     @c_fields = {
       :device_type => 'Apple',
       :device_pin => 'abcd',
       :device_port => '3333',
       :user_id => @u.id,
-      :app_id => @a.id 
+      :app_id => @a.id
     }
     @s_fields = {
       :name => 'SampleAdapter',
@@ -70,9 +69,9 @@ describe "Protocol" do
     Source.update_associations(@a.sources)
     @a.users << @u.id
   end
-    
+
   Rhoconnect.log_disabled = true
-  
+
   before(:each) do
     $rand_id ||= 0
     $content_table ||= []
@@ -85,58 +84,58 @@ describe "Protocol" do
     Rhoconnect::Server.set :run, false
     Rhoconnect::Server.set :secret, "secure!"
   end
-  
+
   before(:each) do
     do_post "/#{@a.name}/clientlogin", "login" => @u.login, "password" => 'testpass'
     @title,@description = nil,nil
     $rand_id += 1
   end
-  
+
   def app
     @app ||= Rhoconnect::Server.new
   end
-  
+
   after(:each) do
     #_print_messages
     _print_markdown if @title and @description
   end
-  
+
   after(:all) do
     _write_doc if $content and $content.length > 0
   end
-  
+
   it "clientlogin" do
     do_post "/#{@a.name}/clientlogin", "login" => @u.login, "password" => 'testpass'
     @title,@description = 'clientlogin', 'authenticate client'
   end
-  
+
   it "wrong login or password clientlogin" do
     do_post "/#{@a.name}/clientlogin", "login" => @u.login, "password" => 'wrongpass'
     @title,@description = 'clientlogin', 'login failure'
   end
-  
-  it "clientcreate" do 
+
+  it "clientcreate" do
     get "/#{@a.name}/clientcreate"
-    @title,@description = 'clientcreate', 'create client id'          
+    @title,@description = 'clientcreate', 'create client id'
   end
-  
-  it "clientcreate" do 
+
+  it "clientcreate" do
     get "/#{@a.name}/clientcreate?device_type=iPhone&device_pin=abcd&device_port=3333"
-    @title,@description = 'clientcreate-and-register', 'create client id with register params'          
+    @title,@description = 'clientcreate-and-register', 'create client id with register params'
   end
-  
+
   it "clientregister" do
-    do_post "/#{@a.name}/clientregister", 
-      "device_type" => "iPhone", "device_pin" => "abcd", 
+    do_post "/#{@a.name}/clientregister",
+      "device_type" => "iPhone", "device_pin" => "abcd",
       "device_port" => "3333", "client_id" => @c.id
-    @title,@description = 'clientregister', 'register client with params'     
+    @title,@description = 'clientregister', 'register client with params'
   end
-  
+
   it "clientreset" do
     get "/#{@a.name}/clientreset", :client_id => @c.id
     @title,@description = 'clientreset', 'reset client database'
   end
-  
+
   ['create','update','delete'].each do |operation|
     it "client #{operation} object(s)" do
       params = {operation=>{'1'=>product1},
@@ -146,7 +145,7 @@ describe "Protocol" do
       @title,@description = operation, "#{operation} object(s)"
     end
   end
-  
+
   it "client creates blobs" do
     body = <<eol
 <pre>------------XnJLe9ZIbbGUYtzPQJ16u1
@@ -167,7 +166,7 @@ Content-Disposition: form-data; name="cud"
 {"client_id":"278c76a7ab2a4f64ba804c1aa22504f3","source_name":"SampleAdapter","version":3,"create":{"1":{"price":"199.99","brand":"Apple","name":"iPhone","txtfile-rhoblob":"upload1.txt","_id":"tempobj1"},"2":{"price":"99.99","brand":"Android","name":"G2","txtfile-rhoblob":"upload2.txt","_id":"tempobj2"}},"blob_fields":["txtfile-rhoblob"]}
 ------------XnJLe9ZIbbGUYtzPQJ16u1--</pre>
 eol
-    @title,@description = 'create', 'client creates blobs'    
+    @title,@description = 'create', 'client creates blobs'
     $content_table << {$rand_id => "#{@title} - #{@description}"}
     data = {
       :title => @title,
@@ -187,9 +186,9 @@ eol
       :res_body => ''
     }
     $content << data
-    @title,@description = nil,nil    
+    @title,@description = nil,nil
   end
-  
+
   it "client create,update,delete objects" do
     params = {'create'=>{'1'=>product1},
               'update'=>{'2'=>product2},
@@ -199,7 +198,7 @@ eol
     do_post "/#{@a.name}", params
     @title,@description = 'create-update-delete', 'create,update,delete object(s)'
   end
-  
+
   it "server sends link created object" do
     product4['link'] = 'test link'
     params = {'create'=>{'4'=>product4},
@@ -210,25 +209,25 @@ eol
       :version => Rhoconnect::SYNC_VERSION
     @title,@description = 'create-with-link', 'send link for created object'
   end
-  
+
   it "server send source query error to client" do
     set_test_data('test_db_storage',{},"Error during query",'query error')
     get "/#{@a.name}",:client_id => @c.id,:source_name => @s.name,:version => Rhoconnect::SYNC_VERSION
     @title,@description = 'query-error', 'send query error'
   end
-  
+
   it "server send source login error to client" do
     @u.login = nil
     get "/#{@a.name}",:client_id => @c.id,:source_name => @s.name,:version => Rhoconnect::SYNC_VERSION
     @title,@description = 'login-error', 'send login error'
   end
-  
+
   it "server send source logoff error to client" do
     set_test_data('test_db_storage',{},"Error logging off",'logoff error')
     get "/#{@a.name}",:client_id => @c.id,:source_name => @s.name,:version => Rhoconnect::SYNC_VERSION
     @title,@description = 'logoff-error', 'send logoff error'
   end
-  
+
   ['create','update','delete'].each do |operation|
     it "client #{operation} object(s) with error" do
       if operation == 'update'
@@ -244,7 +243,7 @@ eol
       @title,@description = "#{operation}-error", "send #{operation} error"
     end
   end
-  
+
   it "server send insert objects to client" do
     cs = ClientSync.new(@s,@c,1)
     data = {'1'=>product1,'2'=>product2}
@@ -252,7 +251,7 @@ eol
     get "/#{@a.name}",:client_id => @c.id,:source_name => @s.name,:version => Rhoconnect::SYNC_VERSION
     @title,@description = 'insert objects', 'send insert objects'
   end
-  
+
   it "server send metadata to client" do
     mock_metadata_method([SampleAdapter]) do
       cs = ClientSync.new(@s,@c,1)
@@ -261,8 +260,8 @@ eol
     end
     @title,@description = 'metadata', 'send metadata'
   end
-  
-  it "server send delete objects to client" do 
+
+  it "server send delete objects to client" do
     cs = ClientSync.new(@s,@c,1)
     data = {'1'=>product1,'2'=>product2}
     set_test_data('test_db_storage',data)
@@ -274,8 +273,8 @@ eol
       :version => Rhoconnect::SYNC_VERSION
     @title,@description = 'delete objects', 'send delete objects'
   end
-  
-  it "server send insert,delete objects to client" do 
+
+  it "server send insert,delete objects to client" do
     cs = ClientSync.new(@s,@c,1)
     data = {'1'=>product1,'2'=>product2}
     set_test_data('test_db_storage',data)
@@ -287,7 +286,7 @@ eol
       :version => Rhoconnect::SYNC_VERSION
     @title,@description = 'insert-delete objects', 'send insert and delete objects'
   end
-  
+
   it "server send search results" do
     sources = [{:name=>'SampleAdapter'}]
     Store.put_data('test_db_storage',products)
@@ -296,7 +295,7 @@ eol
     get "/#{@a.name}/search",params
     @title,@description = 'search result', 'send search results'
   end
-  
+
   it "should get search results with error" do
     sources = [{:name=>'SampleAdapter'}]
     msg = "Error during search"
@@ -306,7 +305,7 @@ eol
     get "/#{@a.name}/search",params
     @title,@description = 'search error', 'send search error'
   end
-  
+
   it "should get multiple source search results" do
     Store.put_data('test_db_storage',products)
     sources = [{:name=>'SimpleAdapter'},{:name=>'SampleAdapter'}]
@@ -314,8 +313,8 @@ eol
       :version => Rhoconnect::SYNC_VERSION}
     get "/#{@a.name}/search",params
     @title,@description = 'multi source search', 'send multiple sources in search results'
-  end  
-  
+  end
+
   it "should ack multiple sources search results" do
     set_test_data('test_db_storage',products)
     sources = [{'name'=>'SimpleAdapter'},{'name'=>'SampleAdapter'}]
@@ -332,7 +331,7 @@ eol
     get "/#{@a.name}/search",params
     @title,@description = 'multi source search ack', 'acknowledge search result on multiple sources'
   end
-  
+
   private
   def _print_markdown
     $content_table << {$rand_id => "#{@title} - #{@description}"}
@@ -356,7 +355,7 @@ eol
     last_request.body.rewind
     $content << data
   end
-  
+
   def _write_doc
     File.open(File.join('doc','protocol.html'),'w') do |file|
       header = ERB.new(File.read(File.join(File.dirname(__FILE__),'header.html'))).result(binding)
@@ -369,7 +368,7 @@ eol
       file.write(footer)
     end
   end
-  
+
   def _get_header_text(header)
     header ? header : '&nbsp;'
   end