notifiable-gcm-spacialdb 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 536406a49ca504f3664c9ebcc375c0c88a2870dd
-  data.tar.gz: 6b999987c6c6aa7886b4a7305b96d372fe59eb06
+  metadata.gz: d61457fbeffca641f889b92f5c8c0bd2ae7f07bd
+  data.tar.gz: acdf05b132205e223e2dadc768d76cb284cacf46
 SHA512:
-  metadata.gz: 39a29232f4829ac8f5e54d0b23d4929a14fc1dacedc28323a1e70d22379681d73141fb61c812def3408e6e70eed951ec6d943685a54fb289ce646d65950ab078
-  data.tar.gz: 1d155d711bf712c94fcfc0d2720659cf120dc06a38a5c101f65691b05c148550d60221b431451f27dfa70bd9a94a2958b4885b747adefa57cbc9385d2ca18195
+  metadata.gz: d00f13c3297670c8541a1a0758987370694424c6784f493e64fc8c297d44dc64f4c29f9906e5a4ac872a1555cba6dae708a0526abe0829d85b0c2cb6d0e00877
+  data.tar.gz: 0b96b449d6025348f6ef84c473eb644b352c845525dd42aa0f9dc3fac6c7fe5602c81e5cbdcd1098309b5d10a2613ab5f3ea72212425330a0a8c9835ff116a03

data/Gemfile.lock

@@ -1,40 +1,39 @@
 PATH
   remote: .
   specs:
-    notifiable-gcm-spacialdb (0.4.4)
+    notifiable-gcm-spacialdb (0.5.0)
       gcm (~> 0.0.6)
-      notifiable-rails (>= 0.6.0)
+      notifiable-rails (>= 0.17.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.0.2)
-      actionpack (= 4.0.2)
+    actionmailer (4.0.4)
+      actionpack (= 4.0.4)
       mail (~> 2.5.4)
-    actionpack (4.0.2)
-      activesupport (= 4.0.2)
+    actionpack (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
       erubis (~> 2.7.0)
       rack (~> 1.5.2)
       rack-test (~> 0.6.2)
-    activemodel (4.0.2)
-      activesupport (= 4.0.2)
+    activemodel (4.0.4)
+      activesupport (= 4.0.4)
       builder (~> 3.1.0)
-    activerecord (4.0.2)
-      activemodel (= 4.0.2)
+    activerecord (4.0.4)
+      activemodel (= 4.0.4)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.2)
+      activesupport (= 4.0.4)
       arel (~> 4.0.0)
     activerecord-deprecated_finders (1.0.3)
-    activesupport (4.0.2)
-      i18n (~> 0.6, >= 0.6.4)
+    activesupport (4.0.4)
+      i18n (~> 0.6, >= 0.6.9)
       minitest (~> 4.2)
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
     addressable (2.3.5)
     arel (4.0.2)
-    atomic (1.1.14)
     builder (3.1.4)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
@@ -42,11 +41,11 @@ GEM
     diff-lcs (1.2.5)
     docile (1.1.2)
     erubis (2.7.0)
-    gcm (0.0.6)
+    gcm (0.0.7)
       httparty
       json
     hike (1.2.3)
-    httparty (0.12.0)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.6.9)
@@ -58,23 +57,23 @@ GEM
     minitest (4.7.5)
     multi_json (1.8.4)
     multi_xml (0.5.5)
-    notifiable-rails (0.6.0)
+    notifiable-rails (0.17.0)
       rails (~> 4.0.0)
-    polyglot (0.3.3)
+    polyglot (0.3.4)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (4.0.2)
-      actionmailer (= 4.0.2)
-      actionpack (= 4.0.2)
-      activerecord (= 4.0.2)
-      activesupport (= 4.0.2)
+    rails (4.0.4)
+      actionmailer (= 4.0.4)
+      actionpack (= 4.0.4)
+      activerecord (= 4.0.4)
+      activesupport (= 4.0.4)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.0.2)
+      railties (= 4.0.4)
       sprockets-rails (~> 2.0.0)
-    railties (4.0.2)
-      actionpack (= 4.0.2)
-      activesupport (= 4.0.2)
+    railties (4.0.4)
+      actionpack (= 4.0.4)
+      activesupport (= 4.0.4)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.1.1)
@@ -94,7 +93,7 @@ GEM
     simplecov-html (0.8.0)
     simplecov-rcov (0.2.3)
       simplecov (>= 0.4.1)
-    sprockets (2.10.1)
+    sprockets (2.12.1)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -104,14 +103,13 @@ GEM
       activesupport (>= 3.0)
       sprockets (~> 2.8)
     sqlite3 (1.3.8)
-    thor (0.18.1)
-    thread_safe (0.1.3)
-      atomic
+    thor (0.19.1)
+    thread_safe (0.3.3)
     tilt (1.4.1)
     treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.38)
+    tzinfo (0.3.39)
     webmock (1.17.1)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)

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

@@ -8,93 +8,90 @@ module Notifiable
         
         attr_accessor :api_key, :batch_size
         
-        def initialize
+        def initialize(env, notification)
+          super(env, notification)
+          @batch = []
           @batch_size = 1000          
         end
-                
-        def batch
-          @batch ||= {}
-        end
         
-        # todo should be made threadsafe
         protected 
-  			def enqueue(notification, device_token)
-          self.batch[notification.id] = [] if self.batch[notification.id].nil?
-          self.batch[notification.id] << device_token        								
-          tokens = self.batch[notification.id]
-          if tokens.count >= self.batch_size
-            send_batch(notification, tokens)
-          end
-    		end
+    			def enqueue(device_token)
+            @batch << device_token        								
+            if @batch.count >= @batch_size
+              send_batch
+            end
+      		end
       
-        def flush
-          self.batch.each_pair do |notification_id, device_tokens|
-            send_batch(Notifiable::Notification.find(notification_id), device_tokens)
+          def flush
+            send_batch unless @batch.empty?
           end
-        end
 
   			private
-  			def send_batch(notification, device_tokens)
-          if Notifiable.delivery_method == :test
-            device_tokens.each {|d| processed(notification, d)}
-          else
-    				gcm = ::GCM.new(self.api_key)
+    			def send_batch
+            if Notifiable.delivery_method == :test
+              @batch.each {|d| processed(d, 0)}
+            else
+      				gcm = ::GCM.new(self.api_key)
             
-            data = {:message => notification.message}
-            data.merge! notification.params if notification.params    
+              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)
             
-            # send
-    				response = gcm.send_notification(device_tokens.collect{|dt| dt.token}, {:data => data})
-            if response[:status_code] == 200
-      				body = JSON.parse(response.fetch(:body, "{}"))
-      				results = body.fetch("results", [])
-      				results.each_with_index do |result, idx|
-                # Remove the token if it is marked NotRegistered (user deleted the App for example)
-      					if ["InvalidRegistration", "NotRegistered"].include? result["error"] 
-      						device_tokens[idx].update_attribute('is_valid', false)
-                
-                # Process canonical IDs
-                elsif result["registration_id"] && Notifiable::DeviceToken.exists?(:token => result["registration_id"])
-                  device_tokens[idx].update_attribute('is_valid', false)                                        
-                elsif result["registration_id"]
-                  device_tokens[idx].update_attribute('token', result["registration_id"])                    
-                end
+              # 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(notification, device_tokens[idx], error_code(result["error"]))
-      				end 
-            else
-              Rails.logger.error "Sending notification id: #{notification.id} code: #{response[:status_code]} response: #{response[:response]}"
-            end         
+              processed(dt, error_code(result["error"]))
+    				end 
           end
-          self.batch.delete(notification.id)
-  			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 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

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Gcm
     module Spacialdb
-      VERSION = "0.4.4"
+      VERSION = "0.5.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.6.0"
+  spec.add_dependency "notifiable-rails", ">=0.17.0"
   spec.add_dependency "gcm", "~> 0.0.6"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/batch_spec.rb

@@ -2,49 +2,42 @@ require 'spec_helper'
 
 describe Notifiable::Gcm::Spacialdb::Batch do
   
-  let(:g) { Notifiable::Gcm::Spacialdb::Batch.new }
-  let(:n) { Notifiable::Notification.create(:message => "Test message") }
-  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :gcm) }
-  let(:u) { User.new(d) }
+  let(:a) { Notifiable::App.create }  
+  let(:n1) { Notifiable::Notification.create(:message => "Test message", :app => a) }
+  let(:n1_with_params) { Notifiable::Notification.create(:message => "Test message", :app => a, :params => {:flag => true}) }
+  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :gcm, :app => a) }
   
   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" }]}')   
     
-    g.send_notification(n, d)
-    g.close
+    n1.batch do |n|
+      n.add_device_token(d)
+    end
     
     Notifiable::NotificationStatus.count.should == 1
     Notifiable::NotificationStatus.first.status = 0
   end
   
-  it "sends custom attributes" do
-    n.update_attribute(:params, {:custom_id => 123456})
-        
+  it "sends custom attributes" do        
     stub_request(:post, "https://android.googleapis.com/gcm/send")
-      .with(:body => {:registration_ids => ["ABC123"], :data => {:message => n.message, :custom_id => 123456}})
+      .with(:body => {:registration_ids => ["ABC123"], :data => {:message => n1.message, :flag => true, :notification_id => n1_with_params.id}})
       .to_return(:body => '{ "multicast_id": 108, "success": 1, "failure": 0, "canonical_ids": 0, "results": [{ "message_id": "1:08" }]}')   
     
-    g.send_notification(n, d)
-    g.close
-    
+    n1_with_params.batch do |n|
+      n.add_device_token(d)
+    end
+      
     Notifiable::NotificationStatus.count.should == 1
     Notifiable::NotificationStatus.first.status = 0
   end
   
-  it "sends a single gcm notification in a batch" 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" }]}')  
-        
-    Notifiable.batch {|b| b.add(n, u)}
-    
-    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" }]}')  
         
-    Notifiable.batch {|b| b.add(n, u)}
-    
+    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
@@ -53,8 +46,10 @@ describe Notifiable::Gcm::Spacialdb::Batch 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" }]}')  
         
-    Notifiable.batch {|b| b.add(n, u)}
-    
+    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
@@ -63,8 +58,10 @@ describe Notifiable::Gcm::Spacialdb::Batch do
   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" }]}')  
         
-    Notifiable.batch {|b| b.add(n, u)}
-    
+    n1.batch do |n|
+      n.add_device_token(d)
+    end
+        
     Notifiable::NotificationStatus.count.should == 1
     Notifiable::NotificationStatus.first.status = 0
     Notifiable::DeviceToken.count.should == 1
@@ -72,31 +69,29 @@ describe Notifiable::Gcm::Spacialdb::Batch do
   end 
   
   
-  it "marks a token as invalid if the canonical ID already exists" do  
-    Notifiable::DeviceToken.create(:token => "GHJ12345", :provider => :gcm)
+#  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" }]}')  
+#    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" }]}')  
         
-    Notifiable.batch {|b| b.add(n, u)}
-    
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status = 0
-    Notifiable::DeviceToken.count.should == 2
-    d.is_valid.should be_false
-  end 
+#    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)  
         
-    Notifiable.batch {|b| b.add(n, u)}
-    
+    n1.batch do |n|
+      n.add_device_token(d)
+    end
+        
     Notifiable::NotificationStatus.count.should == 0
   end 
   
-end
-
-User = Struct.new(:device_token) do
-  def device_tokens
-    [device_token]
-  end
 end

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

@@ -0,0 +1,10 @@
+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/20131228225140_create_notifiable_notifications.rb

@@ -2,13 +2,25 @@ class CreateNotifiableNotifications < ActiveRecord::Migration
   
   def change
     create_table :notifiable_notifications do |t|
-      t.text :title
       t.text :message
       t.text :params
-      t.integer :badge
-      t.text :sound
-      t.datetime :expiry
+      t.references :app
+      
+      #stats
+      t.integer :sent_count, :default => 0
+      t.integer :gateway_accepted_count, :default => 0
+      t.integer :opened_count, :default => 0
+      
+      # 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/20131229104039_create_notifiable_statuses.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-gcm-spacialdb
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-07 00:00:00.000000000 Z
+date: 2014-05-03 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.6.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: gcm
   requirement: !ruby/object:Gem::Requirement
@@ -173,9 +173,10 @@ files:
 - notifiable-gcm-spacialdb.gemspec
 - spec/batch_spec.rb
 - spec/spec_helper.rb
+- spec/support/db/migrate/20131228225138_create_notifiable_apps.rb
 - spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
 - spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb
+- spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb
 homepage: http://www.futureworkshops.com
 licenses:
 - Apache 2.0
@@ -203,6 +204,7 @@ summary: Plugin to use GCM with Notifiable-Rails
 test_files:
 - spec/batch_spec.rb
 - spec/spec_helper.rb
+- spec/support/db/migrate/20131228225138_create_notifiable_apps.rb
 - spec/support/db/migrate/20131228225139_create_notifiable_device_tokens.rb
 - spec/support/db/migrate/20131228225140_create_notifiable_notifications.rb
-- spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb
+- spec/support/db/migrate/20131229104039_create_notifiable_statuses.rb

data/spec/support/db/migrate/20131229104039_create_notifiable_notification_statuses.rb

@@ -1,11 +0,0 @@
-class CreateNotifiableNotificationStatuses < ActiveRecord::Migration
-  
-  def change
-    create_table :notifiable_notification_statuses do |t|
-      t.references :notification
-      t.references :device_token
-      t.integer :status
-    end
-  end
-
-end