rhosync 2.1.6 → 2.1.7

data/CHANGELOG

@@ -1,3 +1,11 @@
+## 2.1.7
+* #14021681 - check for client on client_sync class methods
+* #14082861 - expose Store.lock timeout to high-level functions
+* #14082589 - fixed source loading so a unique instance is loaded
+* #14124195 - concurrency issue under load for same user via push_objects api
+* #14511763 - added global options `raise_on_expired_lock` (true/false) and `lock_duration` (sec) settings
+* #14514773 - REST API push_objects, push_deletes :md_size count fix  
+
 ## 2.1.6
 * #13830841 - fixed issue where current_user.login doesn't match @source.user_id
 

data/Rakefile

@@ -73,7 +73,7 @@ begin
     gemspec.add_dependency "rest-client", "~>1.6.1"
     gemspec.add_dependency "sinatra", "~>1.2"
     gemspec.add_dependency "templater", "~>1.0.0"
-    gemspec.add_dependency "rake", ">=0.8.7"
+    gemspec.add_dependency "rake", "~>0.8.7"
     gemspec.add_development_dependency "log4r", "~>1.1.7"
     gemspec.add_development_dependency "jeweler", ">=1.4.0"
     gemspec.add_development_dependency "rspec", ">=1.3.0"

data/lib/rhosync/api_token.rb

@@ -12,7 +12,7 @@ module Rhosync
     end
     
     def user
-      @user ||= User.load(self.user_id)
+      User.load(self.user_id)
     end
   end
 end

data/lib/rhosync/client.rb

@@ -5,7 +5,7 @@ module Rhosync
     field :device_type,:string
     field :device_pin,:string
     field :device_port,:string
-    
+    field :phone_id,:string
     field :user_id,:string
     field :app_id,:string
     attr_accessor :source_name
@@ -80,7 +80,7 @@ module Rhosync
     end
     
     def update_fields(params)
-      [:device_type,:device_pin,:device_port].each do |setting|
+      [:device_type,:device_pin,:device_port,:phone_id].each do |setting|
         self.send "#{setting}=".to_sym, params[setting].to_s if params[setting]
       end
     end

data/lib/rhosync/client_sync.rb

@@ -3,10 +3,13 @@ module Rhosync
     attr_accessor :source,:client,:p_size,:source_sync
     
     VERSION = 3
+    UNKNOWN_CLIENT = "Unknown client"
+    UNKNOWN_SOURCE = "Unknown source"
+    
     
     def initialize(source,client,p_size=nil)
-      raise ArgumentError.new('Unknown client') unless client
-      raise ArgumentError.new('Unknown source') unless source
+      raise ArgumentError.new(UNKNOWN_CLIENT) unless client
+      raise ArgumentError.new(UNKNOWN_SOURCE) unless source
       @source,@client,@p_size = source,client,p_size ? p_size.to_i : 500
       @source_sync = SourceSync.new(@source)
     end
@@ -199,6 +202,7 @@ module Rhosync
       end
     
       def search_all(client,params=nil)
+        raise ArgumentError.new(UNKNOWN_CLIENT) unless client
         return [] unless params[:sources]
         res = []
         params[:sources].each do |source|
@@ -214,6 +218,7 @@ module Rhosync
       end
       
       def bulk_data(partition,client)
+        raise ArgumentError.new(UNKNOWN_CLIENT) unless client
         name = BulkData.get_name(partition,client.user_id)
         data = BulkData.load(name)
         

data/lib/rhosync/jobs/ping_job.rb

@@ -8,20 +8,35 @@ module Rhosync
     def self.perform(params)
       user = User.load(params["user_id"])
       device_pins = []
+      phone_ids   = []
       user.clients.members.each do |client_id|
         client = Client.load(client_id,{:source_name => '*'})
-        params.merge!('device_port' => client.device_port, 'device_pin' => client.device_pin)
-        if client.device_type and client.device_type.size > 0 and client.device_pin and client.device_pin.size > 0
-          unless device_pins.include? client.device_pin   
-            device_pins << client.device_pin
-            klass = Object.const_get(camelize(client.device_type.downcase))
+        params.merge!('device_port' => client.device_port, 'device_pin' => client.device_pin, 'phone_id' => client.phone_id)
+        send_push = false
+        if client.device_type and client.device_type.size > 0
+          if client.phone_id and client.phone_id.size > 0
+            unless phone_ids.include? client.phone_id   
+              phone_ids << client.phone_id
+              send_push = true
+            end
+          elsif client.device_pin and client.device_pin.size > 0
+            unless device_pins.include? client.device_pin   
+              device_pins << client.device_pin
+              send_push = true
+            end
+          else
+            log "Skipping ping for non-registered client_id '#{client_id}'..."
+            next
+          end
+          if send_push
+            klass = Object.const_get(camelize(client.device_type.downcase)) 
             if klass
               params['vibrate'] = params['vibrate'].to_s
               klass.ping(params) 
             end
           else
-            log "Dropping ping request for client_id '#{client_id}' because it's already in user's device pin list."
-          end  
+            log "Dropping ping request for client_id '#{client_id}' because it's already in user's device pin or phone_id list."
+          end
         else
           log "Skipping ping for non-registered client_id '#{client_id}'..."
         end

data/lib/rhosync/lock_ops.rb

@@ -3,8 +3,8 @@
 # source documents when source_sync and client_sync
 # need to access them
 module LockOps
-  def lock(doc)
-    Store.lock(docname(doc)) do
+  def lock(doc,timeout=0,raise_on_expire=false)
+    Store.lock(docname(doc),timeout,raise_on_expire) do
       yield self
     end
   end

data/lib/rhosync/ping/android.rb

@@ -32,7 +32,7 @@ module Rhosync
       data['data.alert'] = params['message'] if params['message']
       data['data.vibrate'] = params['vibrate'] if params['vibrate']
       data['data.sound'] = params['sound'] if params['sound']
-
+      data['data.phone_id'] = params['phone_id'] if params['phone_id']
       data
     end
   end

data/lib/rhosync/read_state.rb

@@ -1,6 +1,6 @@
 module Rhosync  
   class ReadState < Model
-    field :refresh_time,:integer
+    field :refresh_time, :integer
   
     def self.create(fields)
       fields[:id] = get_id(fields)

data/lib/rhosync/source.rb

@@ -7,28 +7,45 @@ module Rhosync
     
     class << self
       attr_accessor :validates_presence
+      
+      def create(fields,params)
+        if self.validates_presence
+          self.validates_presence.each do |field|
+            raise ArgumentError.new("Missing required field '#{field}'") unless fields[field]
+          end
+        end
+      end
     
       def define_fields(string_fields = [], integer_fields = [])
         @@string_fields,@@integer_fields = string_fields,integer_fields
         integer_fields.each do |attrib|
           define_method("#{attrib}=") do |value|
             value = (value.nil?) ? nil : value.to_i 
-            instance_variable_set(:"@#{attrib}", value)
+            @@model_data[self.name.to_sym][attrib.to_sym] = value
           end
           define_method("#{attrib}") do
-            instance_variable_get(:"@#{attrib}")
+            @@model_data[self.name.to_sym][attrib.to_sym]
           end
         end
         string_fields.each do |attrib|
           define_method("#{attrib}=") do |value|
-            instance_variable_set(:"@#{attrib}", value)
+            attrib = attrib.to_sym
+            name = nil
+            if attrib == :name
+              instance_variable_set(:@name, value)
+              name = value
+            else  
+              name = self.name
+            end
+            @@model_data[name.to_sym] ||= {} # TODO: shouldn't be nil here
+            @@model_data[name.to_sym][attrib] = value
           end
           define_method("#{attrib}") do
-            instance_variable_get(:"@#{attrib}")
+            @@model_data[instance_variable_get(:@name).to_sym][attrib.to_sym]
           end
+          # we have separate methods for this
+          @@integer_fields << :poll_interval unless @@integer_fields.include?(:poll_interval)
         end
-        @@string_fields << :id
-        @@string_fields << :rho__id
       end
         
       def validates_presence_of(*names)
@@ -64,7 +81,7 @@ module Rhosync
   end
   
   class Source < MemoryModel
-    attr_accessor :app_id, :user_id, :rho__id
+    attr_accessor :app_id, :user_id
             
     validates_presence_of :name
     
@@ -72,10 +89,11 @@ module Rhosync
     include LockOps
     
     # source fields
-    define_fields([:name, :url, :login, :password, :callback_url, :partition_type, :sync_type, 
-      :queue, :query_queue, :cud_queue, :belongs_to, :has_many], [:source_id, :priority, :poll_interval])
+    define_fields([:id, :rho__id, :name, :url, :login, :password, :callback_url, :partition_type, :sync_type, 
+      :queue, :query_queue, :cud_queue, :belongs_to, :has_many], [:source_id, :priority])
     
     def initialize(fields)
+      self.name = fields['name'] || fields[:name]
       fields.each do |name,value|
         arg = "#{name}=".to_sym
         self.send(arg, value) if self.respond_to?(arg)
@@ -98,17 +116,22 @@ module Rhosync
         
     def self.create(fields,params)
       fields = fields.with_indifferent_access # so we can access hash keys as symbols
+      super(fields,params)
+      @@model_data[fields[:name].to_sym] = {}
       set_defaults(fields)
       obj = new(fields)
       obj.assign_args(params)
-      @@model_data[obj.rho__id.to_sym] = obj
       obj
     end
-    
+          
     def self.load(obj_id,params)
       validate_attributes(params)
-      obj = @@model_data[obj_id.to_sym]
-      obj.assign_args(params) if obj
+      model_hash = @@model_data[obj_id.to_sym]
+      obj = new(model_hash) if model_hash
+      if obj
+        obj = obj.dup
+        obj.assign_args(params) 
+      end
       obj
     end
       
@@ -136,13 +159,14 @@ module Rhosync
     end
     
     def self.delete_all
-      @@model_data.each { |k,v| v.delete }
+      params = {:app_id => APP_NAME,:user_id => '*'}
+      @@model_data.each { |k,v| Source.load(k,params).delete }
       @@model_data = {}
     end
 
     def assign_args(params)
       self.user_id = params[:user_id]
-      self.app_id = params[:app_id]    
+      self.app_id = params[:app_id]   
     end
       
     def blob_attribs
@@ -159,25 +183,33 @@ module Rhosync
     def update(fields)
       fields = fields.with_indifferent_access # so we can access hash keys as symbols
       self.class.set_defaults(fields)
-      #super(fields)
     end
     
     def clone(src_doctype,dst_doctype)
       Store.clone(docname(src_doctype),docname(dst_doctype))
     end
     
+    def poll_interval
+      value = Store.get_value(poll_interval_key)
+      value ? value.to_i : nil
+    end
+    
+    def poll_interval=(interval)
+      Store.put_value(poll_interval_key, interval)
+    end
+    
     # Return the user associated with a source
     def user
-      @user = User.load(self.user_id)
+      User.load(self.user_id)
     end
     
     # Return the app the source belongs to
     def app
-      @app = App.load(self.app_id)
+      App.load(self.app_id)
     end
     
     def schema
-      @schema ||= self.get_value(:schema)
+      self.get_value(:schema)
     end
     
     def read_state
@@ -192,6 +224,7 @@ module Rhosync
     
     def delete
       flash_data('*')
+      flash_data(poll_interval_key)
       @@model_data.delete(rho__id.to_sym) if rho__id
     end
     
@@ -222,6 +255,10 @@ module Rhosync
     end
           
     private
+    def poll_interval_key
+      "source:#{self.name}:poll_interval"
+    end
+    
     def self.validate_attributes(params)
       raise ArgumentError.new('Missing required attribute user_id') unless params[:user_id]
       raise ArgumentError.new('Missing required attribute app_id') unless params[:app_id]

data/lib/rhosync/source_sync.rb

@@ -75,26 +75,30 @@ module Rhosync
         @source.app_id,@source.user_id,client_id,params)
     end
     
-    def push_objects(objects)
-      @source.lock(:md) do |s|
+    def push_objects(objects,timeout=10,raise_on_expire=false)
+      @source.lock(:md,timeout,raise_on_expire) do |s|
         doc = @source.get_data(:md)
+        orig_doc_size = doc.size
         objects.each do |id,obj|
           doc[id] ||= {}
           doc[id].merge!(obj)
         end  
+        diff_count = doc.size - orig_doc_size
         @source.put_data(:md,doc)
-        @source.update_count(:md_size,doc.size)
+        @source.update_count(:md_size,diff_count)
       end      
     end    
 
-    def push_deletes(objects)
-      @source.lock(:md) do |s|
+    def push_deletes(objects,timeout=10,raise_on_expire=false)
+      @source.lock(:md,timeout,raise_on_expire) do |s|
         doc = @source.get_data(:md)
+        orig_doc_size = doc.size
         objects.each do |id|
           doc.delete(id)
         end  
+        diff_count = doc.size - orig_doc_size
         @source.put_data(:md,doc)
-        @source.update_count(:md_size,doc.size)
+        @source.update_count(:md_size,diff_count)
       end      
     end
     

data/lib/rhosync/store.rb

@@ -1,4 +1,7 @@
 module Rhosync
+  
+  class StoreLockException < RuntimeError; end
+  
   class Store
     RESERVED_ATTRIB_NAMES = ["attrib_type", "id"] unless defined? RESERVED_ATTRIB_NAMES
     @@db = nil
@@ -139,25 +142,36 @@ module Rhosync
       end
       
       # Lock a given key and release when provided block is finished
-      def lock(dockey,timeout=0)
-        m_lock = get_lock(dockey,timeout)
+      def lock(dockey,timeout=0,raise_on_expire=false)
+        m_lock = get_lock(dockey,timeout,raise_on_expire)
         res = yield
         release_lock(dockey,m_lock)
         res
       end
-    
-      def get_lock(dockey,timeout=0)
+      
+      def get_lock(dockey,timeout=0,raise_on_expire=false)
         lock_key = _lock_key(dockey)
         current_time = Time.now.to_i   
-        ts = current_time+timeout+1
-        if not @@db.setnx(lock_key,ts)
-          loop do 
-            if @@db.get(lock_key).to_i <= current_time and 
-              @@db.getset(lock_key,ts).to_i <= current_time
-              break
+        ts = current_time+(Rhosync.lock_duration || timeout)+1
+        loop do 
+          if not @@db.setnx(lock_key,ts)
+            if raise_on_expire or Rhosync.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
             sleep(1)
             current_time = Time.now.to_i
+          else
+            break #no lock was set, so we set ours and leaving
           end
         end
         return ts

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.6'
+  VERSION = '2.1.7'
 end

data/lib/rhosync.rb

@@ -43,7 +43,8 @@ module Rhosync
   class << self
     attr_accessor :base_directory, :app_directory, :data_directory, 
       :vendor_directory, :blackberry_bulk_sync, :redis, :environment,
-      :log_disabled, :license, :bulk_sync_poll_interval, :stats
+      :log_disabled, :license, :bulk_sync_poll_interval, :stats,
+      :raise_on_expired_lock, :lock_duration
   end
   
   ### Begin Rhosync setup methods  
@@ -61,6 +62,8 @@ module Rhosync
     Rhosync.bulk_sync_poll_interval = get_setting(config,environment,:bulk_sync_poll_interval,3600)
     Rhosync.redis = get_setting(config,environment,:redis,false)
     Rhosync.log_disabled = get_setting(config,environment,:log_disabled,false)
+    Rhosync.raise_on_expired_lock = get_setting(config,environment,:raise_on_expired_lock,false)
+    Rhosync.lock_duration = get_setting(config,environment,:lock_duration)
     Rhosync.environment = environment    
     yield self if block_given?
     Store.create(Rhosync.redis)
@@ -69,9 +72,6 @@ module Rhosync
     Rhosync.app_directory ||= Rhosync.base_directory
     Rhosync.data_directory ||= File.join(Rhosync.base_directory,'data')
     Rhosync.vendor_directory ||= File.join(Rhosync.base_directory,'vendor')
-    Rhosync.blackberry_bulk_sync ||= false
-    Rhosync.bulk_sync_poll_interval ||= 3600
-    Rhosync.log_disabled ||= false
     Rhosync.stats ||= false
     Rhosync.license = License.new
     

data/spec/api/get_client_params_spec.rb

@@ -11,6 +11,7 @@ describe "RhosyncApiGetClientParams" do
       {"name"=>"device_type", "value"=>"Apple", "type"=>"string"}, 
       {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
       {"name"=>"device_port", "value"=>"3333", "type"=>"string"}, 
+      {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
       {"name"=>"user_id", "value"=>"testuser", "type"=>"string"}, 
       {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
   end

data/spec/api/push_deletes_spec.rb

@@ -6,7 +6,7 @@ describe "RhosyncApiPushDeletes" do
   it "should delete object from :md" do
     data = {'1' => @product1, '2' => @product2, '3' => @product3}
     @s = Source.load(@s_fields[:name],@s_params)
-    set_state(@s.docname(:md) => data)
+    set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
     data.delete('2')
     post "/api/push_deletes", :api_token => @api_token, 
       :user_id => @u.id, :source_id => @s_fields[:name], :objects => ['2']

data/spec/api/push_objects_spec.rb

@@ -15,7 +15,7 @@ describe "RhosyncApiPushObjects" do
     data = {'1' => @product1, '2' => @product2, '3' => @product3}
     update = {'price' => '0.99', 'new_field' => 'value'}
     @s = Source.load(@s_fields[:name],@s_params)
-    set_state(@s.docname(:md) => data)
+    set_state(@s.docname(:md) => data,@s.docname(:md_size) => '3')
     update.each do |key,value|
       data['2'][key] = value
     end

data/spec/api/rhosync_api_spec.rb

@@ -127,6 +127,7 @@ describe "RhosyncApi" do
       {"name"=>"device_pin", "value"=>"abcd", "type"=>"string"}, 
       {"name"=>"device_port", "value"=>"3333", "type"=>"string"}, 
       {"name"=>"user_id", "value"=>"testuser", "type"=>"string"}, 
+      {"name"=>"phone_id", "value"=>nil, "type"=>"string"},
       {"name"=>"app_id", "value"=>"application", "type"=>"string"}].sort{|x,y| x['name']<=>y['name']}
   end
   

data/spec/jobs/ping_job_spec.rb

@@ -7,7 +7,7 @@ describe "PingJob" do
   it "should perform apple ping" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id" => nil}
     Apple.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
       'device_port' => @c.device_port}.merge!(params))
     PingJob.perform(params)
@@ -16,7 +16,7 @@ describe "PingJob" do
   it "should perform blackberry ping" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id" => nil}
     @c.device_type = 'blackberry'
     Blackberry.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
       'device_port' => @c.device_port}.merge!(params))
@@ -35,7 +35,7 @@ describe "PingJob" do
   it "should skip ping for empty device_pin" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3',"phone_id"=>nil}
     @c.device_type = 'blackberry'
     @c.device_pin = nil
     PingJob.should_receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
@@ -45,7 +45,7 @@ describe "PingJob" do
   it "should drop ping if it's already in user's device pin list" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
-      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id"=>nil}
 
     # another client with the same device pin ...
     @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
@@ -57,4 +57,21 @@ describe "PingJob" do
     lambda { PingJob.perform(params) }.should_not raise_error
   end
   
+  it "should drop ping if it's already in user's phone id list and device pin is different" do
+    params = {"user_id" => @u.id, "api_token" => @api_token,
+      "sources" => [@s.name], "message" => 'hello world', 
+      "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3'}
+    @c.phone_id = '3'
+    @c_fields.merge!(:phone_id => '3')
+    # another client with the same phone id..
+    @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+    #  yet another...
+    @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+
+    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).twice.with(/Dropping ping request for client/)
+    lambda { PingJob.perform(params) }.should_not raise_error
+  end
+  
+  
 end

data/spec/source_adapter_spec.rb

@@ -16,18 +16,27 @@ describe "SourceAdapter" do
   it_should_behave_like "SourceAdapterHelper"
   
   before(:each) do
-    @s = Source.load(@s_fields[:name],@s_params)
-    @s.name = 'SimpleAdapter'
+    @s = Source.load('SimpleAdapter',@s_params)
     @sa = SourceAdapter.create(@s,nil)
   end
   
+  def setup_adapter(name)
+    fields = {
+      :name => name,
+      :url => 'http://example.com',
+      :login => 'testuser',
+      :password => 'testpass',
+    }
+    Source.create(fields,@s_params)
+  end
+  
   it "should create SourceAdapter with source" do
     @sa.class.name.should == @s.name
   end
   
   it "should create and execute SubAdapter that extends BaseAdapter" do
-    @s.name = 'SubAdapter'
-    @sa = SourceAdapter.create(@s,nil)
+    sub = setup_adapter('SubAdapter')
+    @sa = SourceAdapter.create(sub,nil)
     @sa.class.name.should == 'SubAdapter'
     expected = {'1'=>@product1,'2'=>@product2}
     @sa.inject_result expected
@@ -35,15 +44,14 @@ describe "SourceAdapter" do
   end
   
   it "should fail to create SourceAdapter" do
-    @s_fields[:name] = 'Broken'
-    broken_source = Source.create(@s_fields,@s_params)
+    broken_source = setup_adapter('Broken')    
     lambda { SourceAdapter.create(broken_source) }.should raise_error(Exception)
     broken_source.delete
   end
   
   it "should create SourceAdapter with trailing spaces" do
-    @s.name = 'SimpleAdapter '
-    SourceAdapter.create(@s,nil).is_a?(SimpleAdapter).should be_true
+    s = setup_adapter('SimpleAdapter ')
+    SourceAdapter.create(s,nil).is_a?(SimpleAdapter).should be_true
   end
     
   describe "SourceAdapter methods" do

data/spec/source_spec.rb

@@ -34,7 +34,6 @@ describe "Source" do
     @s1.poll_interval.should == 300
     @s1.app_id.should == @s_params[:app_id]
     @s1.user_id.should == @s_params[:user_id]
-#    puts "#{@s1.inspect()}" # FIXME:
   end
   
   it "should create source with user" do

data/spec/spec.opts

@@ -1,3 +1,4 @@
 --color
 -fn
--b
+-b
+-R

data/spec/spec_helper.rb

@@ -280,13 +280,20 @@ describe "DBObjectsHelper", :shared => true do
       :login => 'testuser',
       :password => 'testpass',
     }
+    @s1_fields = {
+      :name => 'FixedSchemaAdapter',
+      :url => 'http://example.com',
+      :login => 'testuser',
+      :password => 'testpass',
+    }
     @s_params = {
       :user_id => @u.id,
       :app_id => @a.id
     }
     @c = Client.create(@c_fields,{:source_name => @s_fields[:name]})
     @s = Source.create(@s_fields,@s_params)
-    @s1 = Source.load('FixedSchemaAdapter',@s_params)
+    @s1 = Source.create(@s1_fields,@s_params)
+    @s1.belongs_to = [{'brand' => 'SampleAdapter'}].to_json    
     config = Rhosync.source_config["sources"]['FixedSchemaAdapter']
     @s1.update(config)
     @r = @s.read_state

data/spec/stats/record_spec.rb

@@ -65,6 +65,7 @@ describe "Record" do
       end
     end
     Store.db.zrange('stat:foo', 0, -1).should == ["1,1.0:14", "1,1.0:18", "1,1.0:20"]
+    Rhosync.stats = false
   end
   
   it "should get range of metric values" do

data/spec/store_spec.rb

@@ -159,11 +159,42 @@ describe "Store" do
     
     it "should lock key for timeout" do
       doc = "locked_data"
-      Store.db.set "lock:#{doc}", Time.now.to_i+3
-      Store.should_receive(:sleep).at_least(:once).with(1).and_return { sleep 1 }
-      m_lock = Store.get_lock(doc,2)
+      lock = Time.now.to_i+3
+      Store.db.set "lock:#{doc}", lock
+      Store.should_receive(:sleep).at_least(:once).with(1).and_return { sleep 1; Store.release_lock(doc,lock); }
+      Store.get_lock(doc,4)
+    end
+
+    it "should raise exception if lock expires" do
+      doc = "locked_data"
+      Store.get_lock(doc)
+      lambda { sleep 2; Store.get_lock(doc,4,true) }.should raise_error(StoreLockException,"Lock \"lock:locked_data\" expired before it was released")
+    end
+    
+    it "should raise lock expires exception on global setting" do
+      doc = "locked_data"
+      Store.get_lock(doc)
+      Rhosync.raise_on_expired_lock = true
+      lambda { sleep 2; Store.get_lock(doc,4) }.should raise_error(StoreLockException,"Lock \"lock:locked_data\" expired before it was released")
+      Rhosync.raise_on_expired_lock = false
+    end
+    
+    it "should acquire lock if it expires" do
+     	doc = "locked_data"
+     	Store.get_lock(doc)
+     	sleep 2
+     	Store.get_lock(doc,1).should > Time.now.to_i
     end
     
+    it "should use global lock duration" do
+      doc = "locked_data"
+      Rhosync.lock_duration = 2
+     	Store.get_lock(doc)
+     	Store.should_receive(:sleep).exactly(3).times.with(1).and_return { sleep 1 }
+      Store.get_lock(doc)
+     	Rhosync.lock_duration = nil
+    end
+        
     it "should lock document in block" do
       doc = "locked_data"
       Store.lock(doc,0) do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: 
   segments: 
   - 2
   - 1
-  - 6
-  version: 2.1.6
+  - 7
+  version: 2.1.7
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 Z
+date: 2011-06-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -166,7 +166,7 @@ dependencies:
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 49
         segments: 
@@ -572,7 +572,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework