rhoconnect 3.4.5 → 4.0.0.beta.10

data/spec/perf/store_perf_spec.rb

@@ -61,25 +61,55 @@ describe "Rhoconnect Performance" do
       @data1 = get_test_data(10000)
       @data1['950']['Phone1'] = 'This is changed'
       expected = {'950' => {'Phone1' => 'This is changed'}}
-      Store.put_data(@s.docname(:md),@data1).should == true
-      Store.put_data(@c.docname(:cd),@data).should == true
+      @s.put_data(:md,@data1).should == true
+      @c.put_data(:cd,@data).should == true
       start = start_timer
-      cs = ClientSync.new(@s,@c)
+      cs = create_sync_handler
       token,progress_count,total_count,res = cs.send_new_page
       lap_timer('compute_page duration', start)
-      Store.get_data(@c.docname(:page)).should == expected
+      @c.get_data(:page).should == expected
+      res['insert'].should == expected
+      res['delete'].should == {'950' => {'Phone1' => @data['950']['Phone1']}}
+    end
+
+    it "should process single attribute diff for 10000-record doc using brute-force approach" do
+      @data = get_test_data(10000)
+      @data1 = get_test_data(10000)
+      @data1['950']['Phone1'] = 'This is changed'
+      expected = {'950' => {'Phone1' => 'This is changed'}}
+      @s.put_data(:md,@data1).should == true
+      @c.put_data(:cd,@data).should == true
+      start = start_timer
+      cs = create_sync_handler
+      token,progress_count,total_count,res = cs.send_new_page_bruteforce
+      lap_timer('compute_page duration', start)
+      @c.get_data(:page).should == expected
       res['insert'].should == expected
       res['delete'].should == {'950' => {'Phone1' => @data['950']['Phone1']}}
     end
     
     it "should process full-sync for 5000-record doc" do
       @data = get_test_data(5000)
-      Store.put_data(@s.docname(:md),@data).should == true
+      @s.put_data(:md,@data).should == true
       start = start_timer
-      cs = ClientSync.new(@s,@c,5000)
+      params = { :p_size => 5000 }
+      cs = create_sync_handler params
       token,progress_count,total_count,res = cs.send_new_page
       lap_timer('compute_page duration', start)
-      Store.get_data(@c.docname(:page)).should == @data
+      @c.get_data(:page).should == @data
+      res['insert'].should == @data
+      res['delete'].should == nil
+    end
+
+    it "should process full-sync for 5000-record doc using brute-force approach" do
+      @data = get_test_data(5000)
+      @s.put_data(:md,@data).should == true
+      start = start_timer
+      params = { :p_size => 5000 }
+      cs = create_sync_handler params
+      token,progress_count,total_count,res = cs.send_new_page_bruteforce
+      lap_timer('compute_page duration', start)
+      @c.get_data(:page).should == @data
       res['insert'].should == @data
       res['delete'].should == nil
     end
@@ -88,17 +118,42 @@ describe "Rhoconnect Performance" do
       @data = generate_fake_data(5000,true)
       sleep(1.5)
       @data1 = generate_fake_data(5000,true)
-      Store.put_data(@s.docname(:md),@data).should == true
-      Store.put_data(@c.docname(:cd),@data1).should == true
+      @s.put_data(:md,@data).should == true
+      @c.put_data(:cd,@data1).should == true
       start = start_timer
-      cs = ClientSync.new(@s,@c,5000)
+      params = { :p_size => 5000 }
+      cs = create_sync_handler params
       token,progress_count,total_count,res = cs.send_new_page
       lap_timer('compute_page duration', start)
-      Store.get_data(@c.docname(:page)).should == @data
-      Store.get_data(@c.docname(:cd)).should == Store.get_data(@s.docname(:md))
+      @c.get_data(:page).should == @data
+      @c.get_data(:cd).should == @s.get_data(:md)
+      res['insert'].should == @data
+      res['delete'].should == @data1
+    end
+
+    it "should process worst-case sync scenario there every attrib of every object is changed for 5000-record doc using brute-force approach" do
+      @data = generate_fake_data(5000,true)
+      sleep(1.5)
+      @data1 = generate_fake_data(5000,true)
+      @s.put_data(:md,@data).should == true
+      @c.put_data(:cd,@data1).should == true
+      start = start_timer
+      params = { :p_size => 5000 }
+      cs = create_sync_handler params
+      token,progress_count,total_count,res = cs.send_new_page_bruteforce
+      lap_timer('compute_page duration', start)
+      @c.get_data(:page).should == @data
+      @c.get_data(:cd).should == @s.get_data(:md)
       res['insert'].should == @data
       res['delete'].should == @data1
     end
   end
 
+  # helper
+  def create_sync_handler(params = {})
+    rh = lambda { @model.do_query(params[:query]) }
+    @model = Rhoconnect::Model::Base.create(@s)
+    Rhoconnect::Handler::Query::Runner.new(@model, @c, rh, params)
+  end
+
 end

data/spec/ping/android_spec.rb

@@ -69,7 +69,7 @@ describe "Ping Android" do
       @response.stub!(:[]).and_return(nil)
      	setup_post_yield(@response)
      	
-     	Store.should_receive(:flash_data).once
+     	Store.should_receive(:flush_data).once
      	Android.should_receive(:get_c2dm_token).twice.and_return('BadToken')
      	Android.should_receive(:log).twice
      	lambda { Android.ping(@params) }.should raise_error(Android::InvalidAuthToken, "Invalid or expired auth token. Obtain new authtoken from C2DM service.")

data/spec/read_state_spec.rb

@@ -18,7 +18,7 @@ describe "ReadState" do
 
     it "should delete read_state from db" do
       ReadState.delete(@a_fields[:name])
-      Store.db.keys("read_state*").should == []
+      Store.keys("read_state*").should == []
     end
     
     it "should delete read_state from source" do

data/spec/rhoconnect_spec.rb

@@ -6,7 +6,7 @@ describe "Rhoconnect" do
 
   before(:each) do 
     Store.create
-    Store.db.flushdb
+    Store.flush_all
   end
   
   it "should bootstrap Rhoconnect with block" do

data/spec/server/cors_spec.rb

@@ -33,10 +33,9 @@ describe "CORS middleware" do
     @middleware = Rack::Cors.new @app, {} do |cfg|
         cfg.allow do |allow|
           allow.origins /allowed_origin/, 'file://'
-          allow.resource '/application',   :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
-          allow.resource '/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => false
-          allow.resource '/api/application',   :headers => 'allowed_header', :methods => [:get, :post, :put, :delete], :credentials => true, :expose => 'Content-Length'
-          allow.resource '/api/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+          allow.resource "/StubAdapter", :headers => 'allowed_header', :methods => [:get, :post, :put, :delete], :credentials => true, :expose => 'Content-Length'
+          allow.resource "/StubAdapter/any_header_allowed_here", :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+          allow.resource "/StubAdapter/no_default_exposed_headers", :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
         end
     end
   end
@@ -58,16 +57,13 @@ describe "CORS middleware" do
           end
           exception_happens.should == true
 
-          allow.resource '/application',   :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
-          allow.resource '/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => false
-          allow.resource '/api/application',   :headers => 'allowed_header', :methods => [:get, :post, :put, :delete], :credentials => true, :expose => 'Content-Length'
-          allow.resource '/api/application/*', :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
+          allow.resource "/*", :headers => :any, :methods => [:get, :post, :put, :delete], :credentials => true
         end
     end
 
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'wrong_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }
@@ -79,7 +75,7 @@ describe "CORS middleware" do
   it "preflight check should disable unknown origins" do
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'wrong_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }
@@ -91,7 +87,7 @@ describe "CORS middleware" do
   it "preflight check should allow known origins" do
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }
@@ -103,7 +99,7 @@ describe "CORS middleware" do
   it "able to use fallback X-ORIGIN request header if ORIGIN header is undefined" do
     env = {
         'REQUEST_METHOD' => 'POST',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_X_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }
@@ -115,7 +111,7 @@ describe "CORS middleware" do
   it "preflight check treats empty 'null' origin as 'file://' one" do
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'null',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }
@@ -127,7 +123,7 @@ describe "CORS middleware" do
   it "preflight check should enable allowed request headers" do
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST',
         'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'allowed_header'
@@ -141,7 +137,7 @@ describe "CORS middleware" do
   it "preflight check should disable not allowed request headers" do
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST',
         'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'not_allowed_header'
@@ -155,7 +151,7 @@ describe "CORS middleware" do
   it "preflight check should allow any request headers if configured so" do
     env = {
         'REQUEST_METHOD' => 'OPTIONS',
-        'PATH_INFO' => '/api/application/any_headers_allowed_here',
+        'PATH_INFO' => '/StubAdapter/any_header_allowed_here',
         'HTTP_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST',
         'HTTP_ACCESS_CONTROL_REQUEST_HEADERS' => 'not_allowed_header'
@@ -170,7 +166,7 @@ describe "CORS middleware" do
   it "only allowed response headers should be exposed" do
     env = {
         'REQUEST_METHOD' => 'POST',
-        'PATH_INFO' => '/api/application',
+        'PATH_INFO' => '/StubAdapter',
         'HTTP_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }
@@ -182,7 +178,7 @@ describe "CORS middleware" do
   it "no response headers should be exposed by default" do
     env = {
         'REQUEST_METHOD' => 'POST',
-        'PATH_INFO' => '/api/application/no_headers_exposed_here_by_default',
+        'PATH_INFO' => '/StubAdapter/no_default_exposed_headers',
         'HTTP_ORIGIN' => 'allowed_origin',
         'HTTP_ACCESS_CONTROL_REQUEST_METHOD' => 'POST'
     }