rhosync 2.1.17.beta3 → 2.1.17.beta4

data/CHANGELOG

@@ -1,4 +1,5 @@
 ## 2.1.17 (not yet released)
+* #29214293 - do not execute ping if the platform is not configured
 * Refactor server middleware. Remove explicit rack dependency. Fix broken rspec examples.
 * Fixing error with recursive loading of application.rb in ruby-1.8.7 and ree
 * #28330213 - Implementing fast_insert/update/delete API

data/lib/rhosync/jobs/ping_job.rb

@@ -4,43 +4,64 @@ module Rhosync
   module PingJob
     @queue = :ping
     
-    # Perform a ping for all clients registered to a user
+  # Perform a ping for all clients registered to a user
     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, '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
+      phone_ids = []
+      user_ids = params['user_id']
+      user_ids = [user_ids] unless user_ids.is_a? Array
+      errors = []
+      user_ids.each do |user|
+        user_errors = ping_by_user user, params, device_pins, phone_ids
+        errors = errors + user_errors if user_errors
+      end
+      if errors.size != 0
+        joined_err = errors.join '\n'
+        raise joined_err
+      end
+    end
+    
+    def self.ping_by_user(user_id, params, device_pins, phone_ids)
+        # all errors are recorded here
+        errors = []
+        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)
+          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
-          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
+            if send_push
+              klass = Object.const_get(camelize(client.device_type.downcase))
+              if klass
+                params['vibrate'] = params['vibrate'].to_s
+                begin
+                  klass.ping(params) 
+                rescue Exception => e
+                  errors << e
+                end
+              end
+            else
+              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}'..."
-            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 or phone_id list."
-          end
-        else
-          log "Skipping ping for non-registered client_id '#{client_id}'..."
         end
-      end
+        errors
     end
   end
 end

data/lib/rhosync/ping/android.rb

@@ -11,27 +11,28 @@ module Rhosync
       begin
         settings = get_config(Rhosync.base_directory)[Rhosync.environment]
         authtoken = settings[:authtoken]
-              
-        RestClient.post(
-          'https://android.apis.google.com/c2dm/send', c2d_message(params), 
-          :authorization => "GoogleLogin auth=#{authtoken}"
-        ) do |response, request, result, &block|
-          # return exceptions based on response code & body
-          case response.code
-          when 200
-            # TODO: Automate authtoken updates
-            if response[:update_client_auth]
-              raise StaleAuthToken.new(
-                "Stale auth token, please update :authtoken: in settings.yml."
-              )
-            # body will contain the exception class
-            elsif response.body =~ /^Error=(.*)$/
-              raise AndroidPingError.new("Android ping error: #{$1 || ''}")
-            else
-              response.return!(request, result, &block)
+        if(authtoken)   
+          RestClient.post(
+            'https://android.apis.google.com/c2dm/send', c2d_message(params), 
+            :authorization => "GoogleLogin auth=#{authtoken}"
+          ) do |response, request, result, &block|
+            # return exceptions based on response code & body
+            case response.code
+            when 200
+              # TODO: Automate authtoken updates
+              if response[:update_client_auth]
+                raise StaleAuthToken.new(
+                  "Stale auth token, please update :authtoken: in settings.yml."
+                )
+              # body will contain the exception class
+              elsif response.body =~ /^Error=(.*)$/
+                raise AndroidPingError.new("Android ping error: #{$1 || ''}")
+              else
+                response.return!(request, result, &block)
+              end
+            when 401, 403
+              raise InvalidAuthToken.new("Invalid auth token, please update :authtoken: in settings.yml.")
             end
-          when 401, 403
-            raise InvalidAuthToken.new("Invalid auth token, please update :authtoken: in settings.yml.")
           end
         end
       rescue Exception => error

data/lib/rhosync/ping/apple.rb

@@ -8,24 +8,26 @@ module Rhosync
       cert = File.read(cert_file) if File.exists?(cert_file)
     	passphrase = settings[:iphonepassphrase]
     	host = settings[:iphoneserver]
-    	port = settings[:iphoneport] 
-      begin
-        ssl_ctx = OpenSSL::SSL::SSLContext.new
-    		ssl_ctx.key = OpenSSL::PKey::RSA.new(cert, passphrase)
-    		ssl_ctx.cert = OpenSSL::X509::Certificate.new(cert)
+    	port = settings[:iphoneport]
+    	if(cert and host and port) 
+        begin
+          ssl_ctx = OpenSSL::SSL::SSLContext.new
+      		ssl_ctx.key = OpenSSL::PKey::RSA.new(cert, passphrase)
+      		ssl_ctx.cert = OpenSSL::X509::Certificate.new(cert)
 
-    		socket = TCPSocket.new(host, port)
-    		ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_ctx)
-    		ssl_socket.sync = true
-    		ssl_socket.connect
+      		socket = TCPSocket.new(host, port)
+      		ssl_socket = OpenSSL::SSL::SSLSocket.new(socket, ssl_ctx)
+      		ssl_socket.sync = true
+      		ssl_socket.connect
 
-    		ssl_socket.write(apn_message(params))
-    		ssl_socket.close
-    		socket.close
-  		rescue SocketError => error
-  		  log "Error while sending ping: #{error}"
-  		  raise error
-  		end
+      		ssl_socket.write(apn_message(params))
+      		ssl_socket.close
+      		socket.close
+    		rescue SocketError => error
+    		  log "Error while sending ping: #{error}"
+    		  raise error
+    		end
+    	end
     end
 
     # Generates APNS package

data/lib/rhosync/ping/blackberry.rb

@@ -7,17 +7,17 @@ module Rhosync
         settings = get_config(Rhosync.base_directory)[Rhosync.environment]
         host = settings[:mdsserver]
       	port = settings[:mdsserverport]
-        
-        headers = { "X-WAP-APPLICATION-ID" => "/",
-                    "X-RIM-PUSH-DEST-PORT" => params['device_port'],
-                    "CONTENT-TYPE" => 'multipart/related; type="application/xml"; boundary=asdlfkjiurwghasf'}
+        if (host and port)
+          headers = { "X-WAP-APPLICATION-ID" => "/",
+                      "X-RIM-PUSH-DEST-PORT" => params['device_port'],
+                      "CONTENT-TYPE" => 'multipart/related; type="application/xml"; boundary=asdlfkjiurwghasf'}
                     
-        Net::HTTP.new(host,port).start do |http|
-          request = Net::HTTP::Post.new('/pap',headers)
-          request.body = pap_message(params)
-          http.request(request)
+          Net::HTTP.new(host,port).start do |http|
+            request = Net::HTTP::Post.new('/pap',headers)
+            request.body = pap_message(params)
+            http.request(request)
+          end
         end
-
       rescue Exception => error
         log "Error while sending ping: #{error}"
         raise error

data/lib/rhosync/version.rb

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

data/spec/jobs/ping_job_spec.rb

@@ -4,6 +4,21 @@ describe "PingJob" do
   it_should_behave_like "SpecBootstrapHelper"
   it_should_behave_like "SourceAdapterHelper"
   
+  before(:each) do
+     @u1_fields = {:login => 'testuser1'}
+     @u1 = User.create(@u1_fields) 
+     @u1.password = 'testpass1'
+     @c1_fields = {
+       :device_type => 'Apple',
+       :device_pin => 'abcde',
+       :device_port => '3333',
+       :user_id => @u1.id,
+       :app_id => @a.id 
+     }
+     @c1 = Client.create(@c1_fields,{:source_name => @s_fields[:name]})
+     @a.users << @u1.id
+  end
+   
   it "should perform apple ping" do
     params = {"user_id" => @u.id, "api_token" => @api_token,
       "sources" => [@s.name], "message" => 'hello world', 
@@ -73,5 +88,26 @@ describe "PingJob" do
     lambda { PingJob.perform(params) }.should_not raise_error
   end
   
+   it "should process all pings even if some of them are failing" do
+      params = {"user_id" => [ @u.id, @u1.id], "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', 
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', 'phone_id' => nil }
+      @c.phone_id = '3'
+      
+      scrubbed_params = params.dup
+      scrubbed_params['vibrate'] = '5'
+      @c1.device_type = 'blackberry'
+      
+      Apple.should_receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port})).and_return { raise SocketError.new("Socket failure") }
+      Blackberry.should_receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port}.merge!(scrubbed_params))
+      exception_raised = false
+      begin
+        PingJob.perform(params)
+      rescue Exception => e
+        exception_raised = true
+      end
+      exception_raised.should == true
+    end
+  
   
 end

data/spec/ping/android_spec.rb

@@ -13,6 +13,7 @@ describe "Ping Android" do
   
   it "should ping android successfully" do
     result = 'id=0:34234234134254%abc123\n'
+    Rhosync::Android.stub!(:get_config).and_return({:test => {:authtoken=>'test'}})
     @response.stub!(:code).and_return(200)
     @response.stub!(:body).and_return(result)
     @response.stub!(:[]).and_return(false)
@@ -23,6 +24,7 @@ describe "Ping Android" do
   
   it "should ping android with 503 connection error" do
     error = 'Connection refused'
+    Rhosync::Android.stub!(:get_config).and_return({:test => {:authtoken=>'test'}})
     @response.stub!(:body).and_return(error)
     RestClient.stub!(:post).and_return { raise RestClient::Exception.new(@response,503) }
     Android.should_receive(:log).twice
@@ -31,6 +33,7 @@ describe "Ping Android" do
   
   it "should ping android with 200 error message" do
     error = 'Error=QuotaExceeded'
+    Rhosync::Android.stub!(:get_config).and_return({:test => {:authtoken=>'test'}})
     @response.stub!(:code).and_return(200)
     @response.stub!(:body).and_return(error)
     @response.stub!(:[]).and_return(nil)
@@ -43,6 +46,7 @@ describe "Ping Android" do
     @response.stub!(:code).and_return(200)
     @response.stub!(:body).and_return('')
     @response.stub!(:[]).and_return({:update_client_auth => 'abc123'})
+    Rhosync::Android.stub!(:get_config).and_return({:test => {:authtoken=>'test'}})
     RestClient.stub!(:post).and_yield(@response)
     Android.should_receive(:log).twice
     lambda { Android.ping(@params) }.should raise_error(
@@ -53,6 +57,7 @@ describe "Ping Android" do
   it "should ping android with 401 error message" do
     @response.stub!(:code).and_return(401)
     @response.stub!(:body).and_return('')
+    Rhosync::Android.stub!(:get_config).and_return({:test => {:authtoken=>'test'}})
     RestClient.stub!(:post).and_yield(@response)
     Android.should_receive(:log).twice
     lambda { Android.ping(@params) }.should raise_error(
@@ -80,4 +85,13 @@ describe "Ping Android" do
     actual['collapse_key'] = "RAND_KEY" unless actual['collapse_key'].nil?
     actual.should == expected
   end
+  
+  it "should do nothing if no token" do
+    Rhosync::Android.stub!(:get_config).and_return({:test => {}})
+    params = {"device_pin" => @c.device_pin,
+      "sources" => [], "message" => '', "vibrate" => '5', "sound" => 'hello.mp3'}
+    Rhosync::Android.should_receive(:get_config).once
+    RestClient.should_receive(:post).exactly(0).times
+    Android.ping(params)
+  end
 end

data/spec/ping/apple_spec.rb

@@ -68,4 +68,11 @@ describe "Ping Apple" do
     lambda { Apple.ping(@params) }.should raise_error(SocketError,error)
   end
   
+  it "should do nothing if no cert or host or port" do
+    Rhosync::Apple.stub!(:get_config).and_return({:test => {:iphonecertfile=>"none"}})
+    Rhosync::Apple.should_receive(:get_config).once
+    OpenSSL::SSL::SSLContext.should_receive(:new).exactly(0).times
+    Apple.ping(@params)
+  end
+  
 end

data/spec/ping/blackberry_spec.rb

@@ -27,10 +27,29 @@ describe "Ping Blackberry" do
   it "should ping blackberry with connection error" do
     error = 'Connection refused'
     @http.stub!(:request).and_return { raise SocketError.new(error) }
+    Rhosync::Blackberry.stub!(:get_config).and_return({:test => {:mdsserver=>'testserver',:mdsserverport=>'testport'}})
+    Rhosync::Blackberry.should_receive(:get_config).once
     Blackberry.should_receive(:log).once.with("Error while sending ping: #{error}")
     lambda { Blackberry.ping(@params) }.should raise_error(SocketError,error)
   end
   
+  it "should ping blackberry with connection error" do
+    error = 'Connection refused'
+    Rhosync::Blackberry.stub!(:get_config).and_return({:test => {:mdsserver=>'testserver',:mdsserverport=>'testport'}})
+    Rhosync::Blackberry.should_receive(:get_config).once
+    @http.stub!(:request).and_return { raise SocketError.new(error) }
+    Blackberry.should_receive(:log).once.with("Error while sending ping: #{error}")
+    lambda { Blackberry.ping(@params) }.should raise_error(SocketError,error)
+  end
+  
+  it "should do nothing if no host and port" do
+    error = 'Connection refused'
+    Rhosync::Blackberry.stub!(:get_config).and_return({:test => {}})
+    Rhosync::Blackberry.should_receive(:get_config).once
+    Net::HTTP.should_receive(:new).exactly(0).times
+    Blackberry.ping(@params) 
+  end
+  
   it "should compute pap_message" do
     expected = <<PAP
 --asdlfkjiurwghasf

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 2250687
+  hash: 62196339
   prerelease: 7
   segments: 
   - 2
   - 1
   - 17
   - beta
-  - 3
-  version: 2.1.17.beta3
+  - 4
+  version: 2.1.17.beta4
 platform: ruby
 authors: 
 - Rhomobile
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-01 00:00:00 Z
+date: 2012-05-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -582,7 +582,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RhoSync Synchronization Framework