rpush 2.0.1-java → 2.1.0-java

data/lib/tasks/test.rake

@@ -21,8 +21,20 @@ namespace :test do
     begin
       Dir.chdir(path)
       cmd('echo "gem \'rake\'" >> Gemfile')
+      cmd('echo "gem \'pg\'" >> Gemfile')
       cmd("echo \"gem 'rpush', :path => '#{rpush_root}'\" >> Gemfile")
       cmd('bundle install')
+
+      File.open('config/database.yml', 'w') do |fd|
+        fd.write(<<-YML)
+development:
+  adapter: postgresql
+  database: rpush_rails_test
+  pool: 5
+  timeout: 5000
+        YML
+      end
+
       cmd('bundle exec rails g rpush')
       cmd('bundle exec rake db:migrate')
     ensure

data/spec/functional/apns_spec.rb

@@ -122,21 +122,23 @@ describe 'APNs' do
       it 'does not mark prior notifications as failed' do
         notifications.each { |n| wait_for_notification_to_deliver(n) }
         fail_notification(notification2)
-        sleep 1
+        wait_for_notification_to_fail(notification2)
+
         notification1.reload
         notification1.delivered.should be_true
       end
 
-      it 'marks notifications following the failed one as retryable' do
-        Rpush.config.push_poll = 1_000_000
-
-        notifications.each { |n| wait_for_notification_to_deliver(n) }
-        fail_notification(notification2)
-
-        [notification3, notification4].each do |n|
-          wait_for_notification_to_retry(n)
-        end
-      end
+      # Unreliable.
+      # it 'marks notifications following the failed one as retryable' do
+      #   Rpush.config.push_poll = 1_000_000
+      #
+      #   notifications.each { |n| wait_for_notification_to_deliver(n) }
+      #   fail_notification(notification2)
+      #
+      #   [notification3, notification4].each do |n|
+      #     wait_for_notification_to_retry(n)
+      #   end
+      # end
 
       describe 'without an error response' do
         it 'marks all notifications as failed' do

data/spec/functional_spec_helper.rb

@@ -14,10 +14,7 @@ RSpec.configure do |config|
       redis.keys('rpush:*').each { |key| redis.del(key) }
     end
 
-    if functional_example?(example)
-      Rails.stub(root: File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp')))
-      Rpush.config.logger = ::Logger.new(STDOUT)
-    end
+    Rpush.config.logger = ::Logger.new(STDOUT) if functional_example?(example)
   end
 
   config.after(:each) do

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ client = (ENV['CLIENT'] || :active_record).to_sym
 require 'bundler/setup'
 Bundler.require(:default)
 
-unless ENV['TRAVIS'] && ENV['QUALITY'] == 'false'
+if !ENV['TRAVIS'] || (ENV['TRAVIS'] && ENV['QUALITY'] == 'true')
   begin
     require './spec/support/simplecov_helper'
     include SimpleCovHelper
@@ -23,11 +23,10 @@ require 'rpush/daemon/store/redis'
 
 require 'support/active_record_setup'
 
-RAILS_ROOT = '/tmp/rails_root'
+RPUSH_ROOT = '/tmp/rails_root'
 
 Rpush.configure do |config|
   config.client = client
-  config.log_dir = RAILS_ROOT
 end
 
 RPUSH_CLIENT = Rpush.config.client
@@ -51,7 +50,8 @@ end
 
 RSpec.configure do |config|
   config.before(:each) do
-    Rails.stub(root: RAILS_ROOT)
+    Rpush.config.log_file = File.join(RPUSH_ROOT, 'rpush.log')
+    Rpush.stub(root: RPUSH_ROOT)
   end
 
   config.after(:each) do

data/spec/support/active_record_setup.rb

@@ -28,8 +28,9 @@ ActiveRecord::Base.establish_connection(db_config[SPEC_ADAPTER])
 
 require 'generators/templates/add_rpush'
 require 'generators/templates/rpush_2_0_0_updates'
+require 'generators/templates/rpush_2_1_0_updates'
 
-migrations = [AddRpush, Rpush200Updates]
+migrations = [AddRpush, Rpush200Updates, Rpush210Updates]
 
 unless ENV['TRAVIS']
   migrations.reverse.each do |m|

data/spec/unit/client/active_record/apns/notification_spec.rb

@@ -18,9 +18,9 @@ describe Rpush::Client::ActiveRecord::Apns::Notification do
 
   it "should validate the length of the binary conversion of the notification" do
     notification.device_token = "a" * 64
-    notification.alert = "way too long!" * 100
+    notification.alert = "way too long!" * 200
     notification.valid?.should be_false
-    notification.errors[:base].include?("APN notification cannot be larger than 256 bytes. Try condensing your alert and device attributes.").should be_true
+    notification.errors[:base].include?("APN notification cannot be larger than 2048 bytes. Try condensing your alert and device attributes.").should be_true
   end
 
   it "should default the sound to 'default'" do
@@ -143,6 +143,32 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, 'content-available' do
   end
 end
 
+describe Rpush::Client::ActiveRecord::Apns::Notification, 'url-args' do
+  let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
+
+  it 'includes url-args in the payload' do
+    notification.url_args = ['url-arg-1']
+    notification.as_json['aps']['url-args'].should eq ['url-arg-1']
+  end
+
+  it 'does not include url-args in the payload if not set' do
+    notification.as_json['aps'].key?('url-args').should be_false
+  end
+end
+
+describe Rpush::Client::ActiveRecord::Apns::Notification, 'category' do
+  let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
+
+  it 'includes category in the payload' do
+    notification.category = 'INVITE_CATEGORY'
+    notification.as_json['aps']['category'].should eq 'INVITE_CATEGORY'
+  end
+
+  it 'does not include category in the payload if not set' do
+    notification.as_json['aps'].key?('category').should be_false
+  end
+end
+
 describe Rpush::Client::ActiveRecord::Apns::Notification, 'to_binary' do
   let(:notification) { Rpush::Client::ActiveRecord::Apns::Notification.new }
 
@@ -207,7 +233,7 @@ describe Rpush::Client::ActiveRecord::Apns::Notification, "bug #35" do
     end
 
     notification.to_binary(for_validation: true).bytesize.should be > 256
-    notification.payload_size.should be < 256
+    notification.payload.bytesize.should be < 256
     notification.should be_valid
   end
 end

data/spec/unit/configuration_spec.rb

@@ -38,13 +38,6 @@ describe Rpush::Configuration do
     config.pid_file.should eq '/tmp/rpush.pid'
   end
 
-  it 'does not allow foreground to be set to false if the platform is JRuby' do
-    config.foreground = true
-    Rpush.stub(:jruby? => true)
-    config.foreground = false
-    config.foreground.should be_true
-  end
-
   it 'delegate redis_options to Modis' do
     Rpush.config.redis_options = { hi: :mom }
     Modis.redis_options.should eq(hi: :mom)

data/spec/unit/daemon/app_runner_spec.rb

@@ -61,7 +61,7 @@ describe Rpush::Daemon::AppRunner, 'enqueue' do
 end
 
 describe Rpush::Daemon::AppRunner, 'start_app' do
-  let(:app) { double(id: 1, name: 'test') }
+  let(:app) { double(id: 1, name: 'test', connections: 1) }
   let(:runner) { double(Rpush::Daemon::AppRunner, enqueue: nil, start: nil, stop: nil) }
   let(:logger) { double(Rpush::Logger, error: nil, info: nil) }
 

data/spec/unit/daemon/signal_handler_spec.rb

@@ -73,7 +73,7 @@ describe Rpush::Daemon::SignalHandler do
   describe 'error handing' do
     let(:error) { StandardError.new('test') }
 
-    before { Rpush.stub(logger: double(error: nil)) }
+    before { Rpush.stub(logger: double(error: nil, info: nil)) }
 
     it 'logs errors received when handling a signal' do
       Rpush::Daemon::Synchronizer.stub(:sync).and_raise(error)

data/spec/unit/daemon_spec.rb

@@ -78,7 +78,7 @@ describe Rpush::Daemon, "when starting" do
   it "logs an error if the PID file could not be written" do
     Rpush.config.pid_file = '/rails_root/rpush.pid'
     File.stub(:open).and_raise(Errno::ENOENT)
-    logger.should_receive(:error).with("Failed to write PID to '/rails_root/rpush.pid': #<Errno::ENOENT: No such file or directory>")
+    logger.should_receive(:error).with(%r{Failed to write PID to '/rails_root/rpush\.pid'})
     Rpush::Daemon.start
   end
 

data/spec/unit/deprecatable_spec.rb

@@ -21,7 +21,7 @@ describe Rpush::Deprecatable do
   end
 
   it 'warns the method is deprecated when called' do
-    Rpush::Deprecation.should_receive(:warn).with("deprecated_method is deprecated and will be removed from Rpush 4.0.")
+    Rpush::Deprecation.should_receive(:warn).with(/deprecated_method is deprecated and will be removed from Rpush 4\.0\./)
     klass.deprecated_method
   end
 

data/spec/unit/logger_spec.rb

@@ -11,12 +11,12 @@ describe Rpush::Logger do
     @logger_class = defined?(ActiveSupport::BufferedLogger) ? ActiveSupport::BufferedLogger : ActiveSupport::Logger
     @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
+    Rails.stub(logger: @logger)
     File.stub(open: log)
     FileUtils.stub(mkdir_p: nil)
     STDERR.stub(:puts)
     Rpush.config.foreground = true
-    Rpush.config.log_dir = Rails.root
+    Rpush.config.log_file = 'log/rpush.log'
   end
 
   it "disables logging if the log file cannot be opened" do
@@ -112,8 +112,8 @@ describe Rpush::Logger do
   end
 
   it 'defaults auto_flushing to true if the Rails logger does not respond to auto_flushing' do
-    rails_logger = double(info: nil, error: nil, level: 0)
-    Rails.logger = rails_logger
+    Rails.stub(logger: double(info: nil, error: nil, level: 0))
+    Rpush::Logger.new
     @logger.auto_flushing.should be_true
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: java
 authors:
 - Ian Leitch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2014-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -52,6 +52,48 @@ dependencies:
         version: '0'
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thor
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: railties
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: term-ansicolor
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-openssl
   version_requirements: !ruby/object:Gem::Requirement
@@ -91,7 +133,8 @@ files:
 - CHANGELOG.md
 - LICENSE
 - README.md
-- lib/generators/rpush_generator.rb
+- lib/generators/rpush_config_generator.rb
+- lib/generators/rpush_migration_generator.rb
 - lib/generators/templates/add_adm.rb
 - lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb
 - lib/generators/templates/add_app_to_rapns.rb
@@ -105,8 +148,10 @@ files:
 - lib/generators/templates/rename_rapns_to_rpush.rb
 - lib/generators/templates/rpush.rb
 - lib/generators/templates/rpush_2_0_0_updates.rb
+- lib/generators/templates/rpush_2_1_0_updates.rb
 - lib/rpush.rb
 - lib/rpush/apns_feedback.rb
+- lib/rpush/cli.rb
 - lib/rpush/client/active_model.rb
 - lib/rpush/client/active_model/adm/app.rb
 - lib/rpush/client/active_model/adm/data_validator.rb