notifiable-gcm-spacialdb 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d61457fbeffca641f889b92f5c8c0bd2ae7f07bd
-  data.tar.gz: acdf05b132205e223e2dadc768d76cb284cacf46
+  metadata.gz: d4461f897facad949fb42c8202f5d79fc532309d
+  data.tar.gz: 0061dba421c1b4e99796e702caafdfd94de7d06e
 SHA512:
-  metadata.gz: d00f13c3297670c8541a1a0758987370694424c6784f493e64fc8c297d44dc64f4c29f9906e5a4ac872a1555cba6dae708a0526abe0829d85b0c2cb6d0e00877
-  data.tar.gz: 0b96b449d6025348f6ef84c473eb644b352c845525dd42aa0f9dc3fac6c7fe5602c81e5cbdcd1098309b5d10a2613ab5f3ea72212425330a0a8c9835ff116a03
+  metadata.gz: d534b04eb4ce5ffad208c64c7aaa85d988c180fc0d80bfe814cfe7bd316dacd0b5994eb23ec510aa49006bf9eb573791170042367468ff69412a9f3e5861195c
+  data.tar.gz: 0bab0cb2c5d73aad5e263250127fde6e2f4a6502fb182f100aa6a9841606676edcd4f9a0187c1b8551f8d895bf3abb7c967f84a3a74bf891a73437e70a15000c

data/Gemfile.lock

@@ -1,32 +1,32 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.5.0)
+    notifiable-gcm-spacialdb (0.6.0)
       gcm (~> 0.0.6)
-      notifiable-rails (>= 0.17.0)
+      notifiable-rails (>= 0.18.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.4)
-      actionpack (= 4.0.4)
+    actionmailer (4.0.5)
+      actionpack (= 4.0.5)
       mail (~> 2.5.4)
-    actionpack (4.0.4)
-      activesupport (= 4.0.4)
+    actionpack (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.4)
-      activesupport (= 4.0.4)
+    activemodel (4.0.5)
+      activesupport (= 4.0.5)
       builder (~> 3.1.0)
-    activerecord (4.0.4)
-      activemodel (= 4.0.4)
+    activerecord (4.0.5)
+      activemodel (= 4.0.5)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.4)
+      activesupport (= 4.0.5)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.4)
+    activesupport (4.0.5)
       i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -57,23 +57,23 @@ GEM
     minitest (4.7.5)
     multi_json (1.8.4)
     multi_xml (0.5.5)
-    notifiable-rails (0.17.0)
+    notifiable-rails (0.18.0)
       rails (~> 4.0.0)
     polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.4)
-      actionmailer (= 4.0.4)
-      actionpack (= 4.0.4)
-      activerecord (= 4.0.4)
-      activesupport (= 4.0.4)
+    rails (4.0.5)
+      actionmailer (= 4.0.5)
+      actionpack (= 4.0.5)
+      activerecord (= 4.0.5)
+      activesupport (= 4.0.5)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.4)
+      railties (= 4.0.5)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.4)
-      actionpack (= 4.0.4)
-      activesupport (= 4.0.4)
+    railties (4.0.5)
+      actionpack (= 4.0.5)
+      activesupport (= 4.0.5)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)

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

@@ -51,18 +51,15 @@ 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)
-    					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"]))
+              # 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              
     				end 
           end
         

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.5.0"
+      VERSION = "0.6.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.17.0"
+  spec.add_dependency "notifiable-rails", ">=0.18.0"
   spec.add_dependency "gcm", "~> 0.0.6"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/batch_spec.rb

@@ -31,28 +31,26 @@ describe Notifiable::Gcm::Spacialdb::Batch do
     Notifiable::NotificationStatus.first.status = 0
   end
   
-  it "marks a unregistered token as invalid" do    
+  it "delete an unregistered token" 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::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 4
-    d.is_valid.should == false
+    Notifiable::DeviceToken.count == 0
+    Notifiable::NotificationStatus.count.should == 0
   end 
   
-  it "marks an invalid token as invalid" do    
+  it "delete an invalid token" 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::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 2
-    d.is_valid.should == false
+    Notifiable::DeviceToken.count == 0
+    Notifiable::NotificationStatus.count.should == 0
   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,7 +5,6 @@ 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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-03 00:00:00.000000000 Z
+date: 2014-05-08 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.17.0
+        version: 0.18.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.17.0
+        version: 0.18.0
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement