rhosync 2.1.17 → 2.1.18.beta1

data/CHANGELOG

@@ -1,3 +1,6 @@
+## 2.1.18.beta1
+* #31161737 - PingJob handles missing user ids or users with no clients
+
 ## 2.1.17
 * Reset device attributes if Android ping returns "Not Registered" Error
 * #29214293 - do not execute ping if the platform is not configured

data/lib/rhosync/jobs/ping_job.rb

@@ -25,42 +25,47 @@ module Rhosync
         # 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,
-                        'client_id' => client_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
+        clients = user.clients if user
+        if clients
+          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,
+                          'client_id' => client_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
-            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
-                begin
-                  klass.ping(params) 
-                rescue Exception => e
-                  errors << e
+              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 "Dropping ping request for client_id '#{client_id}' because it's already in user's device pin or phone_id list."
+              log "Skipping ping for non-registered client_id '#{client_id}'..."
             end
-          else
-            log "Skipping ping for non-registered client_id '#{client_id}'..."
           end
+        else
+          log "Skipping ping for unknown user '#{user_id}' or '#{user_id}' has no registered clients..."
         end
         errors
     end

data/lib/rhosync/version.rb

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

data/spec/jobs/ping_job_spec.rb

@@ -110,5 +110,11 @@ describe "PingJob" do
       exception_raised.should == true
     end
   
-  
+    it "should skip ping for unknown user or user with no clients" do
+      params = {"user_id" => [ 'fake_user' ], "api_token" => @api_token,
+        "sources" => [@s.name], "message" => 'hello world', 
+        "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', 'phone_id' => nil }
+      PingJob.should_receive(:log).once.with(/Skipping ping for unknown user 'fake_user' or 'fake_user' has no registered clients.../)
+      PingJob.perform(params)
+    end
 end

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 41
-  prerelease: 
+  hash: 2417247871
+  prerelease: 7
   segments: 
   - 2
   - 1
-  - 17
-  version: 2.1.17
+  - 18
+  - beta
+  - 1
+  version: 2.1.18.beta1
 platform: ruby
 authors: 
 - Rhomobile
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-28 00:00:00 Z
+date: 2012-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sinatra
@@ -585,12 +587,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: