rhoconnect 3.0.0.beta1 → 3.0.0.beta3

data/lib/rhoconnect/console/app/views/users.erb

@@ -1,4 +1,11 @@
-<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path('user/new')%>','main_box');" class='nav_button'>Create User</a>
+<div class="panel">
+	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path('user/new')%>','main_box');" class='nav_button'>Create User</a>
+</div>
+<%if @users.size > 0%>
+<div class="panel">
+	<a href="javascript:void(0);" onclick="loadXMLDoc('<%=url_path("user/ping?user_id=#{CGI.escape(@users.first(10).join(','))}")%>','main_box');" class='nav_button'>Ping Users</a>
+</div>
+<%end%>
 
 <h2>Registered users</h2>
 <%if is_errors?%>

data/lib/rhoconnect/jobs/ping_job.rb

@@ -6,9 +6,17 @@ module Rhoconnect
     
     # Perform a ping for all clients registered to a user
     def self.perform(params)
-      user = User.load(params["user_id"])
       device_pins = []
-      phone_ids   = []
+      phone_ids = []
+      user_ids = params['user_id']
+      user_ids = [user_ids] unless user_ids.is_a? Array
+      user_ids.each do |user|
+        ping_by_user user, params, device_pins, phone_ids
+      end
+    end
+    
+    def self.ping_by_user(user_id, params, device_pins, phone_ids)
+      user = User.load(user_id)
       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, 'phone_id' => client.phone_id)
@@ -29,7 +37,7 @@ module Rhoconnect
             next
           end
           if send_push
-            klass = Object.const_get(camelize(client.device_type.downcase)) 
+            klass = Object.const_get(camelize(client.device_type.downcase))
             if klass
               params['vibrate'] = params['vibrate'].to_s
               klass.ping(params) 

data/lib/rhoconnect/model.rb

@@ -33,14 +33,14 @@ module Rhoconnect
     # specified amount.
     def increment!(name,amount=1)
       raise ArgumentError, "Only integer fields can be incremented." unless self.class.fields.include?({:name => name.to_s, :type => :integer})
-      redis.incr(field_key(name), amount)
+      redis.incrby(field_key(name), amount)
     end
   
     # Decrement the specified integer field by 1 or the
     # specified amount.
     def decrement!(name,amount=1)
       raise ArgumentError, "Only integer fields can be decremented." unless self.class.fields.include?({:name => name.to_s, :type => :integer})
-      redis.decr(field_key(name), amount)
+      redis.decrby(field_key(name), amount)
     end
     
     def next_id #:nodoc:

data/lib/rhoconnect/read_state.rb

@@ -1,6 +1,7 @@
 module Rhoconnect  
   class ReadState < Model
     field :refresh_time, :integer
+    field :retry_counter, :integer
   
     def self.create(fields)
       fields[:id] = get_id(fields)
@@ -8,6 +9,7 @@ module Rhoconnect
       fields.delete(:user_id)
       fields.delete(:source_name)
       fields[:refresh_time] ||= Time.now.to_i
+      fields[:retry_counter] ||= 0
       super(fields,{})
     end
   

data/lib/rhoconnect/server.rb

@@ -111,7 +111,8 @@ module Rhoconnect
              
           # if source does not exist create one for dynamic adapter
           unless @source
-            @source = Source.create({:name => params[:source_name]},{:user_id => user.login, :app_id => APP_NAME})
+            sconfig = Rhoconnect.source_config(params[:source_name])
+            @source = Source.create(sconfig.merge!({:name => params[:source_name]}),{:user_id => user.login, :app_id => APP_NAME})
             current_app.sources << @source.name
           end
           @source
@@ -182,11 +183,11 @@ module Rhoconnect
         use Rhoconnect::Stats::Middleware 
         Rhoconnect.stats = true
       end
-      use Rack::Session::Cookie, 
+      use XDomainSessionWrapper
+      use Rack::Session::Cookie,
             :key => 'rhoconnect_session',
             :expire_after => Rhoconnect.cookie_expire,
             :secret => @@secret     
-      use XDomainSessionWrapper
       use Rack::Cors do |cfg|
         cfg.allow do |allow|
           allow.origins /.*/

data/lib/rhoconnect/source.rb

@@ -90,7 +90,7 @@ module Rhoconnect
     
     # source fields
     define_fields([:id, :rho__id, :name, :url, :login, :password, :callback_url, :partition_type, :sync_type, 
-      :queue, :query_queue, :cud_queue, :belongs_to, :has_many, :pass_through], [:source_id, :priority])
+      :queue, :query_queue, :cud_queue, :belongs_to, :has_many, :pass_through], [:source_id, :priority, :retry_limit])
     
     def initialize(fields)
       self.name = fields['name'] || fields[:name]
@@ -112,6 +112,7 @@ module Rhoconnect
       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]
+      fields[:retry_limit] = fields[:retry_limit] ? fields[:retry_limit] : 0
     end
         
     def self.create(fields,params)
@@ -263,14 +264,40 @@ module Rhoconnect
     end
         
     def if_need_refresh(client_id=nil,params=nil)
-      need_refresh = lock(:md) do |s|
-        check = check_refresh_time
-        s.read_state.refresh_time = Time.now.to_i + s.poll_interval if check
-        check
-      end
+      need_refresh = check_refresh_time
       yield client_id,params if need_refresh
     end
     
+    def update_refresh_time(query_failure = false)
+      if self.poll_interval == 0
+        self.read_state.refresh_time = Time.now.to_i + self.poll_interval
+        return
+      end
+      
+      allowed_update = true
+      # reset number of retries on succesfull query
+      # or if last refresh was more than 'poll_interval' time ago
+      if not query_failure or (Time.now.to_i - self.read_state.refresh_time >= self.poll_interval)
+        self.read_state.retry_counter = 0 
+      end
+      
+      # do not reset the refresh time on failure
+      # if retry limit is not reached
+      if query_failure
+        if self.read_state.retry_counter < self.retry_limit
+          allowed_update = false
+          self.read_state.increment!(:retry_counter)
+        # we have reached the limit - update the refresh time
+        # and reset the counter
+        else
+          self.read_state.retry_counter = 0 
+        end
+      end
+      if allowed_update
+        self.read_state.refresh_time = Time.now.to_i + self.poll_interval
+      end
+    end
+    
     def is_pass_through?
       self.pass_through and self.pass_through == 'true'
     end

data/lib/rhoconnect/source_adapter.rb

@@ -55,20 +55,16 @@ module Rhoconnect
     
     def sync
       if @result and @result.empty?
-        @source.lock(:md) do |s|
-          s.flash_data(:md)
-          s.put_value(:md_size,0)
-        end
+        @source.flash_data(:md)
+        @source.put_value(:md_size,0)
       else
         if @result
           Store.put_data(@tmp_docname,@result) 
           @stash_size += @result.size
         end  
-        @source.lock(:md) do |s|
-          s.flash_data(:md)
-          Store.rename(@tmp_docname,s.docname(:md))
-          s.put_value(:md_size,@stash_size)
-        end
+        @source.flash_data(:md)
+        Store.rename(@tmp_docname,@source.docname(:md))
+        @source.put_value(:md_size,@stash_size)
       end
     end
     

data/lib/rhoconnect/source_sync.rb

@@ -90,11 +90,17 @@ module Rhoconnect
     
     def do_query(params=nil)
       result = nil
-      @source.if_need_refresh do
-        Stats::Record.update("source:query:#{@source.name}") do
-          return if _auth_op('login') == false
-          result = self.read(nil,params)
-          _auth_op('logoff')
+      @source.lock(:md) do
+        @source.if_need_refresh do
+          Stats::Record.update("source:query:#{@source.name}") do
+            if _auth_op('login')
+              result = self.read(nil,params)
+              _auth_op('logoff')
+            end
+            # update refresh time
+            query_failure = Store.get_keys(@source.docname(:errors)).size > 0
+            @source.update_refresh_time(query_failure)
+          end
         end  
       end
       result

data/lib/rhoconnect/store.rb

@@ -51,8 +51,11 @@ module Rhoconnect
       # Adds a simple key/value pair
       def put_value(dockey,value)
         if dockey
-          @@db.del(dockey)
-          @@db.set(dockey,value.to_s) if value
+          if value	
+            @@db.set(dockey,value.to_s)
+          else
+            @@db.del(dockey)	
+          end
         end
       end
     
@@ -188,8 +191,8 @@ module Rhoconnect
       #   Time.now.to_i+timeout+1
       # end
       
-      def release_lock(dockey,lock)
-        @@db.del(_lock_key(dockey)) if (lock >= Time.now.to_i)
+      def release_lock(dockey,lock,raise_on_expire=false)
+        @@db.del(_lock_key(dockey)) if raise_on_expire or Rhoconnect.raise_on_expired_lock or (lock >= Time.now.to_i)
       end
       
       # Create a copy of srckey in dstkey

data/lib/rhoconnect/tasks.rb

@@ -253,10 +253,10 @@ namespace :rhoconnect do
   task :start => :dtach_installed do
     cmd = (jruby?) ? trinidad? : (thin? || mongrel? || report_missing_server)
     if windows?
-      puts 'Starting server in new window...'
-      system("start cmd.exe /c #{cmd} config.ru")
+      puts 'Starting rhoconnect...'
+      system("#{cmd} config.ru")
     elsif jruby?
-      puts 'Starting server in jruby environment...'
+      puts 'Starting rhoconnect in jruby environment...'
       system("#{cmd}")
     else
       puts 'Detach with Ctrl+\  Re-attach with rake rhoconnect:attach'

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.0.beta1'
+  VERSION = '3.0.0.beta3'
 end

data/lib/rhoconnect.rb

@@ -63,7 +63,7 @@ module Rhoconnect
     Rhoconnect.blackberry_bulk_sync = get_setting(config,environment,:blackberry_bulk_sync,false)
     Rhoconnect.bulk_sync_poll_interval = get_setting(config,environment,:bulk_sync_poll_interval,3600)
     Rhoconnect.redis = get_setting(config,environment,:redis,false)
-    Rhoconnect.appserver = get_setting(config,environment,:appserver,false)
+    Rhoconnect.appserver ||= get_setting(config,environment,:appserver,false)
     Rhoconnect.api_token = ENV['API_TOKEN'] || get_setting(config,environment,:api_token,false)
     Rhoconnect.log_disabled = get_setting(config,environment,:log_disabled,false)
     Rhoconnect.raise_on_expired_lock = get_setting(config,environment,:raise_on_expired_lock,false)
@@ -99,9 +99,10 @@ module Rhoconnect
       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})
+        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')
@@ -130,13 +131,26 @@ module Rhoconnect
     settings_file = File.join(basedir,'settings','settings.yml') if basedir
     YAML.load_file(settings_file) if settings_file and File.exist?(settings_file)
   end
-  
-  def source_config
-    { "sources" => Rhoconnect.get_config(Rhoconnect.base_directory)[:sources] }
+
+  def source_config(source_name)
+    source_config = {}
+    sources = Rhoconnect.get_config(Rhoconnect.base_directory)[:sources]
+    source_config = sources[source_name] unless (sources.nil? or sources[source_name].nil?)
+    env_config = Rhoconnect.get_config(Rhoconnect.base_directory)[Rhoconnect.environment]
+    force_default = source_config[:force_default]
+    # apply global env settings
+    [:poll_interval].each do |setting|
+      def_setting = env_config["#{setting.to_s}_default".to_sym]
+      next unless def_setting      
+      if source_config[setting].nil? or force_default
+        source_config[setting] = def_setting
+      end
+    end
+    source_config
   end
+
   ### End Rhoconnect setup methods  
   
-  
   def check_default_secret!(secret)
     if secret == '<changeme>'                        
       log "*"*60+"\n\n"

data/rhoconnect.gemspec

@@ -10,14 +10,11 @@ Gem::Specification.new do |s|
   s.date        = Time.now.strftime('%Y-%m-%d')
   s.email       = %q{dev@rhomobile.com}
   s.homepage    = %q{http://rhomobile.com/products/rhoconnect}
-  s.summary     = %q{RhoConnect Server Framework}
-  s.description = %q{RhoConnect Server Framework and related command-line utilities}
+  s.summary     = %q{RhoConnect App Integration Server}
+  s.description = %q{RhoConnect App Integration Server and related command-line utilities}
 
   s.rubyforge_project = nil
-
-  # s.files         = `git ls-files`.split("\n")
-  # s.test_files    = `git ls-files -- {examples,spec,features}/*`.split("\n")
-  # s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  
   s.files        = %w( 
     CHANGELOG CREDITS Gemfile Gemfile.lock install.sh README.md Rakefile LICENSE Rakefile rhoconnect.gemspec 
   )
@@ -48,20 +45,5 @@ Gem::Specification.new do |s|
   s.add_dependency('redis', '>= 2.2.0')
   s.add_dependency('resque', '~> 1.17.0')
   s.add_dependency('rest-client', '~> 1.6.1')
-  s.add_dependency('templater', '~> 1.0.0')
-
-  # Platform specific gems
-  if defined?(JRUBY_VERSION)
-    s.add_dependency('jdbc-sqlite3', ">= 3.7.2")
-    s.add_dependency('dbi', ">= 0.4.5")
-    s.add_dependency('dbd-jdbc', ">= 0.1.4")
-    s.add_dependency('jruby-openssl', ">= 0.7.4")
-  else
-    s.add_dependency('sqlite3', ">= 1.3.3")
-    # Helps with some of the limitations of green threads, not needed in ruby 1.9.x
-    if RUBY_VERSION =~ /1.8/
-      s.add_dependency('SystemTimer', '~> 1.2.3')
-    end
-  end
-  
+  s.add_dependency('templater', '~> 1.0.0')  
 end

data/spec/api/application/rhoconnect_api_spec.rb

@@ -14,15 +14,15 @@ describe "RhoconnectApi" do
   
   it "should get adapter using direct api call" do
      RhoconnectApi::get_adapter('',@api_token)
-     Rhoconnect.appserver.should == "http://test.rhoconnect.com"
+     Rhoconnect.appserver.should == "http://test.com"
   end 
 
    it "should get adapter using rest call" do
      res = mock('HttpResponse')
-     res.stub!(:body).and_return(["http://test.rhoconnect.com"].to_json)
+     res.stub!(:body).and_return(["http://test.com"].to_json)
      RestClient.stub(:post).and_return(res)
      RestClient.should_receive(:post).once
-     RhoconnectApi::get_adapter('some_url',@api_token).should == ["http://test.rhoconnect.com"]
+     RhoconnectApi::get_adapter('some_url',@api_token).should == ["http://test.com"]
    end
    
   it "should save adapter using direct api call" do
@@ -149,12 +149,12 @@ describe "RhoconnectApi" do
   
     it "should list all application sources using direct api call" do
       RhoconnectApi::list_sources('',@api_token).sort.should == 
-        ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].sort
+        ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter"].sort
     end  
   
     it "should list all application sources using rest call" do
       res = mock('HttpResponse')
-      res.stub!(:body).and_return(["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].to_json)
+      res.stub!(:body).and_return(["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter"].to_json)
       RestClient.stub(:post).and_return(res)    
       RestClient.should_receive(:post).once
       RhoconnectApi::list_sources('some_url',@api_token)
@@ -172,7 +172,8 @@ describe "RhoconnectApi" do
         {"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"}, 
+        {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
+        {"name"=>"retry_limit", "value"=>0, "type"=>"integer"},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
@@ -352,12 +353,12 @@ describe "RhoconnectApi" do
 
     it "should list all application sources using direct api call" do
       RhoconnectApi::list_sources('',@api_token).sort.should == 
-        ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].sort
+        ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter"].sort
     end  
 
     it "should list all application sources using rest call" do
       res = mock('HttpResponse')
-      res.stub!(:body).and_return(["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].to_json)
+      res.stub!(:body).and_return(["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter"].to_json)
       RestClient.stub(:post).and_return(res)    
       RestClient.should_receive(:post).once
       RhoconnectApi::list_sources('some_url',@api_token)
@@ -376,6 +377,7 @@ describe "RhoconnectApi" do
         {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
         {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
         {"name"=>"poll_interval", "value"=>300, "type"=>"integer"}, 
+        {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
@@ -386,6 +388,31 @@ describe "RhoconnectApi" do
         {"name"=>"cud_queue", "value"=>nil, "type"=>"string"},
         {"name"=>"pass_through", "value"=>nil, "type"=>"string"}].sort {|x,y| x["name"] <=> y["name"] }
     end
+    
+    it "should list source attributes with default env poll_interval using direct api call" do
+      result = RhoconnectApi::get_source_params(
+        '',@api_token,"OtherAdapter").sort{|x,y| x['name']<=>y['name']}
+      result.should == [
+        {"name"=>"rho__id", "value"=>"OtherAdapter", "type"=>"string"}, 
+        {"name"=>"source_id", "value"=>nil, "type"=>"integer"}, 
+        {"name"=>"name", "value"=>"OtherAdapter", "type"=>"string"}, 
+        {"name"=>"url", "value"=>"", "type"=>"string"}, 
+        {"name"=>"login", "value"=>"", "type"=>"string"}, 
+        {"name"=>"password", "value"=>"", "type"=>"string"}, 
+        {"name"=>"priority", "value"=>3, "type"=>"integer"}, 
+        {"name"=>"callback_url", "value"=>nil, "type"=>"string"}, 
+        {"name"=>"poll_interval", "value"=>201, "type"=>"integer"},  
+        {"name"=>"retry_limit", "value"=>0, "type"=>"integer"},
+        {"name"=>"partition_type", "value"=>"app", "type"=>"string"}, 
+        {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
+        {"name"=>"belongs_to", "type"=>"string", "value"=>nil},
+        {"name"=>"has_many", "type"=>"string", "value"=>nil},
+        {"name"=>"id", "value"=>"OtherAdapter", "type"=>"string"}, 
+        {"name"=>"queue", "value"=>nil, "type"=>"string"}, 
+        {"name"=>"query_queue", "value"=>nil, "type"=>"string"}, 
+        {"name"=>"cud_queue", "value"=>nil, "type"=>"string"},
+        {"name"=>"pass_through", "value"=>nil, "type"=>"string"}].sort {|x,y| x["name"] <=> y["name"] }
+    end
 
     it "should list source attributes using rest call" do
       res = mock('HttpResponse')
@@ -512,6 +539,25 @@ describe "RhoconnectApi" do
       RestClient.should_receive(:post).once
       RhoconnectApi::ping('some_url',@api_token,@u.id,{})
     end
+    
+    it "should do ping multiple users using rest call" do
+      @u1_fields = {:login => 'testuser1'}
+      @u1 = User.create(@u1_fields) 
+      @u1.password = 'testpass'
+      @c1_fields = {
+        :device_type => 'Apple',
+        :device_pin => 'abcde',
+        :device_port => '3334',
+        :user_id => @u1.id,
+        :app_id => @a.id 
+      }
+      @c1 = Client.create(@c1_fields,{:source_name => @s_fields[:name]})
+      @a.users << @u1.id
+      
+      RestClient.stub(:post)    
+      RestClient.should_receive(:post).once
+      RhoconnectApi::ping('some_url',@api_token,[@u.id, @u1.id],{})
+    end
 
     it "should get license info using direct api call" do
       RhoconnectApi::get_license_info('',@api_token).should == {

data/spec/api/source/get_source_params_spec.rb

@@ -16,7 +16,8 @@ describe "RhoconnectApiGetSourceParams" do
         {"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"}, 
+        {"name"=>"poll_interval", "value"=>300, "type"=>"integer"},
+        {"name"=>"retry_limit", "type"=>"integer", "value"=>0},
         {"name"=>"partition_type", "value"=>"user", "type"=>"string"}, 
         {"name"=>"sync_type", "value"=>"incremental", "type"=>"string"}, 
         {"name"=>"belongs_to", "type"=>"string", "value"=>nil},

data/spec/api/source/list_sources_spec.rb

@@ -4,18 +4,18 @@ describe "RhoconnectApiListSources" do
   it_should_behave_like "ApiHelper" do
     it "should list all application sources" do
       post "/api/source/list_sources", {:api_token => @api_token}
-      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].sort
+      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter"].sort
     end
 
     it "should list all application sources using partition_type param" do
       post "/api/source/list_sources", 
         {:api_token => @api_token, :partition_type => 'all'}
-      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter"].sort
+      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "SampleAdapter", "FixedSchemaAdapter", "OtherAdapter"].sort
     end
 
     it "should list app partition sources" do
       post "/api/source/list_sources", {:api_token => @api_token, :partition_type => :app}
-      JSON.parse(last_response.body).should == ["SimpleAdapter"]
+      JSON.parse(last_response.body).sort.should == ["SimpleAdapter", "OtherAdapter"].sort
     end
 
     it "should list user partition sources" do

data/spec/app_spec.rb

@@ -12,7 +12,14 @@ describe "App" do
 
     it "should add source adapters" do
       @a1 = App.load(@a_fields[:name])
-      @a1.sources.sort.should == ["FixedSchemaAdapter", "SampleAdapter", "SimpleAdapter"]
+      @a1.sources.sort.should == ["FixedSchemaAdapter", "OtherAdapter", "SampleAdapter", "SimpleAdapter"]
+    end
+    
+    it "should force environment default and override setting" do
+      poll_interval_default = Rhoconnect.source_config('OtherAdapter')[:poll_interval]
+      poll_interval_default.should == 201
+      poll_interval_override = Rhoconnect.source_config('SimpleAdapter')[:poll_interval]
+      poll_interval_override.should == 600
     end    
   end  
 end

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

@@ -1,21 +1,25 @@
 :sources:
   SampleAdapter:
-    poll_interval: 300
+    :poll_interval: 300
   SimpleAdapter:
-    poll_interval: 600
+    :poll_interval: 600
     partition_type: 'app'
   FixedSchemaAdapter:
-    poll_interval: 300
+    :poll_interval: 300
     sync_type: 'incremental'
     belongs_to: 
       - brand: 'SampleAdapter'
+  OtherAdapter:
+    partition_type: 'app'
+    :force_default: true
+    :poll_interval: 300
     
 :development:
   :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :appserver: http://test.rhoconnect.com
+  :appserver: http://test.com
   :api_token: b6f22608fa8b4acf84e844808845e2fe
 :test: 
   :licensefile: settings/license.key
@@ -26,9 +30,10 @@
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
-  :appserver: http://test.rhoconnect.com
+  :appserver: http://test.com
   :api_token: b6f22608fa8b4acf84e844808845e2fe
   :cookie_expire: 9999999
+  :poll_interval_default: 201
 :production: 
   :licensefile: settings/license.key
   :bulk_sync_poll_interval: 3600

data/spec/apps/rhotestapp/sources/other_adapter.rb

@@ -0,0 +1,7 @@
+require 'base_adapter'
+
+class OtherAdapter < BaseAdapter
+  def initialize(source)
+    super(source)
+  end
+end

data/spec/client_sync_spec.rb

@@ -12,8 +12,8 @@ describe "ClientSync" do
       params = {'create'=>{'1'=>@product1}}
       @c.source_name = 'Product2'
       @cs1 = ClientSync.new(@s2,@c,2)
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/authenticate")
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
+      stub_request(:post, "http://test.com/rhoconnect/authenticate")
+      stub_request(:post, "http://test.com/rhoconnect/create").with(:headers => {'Content-Type' => 'application/json'}).to_return(:body => {:id => 5})
       @cs1.receive_cud(params)
       verify_result(@cs1.client.docname(:create) => {},
         @cs1.client.docname(:update) => {},
@@ -23,8 +23,8 @@ describe "ClientSync" do
     it "should handle send cud for dynamic adapter" do
       data = {'1'=>@product1}
       expected = {'insert'=>data} 
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/authenticate")
-      stub_request(:post, "http://test.rhoconnect.com/rhoconnect/query").with(:headers => {'Content-Type' => 'application/json'}).to_return(:status => 200, :body => data.to_json)
+      stub_request(:post, "http://test.com/rhoconnect/authenticate")
+      stub_request(:post, "http://test.com/rhoconnect/query").with(:headers => {'Content-Type' => 'application/json'}).to_return(:status => 200, :body => data.to_json)
        
       @c.source_name = 'Product'
       @cs1 = ClientSync.new(@s2,@c,2)
@@ -234,10 +234,6 @@ describe "ClientSync" do
           @c.docname(:cd) => {})
       end
 
-      it "should handle blob upload in receive_cud" do
-        pending
-      end
-
       it "should handle send_cud with query_params" do
         expected = {'1'=>@product1}
         set_state('test_db_storage' => {'1'=>@product1,'2'=>@product2,'4'=>@product4})
@@ -677,6 +673,7 @@ describe "ClientSync" do
       it "should create bulk data job app partition if none exists and no partition sources" do
         @s2.delete
         @a.sources.delete("SimpleAdapter")
+        @a.sources.delete("OtherAdapter")
         ClientSync.bulk_data(:app,@c).should == {:result => :nop}
         Resque.peek(:bulk_data).should == nil
       end