gcm_on_rails 0.1.2 → 0.1.3

data/README.textile

@@ -64,7 +64,7 @@ A couple of notes:
 - The api_key is the api key that you received from Google when signing up for GCM
 - Note that unlike the old C2dm on Rails, GCM on Rails switches to a simple API key for authentication. ClientLogin or OAuth2 tokens will NOT work.
 - The app_name is simply the name of the pacakge of your Android app.
-- GCM on Rails message requests can be either be sent in plain text or JSON format. Specify 'json' fro JSON and 'plain_text' for plain text format.
+- GCM on Rails message requests can be either be sent in plain text or JSON format. Specify 'json' for JSON and 'plain_text' for plain text format.
 
 That's it, you are now ready to start creating notifications.
 
@@ -120,6 +120,13 @@ from the GCM servers are:
 
 h2. To-Do's:
 
+- For some reason Gcm servers sometimes return a status code 200 with a nil 'message' key in the json returned but the
+  message is still sent successfully. For version 0.1.3 a nil check has been introduced to check if the message key in the json
+  is nil. The issue that still exists, is that if the message is nil we have no way of knowing if the message was successfully sent
+  just by going by the http status code 200 because HTTP status code 200 could still mean that the errors mentioned above could have
+  occurred. So I still consider this as temporary 'hack' until someone figures out why the Gcm servers may be sometimes sending nil
+  in the message object of the return json.
+
 - Tests, tests then some more tests. These need to be implemented.
 - Implement "broadcasting" sending and processing responses to multiple registration id's within one request. Currently only one message to a single registration id is implemented.
 

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/gcm_on_rails.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "gcm_on_rails"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dennis Ondeng"]
-  s.date = "2012-07-10"
+  s.date = "2012-10-08"
   s.description = "gcm_on_rails is a Ruby on Rails gem that allows you to easily incorporate Google's\n                    'Google Cloud Messaging for Android' into your Rails application. This gem was derived from\n                    c2dm_on_rails (https://github.com/pimeys/c2dm_on_rails) after Google deprecated C2DM on June 27, 2012"
   s.email = "dondeng2@gmail.com"
   s.extra_rdoc_files = [

data/lib/gcm_on_rails/app/models/gcm/device.rb

@@ -11,6 +11,8 @@
 class Gcm::Device < Gcm::Base
   self.table_name = "gcm_devices"
 
+  attr_accessible :registration_id
+
   has_many :notifications, :class_name => 'Gcm::Notification', :dependent => :destroy
   validates_presence_of :registration_id
   validates_uniqueness_of :registration_id

data/lib/gcm_on_rails/app/models/gcm/notification.rb

@@ -21,6 +21,13 @@ class Gcm::Notification < Gcm::Base
     #
     # This can be run from the following Rake task:
     #   $ rake gcm:notifications:deliver
+    #
+    # Below is sample successful response as received from Google servers when the format is JSON
+    #
+    # response: 200;
+    # {:message=>"{\"multicast_id\":6085691036338669615,\"success\":1,\"failure\":0,\"canonical_ids\":0,\"results\":[{\"message_id\":\"0:1349723376618187%d702725e98d39af3\"}]}", :code=>200}
+    #
+    #
     def send_notifications(notifications = Gcm::Notification.all(:conditions => {:sent_at => nil}, :joins => :device, :readonly => false))
 
       if configatron.gcm_on_rails.delivery_format and configatron.gcm_on_rails.delivery_format == 'plain_text'
@@ -33,16 +40,22 @@ class Gcm::Notification < Gcm::Base
         api_key = Gcm::Connection.open
         if api_key
           notifications.each do |notification|
-            #puts "sending notification #{notification.id} to device #{notification.device.registration_id}"
+
+            logger.info "notification = #{notification.inspect}"
             response = Gcm::Connection.send_notification(notification, api_key, format)
-            #puts "response: #{response[:code]}; #{response.inspect}"
+            logger.info "response = #{response.inspect}"
+
             if response[:code] == 200
-              if format == "json"
+              if response[:message].nil?
+                # TODO - Making this assumption might not be right. HTTP status code 200 does not really signify success
+                # if Gcm servers returned nil for the message
+                error = "success"
+              elsif format == "json"
                 error = ""
                 message_data = JSON.parse response[:message]
                 success = message_data['success']
                 error = message_data['results'][0]['error']  if success == 0
-              else   #format is plain text
+              elsif format == "plain_text"   #format is plain text
                 message_data = response[:message]
                 error = response[:message].split('=')[1]
               end

data/lib/gcm_on_rails/libs/connection.rb

@@ -5,7 +5,6 @@ module Gcm
   module Connection
     class << self
       def send_notification(notification, api_key, format)
-
         if format == 'json'
           headers = {"Content-Type" => "application/json",
                      "Authorization" => "key=#{api_key}"}

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gcm_on_rails
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Dennis Ondeng
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-10 00:00:00 Z
+date: 2012-10-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement