notifiable-gcm-spacialdb 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4461f897facad949fb42c8202f5d79fc532309d
-  data.tar.gz: 0061dba421c1b4e99796e702caafdfd94de7d06e
+  metadata.gz: bf8617349fad22ba3f960775005a9cf5690f0dc2
+  data.tar.gz: b4b074036bedd4eda84de247260f29a7d4fceead
 SHA512:
-  metadata.gz: d534b04eb4ce5ffad208c64c7aaa85d988c180fc0d80bfe814cfe7bd316dacd0b5994eb23ec510aa49006bf9eb573791170042367468ff69412a9f3e5861195c
-  data.tar.gz: 0bab0cb2c5d73aad5e263250127fde6e2f4a6502fb182f100aa6a9841606676edcd4f9a0187c1b8551f8d895bf3abb7c967f84a3a74bf891a73437e70a15000c
+  metadata.gz: c9987b8e215fea1e309579aa5311a0a9e86be7df56f2c0f068b0fb57157773bc927ad8bfd342827236e99867b2c32b8f504772c3548368e35b897e91f1de72e9
+  data.tar.gz: dff07a33f03b9fe86681a76b490cbb3e535d3cc4bbfab3c2de3803debd5a0f4027da51c0cfd1256bafc3bf0cdccf0cfe1dd9030cbb9c9ff2c8ea3e716328c806

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.6.0)
+    notifiable-gcm-spacialdb (0.7.0)
       gcm (~> 0.0.6)
-      notifiable-rails (>= 0.18.0)
+      notifiable-rails (>= 0.19.0)
 
 GEM
   remote: https://rubygems.org/
@@ -57,7 +57,7 @@ GEM
     minitest (4.7.5)
     multi_json (1.8.4)
     multi_xml (0.5.5)
-    notifiable-rails (0.18.0)
+    notifiable-rails (0.19.0)
       rails (~> 4.0.0)
     polyglot (0.3.4)
     rack (1.5.2)

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

@@ -51,15 +51,18 @@ module Notifiable
     				results.each_with_index do |result, i|
               dt = @batch[i]
               
-              # Remove the token if it is marked NotRegistered (user deleted the App for example) or is not the canonical ID
-    					if (["InvalidRegistration", "NotRegistered"].include? result["error"]) ||
-                (result["registration_id"] && Notifiable::DeviceToken.exists?(:token => result["registration_id"]))
-    						dt.destroy
-              # Update the token if the canonical ID does not exist                                      
-              else
-                dt.update_attribute('token', result["registration_id"]) if result["registration_id"]  
-                processed(dt, error_code(result["error"]))       
-              end              
+              # Remove the token if it is marked NotRegistered (user deleted the App for example)
+    					if ["InvalidRegistration", "NotRegistered"].include? result["error"] 
+    						dt.update_attribute('is_valid', false)
+            
+              # Process canonical IDs
+              elsif result["registration_id"] && Notifiable::DeviceToken.exists?(:token => result["registration_id"])
+                dt.update_attribute('is_valid', false)                                        
+              elsif result["registration_id"]
+                dt.update_attribute('token', result["registration_id"])                    
+              end
+
+              processed(dt, error_code(result["error"]))
     				end 
           end
         

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.6.0"
+      VERSION = "0.7.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.18.0"
+  spec.add_dependency "notifiable-rails", ">=0.19.0"
   spec.add_dependency "gcm", "~> 0.0.6"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/batch_spec.rb

@@ -31,26 +31,28 @@ describe Notifiable::Gcm::Spacialdb::Batch do
     Notifiable::NotificationStatus.first.status = 0
   end
   
-  it "delete an unregistered token" do    
+  it "marks a unregistered token as invalid" do    
     stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 0, "failure": 1, "canonical_ids": 0, "results": [{ "error": "NotRegistered" }]}')  
         
     n1.batch do |n|
       n.add_device_token(d)
     end
         
-    Notifiable::DeviceToken.count == 0
-    Notifiable::NotificationStatus.count.should == 0
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 4
+    d.is_valid.should == false
   end 
   
-  it "delete an invalid token" do    
+  it "marks an invalid token as invalid" do    
     stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 0, "failure": 1, "canonical_ids": 0, "results": [{ "error": "InvalidRegistration" }]}')  
         
     n1.batch do |n|
       n.add_device_token(d)
     end
         
-    Notifiable::DeviceToken.count == 0
-    Notifiable::NotificationStatus.count.should == 0
+    Notifiable::NotificationStatus.count.should == 1
+    Notifiable::NotificationStatus.first.status = 2
+    d.is_valid.should == false
   end 
   
   it "updates a token to the canonical ID if it does not exist" do   

data/spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb

@@ -5,6 +5,7 @@ class CreateNotifiableDeviceTokens < ActiveRecord::Migration
       t.string :token
     	t.string :provider
       t.string :device_id
+      t.boolean :is_valid, :default => true
       t.integer :user_id
       t.references :app
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-08 00:00:00.000000000 Z
+date: 2014-05-09 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.18.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement