notifiable-gcm-spacialdb 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbadae0496bbab84f8a76618625960a25be7dbb3
-  data.tar.gz: c2f306749eef535c197833ca4cdad5af77594626
+  metadata.gz: 06c745533a7b21a6e1128b9dcee586ce30d0c0fd
+  data.tar.gz: 8603d8c79d6ecf7999527324e8d81610310be5fa
 SHA512:
-  metadata.gz: f402938709e58d0ccf7f42de43670be72cb301cbfbf08e85fc40005c9df4bd36df0e1eedd2f045141778cec61d9081f2361c183ced3579992078abc58624506d
-  data.tar.gz: db538b2b842a4138cae235610ac567bb7a3d7cc9735539a54db46cbfdbe8fcd8e7ca8e565a636ac563400c83ae324bcc509e97b2ef7e3e12882392a589a22faf
+  metadata.gz: cbcc416c965d3ec5e449dae8067254865e6577ea58a3143601b5dafd88edf5185324417691514f94e241fb132525acb65cd4bd72664b7b1fb829510fc9d64e1f
+  data.tar.gz: 93bdd3344f2c702983eda3dd9446ab1d799ba7fe8e667fe8841585096907bc352509fdeb6e32ca759c9f3463dc1e0f9e94a3d17d4cd0cab8a978e962cc47130f

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.3.0)
+    notifiable-gcm-spacialdb (0.4.0)
       gcm (~> 0.0.6)
-      notifiable-rails (>= 0.5.0)
+      notifiable-rails (>= 0.6.0)
 
 GEM
   remote: https://rubygems.org/
@@ -58,7 +58,7 @@ GEM
     minitest (4.7.5)
     multi_json (1.8.4)
     multi_xml (0.5.5)
-    notifiable-rails (0.5.0)
+    notifiable-rails (0.6.0)
       rails (~> 4.0.0)
     polyglot (0.3.3)
     rack (1.5.2)

data/lib/notifiable/gcm/spacialdb/batch.rb

@@ -56,15 +56,39 @@ module Notifiable
                 # Update the token if a canonical ID is returned
                 if result["registration_id"]
                   device_tokens[idx].update_attribute('token', result["registration_id"])
-                end
-                
-                # Mark as processed
-                processed(notification, device_tokens[idx])
+                end                
               end
+              
+              processed(notification, device_tokens[idx], error_code(result["error"]))
     				end          
           end
           self.batch.delete(notification.id)
   			end
+        
+        def error_code(error_message)
+          case error_message
+          when "MissingRegistration"
+            1
+          when "InvalidRegistration"
+            2
+          when "MismatchSenderId"
+            3
+          when "NotRegistered"
+            4
+          when "MessageTooBig"
+            5
+          when "InvalidDataKey"
+            6
+          when "InvalidTtl"
+            7
+          when "Unavailable"
+            8
+          when "InternalServerError" 
+            9   
+          when "InvalidPackageName"
+            10
+          end
+        end
       end
     end
   end

data/lib/notifiable/gcm/spacialdb/version.rb

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.3.0"
+      VERSION = "0.4.0"
     end
   end
 end

data/notifiable-gcm-spacialdb.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "notifiable-rails", ">=0.5.0"
+  spec.add_dependency "notifiable-rails", ">=0.6.0"
   spec.add_dependency "gcm", "~> 0.0.6"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/batch_spec.rb

@@ -13,7 +13,8 @@ describe Notifiable::Gcm::Spacialdb::Batch do
     g.send_notification(n, d)
     g.close
     
-    Notifiable::NotificationDeviceToken.count.should == 1
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 0
   end
   
   it "sends custom attributes" do
@@ -26,7 +27,8 @@ describe Notifiable::Gcm::Spacialdb::Batch do
     g.send_notification(n, d)
     g.close
     
-    Notifiable::NotificationDeviceToken.count.should == 1
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 0
   end
   
   it "sends a single gcm notification in a batch" do    
@@ -34,7 +36,8 @@ describe Notifiable::Gcm::Spacialdb::Batch do
         
     Notifiable.batch {|b| b.add(n, u)}
     
-    Notifiable::NotificationDeviceToken.count.should == 1
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 0
   end 
   
   it "marks a unregistered token as invalid" do    
@@ -42,7 +45,8 @@ describe Notifiable::Gcm::Spacialdb::Batch do
         
     Notifiable.batch {|b| b.add(n, u)}
     
-    Notifiable::NotificationDeviceToken.count.should == 0
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 4
     d.is_valid.should == false
   end 
   
@@ -51,7 +55,8 @@ describe Notifiable::Gcm::Spacialdb::Batch do
         
     Notifiable.batch {|b| b.add(n, u)}
     
-    Notifiable::NotificationDeviceToken.count.should == 0
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 2
     d.is_valid.should == false
   end 
   
@@ -60,7 +65,8 @@ describe Notifiable::Gcm::Spacialdb::Batch do
         
     Notifiable.batch {|b| b.add(n, u)}
     
-    Notifiable::NotificationDeviceToken.count.should == 1
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 0
     d.token.should eql "GHJ12345"
   end 
   

data/spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb

@@ -0,0 +1,11 @@
+class CreateNotifiableNotificationStatuses < ActiveRecord::Migration
+  
+  def change
+    create_table :notifiable_notification_statuses do |t|
+      t.references :notification
+      t.references :device_token
+      t.integer :status
+    end
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-rails
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ files:
 - spec/spec_helper.rb
 - spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
 - spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_notification_device_tokens.rb
+- spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb
 homepage: http://www.futureworkshops.com
 licenses:
 - Apache 2.0
@@ -205,4 +205,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
 - spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_notification_device_tokens.rb
+- spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb

data/spec/support/db/migrate/20131229104039_create_notifiable_notification_device_tokens.rb

@@ -1,11 +0,0 @@
-class CreateNotifiableNotificationDeviceTokens < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_notification_device_tokens do |t|
-      t.references :notification
-      t.references :device_token
-      t.timestamps
-    end
-  end
-
-end