rhoconnect 3.0.0.beta1 → 3.0.0.beta3

data/spec/dynamic_adapter_spec.rb

@@ -13,28 +13,28 @@ describe "DynamicAdapter" do
     
     it "should query dynamic adapter service" do
       data = {'1'=>@product1} 
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/query").with(:headers => {'Content-Type' => 'application/json'}).to_return(:status => 200, :body => data.to_json)
-      da = DynamicAdapter.new(@s2,nil,'http://test.rhoconnect.com')
+      stub_request(:post, "http://test.com/rhoconnect/query").with(:headers => {'Content-Type' => 'application/json'}).to_return(:status => 200, :body => data.to_json)
+      da = DynamicAdapter.new(@s2,nil,'http://test.com')
       da.query.should == data
     end
     
     it "should create new object using dynamic adapter" do
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
-      da = DynamicAdapter.new(@s2,nil,'http://test.rhoconnect.com')
+      stub_request(:post, "http://test.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
+      da = DynamicAdapter.new(@s2,nil,'http://test.com')
       da.create(@product1).should == {:id => 5}
     end
     
     it "should update object using dynamic adapter" do
       data = {'id' => 2} 
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/update").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
-      da = DynamicAdapter.new(@s2,nil,'http://test.rhoconnect.com')
+      stub_request(:post, "http://test.com/rhoconnect/update").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
+      da = DynamicAdapter.new(@s2,nil,'http://test.com')
       da.update(data).should == {:id => 5}
     end
     
     it "should delete object using dynamic adapter" do
       data = {'id' => 2}
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/delete").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
-      da = DynamicAdapter.new(@s2,nil,'http://test.rhoconnect.com')
+      stub_request(:post, "http://test.com/rhoconnect/delete").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
+      da = DynamicAdapter.new(@s2,nil,'http://test.com')
       da.delete(data).should == {:id => 5}
     end
     

data/spec/generator/generator_spec.rb

@@ -23,11 +23,13 @@ describe "Generator" do
     it "should create new application files" do
       SecureRandom.should_receive(:hex).with(64).any_number_of_times
       [ 
-        'config.ru',
+        'Gemfile',
+        'Rakefile',
         "application.rb",
+        'config.ru',
+        'public',
         'settings/settings.yml',
         'settings/license.key',
-        'Rakefile',
         'spec/spec_helper.rb'
       ].each do |template|
         @generator.should create("/tmp/#{appname}/#{template}")

data/spec/jobs/ping_job_spec.rb

@@ -4,6 +4,21 @@ require File.join(File.dirname(__FILE__), '..', 'support', 'shared_examples')
 describe "PingJob" do
   it_behaves_like "SharedRhoconnectHelper", :rhoconnect_data => true do
     
+    before(:each) do
+      @u1_fields = {:login => 'testuser1'}
+      @u1 = User.create(@u1_fields) 
+      @u1.password = 'testpass1'
+      @c1_fields = {
+        :device_type => 'Apple',
+        :device_pin => 'abcde',
+        :device_port => '3333',
+        :user_id => @u1.id,
+        :app_id => @a.id 
+      }
+      @c1 = Client.create(@c1_fields,{:source_name => @s_fields[:name]})
+      @a.users << @u1.id
+    end
+    
     it "should perform apple ping with integer parameters" do
       params = {"user_id" => @u.id, "api_token" => @api_token,
         "sources" => [@s.name], "message" => 'hello world', 
@@ -98,5 +113,43 @@ describe "PingJob" do
       PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
       lambda { PingJob.perform(params) }.should_not raise_error
     end
+    
+    it "should ping two different users from two different devices - Apple and Blackberry" do
+      params = {"user_id" => [ @u.id, @u1.id], "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', 
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', 'phone_id' => nil }
+      @c.phone_id = '3'
+      
+      scrubbed_params = params.dup
+      scrubbed_params['vibrate'] = '5'
+      @c1.device_type = 'blackberry'
+      
+      Apple.should_receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}))
+      Blackberry.should_receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
+      PingJob.perform(params)
+    end
+    
+    it "should drop ping with two different users from the same device" do
+      params = {"user_id" => [ @u.id, @u1.id], "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', 
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      @c.phone_id = '3'
+      @c1.phone_id = '3'
+      
+      Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
+      PingJob.should_receive(:log).once.with(/Dropping ping request for client/)
+      lambda { PingJob.perform(params) }.should_not raise_error
+    end
+    
+    it "should drop ping with two different users with the same pin" do
+      params = {"user_id" => [ @u.id, @u1.id], "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', "phone_id" => nil,
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      @c1.device_pin = @c.device_pin
+
+      Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
+      PingJob.should_receive(:log).once.with(/Dropping ping request for client/)
+      lambda { PingJob.perform(params) }.should_not raise_error
+    end
   end  
 end

data/spec/model_spec.rb

@@ -207,12 +207,12 @@ describe Rhoconnect::Model do
     end
     
     it "should send INCR when #increment! is called on an integer" do
-      @redisMock.should_receive(:incr).with("test_increments:1:foo", 1)
+      @redisMock.should_receive(:incrby).with("test_increments:1:foo", 1)
       @x.increment!(:foo)
     end
     
     it "should send DECR when #decrement! is called on an integer" do
-      @redisMock.should_receive(:decr).with("test_increments:1:foo", 1)
+      @redisMock.should_receive(:decrby).with("test_increments:1:foo", 1)
       @x.decrement!(:foo)
     end
     

data/spec/rhosync_spec.rb

@@ -23,7 +23,7 @@ describe "Rhoconnect" do
     Rhoconnect.bulk_sync_poll_interval.should == 3600
     Rhoconnect.environment.should == :test  
     Rhoconnect.stats.should == false
-    Rhoconnect.appserver.should == 'http://test.rhoconnect.com'
+    Rhoconnect.appserver.should == 'http://test.com'
     Rhoconnect.cookie_expire.should == 9999999
     App.is_exist?(test_app_name).should be_true
   end

data/spec/server/server_spec.rb

@@ -83,7 +83,6 @@ describe "Server" do
       end
 
       it "should return nil if params[:source_name] is missing" do
-        #stub_request(:post, "http://test.rhoconnect.com/rhoconnect/query")
         get "/api/application/query"
         last_response.status.should == 500
       end
@@ -136,15 +135,6 @@ describe "Server" do
     describe "client management routes" do
       before(:each) do
         do_post "/api/application/clientlogin", "login" => @u.login, "password" => 'testpass'
-        @source_config = {
-          "sources"=>
-          {"FixedSchemaAdapter"=>
-            {"poll_interval"=>300,
-             "sync_type"=>"incremental",
-             "belongs_to"=>[{"brand"=>"SampleAdapter"}]},
-           "SampleAdapter"=>{"poll_interval"=>300},
-           "SimpleAdapter"=>{"partition_type"=>"app", "poll_interval"=>600}}
-        }
       end
 
       it "should respond to clientcreate" do
@@ -154,7 +144,7 @@ describe "Server" do
         id = JSON.parse(last_response.body)['client']['client_id']
         id.length.should == 32
         JSON.parse(last_response.body).should == 
-          {"client"=>{"client_id"=>id}}.merge!(@source_config)
+          {"client"=>{"client_id"=>id}}
         c = Client.load(id,{:source_name => '*'})
         c.user_id.should == 'testuser'
         c.device_type.should == 'blackberry'
@@ -164,7 +154,6 @@ describe "Server" do
         do_post "/api/application/clientregister", 
           "device_type" => "iPhone", "device_pin" => 'abcd', "client_id" => @c.id
         last_response.should be_ok
-        JSON.parse(last_response.body).should == @source_config
         @c.device_type.should == 'Apple'
         @c.device_pin.should == 'abcd'
         @c.id.length.should == 32
@@ -173,7 +162,6 @@ describe "Server" do
       it "should respond to clientreset" do
         set_state(@c.docname(:cd) => @data)
         get "/api/application/clientreset", :client_id => @c.id,:version => ClientSync::VERSION
-        JSON.parse(last_response.body).should == @source_config
         verify_result(@c.docname(:cd) => {})
       end
       
@@ -184,7 +172,7 @@ describe "Server" do
         set_state(@c.docname(:cd) => @data)
         sources = [{'name' => 'SimpleAdapter'}]
         get "/api/application/clientreset", :client_id => @c.id,:version => ClientSync::VERSION, :sources => sources
-        JSON.parse(last_response.body).should == @source_config
+        last_response.should be_ok
         @c.source_name = 'SampleAdapter'
         verify_result(@c.docname(:cd) => @data)
         @c.source_name = 'SimpleAdapter'
@@ -436,6 +424,7 @@ describe "Server" do
       it "should receive nop when no sources are available for partition" do
         set_state('test_db_storage' => @data)
         Source.load('SimpleAdapter',@s_params).partition = :user
+        @a.sources.delete('OtherAdapter')
         get "/api/application/bulk_data", :partition => :app, :client_id => @c.id
         last_response.should be_ok
         last_response.body.should == {:result => :nop}.to_json

data/spec/source_sync_spec.rb

@@ -230,6 +230,87 @@ describe "SourceSync" do
         it "should do query with exception raised" do
           verify_read_operation_with_error('query')
         end
+        
+        it "should do query with exception raised and update refresh time only after retries limit is exceeded" do
+          @s.retry_limit = 1
+          msg = "Error during query"
+          @ss.should_receive(:log).with("SourceAdapter raised query exception: #{msg}")
+          @ss.should_receive(:log).with(anything)
+          set_test_data('test_db_storage',{},msg,"query error")
+          res = @ss.do_query
+          verify_result(@s.docname(:md) => {},
+            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+          # 1) if retry_limit is set to N - then, first N retries should not update refresh_time
+          @s.read_state.retry_counter.should == 1
+          @s.read_state.refresh_time.should <= Time.now.to_i
+          
+          # try once more and fail again
+          @ss.should_receive(:log).with("SourceAdapter raised query exception: #{msg}")
+          @ss.should_receive(:log).with(anything)
+          set_test_data('test_db_storage',{},msg,"query error")
+          res = @ss.do_query
+          verify_result(@s.docname(:md) => {},
+            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+          
+          # 2) if retry_limit is set to N and number of retries exceeded it - update refresh_time
+          @s.read_state.retry_counter.should == 0
+          @s.read_state.refresh_time.should > Time.now.to_i
+        end
+        
+        it "should do query with exception raised and restore state with succesfull retry" do
+          @s.retry_limit = 1
+          msg = "Error during query"
+          @ss.should_receive(:log).with("SourceAdapter raised query exception: #{msg}")
+          @ss.should_receive(:log).with(anything)
+          set_test_data('test_db_storage',{},msg,"query error")
+          res = @ss.do_query
+          verify_result(@s.docname(:md) => {},
+            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+          # 1) if retry_limit is set to N - then, first N retries should not update refresh_time
+          @s.read_state.retry_counter.should == 1
+          @s.read_state.refresh_time.should <= Time.now.to_i
+          
+          # try once more (with success)
+          expected = {'1'=>@product1,'2'=>@product2}
+          set_test_data('test_db_storage',expected)
+          @ss.do_query 
+          verify_result(@s.docname(:md) => expected, 
+            @s.docname(:errors) => {})
+          @s.read_state.retry_counter.should == 0
+          @s.read_state.refresh_time.should > Time.now.to_i
+        end
+        
+        it "should do query with exception raised and update refresh time if retry_limit is 0" do
+          @s.retry_limit = 0
+          msg = "Error during query"
+          @ss.should_receive(:log).with("SourceAdapter raised query exception: #{msg}")
+          @ss.should_receive(:log).with(anything)
+          set_test_data('test_db_storage',{},msg,"query error")
+          res = @ss.do_query
+          verify_result(@s.docname(:md) => {},
+            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+          #  if poll_interval is set to 0 - refresh time should be updated
+          @s.read_state.retry_counter.should == 0
+          @s.read_state.refresh_time.should > Time.now.to_i
+        end
+        
+        it "should do query with exception raised and update refresh time if poll_interval == 0" do
+          @s.retry_limit = 1
+          @s.poll_interval = 0
+          msg = "Error during query"
+          @ss.should_receive(:log).with("SourceAdapter raised query exception: #{msg}")
+          @ss.should_receive(:log).with(anything)
+          set_test_data('test_db_storage',{},msg,"query error")
+          prev_refresh_time = @s.read_state.refresh_time
+          # make sure refresh time is expired
+          sleep(1)
+          res = @ss.do_query
+          verify_result(@s.docname(:md) => {},
+            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+          #  if poll_interval is set to 0 - refresh time should be updated
+          @s.read_state.retry_counter.should == 0
+          @s.read_state.refresh_time.should > prev_refresh_time
+        end
       end
 
       describe "search" do
@@ -257,7 +338,8 @@ describe "SourceSync" do
           verify_result("source:#{test_app_name}:__shared__:#{@s_fields[:name]}:md" => expected)
           Store.db.keys("read_state:#{test_app_name}:__shared__*").sort.should ==
             [ "read_state:#{test_app_name}:__shared__:SampleAdapter:refresh_time",
-              "read_state:#{test_app_name}:__shared__:SampleAdapter:rho__id"]
+              "read_state:#{test_app_name}:__shared__:SampleAdapter:rho__id",
+              "read_state:#{test_app_name}:__shared__:SampleAdapter:retry_counter"].sort
         end
       end
 
@@ -302,7 +384,7 @@ describe "SourceSync" do
         if operation == 'query'
           @ss.read.should == true
           verify_result(@s.docname(:md) => {},
-            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})
+            @s.docname(:errors) => {'query-error'=>{'message'=>msg}})  
         else
           @ss.search(@c.id).should == true
           verify_result(@c.docname(:search) => {}, 

data/spec/support/shared_examples.rb

@@ -54,7 +54,7 @@ shared_examples_for "SharedRhoconnectHelper" do |params|
     @s2 = Source.create({:name=> 'Product2'},@s_params)
     @s3 = Source.create({:name=> 'SimpleAdapter',:partition_type=> 'app'},@s_params)
     @s1.belongs_to = [{'brand' => 'SampleAdapter'}].to_json    
-    config = Rhoconnect.source_config["sources"]['FixedSchemaAdapter']
+    config = Rhoconnect.source_config('FixedSchemaAdapter')
     @s1.update(config)
     @r = @s.read_state
     @a.sources << @s.id
@@ -146,7 +146,7 @@ shared_examples_for "ApiHelper" do
     @s1 = Source.create(@s1_fields,@s_params)
     @s2 = Source.create({:name=> 'Product2'},@s_params)
     @s1.belongs_to = [{'brand' => 'SampleAdapter'}].to_json    
-    config = Rhoconnect.source_config["sources"]['FixedSchemaAdapter']
+    config = Rhoconnect.source_config('FixedSchemaAdapter')
     @s1.update(config)
     @r = @s.read_state
     @a.sources << @s.id

data/tasks/redis.rake

@@ -7,7 +7,7 @@ def windows?
 end
 
 if windows?
-	$redis_ver = "redis-2.2.12"
+	$redis_ver = "redis-2.2.13"
 	$redis_zip = "C:/#{$redis_ver}.zip"
 	$redis_dest = "C:/"
 end
@@ -164,7 +164,7 @@ namespace :redis do
     else
       sh 'rm -rf /tmp/redis/' if File.exists?("#{RedisRunner.redisdir}")
       sh 'git clone git://github.com/antirez/redis.git /tmp/redis -n'
-      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.12"
+      sh "cd #{RedisRunner.redisdir} && git reset --hard && git checkout 2.2.13"
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhoconnect
 version: !ruby/object:Gem::Version 
-  hash: 62196417
+  hash: 62196421
   prerelease: 6
   segments: 
   - 3
   - 0
   - 0
   - beta
-  - 1
-  version: 3.0.0.beta1
+  - 3
+  version: 3.0.0.beta3
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-01 00:00:00 Z
+date: 2011-09-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   type: :runtime
@@ -177,39 +177,7 @@ dependencies:
         version: 1.0.0
   version_requirements: *id010
   name: templater
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 1
-        - 3
-        - 3
-        version: 1.3.3
-  version_requirements: *id011
-  name: sqlite3
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 1
-        - 2
-        - 3
-        version: 1.2.3
-  version_requirements: *id012
-  name: SystemTimer
-description: RhoConnect Server Framework and related command-line utilities
+description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
 executables: 
 - rhoconnect
@@ -293,6 +261,8 @@ files:
 - bench/spec/mock_client_spec.rb
 - bench/spec/result_spec.rb
 - bench/spec/utils_spec.rb
+- doc/adapters-crm.txt
+- doc/adapters-intro.txt
 - doc/async-jobs.txt
 - doc/authentication.txt
 - doc/benchmarks.txt
@@ -302,17 +272,22 @@ files:
 - doc/command-line.txt
 - doc/contributing.txt
 - doc/deploying.txt
+- doc/heroku-addon.txt
 - doc/install.txt
 - doc/introduction.txt
 - doc/licensing.txt
 - doc/metadata.txt
 - doc/migration.txt
+- doc/net-plugin.txt
+- doc/plugin-intro.txt
 - doc/public/css/print.css
 - doc/public/css/screen.css
 - doc/public/css/style.css
 - doc/push.txt
+- doc/rails-plugin.txt
 - doc/release.txt
 - doc/rest-api.txt
+- doc/settings.txt
 - doc/source-adapters.txt
 - doc/stats-middleware.txt
 - doc/testing.txt
@@ -329,12 +304,26 @@ files:
 - generators/templates/application/application.rb
 - generators/templates/application/config.ru
 - generators/templates/application/Gemfile
+- generators/templates/application/gitignore
 - generators/templates/application/Rakefile
 - generators/templates/application/settings/license.key
 - generators/templates/application/settings/settings.yml
 - generators/templates/application/spec/spec_helper.rb
 - generators/templates/source/source_adapter.rb
 - generators/templates/source/source_spec.rb
+- installer/deb-scripts/install.sh
+- installer/deb-scripts/LICENSE
+- installer/deb-scripts/scripts/rho_connect_install_constants.rb
+- installer/deb-scripts/scripts/rho_connect_install_installers.rb
+- installer/deb-scripts/scripts/rho_connect_install_utilities.rb
+- installer/deb-scripts/scripts/rhoinstaller.rb
+- installer/deb-scripts/utils/create_texts.rb
+- installer/deb-scripts/utils/README
+- installer/deb-scripts/utils/redis_init_script
+- installer/deb-scripts/utils/redis_log_rotate
+- installer/unix-like/install.sh
+- installer/unix-like/post-install.sh
+- installer/unix-like/pre-install.sh
 - installer/unix-like/rho_connect_install_checkers.rb
 - installer/unix-like/rho_connect_install_constants.rb
 - installer/unix-like/rho_connect_install_debian.rb
@@ -501,7 +490,6 @@ files:
 - spec/api/client/list_client_docs_spec.rb
 - spec/api/client/list_clients_spec.rb
 - spec/api/client/ping_spec.rb
-- spec/api/rhosync_api_spec.rb.orig
 - spec/api/source/adapter_spec.rb
 - spec/api/source/get_db_doc_spec.rb
 - spec/api/source/get_source_params_spec.rb
@@ -529,6 +517,7 @@ files:
 - spec/apps/rhotestapp/settings/settings.yml
 - spec/apps/rhotestapp/sources/base_adapter.rb
 - spec/apps/rhotestapp/sources/fixed_schema_adapter.rb
+- spec/apps/rhotestapp/sources/other_adapter.rb
 - spec/apps/rhotestapp/sources/sample_adapter.rb
 - spec/apps/rhotestapp/sources/simple_adapter.rb
 - spec/apps/rhotestapp/sources/sub_adapter.rb
@@ -609,10 +598,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: RhoConnect Server Framework
+summary: RhoConnect App Integration Server
 test_files: 
 - spec/api/admin/api_token_spec.rb
 - spec/api/admin/get_api_token_spec.rb
@@ -627,7 +616,6 @@ test_files:
 - spec/api/client/list_client_docs_spec.rb
 - spec/api/client/list_clients_spec.rb
 - spec/api/client/ping_spec.rb
-- spec/api/rhosync_api_spec.rb.orig
 - spec/api/source/adapter_spec.rb
 - spec/api/source/get_db_doc_spec.rb
 - spec/api/source/get_source_params_spec.rb
@@ -655,6 +643,7 @@ test_files:
 - spec/apps/rhotestapp/settings/settings.yml
 - spec/apps/rhotestapp/sources/base_adapter.rb
 - spec/apps/rhotestapp/sources/fixed_schema_adapter.rb
+- spec/apps/rhotestapp/sources/other_adapter.rb
 - spec/apps/rhotestapp/sources/sample_adapter.rb
 - spec/apps/rhotestapp/sources/simple_adapter.rb
 - spec/apps/rhotestapp/sources/sub_adapter.rb