rapns 3.3.2 → 3.4.0

data/spec/unit/deprecation_spec.rb

@@ -6,9 +6,9 @@ describe Rapns::Deprecation do
     Rapns::Deprecation.warn("msg")
   end
 
-  it 'does not print a warning when silenced' do
+  it 'does not print a warning when muted' do
     STDERR.should_not_receive(:puts)
-    Rapns::Deprecation.silenced do
+    Rapns::Deprecation.muted do
       Rapns::Deprecation.warn("msg")
     end
   end

data/spec/unit/logger_spec.rb

@@ -21,14 +21,21 @@ module Airbrake
 end
 
 describe Rapns::Logger do
-  let(:log) { stub(:sync= => true) }
-  let(:config) { stub(:airbrake_notify => true) }
+  let(:log) { double(:sync= => true) }
+  let(:config) { double(:airbrake_notify => true) }
 
   before do
     Rails.stub(:root).and_return("/rails_root")
-    @buffered_logger = mock("BufferedLogger", :info => nil, :error => nil, :level => 0, :auto_flushing => 1, :auto_flushing= => nil)
-    Rails.logger = @buffered_logger
-    ActiveSupport::BufferedLogger.stub(:new).and_return(@buffered_logger)
+
+    @logger_class = if defined?(ActiveSupport::BufferedLogger)
+      ActiveSupport::BufferedLogger
+    else
+      ActiveSupport::Logger
+    end
+
+    @logger = double(@logger_class.name, :info => nil, :error => nil, :level => 0, :auto_flushing => 1, :auto_flushing= => nil)
+    @logger_class.stub(:new).and_return(@logger)
+    Rails.logger = @logger
     File.stub(:open => log)
     STDERR.stub(:puts)
   end
@@ -50,19 +57,28 @@ describe Rapns::Logger do
     Rapns::Logger.new(:foreground => true)
   end
 
-  it 'instantiates the BufferedLogger' do
-    ActiveSupport::BufferedLogger.should_receive(:new).with(log, Rails.logger.level)
-    Rapns::Logger.new(:foreground => true)
-  end
-
   it 'uses the user-defined logger' do
-    my_logger = stub
+    my_logger = double
     Rapns.config.logger = my_logger
     logger = Rapns::Logger.new({})
     my_logger.should_receive(:info)
     logger.info('test')
   end
 
+  it 'uses ActiveSupport::BufferedLogger if a user-defined logger is not set' do
+    if ActiveSupport.const_defined?('BufferedLogger')
+      ActiveSupport::BufferedLogger.should_receive(:new).with(log, Rails.logger.level)
+      Rapns::Logger.new(:foreground => true)
+    end
+  end
+
+  it 'uses ActiveSupport::Logger if BufferedLogger does not exist' do
+    stub_const('ActiveSupport::Logger', double)
+    ActiveSupport.stub(:const_defined? => false)
+    ActiveSupport::Logger.should_receive(:new).with(log, Rails.logger.level)
+    Rapns::Logger.new(:foreground => true)
+  end
+
   it "should print out the msg if running in the foreground" do
     logger = Rapns::Logger.new(:foreground => true)
     STDOUT.should_receive(:puts).with(/hi mom/)
@@ -79,19 +95,19 @@ describe Rapns::Logger do
     now = Time.now
     Time.stub(:now).and_return(now)
     logger = Rapns::Logger.new(:foreground => false)
-    @buffered_logger.should_receive(:info).with(/#{Regexp.escape("[#{now.to_s(:db)}]")}/)
+    @logger.should_receive(:info).with(/#{Regexp.escape("[#{now.to_s(:db)}]")}/)
     logger.info("blah")
   end
 
   it "should prefix error logs with the ERROR label" do
     logger = Rapns::Logger.new(:foreground => false)
-    @buffered_logger.should_receive(:error).with(/#{Regexp.escape("[ERROR]")}/)
+    @logger.should_receive(:error).with(/#{Regexp.escape("[ERROR]")}/)
     logger.error("eeek")
   end
 
   it "should prefix warn logs with the WARNING label" do
     logger = Rapns::Logger.new(:foreground => false)
-    @buffered_logger.should_receive(:warn).with(/#{Regexp.escape("[WARNING]")}/)
+    @logger.should_receive(:warn).with(/#{Regexp.escape("[WARNING]")}/)
     logger.warn("eeek")
   end
 
@@ -99,7 +115,7 @@ describe Rapns::Logger do
     e = RuntimeError.new("hi mom")
     e.stub(:backtrace => [])
     logger = Rapns::Logger.new(:foreground => false)
-    @buffered_logger.should_receive(:error).with(/RuntimeError, hi mom/)
+    @logger.should_receive(:error).with(/RuntimeError, hi mom/)
     logger.error(e)
   end
 
@@ -155,9 +171,9 @@ describe Rapns::Logger do
   end
 
   it 'defaults auto_flushing to true if the Rails logger does not respond to auto_flushing' do
-    rails_logger = mock(:info => nil, :error => nil, :level => 0)
+    rails_logger = double(:info => nil, :error => nil, :level => 0)
     Rails.logger = rails_logger
     logger = Rapns::Logger.new({})
-    @buffered_logger.auto_flushing.should be_true
+    @logger.auto_flushing.should be_true
   end
 end

data/spec/unit/notification_shared.rb

@@ -1,5 +1,7 @@
 shared_examples_for "an Notification subclass" do
   describe "when assigning data for the device" do
+    before { Rapns::Deprecation.stub(:warn) }
+
     it "calls MultiJson.dump when multi_json responds to :dump" do
       notification = notification_class.new
       MultiJson.stub(:respond_to?).with(:dump).and_return(true)
@@ -30,9 +32,11 @@ shared_examples_for "an Notification subclass" do
       notification.send(data_getter).should == {"hi" => "mom"}
     end
 
-    it 'warns if attributes_for_device is assigned via mass-assignment' do
-      Rapns::Deprecation.should_receive(:warn)
-      notification_class.new(:attributes_for_device => {:hi => 'mom'})
+    if Rails::VERSION::STRING < '4'
+      it 'warns if attributes_for_device is assigned via mass-assignment' do
+        Rapns::Deprecation.should_receive(:warn).with(':attributes_for_device via mass-assignment is deprecated. Use :data or the attributes_for_device= instance method.')
+        notification_class.new(:attributes_for_device => {:hi => 'mom'})
+      end
     end
   end
 end

data/spec/unit/upgraded_spec.rb

@@ -1,39 +1,33 @@
 require 'unit_spec_helper'
 
 describe Rapns::Upgraded do
-  let(:logger) { stub(:logger, :warn => nil) }
-  let(:config) { stub(:config) }
+  let(:logger) { double(:logger, :warn => nil) }
+  let(:config) { double(:config) }
 
   before do
     Rails.stub(:root).and_return('/rails_root')
     Rapns.stub(:logger => logger, :config => config)
   end
 
-  it 'prints a warning if there are no apps' do
-    Rapns::App.stub(:count => 0)
-    Rapns.logger.should_receive(:warn).any_number_of_times
-    Rapns::Upgraded.check(:exit => false)
-  end
-
   it 'prints a warning and exists if rapns has not been upgraded' do
-    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
-    Rapns::Upgraded.should_receive(:puts).any_number_of_times
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid, "test")
+    Rapns::Upgraded.stub(:puts)
     Rapns::Upgraded.should_receive(:exit).with(1)
     Rapns::Upgraded.check(:exit => true)
   end
 
   it 'does not exit if Rapns has not been upgraded and :exit is false' do
     Rapns.config.stub(:embedded => true)
-    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
-    Rapns::Upgraded.should_receive(:puts).any_number_of_times
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid, "test")
+    Rapns::Upgraded.stub(:puts)
     Rapns::Upgraded.should_not_receive(:exit)
     Rapns::Upgraded.check(:exit => false)
   end
 
   it 'does not exit if Rapns has not been upgraded and is in push mode' do
     Rapns.config.stub(:push => true)
-    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
-    Rapns::Upgraded.should_receive(:puts).any_number_of_times
+    Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid, "test")
+    Rapns::Upgraded.stub(:puts)
     Rapns::Upgraded.should_not_receive(:exit)
     Rapns::Upgraded.check(:exit => false)
   end

data/spec/unit_spec_helper.rb

@@ -9,6 +9,7 @@ rescue LoadError
 end
 
 require 'active_record'
+# require 'timecop'
 
 jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
 
@@ -52,6 +53,11 @@ Bundler.require(:default)
 
 require 'database_cleaner'
 
+# Ensure SQLite3Adapter is loaded before DatabaseCleaner so that DC
+# can detect the correct superclass.
+# SQLite3 is used by the acceptance tests.
+require 'active_record/connection_adapters/sqlite3_adapter'
+
 DatabaseCleaner.strategy = :truncation
 
 require 'rapns'
@@ -76,7 +82,9 @@ RSpec.configure do |config|
   config.after(:each) do
     Rapns.logger = nil
     Rapns::Daemon.store = nil
-    Rapns.config.set_defaults if Rapns.config.kind_of?(Rapns::Configuration)
+    Rapns::Deprecation.muted do
+      Rapns.config.set_defaults if Rapns.config.kind_of?(Rapns::Configuration)
+    end
   end
 end
 

metadata

@@ -1,61 +1,51 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rapns
-version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: 
-  segments: 
-  - 3
-  - 3
-  - 2
-  version: 3.3.2
+version: !ruby/object:Gem::Version
+  version: 3.4.0
 platform: ruby
-authors: 
+authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-06-30 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: net-http-persistent
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: net-http-persistent
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Professional grade APNs and GCM for Ruby
-email: 
+email:
 - port001@gmail.com
-executables: 
+executables:
 - rapns
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - CHANGELOG.md
 - LICENSE
 - README.md
@@ -68,6 +58,7 @@ files:
 - lib/generators/templates/create_rapns_notifications.rb
 - lib/generators/templates/rapns.rb
 - lib/rapns.rb
+- lib/rapns/TODO
 - lib/rapns/apns/app.rb
 - lib/rapns/apns/binary_notification_validator.rb
 - lib/rapns/apns/device_token_format_validator.rb
@@ -78,18 +69,18 @@ files:
 - lib/rapns/configuration.rb
 - lib/rapns/daemon.rb
 - lib/rapns/daemon/apns/app_runner.rb
+- lib/rapns/daemon/apns/certificate_expired_error.rb
 - lib/rapns/daemon/apns/connection.rb
 - lib/rapns/daemon/apns/delivery.rb
 - lib/rapns/daemon/apns/delivery_handler.rb
 - lib/rapns/daemon/apns/disconnection_error.rb
 - lib/rapns/daemon/apns/feedback_receiver.rb
 - lib/rapns/daemon/app_runner.rb
+- lib/rapns/daemon/batch.rb
 - lib/rapns/daemon/delivery.rb
 - lib/rapns/daemon/delivery_error.rb
 - lib/rapns/daemon/delivery_handler.rb
-- lib/rapns/daemon/delivery_queue.rb
-- lib/rapns/daemon/delivery_queue_18.rb
-- lib/rapns/daemon/delivery_queue_19.rb
+- lib/rapns/daemon/delivery_handler_collection.rb
 - lib/rapns/daemon/feeder.rb
 - lib/rapns/daemon/gcm/app_runner.rb
 - lib/rapns/daemon/gcm/delivery.rb
@@ -119,8 +110,6 @@ files:
 - lib/tasks/cane.rake
 - lib/tasks/test.rake
 - config/database.yml
-- spec/acceptance/gcm_upgrade_spec.rb
-- spec/acceptance_spec_helper.rb
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/simplecov_helper.rb
@@ -132,6 +121,7 @@ files:
 - spec/unit/app_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/apns/app_runner_spec.rb
+- spec/unit/daemon/apns/certificate_expired_error_spec.rb
 - spec/unit/daemon/apns/connection_spec.rb
 - spec/unit/daemon/apns/delivery_handler_spec.rb
 - spec/unit/daemon/apns/delivery_spec.rb
@@ -139,9 +129,10 @@ files:
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/app_runner_shared.rb
 - spec/unit/daemon/app_runner_spec.rb
+- spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
+- spec/unit/daemon/delivery_handler_collection_spec.rb
 - spec/unit/daemon/delivery_handler_shared.rb
-- spec/unit/daemon/delivery_queue_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/app_runner_spec.rb
 - spec/unit/daemon/gcm/delivery_handler_spec.rb
@@ -167,41 +158,29 @@ files:
 - bin/rapns
 homepage: https://github.com/ileitch/rapns
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Professional grade APNs and GCM for Ruby
-test_files: 
+test_files:
 - config/database.yml
-- spec/acceptance/gcm_upgrade_spec.rb
-- spec/acceptance_spec_helper.rb
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/simplecov_helper.rb
@@ -213,6 +192,7 @@ test_files:
 - spec/unit/app_spec.rb
 - spec/unit/configuration_spec.rb
 - spec/unit/daemon/apns/app_runner_spec.rb
+- spec/unit/daemon/apns/certificate_expired_error_spec.rb
 - spec/unit/daemon/apns/connection_spec.rb
 - spec/unit/daemon/apns/delivery_handler_spec.rb
 - spec/unit/daemon/apns/delivery_spec.rb
@@ -220,9 +200,10 @@ test_files:
 - spec/unit/daemon/apns/feedback_receiver_spec.rb
 - spec/unit/daemon/app_runner_shared.rb
 - spec/unit/daemon/app_runner_spec.rb
+- spec/unit/daemon/batch_spec.rb
 - spec/unit/daemon/delivery_error_spec.rb
+- spec/unit/daemon/delivery_handler_collection_spec.rb
 - spec/unit/daemon/delivery_handler_shared.rb
-- spec/unit/daemon/delivery_queue_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/app_runner_spec.rb
 - spec/unit/daemon/gcm/delivery_handler_spec.rb

data/lib/rapns/daemon/delivery_queue.rb

@@ -1,42 +0,0 @@
-module Rapns
-  module Daemon
-    if RUBY_VERSION < '1.9'
-      require 'rapns/daemon/delivery_queue_18'
-      ancestor_class = DeliveryQueue18
-    else
-      require 'rapns/daemon/delivery_queue_19'
-      ancestor_class = DeliveryQueue19
-    end
-
-    class DeliveryQueue < ancestor_class
-      class WakeupError < StandardError; end
-
-      def initialize
-        @num_notifications = 0
-        @queue = []
-        @waiting = []
-
-        super
-      end
-
-      def wakeup(thread)
-        synchronize do
-          t = @waiting.delete(thread)
-          t.raise WakeupError if t
-        end
-      end
-
-      def size
-        synchronize { @queue.size }
-      end
-
-      def notification_processed
-        synchronize { @num_notifications -= 1 }
-      end
-
-      def notifications_processed?
-        synchronize { @num_notifications <= 0 }
-      end
-    end
-  end
-end