rhosync 2.1.17.beta7 → 2.1.17

data/CHANGELOG

@@ -1,4 +1,4 @@
-## 2.1.17 (not yet released)
+## 2.1.17
 * Reset device attributes if Android ping returns "Not Registered" Error
 * #29214293 - do not execute ping if the platform is not configured
 * Refactor server middleware. Remove explicit rack dependency. Fix broken rspec examples.
@@ -11,6 +11,7 @@
 * Revert fix for Zendesk ticket #2336 by customer request
 * #28094895 - Zendesk ticket #2354: Bulk sync not updating sources table (fields 'last_inserted_size' and 'backend_refresh_time' now updated)
 * #29796429 - Zendesk ticket #2447: use list to preserve bulk data sources order
+* Fixing redis dependencies to handle redis 3.0.0 release
 
 ## 2.1.16
 * revert rack support for v. 1.4.1 and lock to v. 1.3.6 due to problems with Heroku deployment (Rack 1.4.1 produces 502 error) 

data/Rakefile

@@ -71,7 +71,8 @@ begin
     gemspec.add_dependency "sqlite3-ruby", "~>1.2.5"
     gemspec.add_dependency "rubyzip", "~>0.9.4"
     gemspec.add_dependency "uuidtools", ">=2.1.1"
-    gemspec.add_dependency "redis", "~>2.1.1"
+    gemspec.add_dependency "redis-namespace", "~>1.1.0"
+    gemspec.add_dependency "redis", "~>2.2.2"
     gemspec.add_dependency "resque", "~>1.14.0"
     gemspec.add_dependency "rest-client", "~>1.6.1"
     gemspec.add_dependency "templater", "~>1.0.0"

data/lib/rhosync.rb

@@ -92,18 +92,18 @@ module Rhosync
       end
       sources = config[:sources] || []
       Source.delete_all
+      app.delete_sources
       sources.each do |source_name,fields|
-        check_for_schema_field!(fields)
-        fields[:name] = source_name
-        Source.create(fields,{:app_id => app.name})
-        unless app.sources.members.include?(source_name)
-          app.sources << source_name
-        end
+        source_config = source_config(source_name)
+        check_for_schema_field!(source_config)
+        source_config[:name] = source_name
+        Source.create(source_config,{:app_id => app.name})
+        app.sources << source_name
         # load ruby file for source adapter to re-load class
         load under_score(source_name+'.rb')
       end
       # Create associations for all sources
-      Source.update_associations(app.sources.members)
+      Source.update_associations(app.sources)
     end
   end
   
@@ -127,8 +127,11 @@ module Rhosync
     YAML.load_file(settings_file) if settings_file and File.exist?(settings_file)
   end
   
-  def source_config
-    { "sources" => Rhosync.get_config(Rhosync.base_directory)[:sources] }
+  def source_config(source_name)
+    source_config = {}
+    sources = Rhosync.get_config(Rhosync.base_directory)[:sources]
+    source_config = sources[source_name] unless (sources.nil? or sources[source_name].nil?)
+    source_config
   end
   ### End Rhosync setup methods  
   

data/lib/rhosync/api/delete_user.rb

@@ -2,7 +2,7 @@ Server.api :delete_user do |params,user|
   User.load(params[:user_id]).delete
   App.load(APP_NAME).users.delete(params[:user_id])
   params = {:app_id => APP_NAME,:user_id => params[:user_id]}
-  App.load(APP_NAME).sources.members.each{ |source|
+  App.load(APP_NAME).sources.each{ |source|
     Source.load(source, params).flash_store_data
   }
   "User deleted"

data/lib/rhosync/api/list_sources.rb

@@ -1,5 +1,5 @@
 Server.api :list_sources do |params,user|
-  sources = App.load(APP_NAME).sources.members
+  sources = App.load(APP_NAME).sources
   if params[:partition_type].nil? or params[:partition_type] == 'all'
     sources.to_json 
   else

data/lib/rhosync/app.rb

@@ -2,10 +2,11 @@ module Rhosync
   class App < Model
     field :name, :string
     set   :users, :string
-    set   :sources, :string
     attr_reader :delegate
     validates_presence_of :name
-    
+
+    @@sources = []
+
     class << self
       def create(fields={})
         fields[:id] = fields[:name]
@@ -31,10 +32,19 @@ module Rhosync
     def delegate
       @delegate.nil? ? Object.const_get(camelize(self.name)) : @delegate
     end
+
+    def delete
+      @@sources = []
+      super
+    end
+
+    def delete_sources
+      @@sources = []
+    end
     
     def partition_sources(partition,user_id)
       names = []
-      sources.members.each do |source|
+      @@sources.each do |source|
         s = Source.load(source,{:app_id => self.name,
           :user_id => user_id})
         if s.partition == partition
@@ -47,5 +57,11 @@ module Rhosync
     def store_blob(obj,field_name,blob)
       self.delegate.send :store_blob, obj,field_name,blob
     end
+
+    def sources
+      @@sources.uniq!
+      # Sort sources array by priority
+      @@sources = @@sources.sort_by { |s| Source.load(s, {:app_id => self.name, :user_id => '*'}).priority }
+    end
   end
 end

data/lib/rhosync/server.rb

@@ -218,21 +218,21 @@ module Rhosync
         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
+        { "client" => { "client_id" =>  client.id.to_s } }.to_json
       end
     end
 
     post '/application/clientregister' do
       catch_all do 
         current_client.update_fields(params)
-        source_config.to_json
+        status 200
       end
     end
 
     get '/application/clientreset' do
       catch_all do 
         ClientSync.reset(current_client, params)
-        source_config.to_json
+        status 200
       end
     end
 

data/lib/rhosync/version.rb

@@ -1,3 +1,3 @@
 module Rhosync
-  VERSION = '2.1.17.beta7'
+  VERSION = '2.1.17'
 end

data/spec/api/get_source_params_spec.rb

@@ -13,7 +13,7 @@ describe "RhosyncApiGetSourceParams" do
       {"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"=>"priority", "value"=>1, "type"=>"integer"},
       {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
       {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
       {"name"=>"retry_limit", "value"=>0, "type"=>"integer"},

data/spec/api/rhosync_api_spec.rb

@@ -162,7 +162,7 @@ describe "RhosyncApi" do
       {"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"=>"priority", "value"=>1, "type"=>"integer"},
       {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
       {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
       {"name"=>"retry_limit", "type"=>"integer", "value"=>0},

data/spec/app_spec.rb

@@ -13,6 +13,6 @@ describe "App" do
   
   it "should add source adapters" do
     @a1 = App.load(@a_fields[:name])
-    @a1.sources.members.sort.should == ["FixedSchemaAdapter", "SampleAdapter"]
+    @a1.sources.sort.should == ["FixedSchemaAdapter", "SampleAdapter", "SimpleAdapter"]
   end
 end

data/spec/apps/rhotestapp/settings/settings.yml

@@ -1,11 +1,13 @@
 :sources:
   SampleAdapter:
     poll_interval: 300
+    priority: 1
   SimpleAdapter:
     poll_interval: 600
     partition_type: 'app'
   FixedSchemaAdapter:
     poll_interval: 300
+    priority: 5
     sync_type: 'incremental'
     belongs_to: 
       - brand: 'SampleAdapter'

data/spec/bulk_data/bulk_data_spec.rb

@@ -61,17 +61,16 @@ describe "BulkData" do
       File.join(@a_fields[:name],@a_fields[:name])
   end
 
-  it "should have ordered sources list" do
+  it "should have ordered sources list by priority" do
     data = BulkData.create(:name => bulk_data_docname(@a.id,@u.id),
       :state => :inprogress,
       :app_id => @a.id,
       :user_id => @u.id,
       :sources => @a.partition_sources(:user, @u.id))
     data.sources[0, -1].should == ["SampleAdapter", "FixedSchemaAdapter"]
-  end
-
-  it "should have ordered sources list by priority" do
-    pending
+    p1 = Source.load("SampleAdapter", {:app_id => data.app_id, :user_id => data.user_id}).priority
+    p2 = Source.load("FixedSchemaAdapter", {:app_id => data.app_id, :user_id => data.user_id}).priority
+    p1.should < p2
   end
   
   it "should process_sources for bulk data" do

data/spec/client_sync_spec.rb

@@ -583,6 +583,7 @@ describe "ClientSync" do
     end
     
     it "should create bulk data job app partition if none exists and no partition sources" do
+      @a.sources.delete("SimpleAdapter")
       ClientSync.bulk_data(:app,@c).should == {:result => :nop}
       Resque.peek(:bulk_data).should == nil
     end

data/spec/rhosync_spec.rb

@@ -48,7 +48,7 @@ describe "Rhosync" do
     )
     App.should_receive(:load).twice.with(@test_app_name).and_return(app)
     Rhosync.bootstrap(get_testapp_path)
-    App.load(@test_app_name).sources.members.should == []
+    App.load(@test_app_name).sources.should == []
   end
   
   it "should exit if schema config exists" do

data/spec/server/server_spec.rb

@@ -129,15 +129,6 @@ describe "Server" do
   describe "client management routes" do
     before(:each) do
       do_post "/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
@@ -147,17 +138,16 @@ 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'
     end
-    
+
     it "should respond to clientregister" do
       do_post "/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
@@ -166,7 +156,6 @@ describe "Server" do
     it "should respond to clientreset" do
       set_state(@c.docname(:cd) => @data)
       get "/application/clientreset", :client_id => @c.id,:version => ClientSync::VERSION
-      JSON.parse(last_response.body).should == @source_config
       verify_result(@c.docname(:cd) => {})
     end
     
@@ -177,7 +166,7 @@ describe "Server" do
       set_state(@c.docname(:cd) => @data)
       sources = [{'name' => 'SimpleAdapter'}]
       get "/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'

data/spec/source_spec.rb

@@ -13,7 +13,7 @@ describe "Source" do
     @s.url.should == @s_fields[:url]
     @s.login.should == @s_fields[:login]
     @s.app.name.should == @a_fields[:name]
-    @s.priority.should == 3
+    @s.priority.should == 1
     @s.callback_url.should be_nil
     @s.queue.should be_nil
     @s.query_queue.should be_nil
@@ -29,7 +29,7 @@ describe "Source" do
     @s1.url.should == @s_fields[:url]
     @s1.login.should == @s_fields[:login]
     @s1.app.name.should == @a_fields[:name]
-    @s1.priority.should == 3
+    @s1.priority.should == 1
     @s1.callback_url.should be_nil
     @s1.poll_interval.should == 300
     @s1.app_id.should == @s_params[:app_id]

data/spec/spec_helper.rb

@@ -303,12 +303,14 @@ describe "DBObjectsHelper", :shared => true do
       :url => 'http://example.com',
       :login => 'testuser',
       :password => 'testpass',
+      :priority => '1'
     }
     @s1_fields = {
       :name => 'FixedSchemaAdapter',
       :url => 'http://example.com',
       :login => 'testuser',
       :password => 'testpass',
+      :priority => '5'
     }
     @s_params = {
       :user_id => @u.id,
@@ -318,12 +320,12 @@ describe "DBObjectsHelper", :shared => true do
     @s = Source.create(@s_fields,@s_params)
     @s1 = Source.create(@s1_fields,@s_params)
     @s1.belongs_to = [{'brand' => 'SampleAdapter'}].to_json    
-    config = Rhosync.source_config["sources"]['FixedSchemaAdapter']
+    config = Rhosync.source_config('FixedSchemaAdapter')
     @s1.update(config)
     @r = @s.read_state
     @a.sources << @s.id
     @a.sources << @s1.id
-    Source.update_associations(@a.sources.members)
+    Source.update_associations(@a.sources)
     @a.users << @u.id
   end
 end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 62196341
-  prerelease: 7
+  hash: 41
+  prerelease: 
   segments: 
   - 2
   - 1
   - 17
-  - beta
-  - 7
-  version: 2.1.17.beta7
+  version: 2.1.17
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-17 00:00:00 Z
+date: 2012-05-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -100,25 +98,41 @@ dependencies:
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: redis
+  name: redis-namespace
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 19
         segments: 
-        - 2
         - 1
         - 1
-        version: 2.1.1
+        - 0
+        version: 1.1.0
   type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: resque
+  name: redis
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 2
+        - 2
+        version: 2.2.2
+  type: :runtime
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: resque
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -130,11 +144,11 @@ dependencies:
         - 0
         version: 1.14.0
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rest-client
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -146,11 +160,11 @@ dependencies:
         - 1
         version: 1.6.1
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: templater
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -162,11 +176,11 @@ dependencies:
         - 0
         version: 1.0.0
   type: :runtime
-  version_requirements: *id009
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -179,11 +193,11 @@ dependencies:
         - 2
         version: 0.9.2.2
   type: :runtime
-  version_requirements: *id010
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: log4r
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -195,11 +209,11 @@ dependencies:
         - 7
         version: 1.1.7
   type: :development
-  version_requirements: *id011
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: jeweler
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -211,11 +225,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id013
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -227,11 +241,11 @@ dependencies:
         - 0
         version: 1.3.0
   type: :development
-  version_requirements: *id013
+  version_requirements: *id014
 - !ruby/object:Gem::Dependency 
   name: rcov
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -243,11 +257,11 @@ dependencies:
         - 8
         version: 0.9.8
   type: :development
-  version_requirements: *id014
+  version_requirements: *id015
 - !ruby/object:Gem::Dependency 
   name: faker
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -259,11 +273,11 @@ dependencies:
         - 1
         version: 0.3.1
   type: :development
-  version_requirements: *id015
+  version_requirements: *id016
 - !ruby/object:Gem::Dependency 
   name: rack-test
   prerelease: false
-  requirement: &id016 !ruby/object:Gem::Requirement 
+  requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -275,11 +289,11 @@ dependencies:
         - 3
         version: 0.5.3
   type: :development
-  version_requirements: *id016
+  version_requirements: *id017
 - !ruby/object:Gem::Dependency 
   name: thor
   prerelease: false
-  requirement: &id017 !ruby/object:Gem::Requirement 
+  requirement: &id018 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -291,7 +305,7 @@ dependencies:
         - 6
         version: 0.13.6
   type: :development
-  version_requirements: *id017
+  version_requirements: *id018
 description: RhoSync Synchronization Framework and related command-line utilities
 email: dev@rhomobile.com
 executables: 
@@ -571,18 +585,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework