notifiable-apns-grocer 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d50ae95d68648f0740d8a4ffb19f080f106c423b
-  data.tar.gz: 874fa74a2c4ce892d38fd48c1a4727a61e56f737
+  metadata.gz: 5f48af75969ed972bfe7f7b5a57b9c5101b6243f
+  data.tar.gz: ef7ca9aa7a7e70aa11e36157cee603f504c88136
 SHA512:
-  metadata.gz: e740ef4e3559dd85c1a4d7b75e0bf0ae3ddc54e0a6ee11dc9ecb0d215556761d028fbc49151b199733326afa78fbe4b8c7237fb027d2c6005122444e2364c54b
-  data.tar.gz: f4f51cdc7842c60f7c17afcfb38905609c805588aa73ff09906ccd73f6d0dfc672e9a2adf0d30f363d3c151b5f9bbe8c657c4ceab6a431dc735e9336dff5b29a
+  metadata.gz: 2f881897464dae23b6d14bbfd1577ec24ed235d457052a99db40f034c312544137883d9d7ac4c756d48557a713d270f04669e6758bd6f84d71d96d9c0ba252a0
+  data.tar.gz: 75fbaafa5746bdffe5ef5529b725fe43db58b2f39e3bceef7038567c8e48cdc3cc7574e42e3b557d2ce03c5ef053eca4115fb0fd942acd254056534fa68c22c9

data/.rspec

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

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.5

data/README.md

@@ -1,29 +1,3 @@
 # Notifiable::Apns::Grocer
 
-TODO: Write a gem description
-
-## Installation
-
-Add this line to your application's Gemfile:
-
-    gem 'notifiable-apns-grocer'
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install notifiable-apns-grocer
-
-## Usage
-
-TODO: Write usage instructions here
-
-## Contributing
-
-1. Fork it
-2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Commit your changes (`git commit -am 'Add some feature'`)
-4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+Please refer to the [notifiable-rails](https://github.com/FutureWorkshops/notifiable-rails) Readme for further information.

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

@@ -7,13 +7,29 @@ module Notifiable
     module Grocer
   		class Stream < Notifiable::NotifierBase
         
-        attr_accessor :sandbox, :certificate, :passphrase, :connection_pool_size, :connection_pool_timeout
+        attr_accessor :certificate, :passphrase, :connection_pool_size, :connection_pool_timeout, :gateway_host, :gateway_port, :feedback_host, :feedback_port
                 
         def close
           super
           @grocer_pusher = nil        
           @grocer_feedback = nil
         end
+        
+        def gateway_host
+          @gateway_host || "gateway.push.apple.com"
+        end
+        
+        def gateway_port
+          @gateway_port || 2195
+        end
+        
+        def feedback_host
+          @gateway_host || "feedback.push.apple.com"
+        end
+        
+        def feedback_port
+          @feedback_port || 2196
+        end
       
   			protected      
     			def enqueue(device_token, localized_notification)        				
@@ -25,7 +41,7 @@ module Notifiable
             )
           
             pusher_pool.with do |pusher|
-              pusher.push(grocer_notification) unless Notifiable.delivery_method == :test
+              pusher.push(grocer_notification)
             end
                       
             # assume processed. Errors will be receieved through a callback
@@ -59,8 +75,8 @@ module Notifiable
             {
               certificate: self.certificate,
               passphrase:  self.passphrase,
-              gateway:     self.test_env? ? "localhost" : sandbox? ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com",
-              port:        2195,
+              gateway:     self.gateway_host,
+              port:        self.gateway_port,
               retries:     3
             }
           end
@@ -69,8 +85,8 @@ module Notifiable
             {
               certificate: self.certificate,
               passphrase:  self.passphrase,
-              gateway:     self.test_env? ? "feedback.sandbox.push.apple.com" : "feedback.push.apple.com",
-              port:        2196,
+              gateway:     self.feedback_host,
+              port:        self.feedback_port,
               retries:     3
             }
           end

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Grocer
-      VERSION = "0.11.0"
+      VERSION = "0.12.0"
     end
   end
 end

data/notifiable-apns-grocer.gemspec

@@ -30,5 +30,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency 'ruby-prof'
+  spec.add_development_dependency 'byebug'
   
 end

data/spec/stream_spec.rb

@@ -7,19 +7,26 @@ describe Notifiable::Apns::Grocer::Stream do
   let!(:ln) { Notifiable::LocalizedNotification.create(:message => "Test message", :params => {:flag => true}, :notification => n1, :locale => :en) }
   let(:d) { Notifiable::DeviceToken.create(:token => "ABC123", :provider => :apns, :app => a, :locale => :en) }
   
+  before(:each) do
+    a.configuration = {:apns => {
+          :gateway_host => "localhost", 
+          :gateway_port => 2195, 
+          :feedback_host => "localhost", 
+          :feedback_port => 2196}}
+  end
+  
   it "sends a single notification" do
-    
     n1.batch do |n| 
       n.add_device_token(d)
     end
     
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status.should == 0
+    expect(Notifiable::NotificationStatus.count).to eql 1
+    expect(Notifiable::NotificationStatus.first.status).to eql 0
     
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
-      notification.alert.should eql "Test message"
-      notification.custom[:localized_notification_id].should == ln.id
+      expect(notification.alert).to eql "Test message"
+      expect(notification.custom[:localized_notification_id]).to eql ln.id
     }
   end 
   
@@ -28,22 +35,24 @@ describe Notifiable::Apns::Grocer::Stream do
       n.add_device_token(d)
     end
 
-    Notifiable::NotificationStatus.count.should == 1
-    Notifiable::NotificationStatus.first.status.should == 0
+    expect(Notifiable::NotificationStatus.count).to eql 1
+    expect(Notifiable::NotificationStatus.first.status).to eql 0
     
     Timeout.timeout(2) {
       notification = @grocer.notifications.pop
-      notification.custom[:localized_notification_id].should == ln.id
-      notification.custom[:flag].should == true
+      expect(notification.custom[:localized_notification_id]).to eql ln.id
+      expect(notification.custom[:flag]).to eql true
     }
   end
   
-  it "can use production gateway" do
+  it "sets gateway and feedback properties" do
     g = Notifiable::Apns::Grocer::Stream.new(Rails.env, n1)
-    a.configuration = {:apns => {:sandbox => "0"}} # This is how production is configured
     a.configure(:apns, g)
     
-    expect(g.send(:sandbox?)).to eq false
+    expect(g.send(:gateway_host)).to eql "localhost"
+    expect(g.send(:gateway_port)).to eql 2195
+    expect(g.send(:feedback_host)).to eql "localhost"
+    expect(g.send(:feedback_port)).to eql 2196
     
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-grocer
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: notifiable-rails
@@ -165,6 +165,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Plugin to use Grocer for APNS with Notifiable-Rails
 email:
 - kamil@futureworkshops.com
@@ -174,6 +188,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - ".ruby-gemset"
 - ".ruby-version"
 - Gemfile
@@ -213,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Plugin to use Grocer for APNS with Notifiable-Rails