notifiable-apns-grocer 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89cdd826c462dcfdd546db1aabcb4d19e4d9a02e
-  data.tar.gz: 7a0e1e9a9e1108b0ba820e57f8b4fd2b88fc8695
+  metadata.gz: e0da6abf688b70927c776b96a722d5327e34099a
+  data.tar.gz: 157899440c6e07fcab402ddc43d4e3de33dbd8d7
 SHA512:
-  metadata.gz: f2410b6777b0c39a472d1814dd39b04062f023b299063907f53ff8d7783db47c65ea40e624a039b5f027dc90ca1674dc10d3c74db41f22e01be3f9f018b2d0b2
-  data.tar.gz: ae01dca01d59761baef1d1c28f946a3e7c304ffee581feb0da5d0df84f794988416a56f964519accb9547ec2e18f465ddb20bafdac110f50cf80a07f08f65a01
+  metadata.gz: acf96da601806993a63080f8cabcb2d2d20d3ade7631613724a25abc2b786e3b2b8ca4bb559eff9fd856f18c6de495f3e6dec8110ef6413d517f1c2b296c6c8e
+  data.tar.gz: e7ed1687ee1cb2780e016d6375c7403e64394b45462ab862f8d859c2ed0fe90cf83d2eadc624ab5593125282863e558f302b60f30496673ffde25ad068b6044c

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

@@ -15,12 +15,12 @@ module Notifiable
         end
       
   			protected      
-  			def enqueue(notification, device_token, message, params)        				
+  			def enqueue(device_token)        				
           
           grocer_notification = ::Grocer::Notification.new(
             device_token: device_token.token, 
-            alert: message, 
-            custom: params
+            alert: notification.message, 
+            custom: notification.send_params
           )
             
   				grocer_pusher.push(grocer_notification) unless Notifiable.delivery_method == :test
@@ -37,7 +37,7 @@ module Notifiable
           #8   - Invalid token
           #255 - None (unknown)
 
-          processed(notification, device_token, 0)
+          processed(device_token, 0)
   			end
       
         def flush

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Grocer
-      VERSION = "0.6.0"
+      VERSION = "0.7.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.16.0"
+  spec.add_dependency "notifiable-rails", ">=0.17.0"
   spec.add_dependency "grocer"
  
   spec.add_development_dependency "bundler", "~> 1.3"

data/spec/grocer_spec.rb

@@ -3,57 +3,34 @@ 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", :app => a) }
+  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 => :apns, :app => a) }
-  let(:u) { User.new(d) }
   
-  it "sends a single grocer notification" do    
-    g.env = "test"      
-    g.send_notification(n, d)
+  it "sends a single notification" do
+    n1.batch do {|n| n.add_device_token(d)}
     
-    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(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.alert.should eql "Test message"
-      notification.custom[:notification_id].should == n.id
+      notification.custom[:notification_id].should == n1.id
     }
   end 
   
-  it "supports custom properties" do
-    n.params = {:flag => true}
-    
-    Notifiable.batch(a) do |b|
-      b.add_notifiable(n, u)
-    end
+  it "supports custom properties" do    
+    n1_with_params.batch do {|n| n.add_device_token(d)}
+
     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[:notification_id].should == n1_with_params.id
       notification.custom[:flag].should == true
     }
   end
   
-end
-
-User = Struct.new(:device_token) do
-  def device_tokens
-    [device_token]
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-grocer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 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.16.0
+        version: 0.17.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.16.0
+        version: 0.17.0
 - !ruby/object:Gem::Dependency
   name: grocer
   requirement: !ruby/object:Gem::Requirement