notifiable-gcm-spacialdb 0.8.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7da221865614e3397cfb5a5d70ec546c6e47364
-  data.tar.gz: e184c03554ae384b3777a379a3845093e1df1bdc
+  metadata.gz: a1f15251a237ef16e25ecaa65fe48602e225a139
+  data.tar.gz: eb2737d7853ec2df977625cecfae70a9788ff9ea
 SHA512:
-  metadata.gz: 7cd2403d53fb87f6c237c9334387748bc3ec80ab8ed416431bd3acc83b91241969a92e6de537bb5c334cf0ed364c4867023392c37f9d1c30b9aab9b642711e92
-  data.tar.gz: 24f93bdf60fcd2bf268be58110652eb9833d1a2fb4f392b36d3a51b5a9e7740f5ba1c9d37082ce76a994c9bce1bdfc07d8fbc96240f4a2b4bb3cab1c45a19896
+  metadata.gz: d67af3e91b582015475f9034d3904f719f04a68089be72b425dcfa964ef270fd86457a008cf4f7bc8c26f06393c3685239a0d5c1f6267ae52aaf3a4deb083931
+  data.tar.gz: a0bf883223f62ee049272639782a9cf927886951b29eb24a73c79ea93fc0bae9e35eb92a6eedd887eba485f187b6fef445467b4085b43a52379901f4fec8e6e8

data/.rspec

@@ -0,0 +1 @@
+--color

data/Gemfile.lock

@@ -3,32 +3,32 @@ PATH
   specs:
     notifiable-gcm-spacialdb (0.8.0)
       gcm (~> 0.0.6)
-      notifiable-rails (>= 0.21.1)
+      notifiable-rails (>= 0.24.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.1.12)
-      actionpack (= 4.1.12)
-      actionview (= 4.1.12)
+    actionmailer (4.1.15)
+      actionpack (= 4.1.15)
+      actionview (= 4.1.15)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.12)
-      actionview (= 4.1.12)
-      activesupport (= 4.1.12)
+    actionpack (4.1.15)
+      actionview (= 4.1.15)
+      activesupport (= 4.1.15)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    actionview (4.1.12)
-      activesupport (= 4.1.12)
+    actionview (4.1.15)
+      activesupport (= 4.1.15)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.12)
-      activesupport (= 4.1.12)
+    activemodel (4.1.15)
+      activesupport (= 4.1.15)
       builder (~> 3.1)
-    activerecord (4.1.12)
-      activemodel (= 4.1.12)
-      activesupport (= 4.1.12)
+    activerecord (4.1.15)
+      activemodel (= 4.1.15)
+      activesupport (= 4.1.15)
       arel (~> 5.0.0)
-    activesupport (4.1.12)
+    activesupport (4.1.15)
       i18n (~> 0.6, >= 0.6.9)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -40,6 +40,7 @@ GEM
     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)
     database_cleaner (1.2.0)
@@ -49,35 +50,37 @@ GEM
     gcm (0.0.9)
       httparty
       json
-    httparty (0.13.5)
+    httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
     json (1.8.3)
-    mail (2.6.3)
-      mime-types (>= 1.16, < 3)
-    mime-types (2.6.1)
-    minitest (5.7.0)
+    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.21.1)
+    notifiable-rails (0.24.1)
       rails (~> 4.1.0)
     rack (1.5.5)
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.12)
-      actionmailer (= 4.1.12)
-      actionpack (= 4.1.12)
-      actionview (= 4.1.12)
-      activemodel (= 4.1.12)
-      activerecord (= 4.1.12)
-      activesupport (= 4.1.12)
+    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.12)
+      railties (= 4.1.15)
       sprockets-rails (~> 2.0)
-    railties (4.1.12)
-      actionpack (= 4.1.12)
-      activesupport (= 4.1.12)
+    railties (4.1.15)
+      actionpack (= 4.1.15)
+      activesupport (= 4.1.15)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
@@ -97,9 +100,10 @@ GEM
     simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sprockets (3.2.0)
-      rack (~> 1.0)
-    sprockets-rails (2.3.2)
+    sprockets (3.5.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)

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

@@ -6,18 +6,23 @@ module Notifiable
     module Spacialdb
   		class Batch < Notifiable::NotifierBase
         
-        attr_accessor :api_key, :batch_size
+        notifier_attribute :api_key, :batch_size
+                
+        def batch_size
+          @batch_size || 1000
+        end
         
         def initialize(env, notification)
           super(env, notification)
           @batch = []
-          @batch_size = 1000          
         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
+            send_batch(localized_notification) if @batch.count >= batch_size
       		end
       
           def flush
@@ -29,7 +34,7 @@ module Notifiable
             if Notifiable.delivery_method == :test
               @batch.each {|d| processed(d, 0)}
             else
-      				gcm = ::GCM.new(self.api_key)
+      				gcm = ::GCM.new(@api_key)
             
               data = {:message => notification.message}.merge(notification.send_params)            
       				response = gcm.send_notification(@batch.collect{|dt| dt.token}, {:data => data})

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

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

data/lib/notifiable/gcm/spacialdb.rb

@@ -8,5 +8,3 @@ module Notifiable
     end
   end
 end
-
-Notifiable.notifier_classes[:gcm] = Notifiable::Gcm::Spacialdb::Batch

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.21.1"
+  spec.add_dependency "notifiable-rails", ">=0.24.1"
   spec.add_dependency "gcm", "~> 0.0.6"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/batch_spec.rb

@@ -4,8 +4,12 @@ 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(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :gcm, :app => a, :locale => :en) }
+  let!(:ln) { Notifiable::LocalizedNotification.create(:message => "Test message", :params => {:flag => true}, :notification => n1, :locale => 'en') }
+  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :gcm, :app => a, :locale => 'en') }
+  
+  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" }]}')   

data/spec/spec_helper.rb

@@ -28,6 +28,9 @@ RSpec.configure do |config|
   
   config.before(:all) {
     
+    Notifiable.notifier_classes[:gcm] = Notifiable::Gcm::Spacialdb::Batch    
+    Notifiable::App.define_configuration_accessors(Notifiable.notifier_classes)
+    
     # DB setup
     ActiveRecord::Base.establish_connection(
      { :adapter => 'sqlite3',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-29 00:00:00.000000000 Z
+date: 2016-03-31 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.21.1
+        version: 0.24.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.21.1
+        version: 0.24.1
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile