rhosync 2.1.3 → 2.1.6

data/CHANGELOG

@@ -1,3 +1,12 @@
+## 2.1.6
+* #13830841 - fixed issue where current_user.login doesn't match @source.user_id
+
+## 2.1.5
+* #13578473 - fixed "undefined method `user_id' for nil:NilClass" error in server.rb
+
+## 2.1.4
+* #13354369 - bug fix "rhosync bootstrap process shouldn't store sources in redis"
+
 ## 2.1.3
 * #4398193 - ping should only send push messages to unique device pin list
 * #13022667 - settings.yml doesn't work for setting external Redis instances

data/lib/rhosync/api/list_sources.rb

@@ -6,7 +6,7 @@ Server.api :list_sources do |params,user|
     res = []
     sources.each do |name|
       s = Source.load(name,{:app_id => APP_NAME,:user_id => '*'})
-      if s.partition_type and s.partition_type == params[:partition_type]
+      if s.partition_type and s.partition_type == params[:partition_type].to_sym
         res << name 
       end
     end  

data/lib/rhosync/jobs/bulk_data_job.rb

@@ -122,8 +122,8 @@ module Rhosync
           values (?,?,?,?,?,?,?,?,?,?)") do |stmt|
           sources_refs.each do |source_name,ref|
             s = ref[:source]
-            stmt.execute(s.source_id,s.name,s.priority,s.partition_type,
-              s.sync_type,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many)
+            stmt.execute(s.source_id,s.name,s.priority,s.partition_type.to_s,
+              s.sync_type.to_s,refs_to_s(ref[:refs]),s.get_value(:metadata),s.schema,s.blob_attribs,s.has_many)
           end
         end
       end

data/lib/rhosync/model.rb

@@ -59,14 +59,15 @@ module Rhosync
       res
     end
 
-    def update(attribs)
-      self.class.fields.each do |field|
-        if field[:name] != 'name' and field[:name] != 'rho__id'
-          redis.del field_key(field[:name]) 
-        end  
-      end    
-      self.class.populate_attributes(self,attribs)
-    end
+    # TODO: not used anymore
+    # def update(attribs)
+    #   self.class.fields.each do |field|
+    #     if field[:name] != 'name' and field[:name] != 'rho__id'
+    #       redis.del field_key(field[:name]) 
+    #     end  
+    #   end    
+    #   self.class.populate_attributes(self,attribs)
+    # end
       
   protected
     def prefix #:nodoc:
@@ -111,8 +112,7 @@ module Rhosync
       end
       
       def load(id, params={})
-        return unless self.is_exist?(id)
-        populate_attributes(self.with_key(id),params)
+        populate_attributes(self.with_key(id),params) if self.is_exist?(id)
       end
       
       def populate_attributes(obj,attribs)

data/lib/rhosync/server.rb

@@ -88,7 +88,13 @@ module Rhosync
       end
 
       def api_user
-        request_action == 'get_api_token' ? current_user : ApiToken.load(params[:api_token]).user
+        if request_action == 'get_api_token'
+          current_user
+        else
+          u = ApiToken.load(params[:api_token])
+          raise "Wrong API token - #{params[:api_token].inspect}" unless u
+          u.user 
+        end
       end
 
       def current_app
@@ -113,7 +119,9 @@ module Rhosync
         if @client.nil? and params[:client_id]
           @client = Client.load(params[:client_id].to_s,
             params[:source_name] ? {:source_name => current_source.name} : {:source_name => '*'})
-          @client.switch_user(current_user.login) unless @client.user_id == current_user.login
+          if @client and current_user and @client.user_id != current_user.login
+            @client.switch_user(current_user.login) 
+          end
           @client
         end  
       end
@@ -204,25 +212,33 @@ module Rhosync
     end
 
     post '/application/clientlogin' do
-      logout
-      do_login
+      catch_all do      
+        logout
+        do_login
+      end
     end
 
     get '/application/clientcreate' do
-      content_type :json
-      client = Client.create(:user_id => current_user.id,:app_id => current_app.id)
-      client.update_fields(params)
-      { "client" => { "client_id" =>  client.id.to_s } }.merge!(source_config).to_json
+      catch_all do 
+        content_type :json
+        client = Client.create(:user_id => current_user.id,:app_id => current_app.id)
+        client.update_fields(params)
+        { "client" => { "client_id" =>  client.id.to_s } }.merge!(source_config).to_json
+      end
     end
 
     post '/application/clientregister' do
-      current_client.update_fields(params)
-      source_config.to_json
+      catch_all do 
+        current_client.update_fields(params)
+        source_config.to_json
+      end
     end
 
     get '/application/clientreset' do
-      ClientSync.reset(current_client)
-      source_config.to_json
+      catch_all do 
+        ClientSync.reset(current_client)
+        source_config.to_json
+      end
     end
 
     # Member routes

data/lib/rhosync/source.rb

@@ -1,51 +1,117 @@
 module Rhosync
-  class Source < Model
-    field :source_id,:integer
-    field :name,:string
-    field :url,:string
-    field :login,:string
-    field :password,:string
-    field :priority,:integer
-    field :callback_url,:string
-    field :poll_interval,:integer
-    field :partition_type,:string
-    field :sync_type,:string
-    field :belongs_to,:string
-    field :has_many,:string
-    field :queue,:string
-    field :query_queue,:string
-    field :cud_queue,:string
-    attr_accessor :app_id, :user_id
-    validates_presence_of :name #, :source_id
+  class MemoryModel
+    @@model_data = {}
+    @@string_fields = []
+    @@integer_fields = []
+    attr_accessor :id
+    
+    class << self
+      attr_accessor :validates_presence
+    
+      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)
+          end
+          define_method("#{attrib}") do
+            instance_variable_get(:"@#{attrib}")
+          end
+        end
+        string_fields.each do |attrib|
+          define_method("#{attrib}=") do |value|
+            instance_variable_set(:"@#{attrib}", value)
+          end
+          define_method("#{attrib}") do
+            instance_variable_get(:"@#{attrib}")
+          end
+        end
+        @@string_fields << :id
+        @@string_fields << :rho__id
+      end
+        
+      def validates_presence_of(*names)
+        self.validates_presence ||= []
+        names.each do |name|
+          self.validates_presence << name
+        end
+      end
+      
+      def is_exist?(id)
+        !@@model_data[id.to_sym].nil?
+      end
+
+      def class_prefix(classname)
+        classname.to_s.
+          sub(%r{(.*::)}, '').
+          gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+          gsub(/([a-z\d])([A-Z])/,'\1_\2').
+          downcase
+      end
+    end
+    
+    def to_array
+      res = []
+      @@string_fields.each do |field|
+        res << {"name" => field, "value" => send(field.to_sym), "type" => "string"}
+      end
+      @@integer_fields.each do |field|
+        res << {"name" => field, "value" => send(field.to_sym), "type" => "integer"}
+      end
+      res
+    end
+  end
+  
+  class Source < MemoryModel
+    attr_accessor :app_id, :user_id, :rho__id
+            
+    validates_presence_of :name
     
     include Document
     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])
+    
+    def initialize(fields)
+      fields.each do |name,value|
+        arg = "#{name}=".to_sym
+        self.send(arg, value) if self.respond_to?(arg)
+      end
+    end
   
     def self.set_defaults(fields)
       fields[:url] ||= ''
       fields[:login] ||= ''
       fields[:password] ||= ''
       fields[:priority] ||= 3
-      fields[:partition_type] ||= :user
+      fields[:partition_type] = fields[:partition_type] ? fields[:partition_type].to_sym : :user
       fields[:poll_interval] ||= 300
-      fields[:sync_type] ||= :incremental
+      fields[:sync_type] = fields[:sync_type] ? fields[:sync_type].to_sym : :incremental
+      fields[:id] = fields[:name]
+      fields[:rho__id] = fields[:name]
       fields[:belongs_to] = fields[:belongs_to].to_json if fields[:belongs_to]
       fields[:schema] = fields[:schema].to_json if fields[:schema]
     end
         
     def self.create(fields,params)
       fields = fields.with_indifferent_access # so we can access hash keys as symbols
-      # validate_attributes(params)
-      fields[:id] = fields[:name]
       set_defaults(fields)
-      super(fields,params)
+      obj = new(fields)
+      obj.assign_args(params)
+      @@model_data[obj.rho__id.to_sym] = obj
+      obj
     end
     
-    def self.load(id,params)
+    def self.load(obj_id,params)
       validate_attributes(params)
-      super(id,params)
+      obj = @@model_data[obj_id.to_sym]
+      obj.assign_args(params) if obj
+      obj
     end
-    
+      
     def self.update_associations(sources)
       params = {:app_id => APP_NAME,:user_id => '*'}
       sources.each { |source| Source.load(source, params).has_many = nil }
@@ -58,7 +124,8 @@ module Rhosync
               attrib = entry.keys[0]
               model = entry[attrib]
               owner = Source.load(model, params)
-              owner.has_many = owner.has_many.length > 0 ? owner.has_many+',' : ''
+              owner.has_many ||= ''
+              owner.has_many = owner.has_many+',' if owner.has_many.length > 0
               owner.has_many += [source,attrib].join(',')
             end
           else
@@ -68,6 +135,16 @@ module Rhosync
       end
     end
     
+    def self.delete_all
+      @@model_data.each { |k,v| v.delete }
+      @@model_data = {}
+    end
+
+    def assign_args(params)
+      self.user_id = params[:user_id]
+      self.app_id = params[:app_id]    
+    end
+      
     def blob_attribs
       return '' unless self.schema
       schema = JSON.parse(self.schema)
@@ -82,7 +159,7 @@ 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)
+      #super(fields)
     end
     
     def clone(src_doctype,dst_doctype)
@@ -91,12 +168,12 @@ module Rhosync
     
     # Return the user associated with a source
     def user
-      @user ||= User.load(self.user_id)
+      @user = User.load(self.user_id)
     end
     
     # Return the app the source belongs to
     def app
-      @app ||= App.load(self.app_id)
+      @app = App.load(self.app_id)
     end
     
     def schema
@@ -106,8 +183,7 @@ module Rhosync
     def read_state
       id = {:app_id => self.app_id,:user_id => user_by_partition,
         :source_name => self.name}
-      @read_state ||= ReadState.load(id)
-      @read_state ||= ReadState.create(id)   
+      ReadState.load(id) || ReadState.create(id)  
     end
     
     def doc_suffix(doctype)
@@ -116,7 +192,7 @@ module Rhosync
     
     def delete
       flash_data('*')
-      super
+      @@model_data.delete(rho__id.to_sym) if rho__id
     end
     
     def partition
@@ -144,7 +220,7 @@ module Rhosync
       end
       yield client_id,params if need_refresh
     end
-        
+          
     private
     def self.validate_attributes(params)
       raise ArgumentError.new('Missing required attribute user_id') unless params[:user_id]

data/lib/rhosync/version.rb

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

data/lib/rhosync.rb

@@ -91,15 +91,11 @@ module Rhosync
         app = App.create(:name => app_name)
       end
       sources = config[:sources] || []
+      Source.delete_all
       sources.each do |source_name,fields|
         check_for_schema_field!(fields)
-        if Source.is_exist?(source_name)
-          s = Source.load(source_name,{:app_id => app.name,:user_id => '*'})
-          s.update(fields)
-        else  
-          fields[:name] = source_name
-          Source.create(fields,{:app_id => app.name})
-        end
+        fields[:name] = source_name
+        Source.create(fields,{:app_id => app.name})
         unless app.sources.members.include?(source_name)
           app.sources << source_name
         end

data/spec/api/get_source_params_spec.rb

@@ -5,13 +5,14 @@ describe "RhosyncApiGetSourceParams" do
   
   it "should list source attributes" do
     post "/api/get_source_params", {:api_token => @api_token, :source_id =>"SampleAdapter"}
-    JSON.parse(last_response.body).should == [
+    result = JSON.parse(last_response.body).sort {|x,y| y["name"] <=> x["name"] }
+    result.should == [
       {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"}, 
       {"name"=>"source_id", "value"=>nil, "type"=>"integer"}, 
       {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"}, 
-      {"name"=>"url", "value"=>"", "type"=>"string"}, 
-      {"name"=>"login", "value"=>"", "type"=>"string"}, 
-      {"name"=>"password", "value"=>"", "type"=>"string"}, 
+      {"name"=>"url", "value"=>"http://example.com", "type"=>"string"}, 
+      {"name"=>"login", "value"=>"testuser", "type"=>"string"}, 
+      {"name"=>"password", "value"=>"testpass", "type"=>"string"}, 
       {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
       {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
       {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
@@ -19,9 +20,10 @@ describe "RhosyncApiGetSourceParams" do
       {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
       {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
       {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
+      {"name"=>"id", "value"=>"SampleAdapter", "type"=>"string"}, 
       {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
       {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
-      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}]
+      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}].sort {|x,y| y["name"] <=> x["name"] }
   end
   
 end

data/spec/api/push_deletes_spec.rb

@@ -5,6 +5,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)
     data.delete('2')
     post "/api/push_deletes", :api_token => @api_token, 

data/spec/api/push_objects_spec.rb

@@ -14,6 +14,7 @@ describe "RhosyncApiPushObjects" do
   it "should push updates to existing objects to rhosync's :md" 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)
     update.each do |key,value|
       data['2'][key] = value

data/spec/api/rhosync_api_spec.rb

@@ -152,13 +152,15 @@ describe "RhosyncApi" do
   end
   
   it "should list source attributes using direct api call" do
-    RhosyncApi::get_source_params('',@api_token,"SampleAdapter").should == [
+    result = RhosyncApi::get_source_params(
+      '',@api_token,"SampleAdapter").sort {|x,y| y["name"] <=> x["name"] }
+    result.should == [
       {"name"=>"rho__id", "value"=>"SampleAdapter", "type"=>"string"}, 
       {"name"=>"source_id", "value"=>nil, "type"=>"integer"}, 
       {"name"=>"name", "value"=>"SampleAdapter", "type"=>"string"}, 
-      {"name"=>"url", "value"=>"", "type"=>"string"}, 
-      {"name"=>"login", "value"=>"", "type"=>"string"}, 
-      {"name"=>"password", "value"=>"", "type"=>"string"}, 
+      {"name"=>"url", "value"=>"http://example.com", "type"=>"string"}, 
+      {"name"=>"login", "value"=>"testuser", "type"=>"string"}, 
+      {"name"=>"password", "value"=>"testpass", "type"=>"string"}, 
       {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
       {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
       {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
@@ -166,9 +168,10 @@ describe "RhosyncApi" do
       {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
       {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
       {"name"=>"has_many", "type"=>"string", "value"=>"FixedSchemaAdapter,brand"},
+      {"name"=>"id", "value"=>"SampleAdapter", "type"=>"string"}, 
       {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
       {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
-      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}]
+      {"name"=>"cud_queue", "value"=>nil, "type"=>"string"}].sort {|x,y| y["name"] <=> x["name"] }
   end
  
   it "should list source attributes using rest call" do

data/spec/bulk_data/bulk_data_spec.rb

@@ -4,6 +4,10 @@ describe "BulkData" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
+  before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
+  end
+  
   after(:each) do
     delete_data_directory
   end

data/spec/client_spec.rb

@@ -7,6 +7,10 @@ describe "Client" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
+  before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
+  end
+  
   it "should create client with fields" do
     @c.id.length.should == 32
     @c.device_type.should == @c_fields[:device_type]

data/spec/client_sync_spec.rb

@@ -10,6 +10,7 @@ describe "ClientSync" do
   end
   
   before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
     @cs = ClientSync.new(@s,@c,2)
   end
   
@@ -341,7 +342,7 @@ describe "ClientSync" do
       token1.should be_nil
       Store.get_data(@c.docname(:search)).should == {}
     end
-    
+     
   end
   
   describe "page methods" do
@@ -354,40 +355,40 @@ describe "ClientSync" do
       Store.get_value(@cs.client.docname(:cd_size)).to_i.should == 0
       Store.get_data(@cs.client.docname(:page)).should == @expected      
     end
-
+  
     it "appends diff to the client document" do
       @cd = {'3'=>@product3}  
       Store.put_data(@c.docname(:cd),@cd)
       Store.get_data(@c.docname(:cd)).should == @cd
-
+  
       @page = {'1'=>@product1,'2'=>@product2}
       @expected = {'1'=>@product1,'2'=>@product2,'3'=>@product3}
-
+  
       Store.put_data(@c.docname(:cd),@page,true).should == true
       Store.get_data(@c.docname(:cd)).should == @expected
     end
-
+  
     it "should return deleted objects in the client document" do
       Store.put_data(@s.docname(:md),@data).should == true
       Store.get_data(@s.docname(:md)).should == @data
-
+  
       @cd = {'1'=>@product1,'2'=>@product2,'3'=>@product3,'4'=>@product4}  
       Store.put_data(@cs.client.docname(:cd),@cd)
       Store.get_data(@cs.client.docname(:cd)).should == @cd
-
+  
       @expected = {'4'=>@product4}
       @cs.compute_deleted_page.should == @expected
       Store.get_data(@cs.client.docname(:delete_page)).should == @expected
     end  
-
+  
     it "should delete objects from client document" do
       Store.put_data(@s.docname(:md),@data).should == true
       Store.get_data(@s.docname(:md)).should == @data
-
+  
       @cd = {'1'=>@product1,'2'=>@product2,'3'=>@product3,'4'=>@product4}  
       Store.put_data(@cs.client.docname(:cd),@cd)
       Store.get_data(@cs.client.docname(:cd)).should == @cd
-
+  
       Store.delete_data(@cs.client.docname(:cd),@cs.compute_deleted_page).should == true
       Store.get_data(@cs.client.docname(:cd)).should == @data 
     end

data/spec/document_spec.rb

@@ -4,6 +4,10 @@ describe "Document" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
+  before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
+  end
+  
   it "should generate client docname" do
     @c.docname(:foo).should == "client:#{@a.id}:#{@u.id}:#{@c.id}:#{@s_fields[:name]}:foo"
   end

data/spec/jobs/source_job_spec.rb

@@ -4,6 +4,10 @@ describe "SourceJob" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
+  before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
+  end
+  
   it "should perform process_query" do
     set_state('test_db_storage' => @data)  
     SourceJob.perform('query',@s.id,@s.app_id,@s.user_id,nil,nil)

data/spec/server/server_spec.rb

@@ -187,6 +187,12 @@ describe "Server" do
       get "/application",:client_id => @c.id,:source_name => @s.name,:version => ClientSync::VERSION
       JSON.parse(last_response.body).last['insert'].should == data
     end
+    
+    it "should return error on routes if client doesn't exist" do
+      get "/application",:client_id => "missingclient",:source_name => @s.name,:version => ClientSync::VERSION
+      last_response.body.should == "Unknown client"
+      last_response.status.should == 500
+    end
   end
   
   describe "source routes" do

data/spec/source_adapter_spec.rb

@@ -16,6 +16,7 @@ describe "SourceAdapter" do
   it_should_behave_like "SourceAdapterHelper"
   
   before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
     @s.name = 'SimpleAdapter'
     @sa = SourceAdapter.create(@s,nil)
   end
@@ -37,6 +38,7 @@ describe "SourceAdapter" do
     @s_fields[:name] = 'Broken'
     broken_source = Source.create(@s_fields,@s_params)
     lambda { SourceAdapter.create(broken_source) }.should raise_error(Exception)
+    broken_source.delete
   end
   
   it "should create SourceAdapter with trailing spaces" do

data/spec/source_spec.rb

@@ -4,6 +4,10 @@ describe "Source" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
+  before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
+  end
+  
   it "should create and load source with @s_fields and @s_params" do
     @s.name.should == @s_fields[:name]
     @s.url.should == @s_fields[:url]
@@ -30,6 +34,7 @@ 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
@@ -40,17 +45,31 @@ describe "Source" do
     @s.app.name.should == @a_fields[:name]
     @s.docname(:md).should == "source:#{@s.app.id}:#{@u.id}:#{@s_fields[:name]}:md"
   end
+  
+  it 'should return values that set by setter method' do
+    @s.login = "shurab"
+    @s.login.should == "shurab"
+    @s.poll_interval = 350
+    @s.poll_interval.should == 350
+    @s.poll_interval = nil
+    @s.poll_interval.should == nil
+    @s.url = nil
+    @s.url.should be_nil  
+  end
     
   it "should delete source" do
     @s.delete
     Source.is_exist?(@s_fields[:name]).should == false
+    @s = Source.create(@s_fields,@s_params)
   end
   
   it "should delete master and all documents associated with source" do
-    set_state(@s.docname(:md) => @data)
+    key = @s.docname('*')
+    set_state(key => @data)
     @s.delete
-    verify_result(@s.docname(:md) => {})
-    Store.db.keys(@s.docname('*')).should == []
+    verify_result(key => {})
+    Store.db.keys(key).should == []
+    @s = Source.create(@s_fields,@s_params)
   end
   
   it "should create source with default partition user" do
@@ -68,16 +87,17 @@ describe "Source" do
     @s_fields[:queue] = :default
     @s_fields[:query_queue] = :query
     @s_fields[:cud_queue] = :cud
-    Source.create(@s_fields,@s_params)
+    @s = Source.create(@s_fields,@s_params)
     s = Source.load(@s_fields[:name],@s_params)
-    s.queue.should == 'default'
-    s.query_queue.should == 'query'
-    s.cud_queue.should == 'cud'
+    s.queue.should == :default
+    s.query_queue.should == :query
+    s.cud_queue.should == :cud
   end
   
   it "should add associations based on belongs_to field for a source" do
     @s2 = Source.create({:name => 'SimpleAdapter'}, @s_params)
     @s2.belongs_to = [{'product_id' => 'SampleAdapter'}].to_json
+    sf = Source.load(@s1.name,{:app_id => @a.id,:user_id => '*'})
     Source.update_associations([@s.name,@s1.name, @s2.name])
     s = Source.load(@s.name,{:app_id => @a.id,:user_id => '*'})
     s.has_many.should == "#{@s1.name},brand,#{@s2.name},product_id"

data/spec/source_sync_spec.rb

@@ -5,6 +5,7 @@ describe "SourceSync" do
   it_should_behave_like "SourceAdapterHelper"
   
   before(:each) do
+    @s = Source.load(@s_fields[:name],@s_params)
     @ss = SourceSync.new(@s)
   end
   
@@ -51,7 +52,7 @@ describe "SourceSync" do
     @ss.process_query
     verify_result(@s.docname(:md) => expected)    
   end
-
+  
   it "should never call read on any call of process" do
     @s.poll_interval = -1
     Store.put_data('test_db_storage',{'1'=>@product1})
@@ -207,7 +208,7 @@ describe "SourceSync" do
     
     describe "app-level partitioning" do
       it "should create app-level masterdoc with '__shared__' docname" do
-        @s1 = Source.load(@s_fields[:name],@s_params)
+        @s1 = Source.load(@s_fields[:name],{:user_id => "testuser",:app_id => @a.id})
         @s1.partition = :app
         @ss1 = SourceSync.new(@s1)
         expected = {'1'=>@product1,'2'=>@product2}

data/spec/spec_helper.rb

@@ -209,6 +209,7 @@ describe "RhosyncHelper", :shared => true do
   before(:each) do
     Store.create
     Store.db.flushdb
+    # Source.delete_all # TODO: should have this
   end
 end
 
@@ -284,10 +285,8 @@ describe "DBObjectsHelper", :shared => true do
       :app_id => @a.id
     }
     @c = Client.create(@c_fields,{:source_name => @s_fields[:name]})
-    @s = Source.load(@s_fields[:name],@s_params)
-    @s = Source.create(@s_fields,@s_params) if @s.nil?
+    @s = Source.create(@s_fields,@s_params)
     @s1 = Source.load('FixedSchemaAdapter',@s_params)
-    @s1 = Source.create({:name => 'FixedSchemaAdapter'},@s_params) if @s1.nil?
     config = Rhosync.source_config["sources"]['FixedSchemaAdapter']
     @s1.update(config)
     @r = @s.read_state

data/spec/sync_states_spec.rb

@@ -5,6 +5,7 @@ describe "Sync Server States" do
   it_should_behave_like "SourceAdapterHelper"
   
   before(:each) do    
+    @s = Source.load(@s_fields[:name],@s_params)
     @cs = ClientSync.new(@s,@c,2)
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 7
   prerelease: 
   segments: 
   - 2
   - 1
-  - 3
-  version: 2.1.3
+  - 6
+  version: 2.1.6
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 -07:00
-default_executable: rhosync
+date: 2011-05-25 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -544,7 +543,6 @@ files:
 - examples/simple/application.rb
 - examples/simple/sources/sample_adapter.rb
 - examples/simple/sources/simple_adapter.rb
-has_rdoc: true
 homepage: http://rhomobile.com/products/rhosync
 licenses: []
 
@@ -574,7 +572,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.3
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework