notifiable-apns-grocer 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e19c4bbf5e02e47e354324afec0cc1be9f232c6
-  data.tar.gz: 18fdffde5e1c152d027b5ab11f6c5d8319426e38
+  metadata.gz: d368d8bb3ad9b2822c74da4245e566bf91fedcc5
+  data.tar.gz: d5d275c9d66a826376d7998229d748ee18bf4768
 SHA512:
-  metadata.gz: d723b14a9077b39abba03a1635f9dac35a6596701c56ec12301fc35e920c8f6c986aefed38d5576aa0b0dbafd6ea0e8bdbe280342a8ba942ce7f772da64f3dd0
-  data.tar.gz: fcf5884e59438232282cdeda0eb6ec37524942561bf5d229f9edf996bb932f81afd41230463a43b61cc0e5e8d0f4765ce659389c391c22c78c05c5423678d183
+  metadata.gz: 00f85e6cc2358514bbf0c5f41fbc9ea69eb374e792f1cebdb3b35aa9269be898d442880abce8bab35b0cd7e55286dc42bf07851ed0f2097fc3fff5d7092db020
+  data.tar.gz: 691aa2a24d3dfeda18db6c418e7fb554dfcaa6afc782784c02a13a06699ef35f1b94b0c3faf53abff06c6c3e2cb3a687964541461244d30cba7dc9cdc04e6128

data/lib/notifiable/apns/grocer/stream.rb

@@ -15,12 +15,12 @@ module Notifiable
         end
       
   			protected      
-  			def enqueue(notification, device_token)        				
+  			def enqueue(notification, device_token, params)        				
           
           grocer_notification = ::Grocer::Notification.new(
             device_token: device_token.token, 
             alert: notification.message, 
-            custom: notification.params
+            custom: params
           )
             
   				grocer_pusher.push(grocer_notification) unless Notifiable.delivery_method == :test

data/lib/notifiable/apns/grocer/version.rb

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Grocer
-      VERSION = "0.4.0"
+      VERSION = "0.5.0"
     end
   end
 end

data/notifiable-apns-grocer.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.12.0"
   spec.add_dependency "grocer"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/grocer_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe Notifiable::Apns::Grocer::Stream do
-  
+
+  let(:a) { Notifiable::App.create }  
   let(:g) { Notifiable::Apns::Grocer::Stream.new }
-  let(:n) { Notifiable::Notification.create(:message => "Test message") }
-  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :apns) }
+  let(:n) { Notifiable::Notification.create(:message => "Test message", :app => a) }
+  let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :apns, :app => a) }
   let(:u) { User.new(d) }
   
   it "sends a single grocer notification" do    
@@ -14,13 +15,14 @@ describe Notifiable::Apns::Grocer::Stream do
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
       notification.alert.should eql "Test message"
+      notification.custom[:notification_id].should == n.id
     }
   end
   
   it "sends a single grocer notification in a batch" do
     
-    Notifiable.batch do |b|
-      b.add(n, u)
+    Notifiable.batch(a) do |b|
+      b.add_notifiable(n, u)
     end
     Notifiable::NotificationStatus.count.should == 1
     Notifiable::NotificationStatus.first.status.should == 0
@@ -28,20 +30,22 @@ describe Notifiable::Apns::Grocer::Stream do
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
       notification.alert.should eql "Test message"
+      notification.custom[:notification_id].should == n.id
     }
   end 
   
   it "supports custom properties" do
     n.params = {:flag => true}
     
-    Notifiable.batch do |b|
-      b.add(n, u)
+    Notifiable.batch(a) do |b|
+      b.add_notifiable(n, u)
     end
     Notifiable::NotificationStatus.count.should == 1
     Notifiable::NotificationStatus.first.status.should == 0
     
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
+      notification.custom[:notification_id].should == n.id
       notification.custom[:flag].should == true
     }
   end

data/spec/spec_helper.rb

@@ -19,6 +19,8 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 db_path = 'spec/support/db/test.sqlite3'
 DatabaseCleaner.strategy = :truncation
 
+Rails.logger = Logger.new(STDOUT)
+
 RSpec.configure do |config|  
   config.mock_with :rspec
   config.order = "random"

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/20131228225139_create_notifiable_device_tokens.rb

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

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

@@ -2,12 +2,23 @@ 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-grocer
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-03-17 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.12.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: grocer
   requirement: !ruby/object:Gem::Requirement
@@ -174,6 +174,7 @@ files:
 - notifiable-apns-grocer.gemspec
 - spec/grocer_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
@@ -204,6 +205,7 @@ summary: Plugin to use Grocer for APNS with Notifiable-Rails
 test_files:
 - spec/grocer_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