rhosync 2.1.2 → 2.1.3

data/CHANGELOG

@@ -1,3 +1,7 @@
+## 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
+
 ## 2.1.2
 * Use server-dir/redis.conf if not found at RedisRunner.prefix (via artemk) 
 * #8471337 - switch client user if it is not equal to current_user

data/bench/benchapp/config.ru

@@ -21,7 +21,6 @@ ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 Rhosync::Server.disable :run
 Rhosync::Server.disable :clean_trace
 Rhosync::Server.enable  :raise_errors
-Rhosync::Server.set     :environment, :development
 Rhosync::Server.set     :secret,      '<changeme>'
 Rhosync::Server.set     :root,        ROOT_PATH
 Rhosync::Server.use     Rack::Static, :urls => ["/data"], :root => Rhosync::Server.root

data/generators/templates/application/config.ru

@@ -18,7 +18,6 @@ ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 Rhosync::Server.disable :run
 Rhosync::Server.disable :clean_trace
 Rhosync::Server.enable  :raise_errors
-Rhosync::Server.set     :environment, :development
 Rhosync::Server.set     :secret,      '<%= @secret %>'
 Rhosync::Server.set     :root,        ROOT_PATH
 Rhosync::Server.use     Rack::Static, :urls => ["/data"], :root => Rhosync::Server.root

data/lib/rhosync/jobs/ping_job.rb

@@ -7,13 +7,21 @@ module Rhosync
     # Perform a ping for all clients registered to a user
     def self.perform(params)
       user = User.load(params["user_id"])
+      device_pins = []
       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)   
+        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
-          klass = Object.const_get(camelize(client.device_type.downcase))
-          klass.ping(params) if klass
+          unless device_pins.include? client.device_pin   
+            device_pins << client.device_pin
+            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  
         else
           log "Skipping ping for non-registered client_id '#{client_id}'..."
         end

data/lib/rhosync/tasks.rb

@@ -88,7 +88,7 @@ namespace :rhosync do
   
   task :config do
     $settings = load_settings(File.join('settings','settings.yml'))
-    $env = (ENV['RHO_ENV'] || :development).to_sym  
+    $env = (ENV['RHO_ENV'] || ENV['RACK_ENV'] || :development).to_sym  
     uri = URI.parse($settings[$env][:syncserver])
     $url = "#{uri.scheme}://#{uri.host}"
     $url = "#{$url}:#{uri.port}" if uri.port && uri.port != 80

data/lib/rhosync/version.rb

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

data/lib/rhosync.rb

@@ -51,7 +51,7 @@ module Rhosync
   def bootstrap(basedir)
     config = get_config(basedir)
     #Load environment
-    environment = (ENV['RHO_ENV'] || :development).to_sym     
+    environment = (ENV['RHO_ENV'] || ENV['RACK_ENV'] || :development).to_sym  
     # Initialize Rhosync and Resque
     Rhosync.base_directory = basedir    
     Rhosync.app_directory = get_setting(config,environment,:app_directory)

data/spec/api/api_helper.rb

@@ -17,11 +17,9 @@ describe "ApiHelper", :shared => true do
     Rhosync.bootstrap(get_testapp_path) do |rhosync|
       rhosync.vendor_directory = File.join(rhosync.base_directory,'..','..','..','vendor')
     end
-    Rhosync::Server.set( 
-      :environment => :test,
-      :run => false,
-      :secret => "secure!"
-    )
+    Rhosync::Server.set :environment, :test
+    Rhosync::Server.set :run, false
+    Rhosync::Server.set :secret, "secure!"
     @api_token = User.load('rhoadmin').token_id
   end
 

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

@@ -12,15 +12,15 @@
     
 :development:
   :licensefile: settings/license.key
-  :iphonecertfile: settings/apple_fake_cert.pem
-  :iphonepassphrase: certpassword
-  :iphoneserver: gateway.sandbox.push.apple.com
-  :iphoneport: 2195
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/
 :test: 
   :licensefile: settings/license.key
+  :iphonecertfile: settings/apple_fake_cert.pem
+  :iphonepassphrase: certpassword
+  :iphoneserver: gateway.sandbox.push.apple.com
+  :iphoneport: 2195  
   :bulk_sync_poll_interval: 3600
   :redis: localhost:6379
   :syncserver: http://localhost:9292/application/

data/spec/doc/doc_spec.rb

@@ -23,11 +23,9 @@ describe "Protocol" do
     Rhosync.bootstrap(get_testapp_path) do |rhosync|
       rhosync.vendor_directory = File.join(rhosync.base_directory,'..','..','..','vendor')
     end
-    Rhosync::Server.set( 
-      :environment => :test,
-      :run => false,
-      :secret => "secure!"
-    )
+    Rhosync::Server.set :environment, :test
+    Rhosync::Server.set :run, false
+    Rhosync::Server.set :secret, "secure!"
   end
   
   before(:each) do

data/spec/jobs/ping_job_spec.rb

@@ -41,5 +41,20 @@ describe "PingJob" do
     PingJob.should_receive(:log).once.with("Skipping ping for non-registered client_id '#{@c.id}'...")
     lambda { PingJob.perform(params) }.should_not raise_error
   end
+
+  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'}
+
+    # another client with the same device pin ...
+    @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+    # and yet another one ...
+    @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
+
+    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, '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/rhosync_spec.rb

@@ -15,7 +15,7 @@ describe "Rhosync" do
     Rhosync.vendor_directory.should == 'foo'
     Rhosync.blackberry_bulk_sync.should == false
     Rhosync.bulk_sync_poll_interval.should == 3600
-    Rhosync.environment.should == :development  
+    Rhosync.environment.should == :test  
     Rhosync.stats.should == false
     App.is_exist?(@test_app_name).should be_true
   end
@@ -27,6 +27,14 @@ describe "Rhosync" do
     ENV.delete('RHO_ENV')
   end
   
+  it "should bootstrap Rhosync with RACK_ENV provided" do
+    env = ENV['RACK_ENV'].dup
+    ENV['RACK_ENV'] = 'production'
+    Rhosync.bootstrap(get_testapp_path)
+    Rhosync.environment.should == :production
+    ENV['RACK_ENV'] = env
+  end
+  
   it "should bootstrap with existing app" do
     app = App.create(:name => @test_app_name)
     App.should_receive(:load).once.with(@test_app_name).and_return(app)

data/spec/server/server_spec.rb

@@ -18,11 +18,9 @@ describe "Server" do
     Rhosync.bootstrap(get_testapp_path) do |rhosync|
       rhosync.vendor_directory = File.join(rhosync.base_directory,'..','..','..','vendor')
     end
-    Rhosync::Server.set( 
-      :environment => :test,
-      :run => false,
-      :secret => "secure!"
-    )
+    Rhosync::Server.set :environment, :test
+    Rhosync::Server.set :run, false
+    Rhosync::Server.set :secret, "secure!"
     Rhosync::Server.use Rack::Static, :urls => ["/data"], 
       :root =>  File.expand_path(File.join(File.dirname(__FILE__),'..','apps','rhotestapp'))
   end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rhosync'
 include Rhosync
+ENV['RACK_ENV'] = 'test'
 
 ERROR = '0_broken_object_id' unless defined? ERROR
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 1
-  - 2
-  version: 2.1.2
+  - 3
+  version: 2.1.3
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -07:00
+date: 2011-05-05 00:00:00 -07:00
 default_executable: rhosync
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -574,7 +574,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework