notifiable-apns-grocer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe0246de41d01630e6997ece48dcc1263b5e6b31
-  data.tar.gz: 96aeb86c1c8850e52a3a95e55518a141c5e42a2f
+  metadata.gz: ec911dcc2570ab9c8a271321f303db764b7b62be
+  data.tar.gz: b96d35f7daefc693e0198727077184b1e1b1b5cf
 SHA512:
-  metadata.gz: ad9409ee4f03f7e5b9d374c2de5ded4ec0358d7fdb4cd69f0716340f9a61715e4ca2378393f80764cab84ef139215dfc89a1ed7e7dc9b52eee2ef3d8afd09f2f
-  data.tar.gz: f9fe2a3a9a9e4b5cd38deb85be368d0f7c8d093281693b8c9d9159f918eb5c79ba8db8a49b47067044e39ef458366824fb3f0224530a5f4eebf0e9a0458c6242
+  metadata.gz: 126caf702a911701e0063a151b418d0664674ed975561b85c53b3ac4d75d261aee3058196b3e6423ce65676522d455a573f6251e90d1ffb1ad30b3ceb5acbeaa
+  data.tar.gz: 8e1167a5e9d16f288baaf31306f588165b5722f5af44c1e05f92066b183d49fc3bc52e0fb0dda264d5c36428aa4ab0af8b7de1727dfafe9c984f019e8c9b44c9

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/Rakefile

@@ -1 +1,15 @@
 require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
+Dir[File.join(File.dirname(__FILE__), 'lib/tasks/**/*.rake')].each {|f| load f }
+
+namespace :ci do
+  namespace :test do
+    desc "Run all specs in spec directory (excluding plugin specs)"
+    RSpec::Core::RakeTask.new(:spec)
+  end
+  
+  task :prepare
+  
+  desc "Run all CI tests"
+  task :test => ['ci:test:spec']
+end

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

@@ -5,7 +5,9 @@ module Notifiable
   module Apns
     module Grocer
   		class Stream < Notifiable::NotifierBase
-      
+        
+        attr_accessor :sandbox, :certificate, :passphrase
+        
         def close
           super
           @grocer_pusher = nil        
@@ -15,35 +17,60 @@ module Notifiable
   			protected      
   			def enqueue(notification, device_token)        				
           
-          grocer_notification = ::Grocer::Notification.new(device_token: device_token.token, alert: notification.apns_message, custom: notification.payload)
+          grocer_notification = ::Grocer::Notification.new(
+            device_token: device_token.token, 
+            alert: notification.provider_value(device_token.provider, :message), 
+            custom: notification.provider_value(device_token.provider, :custom), 
+          )
+            
   				grocer_pusher.push(grocer_notification) unless Notifiable.delivery_method == :test
 
           processed(notification, device_token)
   			end
       
         def flush
-          process_feedback unless Notifiable.env == 'test'
+          process_feedback unless self.test_env?
         end
 
-        private 
-        def grocer_pusher
-          @grocer_pusher ||= ::Grocer.pusher(Notifiable.apns_gateway_config)
-        end
+        private
+          def gateway_config 
+            {
+              certificate: self.certificate,
+              passphrase:  self.passphrase,
+              gateway:     self.test_env? ? "localhost" : self.sandbox ? "gateway.sandbox.push.apple.com" : "gateway.push.apple.com",
+              port:        2195,
+              retries:     3
+            }
+          end
+          
+          def feedback_config
+            {
+              certificate: self.certificate,
+              passphrase:  self.passphrase,
+              gateway:     self.test_env? ? "feedback.sandbox.push.apple.com" : "feedback.push.apple.com",
+              port:        2196,
+              retries:     3
+            }
+          end
+        
+          def grocer_pusher
+            @grocer_pusher ||= ::Grocer.pusher(gateway_config)
+          end
       
-        def grocer_feedback
-  				@grocer_feedback ||= ::Grocer.feedback(Notifiable.apns_feedback_config)
-        end
+          def grocer_feedback
+    				@grocer_feedback ||= ::Grocer.feedback(feedback_config)
+          end
       
-        def process_feedback
-  				grocer_feedback.each do |attempt|
-  					token = attempt.device_token
-  					device_token = DeviceToken.find_by_token(token)
-  					if device_token
-  						device_token.update_attribute("is_valid", false) if device_token.updated_at < attempt.timestamp
-  						Rails.logger.info("Device #{token} (#{device_token.user_id}) failed at #{attempt.timestamp}")
-  					end
-  				end
-        end
+          def process_feedback
+    				grocer_feedback.each do |attempt|
+    					token = attempt.device_token
+    					device_token = DeviceToken.find_by_token(token)
+    					if device_token
+    						device_token.update_attribute("is_valid", false) if device_token.updated_at < attempt.timestamp
+    						Rails.logger.info("Device #{token} (#{device_token.user_id}) failed at #{attempt.timestamp}")
+    					end
+    				end
+          end
   		end
     end
 	end

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

@@ -1,7 +1,7 @@
 module Notifiable
   module Apns
     module Grocer
-      VERSION = "0.1.1"
+      VERSION = "0.2.0"
     end
   end
 end

data/notifiable-apns-grocer.gemspec

@@ -18,14 +18,16 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "notifiable-rails"
+  spec.add_dependency "notifiable-rails", ">=0.4.0"
   spec.add_dependency "grocer"
  
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency "sqlite3"
   spec.add_development_dependency "database_cleaner"
+  spec.add_development_dependency 'ruby-prof'
   
 end

data/spec/grocer_spec.rb

@@ -8,7 +8,7 @@ describe Notifiable::Apns::Grocer::Stream do
   let(:u) { User.new(d) }
   
   it "sends a single grocer notification" do    
-          
+    g.env = "test"      
     g.send_notification(n, d)
     
     Timeout.timeout(2) {
@@ -30,6 +30,20 @@ describe Notifiable::Apns::Grocer::Stream do
     }
   end 
   
+  it "supports custom properties" do
+    n.payload = {:apns => {:custom => {:flag => true}}}
+    
+    Notifiable.batch do |b|
+      b.add(n, u)
+    end
+    Notifiable::NotificationDeviceToken.count.should == 1
+    
+    Timeout.timeout(2) {
+      notification = @grocer.notifications.pop
+      notification.custom[:flag].should == true
+    }
+  end
+  
 end
 
 User = Struct.new(:device_token) do

data/spec/spec_helper.rb

@@ -1,11 +1,13 @@
 ENV['RAILS_ENV'] ||= 'test'
 
 require 'simplecov'
+require 'simplecov-rcov'
+SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
 SimpleCov.start do
-  minimum_coverage 80
   add_filter "/spec/"
 end
 
+require 'timeout'
 require 'database_cleaner'
 require 'active_record'
 require 'rails'
@@ -36,8 +38,6 @@ RSpec.configure do |config|
     
     @grocer = Grocer.server(port: 2195)
     @grocer.accept
-    
-    Notifiable.apns_gateway = "localhost"
   }
   
   config.before(:each) {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifiable-apns-grocer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Kamil Kocemba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
+date: 2014-02-09 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'
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: grocer
   requirement: !ruby/object:Gem::Requirement
@@ -95,6 +95,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  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'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  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