rhosync 2.1.17.beta4 → 2.1.17.beta5

data/CHANGELOG

@@ -1,4 +1,5 @@
 ## 2.1.17 (not yet released)
+* 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.
 * Fixing error with recursive loading of application.rb in ruby-1.8.7 and ree

data/lib/rhosync/jobs/ping_job.rb

@@ -27,7 +27,8 @@ module Rhosync
         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)
+          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

data/lib/rhosync/ping/android.rb

@@ -26,7 +26,15 @@ module Rhosync
                 )
               # body will contain the exception class
               elsif response.body =~ /^Error=(.*)$/
-                raise AndroidPingError.new("Android ping error: #{$1 || ''}")
+                err = $1
+                if err =~ /NotRegistered/
+                  client = Client.load(params['client_id'],{:source_name => '*'})
+                  client.phone_id = nil
+                  client.device_pin = nil
+                  client.device_port = nil
+                else
+                  raise AndroidPingError.new("Android ping error: #{err || ''}")
+                end
               else
                 response.return!(request, result, &block)
               end

data/lib/rhosync/version.rb

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

data/spec/jobs/ping_job_spec.rb

@@ -24,7 +24,7 @@ describe "PingJob" do
       "sources" => [@s.name], "message" => 'hello world', 
       "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id" => nil}
     Apple.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
-      'device_port' => @c.device_port}.merge!(params))
+      'device_port' => @c.device_port, 'client_id' => @c.id}.merge!(params))
     PingJob.perform(params)
   end
   
@@ -34,7 +34,7 @@ describe "PingJob" do
       "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3', "phone_id" => nil}
     @c.device_type = 'blackberry'
     Blackberry.should_receive(:ping).once.with({'device_pin' => @c.device_pin,
-      'device_port' => @c.device_port}.merge!(params))
+      'device_port' => @c.device_port, 'client_id' => @c.id}.merge!(params))
     PingJob.perform(params)
   end
   
@@ -66,8 +66,9 @@ describe "PingJob" do
     @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))
+    
+    Rhosync::Apple.stub!(:get_config).and_return({:test => {:iphonecertfile=>"none"}})
+    #Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port, 'client_id' => @c.id}.merge!(params))
     PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
     lambda { PingJob.perform(params) }.should_not raise_error
   end
@@ -82,8 +83,8 @@ describe "PingJob" do
     @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
     #  yet another...
     @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
-
-    Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))
+    Rhosync::Apple.stub!(:get_config).and_return({:test => {:iphonecertfile=>"none"}})
+    #Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port, 'client_id' => @c.id}.merge!(params))
     PingJob.should_receive(:log).twice.with(/Dropping ping request for client/)
     lambda { PingJob.perform(params) }.should_not raise_error
   end
@@ -98,8 +99,8 @@ describe "PingJob" do
       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))
+      Apple.should_receive(:ping).with(params.merge!({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port,'client_id' => @c.id})).and_return { raise SocketError.new("Socket failure") }
+      Blackberry.should_receive(:ping).with({'device_pin' => @c1.device_pin, 'device_port' => @c1.device_port, 'client_id' => @c1.id}.merge!(scrubbed_params))
       exception_raised = false
       begin
         PingJob.perform(params)

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rhosync
 version: !ruby/object:Gem::Version 
-  hash: 62196339
+  hash: 62196337
   prerelease: 7
   segments: 
   - 2
   - 1
   - 17
   - beta
-  - 4
-  version: 2.1.17.beta4
+  - 5
+  version: 2.1.17.beta5
 platform: ruby
 authors: 
 - Rhomobile