gcm 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0b2ae57d4b3b71772d8a69cc595ec6272cdb7db
-  data.tar.gz: 1818a7075e84ea587e62a599cb6ffda67a2a925a
+  metadata.gz: b91b8dd5c3122716b7790b84bf488997af4481b4
+  data.tar.gz: c61dcbb7792c73561ae858d02ea792dac6e8f193
 SHA512:
-  metadata.gz: a3fa246decd26545e799c645fc64e788a4be1cbeba209fae04e983559e665135d61f4a33fb48bbe37f18fbe7368bcb53784d02371f3f1fca6ea341d2a0cae52c
-  data.tar.gz: a3f675537384617d32993141954920be7604a4b687951d612d9ddf85539ff788af57433df337a91911c79646edf393d276636c4dffe9d6c965566da37d24d723
+  metadata.gz: 88d2177d41c159d051057eea20c8171ab7fadb07cf5b2913005656df76fa3ddb5da451386ee299f8ca8884258b07eee1ea8f9f8e07d17b6f8151c501f918d8d6
+  data.tar.gz: aba44c2d89ea740c2ccf0abfef14a4d05283a0a51e979d4b5c1160b23906e9c0c8ecf53b932b94704cf2f62fe8407b4c5dfe90cfb6750a78eb0f202e0aed8695

data/README.md

@@ -15,7 +15,7 @@ gem 'gcm'
 
 ##Requirements
 
-An Android device running 2.0 or newer and an API key as per [GCM getting started guide](http://developer.android.com/google/gcm).
+An Android device running 2.2 or newer and an API key as per [GCM getting started guide](http://developer.android.com/google/gcm/gs.html).
 
 One of the following, tested Ruby versions:
 
@@ -51,11 +51,14 @@ Currently `response` is just a hash containing the response `body`, `headers` an
 
 ## ChangeLog
 
+## 0.0.7
+* All responses now have a body and header hashes
+
 ### 0.0.6
 
 * You can initialize GCM class with [HTTParty Options](https://github.com/jnunemaker/httparty/blob/master/lib/httparty.rb#L40-L68)
 
-### Version 0.0.5
+### 0.0.5
 
 * Added support for [canonical registration ID](http://developer.android.com/google/gcm/adv.html#canonical)
 * Only support Ruby versions [>= 1.9.3](https://www.ruby-lang.org/en/news/2014/01/10/ruby-1-9-3-will-end-on-2015/)

data/gcm.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "gcm"
-  s.version     = "0.0.6"
+  s.version     = "0.0.7"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Kashif Rasul", "Shoaib Burq"]
   s.email       = ["kashif@spacialdb.com", "shoaib@spacialdb.com"]

data/lib/gcm.rb

@@ -49,19 +49,22 @@ class GCM
   end
 
   def build_response(response, registration_ids)
+    body = response.body || {}
+    response_hash = {:body => body, :headers => response.headers, :status_code => response.code}
     case response.code
       when 200
-        body = response.body || {}
-        { :response => 'success', :body => body, :headers => response.headers, :status_code => response.code, :canonical_ids => build_canonical_ids(body, registration_ids) }
+        response_hash[:response] = 'success'
+        response_hash[:canonical_ids] = build_canonical_ids(body, registration_ids)
       when 400
-        { :response => 'Only applies for JSON requests. Indicates that the request could not be parsed as JSON, or it contained invalid fields.', :status_code => response.code }
+        response_hash[:response] = 'Only applies for JSON requests. Indicates that the request could not be parsed as JSON, or it contained invalid fields.'
       when 401
-        { :response => 'There was an error authenticating the sender account.', :status_code => response.code }
-      when 500
-        { :response => 'There was an internal error in the GCM server while trying to process the request.', :status_code => response.code }
+        response_hash[:response] = 'There was an error authenticating the sender account.'
       when 503
-        { :response => 'Server is temporarily unavailable.', :status_code => response.code }
+        response_hash[:response] = 'Server is temporarily unavailable.'
+      when 500..599
+        response_hash[:response] = 'There was an internal error in the GCM server while trying to process the request.'
     end
+    response_hash
   end
 
   def build_canonical_ids(body, registration_ids)

data/spec/gcm_spec.rb

@@ -74,7 +74,7 @@ describe GCM do
       end
     end
 
-    context " when send_notification responds with failure" do
+    context "when send_notification responds with failure" do
 
       let(:mock_request_attributes) do
         {
@@ -98,6 +98,8 @@ describe GCM do
         end
         it "should not send notification due to 400" do
           subject.send_notification(registration_ids).should eq({
+            :body => {},
+            :headers => {},
             :response => "Only applies for JSON requests. Indicates that the request could not be parsed as JSON, or it contained invalid fields.",
             :status_code => 400
           })
@@ -118,13 +120,15 @@ describe GCM do
 
         it "should not send notification due to 401" do
           subject.send_notification(registration_ids).should eq({
+            :body => {},
+            :headers => {},
             :response => "There was an error authenticating the sender account.",
             :status_code => 401
           })
         end
       end
 
-      context "on failure code 500" do
+      context "on failure code 503" do
         before do
           stub_request(:post, GCM::PUSH_URL).with(
             mock_request_attributes
@@ -132,40 +136,44 @@ describe GCM do
             # ref: http://developer.android.com/guide/google/gcm/gcm.html#success
             :body => {},
             :headers => {},
-            :status => 500
+            :status => 503
           )
         end
 
-        it "should not send notification due to 500" do
+        it "should not send notification due to 503" do
           subject.send_notification(registration_ids).should eq({
-            :response => 'There was an internal error in the GCM server while trying to process the request.',
-            :status_code => 500
+            :body => {},
+            :headers => {},
+            :response => 'Server is temporarily unavailable.',
+            :status_code => 503
           })
         end
       end
 
-      context "on failure code 503" do
+      context "on failure code 5xx" do
         before do
           stub_request(:post, GCM::PUSH_URL).with(
             mock_request_attributes
           ).to_return(
             # ref: http://developer.android.com/guide/google/gcm/gcm.html#success
-            :body => {},
-            :headers => {},
-            :status => 503
+            :body => { "body-key" => "Body value" },
+            :headers => { "header-key" => "Header value" },
+            :status => 599
           )
         end
 
-        it "should not send notification due to 503" do
+        it "should not send notification due to 599" do
           subject.send_notification(registration_ids).should eq({
-            :response => 'Server is temporarily unavailable.',
-            :status_code => 503
+            :body => { "body-key" => "Body value" },
+            :headers => { "header-key" => ["Header value"] },
+            :response => 'There was an internal error in the GCM server while trying to process the request.',
+            :status_code => 599
           })
         end
       end
     end
 
-    context " when send_notification responds canonical_ids" do
+    context "when send_notification responds canonical_ids" do
 
       let(:mock_request_attributes) do
         {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gcm
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kashif Rasul
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty