rpush 2.2.0 → 2.3.0.rc1

data/spec/unit/daemon/wpns/delivery_spec.rb

@@ -2,7 +2,7 @@ require 'unit_spec_helper'
 
 describe Rpush::Daemon::Wpns::Delivery do
   let(:app) { Rpush::Wpns::App.create!(name: "MyApp") }
-  let(:notification) { Rpush::Wpns::Notification.create!(app: app, alert: "test", uri: "http://some.example/", deliver_after: Time.now) }
+  let(:notification) { Rpush::Wpns::Notification.create!(app: app, data: { title: "MyApp", body: "Example notification", param: "/param1" }, uri: "http://some.example/", deliver_after: Time.now) }
   let(:logger) { double(error: nil, info: nil, warn: nil) }
   let(:response) { double(code: 200, header: {}) }
   let(:http) { double(shutdown: nil, request: response) }

data/spec/unit/daemon_spec.rb

@@ -6,7 +6,7 @@ describe Rpush::Daemon, "when starting" do
 
   let(:certificate) { double }
   let(:password) { double }
-  let(:logger) { double(:logger, info: nil, error: nil, warn: nil) }
+  let(:logger) { double(:logger, info: nil, error: nil, warn: nil, internal_logger: nil) }
 
   before do
     Rpush.stub(logger: logger)
@@ -22,7 +22,7 @@ describe Rpush::Daemon, "when starting" do
   unless Rpush.jruby?
     it "forks into a daemon if the foreground option is false" do
       Rpush.config.foreground = false
-      Rpush::Daemon.initialize_store
+      Rpush::Daemon.common_init
       Process.should_receive(:daemon)
       Rpush::Daemon.start
     end
@@ -63,6 +63,14 @@ describe Rpush::Daemon, "when starting" do
     Rpush::Daemon.store.should be_kind_of(Rpush::Daemon::Store::ActiveRecord)
   end
 
+  it 'initializes plugins' do
+    plugin = Rpush.plugin(:test)
+    did_init = false
+    plugin.init { did_init = true }
+    Rpush::Daemon.common_init
+    expect(did_init).to be_true
+  end
+
   it 'logs an error if the store cannot be loaded' do
     Rpush.config.client = :foo_bar
     Rpush.logger.should_receive(:error).with(kind_of(LoadError))

data/spec/unit/logger_spec.rb

@@ -21,7 +21,6 @@ describe Rpush::Logger do
 
   it "disables logging if the log file cannot be opened" do
     File.stub(:open).and_raise(Errno::ENOENT)
-    STDERR.should_receive(:puts).with(/No such file or directory/)
     STDERR.should_receive(:puts).with(/Logging disabled/)
     Rpush::Logger.new
   end

data/spec/unit/plugin_spec.rb

@@ -0,0 +1,36 @@
+require 'unit_spec_helper'
+
+describe Rpush::Plugin do
+  include Rpush::Reflectable
+
+  it 'can only be initialized once' do
+    plugin = double(Rpush::Plugin, unload: nil)
+    expect(Rpush::Plugin).to receive(:new).once.and_return(plugin)
+    Rpush.plugin(:test)
+    Rpush.plugin(:test)
+  end
+
+  it 'can be referenced' do
+    plugin = Rpush.plugin(:test)
+    expect(Rpush.plugins[:test]).to eq(plugin)
+  end
+
+  it 'can be configured' do
+    plugin = Rpush.plugin(:test)
+    plugin.configure do |config|
+      config.is_configured = true
+    end
+    expect(Rpush.config.plugin.test.is_configured).to be_true
+  end
+
+  it 'can hook up reflections' do
+    plugin = Rpush.plugin(:test)
+    reflected_error = nil
+    plugin.reflect do |on|
+      on.error { |error| reflected_error = error }
+    end
+    error = double
+    reflect(:error, error)
+    expect(reflected_error).to eq(error)
+  end
+end

data/spec/unit/push_spec.rb

@@ -12,8 +12,8 @@ describe Rpush, 'push' do
     Rpush.config.push.should be_true
   end
 
-  it 'initializes the store' do
-    Rpush::Daemon.should_receive(:initialize_store)
+  it 'initializes the daemon' do
+    Rpush::Daemon.should_receive(:common_init)
     Rpush.push
   end
 

data/spec/unit/{daemon/reflectable_spec.rb → reflectable_spec.rb}

@@ -1,26 +1,26 @@
 require 'unit_spec_helper'
 
-describe Rpush::Daemon::Reflectable do
+describe Rpush::Reflectable do
   class TestReflectable
-    include Rpush::Daemon::Reflectable
+    include Rpush::Reflectable
   end
 
   let(:logger) { double(error: nil) }
   let(:test_reflectable) { TestReflectable.new }
 
   before do
-    Rpush.reflections.stub(:__dispatch)
+    Rpush.reflection_stack[0].stub(:__dispatch)
     Rpush.stub(logger: logger)
   end
 
   it 'dispatches the given reflection' do
-    Rpush.reflections.should_receive(:__dispatch).with(:error)
+    Rpush.reflection_stack[0].should_receive(:__dispatch).with(:error)
     test_reflectable.reflect(:error)
   end
 
-  it 'logs errors raise by the reflection' do
+  it 'logs errors raised by the reflection' do
     error = StandardError.new
-    Rpush.reflections.stub(:__dispatch).and_raise(error)
+    Rpush.reflection_stack[0].stub(:__dispatch).and_raise(error)
     Rpush.logger.should_receive(:error).with(error)
     test_reflectable.reflect(:error)
   end

data/spec/unit/{reflection_spec.rb → reflection_collection_spec.rb}

@@ -6,25 +6,21 @@
      Rpush.reflect { did_yield = true }
      did_yield.should be_true
    end
-
-   it 'returns all reflections' do
-     Rpush.reflections.should be_kind_of(Rpush::Reflections)
-   end
  end
 
- describe Rpush::Reflections do
+ describe Rpush::ReflectionCollection do
    it 'dispatches the given reflection' do
      did_yield = false
      Rpush.reflect do |on|
        on.error { did_yield = true }
      end
-     Rpush.reflections.__dispatch(:error)
+     Rpush.reflection_stack[0].__dispatch(:error)
      did_yield.should be_true
    end
 
    it 'raises an error when trying to dispatch and unknown reflection' do
      expect do
-       Rpush.reflections.__dispatch(:unknown)
-     end.to raise_error(Rpush::Reflections::NoSuchReflectionError)
+       Rpush.reflection_stack[0].__dispatch(:unknown)
+     end.to raise_error(Rpush::ReflectionCollection::NoSuchReflectionError)
    end
  end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpush
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0.rc1
 platform: ruby
 authors:
 - Ian Leitch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-08 00:00:00.000000000 Z
+date: 2015-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: term-ansicolor
+  name: ansi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -189,7 +189,6 @@ files:
 - lib/rpush/daemon/loggable.rb
 - lib/rpush/daemon/proc_title.rb
 - lib/rpush/daemon/queue_payload.rb
-- lib/rpush/daemon/reflectable.rb
 - lib/rpush/daemon/retry_header_parser.rb
 - lib/rpush/daemon/retryable_error.rb
 - lib/rpush/daemon/ring_buffer.rb
@@ -209,8 +208,11 @@ files:
 - lib/rpush/embed.rb
 - lib/rpush/logger.rb
 - lib/rpush/multi_json_helper.rb
+- lib/rpush/plugin.rb
 - lib/rpush/push.rb
-- lib/rpush/reflection.rb
+- lib/rpush/reflectable.rb
+- lib/rpush/reflection_collection.rb
+- lib/rpush/reflection_public_methods.rb
 - lib/rpush/version.rb
 - lib/tasks/quality.rake
 - lib/tasks/test.rake
@@ -224,14 +226,11 @@ files:
 - spec/functional/synchronization_spec.rb
 - spec/functional/wpns_spec.rb
 - spec/functional_spec_helper.rb
-- spec/integration/rpush_spec.rb
-- spec/integration/support/gcm_success_response.json
 - spec/spec_helper.rb
 - spec/support/active_record_setup.rb
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/config/database.yml
-- spec/support/install.sh
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
@@ -261,7 +260,6 @@ files:
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
-- spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
 - spec/unit/daemon/signal_handler_spec.rb
@@ -275,8 +273,10 @@ files:
 - spec/unit/embed_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/notification_shared.rb
+- spec/unit/plugin_spec.rb
 - spec/unit/push_spec.rb
-- spec/unit/reflection_spec.rb
+- spec/unit/reflectable_spec.rb
+- spec/unit/reflection_collection_spec.rb
 - spec/unit/rpush_spec.rb
 - spec/unit_spec_helper.rb
 homepage: https://github.com/rpush/rpush
@@ -294,12 +294,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The push notification service for Ruby.
@@ -314,14 +314,11 @@ test_files:
 - spec/functional/synchronization_spec.rb
 - spec/functional/wpns_spec.rb
 - spec/functional_spec_helper.rb
-- spec/integration/rpush_spec.rb
-- spec/integration/support/gcm_success_response.json
 - spec/spec_helper.rb
 - spec/support/active_record_setup.rb
 - spec/support/cert_with_password.pem
 - spec/support/cert_without_password.pem
 - spec/support/config/database.yml
-- spec/support/install.sh
 - spec/support/simplecov_helper.rb
 - spec/support/simplecov_quality_formatter.rb
 - spec/tmp/.gitkeep
@@ -351,7 +348,6 @@ test_files:
 - spec/unit/daemon/dispatcher_loop_spec.rb
 - spec/unit/daemon/feeder_spec.rb
 - spec/unit/daemon/gcm/delivery_spec.rb
-- spec/unit/daemon/reflectable_spec.rb
 - spec/unit/daemon/retryable_error_spec.rb
 - spec/unit/daemon/service_config_methods_spec.rb
 - spec/unit/daemon/signal_handler_spec.rb
@@ -365,7 +361,9 @@ test_files:
 - spec/unit/embed_spec.rb
 - spec/unit/logger_spec.rb
 - spec/unit/notification_shared.rb
+- spec/unit/plugin_spec.rb
 - spec/unit/push_spec.rb
-- spec/unit/reflection_spec.rb
+- spec/unit/reflectable_spec.rb
+- spec/unit/reflection_collection_spec.rb
 - spec/unit/rpush_spec.rb
 - spec/unit_spec_helper.rb

data/lib/rpush/daemon/reflectable.rb

@@ -1,11 +0,0 @@
-module Rpush
-  module Daemon
-    module Reflectable
-      def reflect(name, *args)
-        Rpush.reflections.__dispatch(name, *args)
-      rescue StandardError => e
-        Rpush.logger.error(e)
-      end
-    end
-  end
-end

data/spec/integration/rpush_spec.rb

@@ -1,13 +0,0 @@
-# describe "Rpush" do
-
-#     before :all do
-#         `vagrant up`
-#         # TODO: Upload current directory.
-#         # TODO: Use Net::SSH
-#         `vagrant ssh 'cd rpush; git fetch origin; git reset --hard origin/master; sh tools/run_docker.sh'`
-#     end
-
-#     it 'can be installed and successfully delivers a notification' do
-#         # Can now SSH to the Docker instance with; ssh -i docker_key root@localhost -p 2100
-#     end
-# end

data/spec/integration/support/gcm_success_response.json

@@ -1 +0,0 @@
-{"results":[{"message_id": "123"}]}

data/spec/support/install.sh

@@ -1,68 +0,0 @@
-set -ev
-cp -R /mnt/rpush /rpush
-cd /tmp
-export HOME=/
-export RAILS_NAME=rpush_`date +"%Y%m%d%H%M%S"`
-mysqladmin create `echo $RAILS_NAME`_development
-gem install --no-ri --no-rdoc rails bundler
-rails new $RAILS_NAME -BJTS -d mysql
-cd $RAILS_NAME
-for gem in sdoc coffee-rails uglifier sass-rails jquery-rails jbuilder turbolinks
-do
-  sed -i.bak -e "s/^[ \t]*gem '$gem'/\# gem '$gem'/g" Gemfile
-done
-
-echo 'gem "rpush", path: "/rpush"' >> Gemfile
-bundle
-rails g rpush
-rake db:migrate
-
-cat > gcm_server.rb <<EOF
-require 'webrick'
-server = WEBrick::HTTPServer.new(:Port => 80)
-server.mount_proc '/' do |req, res|
-  res["Content-Type"] = 'application/json'
-  res.body = File.read('/rpush/spec/integration/support/gcm_success_response.json')
-end
-server.start
-EOF
-rails runner gcm_server.rb &
-
-cat > create_app.rb <<EOF
-app = Rpush::Gcm::App.new
-app.name = "android_app"
-app.auth_key = "123"
-app.save!
-
-n = Rpush::Gcm::Notification.new
-n.app = app
-n.registration_ids = ["abc"]
-n.data = {:message => "hi mom!"}
-n.save!
-puts n.id
-EOF
-
-export NOTIFICATION_ID=`rails runner create_app.rb`
-export RPUSH_GCM_HOST='http://localhost'
-rpush development
-
-cat > check_notification_status.rb <<EOF
-n = Rpush::Gcm::Notification.find(ENV["NOTIFICATION_ID"])
-
-while true do
-  if n.failed
-    puts "FAILED"
-    break
-  elsif n.delivered
-    puts "DELIVERED"
-    break
-  else
-    STDOUT.write(".")
-    STDOUT.flush
-  end
-
-  sleep 0.2
-  n.reload
-end
-EOF
-rails runner check_notification_status.rb