notifiable-gcm-spacialdb 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1f15251a237ef16e25ecaa65fe48602e225a139
-  data.tar.gz: eb2737d7853ec2df977625cecfae70a9788ff9ea
+  metadata.gz: 9d6f7c97e0686c9df19b325d26045a5f03778150
+  data.tar.gz: f376083ac33fe4e4e9939e78ab6a5ca1a266c155
 SHA512:
-  metadata.gz: d67af3e91b582015475f9034d3904f719f04a68089be72b425dcfa964ef270fd86457a008cf4f7bc8c26f06393c3685239a0d5c1f6267ae52aaf3a4deb083931
-  data.tar.gz: a0bf883223f62ee049272639782a9cf927886951b29eb24a73c79ea93fc0bae9e35eb92a6eedd887eba485f187b6fef445467b4085b43a52379901f4fec8e6e8
+  metadata.gz: c79af147476ad3e19d1593c54736c907894c1faf3006abb3ed8a3920bf0bb2d5e914f03204d0a9c4abedbbee36a1519c266bafc2cb051487987011e9aca57e44
+  data.tar.gz: 2117913e0dc1b6d914d6122d3448c979a828b67da6e5fd6764a48f9ed3a3d24c3577ba5e338522a3645d8af2dcefb0f5bad7858d411bbeaf355bf99d2e2e0965

data/.gitignore

@@ -18,3 +18,4 @@ _yardoc
 doc/
 
 .DS_Store
+/.byebug_history

data/Gemfile

@@ -1,4 +1,6 @@
 source 'https://rubygems.org'
 
+ruby '2.4.3'
+
 # Specify your gem's dependencies in notifiable-apns-grocer.gemspec
 gemspec

data/Gemfile.lock

@@ -1,98 +1,141 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.8.0)
-      gcm (~> 0.0.6)
-      notifiable-rails (>= 0.24.1)
+    notifiable-gcm-spacialdb (0.10.0)
+      gcm (~> 0.1.1)
+      notifiable-rails (>= 0.26.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.15)
-      actionpack (= 4.1.15)
-      actionview (= 4.1.15)
+    actioncable (5.1.5)
+      actionpack (= 5.1.5)
+      nio4r (~> 2.0)
+      websocket-driver (~> 0.6.1)
+    actionmailer (5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.15)
-      actionview (= 4.1.15)
-      activesupport (= 4.1.15)
-      rack (~> 1.5.2)
-      rack-test (~> 0.6.2)
-    actionview (4.1.15)
-      activesupport (= 4.1.15)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.1.5)
+      actionview (= 5.1.5)
+      activesupport (= 5.1.5)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.1.5)
+      activesupport (= 5.1.5)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
-    activemodel (4.1.15)
-      activesupport (= 4.1.15)
-      builder (~> 3.1)
-    activerecord (4.1.15)
-      activemodel (= 4.1.15)
-      activesupport (= 4.1.15)
-      arel (~> 5.0.0)
-    activesupport (4.1.15)
-      i18n (~> 0.6, >= 0.6.9)
-      json (~> 1.7, >= 1.7.7)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.1.5)
+      activesupport (= 5.1.5)
+      globalid (>= 0.3.6)
+    activemodel (5.1.5)
+      activesupport (= 5.1.5)
+    activerecord (5.1.5)
+      activemodel (= 5.1.5)
+      activesupport (= 5.1.5)
+      arel (~> 8.0)
+    activerecord-postgis-adapter (5.2.1)
+      activerecord (~> 5.1)
+      rgeo-activerecord (~> 6.0)
+    activesupport (5.1.5)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.5)
-    arel (5.0.1.20140414130214)
-    builder (3.2.2)
-    byebug (5.0.0)
-      columnize (= 0.9.0)
-    columnize (0.9.0)
-    concurrent-ruby (1.0.1)
-    crack (0.4.1)
-      safe_yaml (~> 0.9.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (8.0.0)
+    builder (3.2.3)
+    byebug (10.0.1)
+    concurrent-ruby (1.0.5)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    crass (1.0.3)
     database_cleaner (1.2.0)
-    diff-lcs (1.2.5)
-    docile (1.1.2)
-    erubis (2.7.0)
-    gcm (0.0.9)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    erubi (1.7.1)
+    gcm (0.1.1)
       httparty
       json
-    httparty (0.13.7)
-      json (~> 1.8)
+    globalid (0.4.1)
+      activesupport (>= 4.2.0)
+    httparty (0.16.1)
       multi_xml (>= 0.5.2)
-    i18n (0.7.0)
-    json (1.8.3)
-    mail (2.6.4)
-      mime-types (>= 1.16, < 4)
-    mime-types (3.0)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0221)
-    minitest (5.8.4)
-    multi_json (1.8.4)
-    multi_xml (0.5.5)
-    notifiable-rails (0.24.1)
-      rails (~> 4.1.0)
-    rack (1.5.5)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (4.1.15)
-      actionmailer (= 4.1.15)
-      actionpack (= 4.1.15)
-      actionview (= 4.1.15)
-      activemodel (= 4.1.15)
-      activerecord (= 4.1.15)
-      activesupport (= 4.1.15)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.15)
-      sprockets-rails (~> 2.0)
-    railties (4.1.15)
-      actionpack (= 4.1.15)
-      activesupport (= 4.1.15)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json (2.1.0)
+    loofah (2.2.1)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    method_source (0.9.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    nio4r (2.3.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    notifiable-rails (0.26.3)
+      activerecord-postgis-adapter
+      pg
+      rails
+    pg (1.0.0)
+    public_suffix (3.0.2)
+    rack (2.0.4)
+    rack-test (0.8.3)
+      rack (>= 1.0, < 3)
+    rails (5.1.5)
+      actioncable (= 5.1.5)
+      actionmailer (= 5.1.5)
+      actionpack (= 5.1.5)
+      actionview (= 5.1.5)
+      activejob (= 5.1.5)
+      activemodel (= 5.1.5)
+      activerecord (= 5.1.5)
+      activesupport (= 5.1.5)
+      bundler (>= 1.3.0)
+      railties (= 5.1.5)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (5.1.5)
+      actionpack (= 5.1.5)
+      activesupport (= 5.1.5)
+      method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-    safe_yaml (0.9.7)
+    rgeo (1.0.0)
+    rgeo-activerecord (6.0.0)
+      activerecord (~> 5.0)
+      rgeo (~> 1.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    safe_yaml (1.0.4)
     simplecov (0.8.2)
       docile (~> 1.1.0)
       multi_json
@@ -100,21 +143,24 @@ GEM
     simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sprockets (3.5.2)
+    sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (2.3.3)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      sprockets (>= 2.8, < 4.0)
-    sqlite3 (1.3.8)
-    thor (0.19.1)
-    thread_safe (0.3.5)
-    tzinfo (1.2.2)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    sqlite3 (1.3.13)
+    thor (0.20.0)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    webmock (1.17.1)
+    webmock (1.17.4)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
+    websocket-driver (0.6.5)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
 
 PLATFORMS
   ruby
@@ -125,8 +171,14 @@ DEPENDENCIES
   database_cleaner (~> 1.2.0)
   notifiable-gcm-spacialdb!
   rake (~> 10.1.1)
-  rspec (~> 2.14.1)
+  rspec (~> 3.7)
   simplecov (~> 0.8.2)
   simplecov-rcov (~> 0.2.3)
-  sqlite3 (~> 1.3.8)
+  sqlite3
   webmock (~> 1.17.1)
+
+RUBY VERSION
+   ruby 2.4.3p205
+
+BUNDLED WITH
+   1.16.1

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

@@ -12,90 +12,88 @@ module Notifiable
           @batch_size || 1000
         end
         
-        def initialize(env, notification)
-          super(env, notification)
-          @batch = []
+        def batch
+          @batch ||= []
         end
         
-        protected 
-    			def enqueue(device_token, localized_notification)
-            raise "API Key missing" if @api_key.nil?
-            
-            @batch << device_token        								
-            send_batch(localized_notification) if @batch.count >= batch_size
-      		end
-      
-          def flush
-            send_batch(localized_notification(@batch.first)) unless @batch.empty?
-          end
+        protected        
+        
+  			def enqueue(device_token, notification)
+          raise "API Key missing" if @api_key.nil?
+
+          @batch_notification = notification
+          batch << device_token        								
+          send_batch(notification) if batch.count >= batch_size
+    		end
+    
+        def flush
+          send_batch(@batch_notification) unless batch.empty?
+        end
 
   			private
-    			def send_batch(notification)
-            if Notifiable.delivery_method == :test
-              @batch.each {|d| processed(d, 0)}
-            else
-      				gcm = ::GCM.new(@api_key)
-            
-              data = {:message => notification.message}.merge(notification.send_params)            
-      				response = gcm.send_notification(@batch.collect{|dt| dt.token}, {:data => data})
-              
-              if response[:status_code] == 200
-        				process_success_response(response)
-              else
-                Rails.logger.error "Sending notification id: #{notification.id} code: #{response[:status_code]} response: #{response[:response]}"
-              end         
-            end
-            @batch = []
-    			end
-          
-          def process_success_response(response)
-    				body = JSON.parse(response.fetch(:body, "{}"))
-    				results = body.fetch("results", [])
-    				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
+        
+  			def send_batch(notification)
+  				gcm = ::GCM.new(@api_key)
+        
+          data = {:message => notification.message}.merge(notification.send_params)            
+  				response = gcm.send_notification(batch.collect{|dt| dt.token}, {:data => data})
 
-              processed(dt, error_code(result["error"]))
-    				end 
-          end
+          if response[:status_code] == 200
+    				process_success_response(response)
+          else
+            Rails.logger.error "Sending notification id: #{notification.id} code: #{response[:status_code]} response: #{response[:response]}"
+          end         
+          @batch = []
+  			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
-            else
-              0
+        def process_success_response(response)
+  				body = JSON.parse(response.fetch(:body, "{}"))
+  				results = body.fetch("results", [])
+  				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
+            elsif result["registration_id"] && Notifiable::DeviceToken.exists?(:token => result["registration_id"])
+              dt.destroy
+            elsif result["registration_id"]
+              dt.update_attribute('token', result["registration_id"])                    
             end
+
+            processed(dt, error_code(result["error"]))
+  				end
+
+        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
+          else
+            0
           end
-      end
+        end
+    end
     end
   end
 end

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.9.0"
+      VERSION = "0.10.0"
     end
   end
 end

data/notifiable-gcm-spacialdb.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Kamil Kocemba", "Matt Brooke-Smith"]
   spec.email         = ["kamil@futureworkshops.com", "matt@futureworkshops.com"]
   spec.homepage      = "http://www.futureworkshops.com"
-  spec.description   = "Plugin to use GCM with Notifiable-Rails"
-  spec.summary       = "Plugin to use GCM with Notifiable-Rails"
+  spec.description   = "Plugin to use GCM with Notifiable"
+  spec.summary       = "Plugin to use GCM with Notifiable"
   spec.license       = "Apache 2.0"
 
   spec.files         = `git ls-files`.split($/)
@@ -18,15 +18,15 @@ 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.24.1"
-  spec.add_dependency "gcm", "~> 0.0.6"
+  spec.add_dependency "notifiable-rails", ">=0.26.3"
+  spec.add_dependency "gcm", '~> 0.1.1'
  
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake", "~> 10.1.1"
-  spec.add_development_dependency "rspec", "~> 2.14.1"
+  spec.add_development_dependency "rspec", '~> 3.7'
   spec.add_development_dependency "simplecov", "~> 0.8.2"
   spec.add_development_dependency "simplecov-rcov", "~> 0.2.3"
-  spec.add_development_dependency "sqlite3", "~> 1.3.8"
+  spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner", "~> 1.2.0"
   spec.add_development_dependency "webmock", "~> 1.17.1"
   spec.add_development_dependency "byebug"

data/spec/batch_spec.rb

@@ -2,89 +2,50 @@ require 'spec_helper'
 
 describe Notifiable::Gcm::Spacialdb::Batch do
   
-  let(:a) { Notifiable::App.create }  
-  let(:n1) { Notifiable::Notification.create(:app => a) }
-  let!(:ln) { Notifiable::LocalizedNotification.create(:message => "Test message", :params => {:flag => true}, :notification => n1, :locale => 'en') }
+  let(:app_configuration) { {save_notification_statuses: true, gcm: {api_key: 'abc123'}} }
+  let(:a) { Notifiable::App.create gcm_api_key: 'abc123', configuration: app_configuration }  
+  let(:n1) { Notifiable::Notification.create(app: a, message: 'Test message', parameters: {flag: true} ) }
   let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :gcm, :app => a, :locale => 'en') }
+  let!(:stubbed_request) { stub_request(:post, "https://gcm-http.googleapis.com/gcm/send").with(body: request_body).to_return(body: response_body) }
+  let(:request_body) { }
+  let(:response_body) { }
   
-  before(:each) do
-    a.gcm_api_key = "abc123"
-  end
-  
-  it "sends a single gcm notification" do    
-    stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}')   
+  describe '#batch' do
+    before(:each) { n1.batch {|n| n.add_device_token(d)} }
     
-    n1.batch {|n| n.add_device_token(d)}
-        
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 0
-  end
-  
-  it "sends custom attributes" do        
-      stub_request(:post, "https://android.googleapis.com/gcm/send")
-               .with(:body => "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"localized_notification_id\":1}}")
-               .to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}') 
+    context 'single' do
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      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 }
+    end
+    
+    context 'custom attributes' do
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      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 }
+    end
+    
+    context 'deletes an unregistered token' do
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      let(:response_body) { '{ "multicast_id": 108, "success": 0, "failure": 1, "canonical_ids": 0, "results": [{ "error": "NotRegistered" }]}' }
+      it { expect(Notifiable::NotificationStatus.count).to eq 0 }
+      it { expect(Notifiable::DeviceToken.count).to eq 0 }
+    end
+    
+    context 'id change' do
+      let(:request_body) { "{\"registration_ids\":[\"ABC123\"],\"data\":{\"message\":\"Test message\",\"flag\":true,\"n_id\":1}}" }
+      let(:response_body) { '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 1, "results": [{ "message_id": "1:08", "registration_id": "GHJ12345" }]}' }
+      it { expect(Notifiable::NotificationStatus.count).to eq 1 }
+      it { expect(Notifiable::DeviceToken.count).to eq 1 }
+      it { expect(Notifiable::DeviceToken.first.token).to eq "GHJ12345" }
+    end
+    
+    context 'bad key' do
+      let!(:stubbed_request) { stub_request(:post, "https://gcm-http.googleapis.com/gcm/send").to_return(body: '<html>Message</html>', status: 401) }
+      it { expect(Notifiable::NotificationStatus.count).to eq 0 }
+    end
     
-    n1.batch {|n| n.add_device_token(d)}
-   
-   
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 0
   end
-  
-  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 {|n| n.add_device_token(d)}
-        
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 4
-    d.is_valid.should == false
-  end 
-  
-  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 {|n| n.add_device_token(d)}
-        
-    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   
-    stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 1, "results": [{ "message_id": "1:08", "registration_id": "GHJ12345" }]}')  
-        
-    n1.batch {|n| n.add_device_token(d)}
-        
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 0
-    Notifiable::DeviceToken.count.should == 1
-    d.token.should eql "GHJ12345"
-  end 
-  
-  
-#  it "marks a token as invalid if the canonical ID already exists" do  
-#    Notifiable::DeviceToken.create(:token => "GHJ12345", :provider => :gcm)
-     
-#    stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 1, "results": [{ "message_id": "1:08", "registration_id": "GHJ12345" }]}')  
-        
-#    n1.batch do |n|
-#      n.add_device_token(d)
-#    end
-        
-#    Notifiable::NotificationStatus.count.should == 1
-#    Notifiable::NotificationStatus.first.status = 0
-#    Notifiable::DeviceToken.count.should == 2
-#    d.is_valid.should be_false
-#  end 
-  
-  it "deals gracefully with an unauthenticated key" do    
-    stub_request(:post, "https://android.googleapis.com/gcm/send").to_return(:body => '<html>Message</html>', :status => 401)  
-        
-    n1.batch {|n| n.add_device_token(d)}
-
-    Notifiable::NotificationStatus.count.should == 0
-  end 
-  
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ require 'byebug'
 require File.expand_path("../../lib/notifiable/gcm/spacialdb",  __FILE__)
 Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
-db_path = 'spec/support/db/test.sqlite3'
+db_path = 'spec/test.sqlite3'
 DatabaseCleaner.strategy = :truncation
 
 Rails.logger = Logger.new(STDOUT)
@@ -40,7 +40,8 @@ RSpec.configure do |config|
     )
     
     ActiveRecord::Migration.verbose = false
-    ActiveRecord::Migrator.migrate "spec/support/db/migrate"
+    notifiable_rails_path = Gem.loaded_specs['notifiable-rails'].full_gem_path
+    ActiveRecord::Migrator.migrate File.join(notifiable_rails_path, 'db', 'migrate')
     
     # todo start stub
   }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2018-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-rails
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.1
+        version: 0.26.3
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.0.6
+        version: 0.1.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -113,16 +113,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.8
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -165,7 +165,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Plugin to use GCM with Notifiable-Rails
+description: Plugin to use GCM with Notifiable
 email:
 - kamil@futureworkshops.com
 - matt@futureworkshops.com
@@ -175,8 +175,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
-- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -188,11 +186,6 @@ files:
 - notifiable-gcm-spacialdb.gemspec
 - spec/batch_spec.rb
 - spec/spec_helper.rb
-- spec/support/db/migrate/20131210115648_create_notifiable_apps.rb
-- spec/support/db/migrate/20131210115649_create_notifiable_device_tokens.rb
-- spec/support/db/migrate/20131210115650_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131210115651_create_notifiable_localized_notifications.rb
-- spec/support/db/migrate/20131210115652_create_notifiable_statuses.rb
 homepage: http://www.futureworkshops.com
 licenses:
 - Apache 2.0
@@ -213,15 +206,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
-summary: Plugin to use GCM with Notifiable-Rails
+summary: Plugin to use GCM with Notifiable
 test_files:
 - spec/batch_spec.rb
 - spec/spec_helper.rb
-- spec/support/db/migrate/20131210115648_create_notifiable_apps.rb
-- spec/support/db/migrate/20131210115649_create_notifiable_device_tokens.rb
-- spec/support/db/migrate/20131210115650_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131210115651_create_notifiable_localized_notifications.rb
-- spec/support/db/migrate/20131210115652_create_notifiable_statuses.rb

data/.ruby-gemset

@@ -1 +0,0 @@
-notifiable-gcm-spacialdb

data/.ruby-version

@@ -1 +0,0 @@
-2.1.6

data/spec/support/db/migrate/20131210115648_create_notifiable_apps.rb

@@ -1,10 +0,0 @@
-class CreateNotifiableApps < ActiveRecord::Migration
-  def change
-    create_table :notifiable_apps do |t|
-      t.string :name
-      t.text :configuration
-
-      t.timestamps
-    end
-  end
-end

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

@@ -1,19 +0,0 @@
-class CreateNotifiableDeviceTokens < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_device_tokens do |t|
-      t.string :token
-    	t.string :provider
-      t.string :locale
-      t.boolean :is_valid, :default => true
-      t.integer :user_id
-      t.references :app
-
-      t.timestamps
-    end
-
-    add_index :notifiable_device_tokens, :token, :unique => true      
-    add_index :notifiable_device_tokens, :user_id
-  end
-
-end

data/spec/support/db/migrate/20131210115650_create_notifiable_notifications.rb

@@ -1,16 +0,0 @@
-class CreateNotifiableNotifications < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_notifications do |t|
-      t.references :app
-      
-      #stats
-      t.integer :sent_count, :default => 0
-      t.integer :gateway_accepted_count, :default => 0
-      t.integer :opened_count, :default => 0
-      
-      t.timestamps
-    end
-  end
-
-end

data/spec/support/db/migrate/20131210115651_create_notifiable_localized_notifications.rb

@@ -1,22 +0,0 @@
-class CreateNotifiableLocalizedNotifications < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_localized_notifications do |t|
-      t.text :message
-      t.text :params
-      t.string :locale
-      t.references :notification
-      
-      # APNS - Optional
-      #t.integer :badge
-      #t.text :sound
-      #t.datetime :expiry
-      
-      # MPNS - Optional
-      #t.text :title
-      
-      t.timestamps
-    end
-  end
-
-end

data/spec/support/db/migrate/20131210115652_create_notifiable_statuses.rb

@@ -1,12 +0,0 @@
-class CreateNotifiableStatuses < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_statuses do |t|
-      t.references :localized_notification
-      t.references :device_token
-      t.integer :status
-      t.datetime :created_at
-    end    
-  end
-
-end