notifiable-gcm-spacialdb 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 769e2320e360a242641239d21d0d8ef9f64347a8
-  data.tar.gz: 75dee657c770507b26a88bf887cf8abd47271144
+  metadata.gz: 190cc80990665f516754191f47e78b579befc5af
+  data.tar.gz: c1c5fe160f08a3594171bc4eb669003df2de0b6d
 SHA512:
-  metadata.gz: a022b262371b455923117e8b25f8e9c015711a93f67666f7e2dddaf09c331a2ae6236ce4a35130374fe14ea9d355b5eb56164e285b92c98f67f5412ebac0c9ee
-  data.tar.gz: 862a3ff8c45544b61bb21be8c35a49b627fc6762c0dee4657dae52c3e977c182c23d541a2e7747025f9971fc0b48662623e649747744e348d6c315c6610e89b2
+  metadata.gz: 98dfd2e9814235d051e53a82cf05d0a9c4bb45965c8f86f3d6a38c8b749ed01695be1f56b50310d1cf1ff482ffb872623bf6a2eb4cd3b006c66041dadda8351b
+  data.tar.gz: 267e694ca074deb949704fdcf60d4e3e524a3ea2e9c05dce81075f89d168615e6a16c1d03f8cc4be25fece9778c274643f80bbb7837347869bb1a8c4376edcfd

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.11.1)
+    notifiable-gcm-spacialdb (0.12.0)
       gcm (~> 0.1.1)
-      notifiable-core (>= 0.1.3)
+      notifiable-core (>= 0.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -42,7 +42,7 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    notifiable-core (0.1.3)
+    notifiable-core (0.2.0)
       activerecord
       activerecord-import
     pg (1.0.0)

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

@@ -55,17 +55,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)
-  					if ["InvalidRegistration", "NotRegistered"].include? result["error"] 
-  					  dt.destroy
-            # Process canonical IDs
+            if result["error"]
+  					  dt.destroy if ["InvalidRegistration", "NotRegistered"].include? result["error"] 
+              processed(dt, Notifiable::NotificationStatus::REJECTED_STATUS, error_code(result["error"]), result["error"])
+              next; 
+              
             elsif result["registration_id"] && Notifiable::DeviceToken.exists?(:token => result["registration_id"])
               dt.destroy
             elsif result["registration_id"]
-              dt.update_attribute('token', result["registration_id"])                    
+              dt.update_attribute('token', result["registration_id"])
             end
-
-            processed(dt, error_code(result["error"]), result["error"])
+            
+            processed(dt)
   				end
 
         end

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.11.1"
+      VERSION = "0.12.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-core", ">= 0.1.3"
+  spec.add_dependency "notifiable-core", ">= 0.2.0"
   spec.add_dependency "gcm", '~> 0.1.1'
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/batch_spec.rb

@@ -18,20 +18,23 @@ describe Notifiable::Gcm::Spacialdb::Batch do
       let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"title\":\"Test title\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}' }
       it { expect(Notifiable::NotificationStatus.count).to eq 1 }
-      it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.first.status).to eq Notifiable::NotificationStatus::SENT_STATUS }
     end
     
     context 'custom attributes' do
       let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}' }
       it { expect(Notifiable::NotificationStatus.count).to eq 1 }
-      it { expect(Notifiable::NotificationStatus.first.status).to eq 0 }
+      it { expect(Notifiable::NotificationStatus.first.status).to eq Notifiable::NotificationStatus::SENT_STATUS }
     end
     
     context 'deletes an unregistered token' do
       let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":#{n1.id}}}" }
       let(:response_body) { '{ "multicast_id": 108, "success": 0, "failure": 1, "canonical_ids": 0, "results": [{ "error": "NotRegistered" }]}' }
       it { expect(Notifiable::NotificationStatus.count).to eq 1 }
+      it { expect(Notifiable::NotificationStatus.first.status).to eq Notifiable::NotificationStatus::REJECTED_STATUS }
+      it { expect(Notifiable::NotificationStatus.first.error_code).to eq 4 }
+      it { expect(Notifiable::NotificationStatus.first.error_message).to eq 'NotRegistered' }
       it { expect(Notifiable::DeviceToken.count).to eq 0 }
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-26 00:00:00.000000000 Z
+date: 2018-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-core
@@ -17,14 +17,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement