rhoconnect 3.0.2 → 3.0.3

data/lib/rhoconnect/store.rb

@@ -181,10 +181,23 @@ module Rhoconnect
     
       # Deletes all keys matching a given mask
       def flash_data(keymask)
-        @@db.keys(keymask).each do |key|
-          @@db.del(key)
+        if keymask[/[*\[\]?]/]
+          # If the keymask contains any pattern matching characters
+          # Use keys command to find all keys matching pattern (this is extremely expensive)
+          # Then delete matches
+          @@db.keys(keymask).each do |key|
+            @@db.del(key)
+          end
+        else
+          # The keymask doesn't contain pattern matching characters
+          # A delete call is all that is needed
+          @@db.del(keymask)
         end
       end
+      
+      def exists?(key)
+        @@db.exists(key)
+      end
     
       # Returns array of keys matching a given keymask
       def get_keys(keymask)
@@ -210,19 +223,27 @@ module Rhoconnect
         ts = current_time+(Rhoconnect.lock_duration || timeout)+1
         loop do 
           if not @@db.setnx(lock_key,ts)
-            if raise_on_expire or Rhoconnect.raise_on_expired_lock
-              if @@db.get(lock_key).to_i <= current_time
-                # lock expired before operation which set it up completed
-                # this process cannot continue without corrupting locked data 
-                raise StoreLockException, "Lock \"#{lock_key}\" expired before it was released"
-              end
-            else  
-              if @@db.get(lock_key).to_i <= current_time and 
-                @@db.getset(lock_key,ts).to_i <= current_time
-                # previous lock expired and we replaced it with our own
-                break
-              end
-            end
+            current_lock = @@db.get(lock_key)
+            # ensure lock wasn't released between the setnx and get calls
+            if current_lock
+             	current_lock_timeout = current_lock.to_i
+             	if raise_on_expire or Rhoconnect.raise_on_expired_lock
+             	  if current_lock_timeout <= current_time
+             	    # lock expired before operation which set it up completed
+             	    # this process cannot continue without corrupting locked data 
+             	    raise StoreLockException, "Lock \"#{lock_key}\" expired before it was released"
+             	  end
+             	else  
+             	  if current_lock_timeout <= current_time and 
+             	    @@db.getset(lock_key,ts).to_i <= current_time
+             	    # previous lock expired and we replaced it with our own
+             	    break
+             	  end
+           	  end
+         	  # lock was released between setnx and get - try to acquire it again
+       	    elsif @@db.setnx(lock_key,ts)
+         	    break
+     	      end
             sleep(1)
             current_time = Time.now.to_i
           else

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.2'
+  VERSION = '3.0.3'
 end

data/rhoconnect.gemspec

@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rubyzip', '~> 0.9.4')
   s.add_dependency('uuidtools', '>= 2.1.1')
   s.add_dependency('redis', '>= 2.2.0')
-  s.add_dependency('resque', '~> 1.18.0')
+  s.add_dependency('resque', '~> 1.19.0')
   s.add_dependency('rest-client', '~> 1.6.1')
   s.add_dependency('templater', '~> 1.0.0')  
 end

data/spec/source_sync_spec.rb

@@ -231,25 +231,97 @@ describe "SourceSync" 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"
+          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
+          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"
+          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 reset the retry counter if prev_refresh_time was set more than poll_interval secs ago" do
+          @s.retry_limit = 3
+          @s.poll_interval = 2
+          msg = "Error during query"
+          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
+
+          # 2) Make another error - results are the same
+          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}})
+          @s.read_state.retry_counter.should == 2
+          @s.read_state.refresh_time.should <= Time.now.to_i
+
+          # wait until time interval exprires and prev_refresh_time is too old - 
+          # this should reset the counter on next request with error
+          # and do not update refresh_time
+          sleep(3)
+          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}})
+          @s.read_state.retry_counter.should == 1
+          @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
@@ -288,6 +360,7 @@ 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:prev_refresh_time",
               "read_state:#{test_app_name}:__shared__:SampleAdapter:rho__id",
               "read_state:#{test_app_name}:__shared__:SampleAdapter:retry_counter"].sort
         end

data/spec/store_spec.rb

@@ -164,6 +164,29 @@ describe "Store" do
         Store.flash_data(@s.docname(:md))
         Store.get_data(@s.docname(:md)).should == {}
       end
+      
+      it "should flash_data for all keys matching pattern" do
+        keys = ['test_flash_data1','test_flash_data2']
+        keys.each {|key| Store.put_data(key,@data)}
+        Store.flash_data('test_flash_data*')
+        keys.each {|key| Store.get_data(key).should == {} }
+      end
+
+      it "should flash_data without calling KEYS when there aren't pattern matching characters in the provided keymask" do
+        key = 'test_flash_data'
+        Store.put_data(key,@data)
+        Store.db.should_not_receive(:keys)
+        Store.db.should_receive(:del).once.with(key).and_return(true)
+        Store.flash_data(key)
+      end
+
+      it "should flash_data and call KEYS when there are pattern matching characters in the provided keymask" do
+        keys = ['test_flash_data1','test_flash_data2']
+        keys.each {|key| Store.put_data(key,@data)}
+        Store.db.should_receive(:keys).exactly(1).times.with("test_flash_data*").and_return(keys)
+        Store.db.should_receive(:del).exactly(2).times.with(/^test_flash_data[12]$/).and_return(true)
+        Store.flash_data("test_flash_data*")
+      end
 
       it "should get_keys" do
         expected = ["doc1:1:1:1:source1", "doc1:1:1:1:source2"]

metadata

@@ -1,190 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rhoconnect
-version: !ruby/object:Gem::Version 
-  hash: 3
+version: !ruby/object:Gem::Version
+  version: 3.0.3
   prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 2
-  version: 3.0.2
 platform: ruby
-authors: 
+authors:
 - Rhomobile
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-05 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-13 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2160601560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  version_requirements: *id001
-  name: bundler
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160601560
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &2160591620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 1
-        - 3
-        version: "1.3"
-  version_requirements: *id002
-  name: sinatra
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160591620
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2160590320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  version_requirements: *id003
-  name: rake
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2160590320
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2160588440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 5
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.5.0
-  version_requirements: *id004
-  name: json
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2160588440
+- !ruby/object:Gem::Dependency
+  name: rubyzip
+  requirement: &2160586960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 51
-        segments: 
-        - 0
-        - 9
-        - 4
+      - !ruby/object:Gem::Version
         version: 0.9.4
-  version_requirements: *id005
-  name: rubyzip
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2160586960
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  requirement: &2160585460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 1
-        - 1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.1.1
-  version_requirements: *id006
-  name: uuidtools
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2160585460
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: &2160556320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        - 2
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.2.0
-  version_requirements: *id007
-  name: redis
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2160556320
+- !ruby/object:Gem::Dependency
+  name: resque
+  requirement: &2160555260 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 95
-        segments: 
-        - 1
-        - 18
-        - 0
-        version: 1.18.0
-  version_requirements: *id008
-  name: resque
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 1.19.0
   type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2160555260
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2160553000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 6
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.6.1
-  version_requirements: *id009
-  name: rest-client
-- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2160553000
+- !ruby/object:Gem::Dependency
+  name: templater
+  requirement: &2160551640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
-  version_requirements: *id010
-  name: templater
+  type: :runtime
+  prerelease: false
+  version_requirements: *2160551640
 description: RhoConnect App Integration Server and related command-line utilities
 email: dev@rhomobile.com
-executables: 
+executables:
 - rhoconnect
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.md
-files: 
+files:
 - CHANGELOG.md
 - CREDITS
 - Gemfile
@@ -265,6 +210,7 @@ files:
 - doc/benchmarks.txt
 - doc/blob-sync.txt
 - doc/bulk-sync.txt
+- doc/client-objc.txt
 - doc/client.txt
 - doc/command-line.txt
 - doc/contributing.txt
@@ -292,7 +238,6 @@ files:
 - doc/web-console.txt
 - examples/simple/application.rb
 - examples/simple/config.ru
-- examples/simple/dump.rdb
 - examples/simple/Rakefile
 - examples/simple/settings/license.key
 - examples/simple/settings/settings.yml
@@ -561,38 +506,32 @@ files:
 - bin/rhoconnect
 homepage: http://rhomobile.com/products/rhoconnect
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2200436175486104004
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RhoConnect App Integration Server
-test_files: 
+test_files:
 - spec/api/admin/api_token_spec.rb
 - spec/api/admin/get_api_token_spec.rb
 - spec/api/admin/get_license_info_spec.rb