rapns 2.0.0rc1 → 2.0.0rc2

data/README.md

@@ -47,17 +47,17 @@ Generate the migration, rapns.yml and migrate:
     app = Rapns::App.new
     app.key = "my_app"
     app.certificate = File.read("/path/to/development.pem")
+    app.environment = "development"
     app.password = "certificate password"
     app.connections = 1
     app.save!
 
 * `key` is a symbolic name to tie this app to notifications.
 * `certificate` is the contents of your PEM certificate, NOT its path on disk.
+* `environment` the certificate type, either `development` or `production`.
 * `password` should be left blank if you did not password protect your certificate.
 * `connections` (default: 1) the number of connections to keep open to the APNs. Consider increasing this if you are sending a large number of notifications to this app.
 
-The APNs environment is automatically detected from the app certificate, you do not need to configure push and feedback hosts.
-
 ## Starting the rapns Daemon
 
     cd /path/to/rails/app

data/lib/generators/templates/create_rapns_apps.rb

@@ -2,6 +2,7 @@ class CreateRapnsApps < ActiveRecord::Migration
   def self.up
     create_table :rapns_apps do |t|
       t.string    :key,             :null => false
+      t.string    :environment,     :null => false
       t.text      :certificate,     :null => false
       t.string    :password,        :null => true
       t.integer   :connections,     :null => false, :default => 1

data/lib/rapns/app.rb

@@ -3,6 +3,7 @@ module Rapns
     self.table_name = 'rapns_apps'
 
     validates :key, :presence => true, :uniqueness => true
+    validates :environment, :presence => true, :inclusion => { :in => %w(development production) }
     validates :certificate, :presence => true
     validates_numericality_of :connections, :greater_than => 0, :only_integer => true
   end

data/lib/rapns/daemon/app_runner.rb

@@ -38,10 +38,8 @@ module Rapns
           if @all[app.key]
             @all[app.key].sync(app)
           else
-            environment = detect_environment(app)
-            next unless environment
-            push_host, push_port = HOSTS[environment][:push]
-            feedback_host, feedback_port = HOSTS[environment][:feedback]
+            push_host, push_port = HOSTS[app.environment.to_sym][:push]
+            feedback_host, feedback_port = HOSTS[app.environment.to_sym][:feedback]
             feedback_poll = Rapns::Daemon.config.feedback_poll
             runner = AppRunner.new(app, push_host, push_port, feedback_host, feedback_port, feedback_poll)
             runner.start
@@ -61,17 +59,6 @@ module Rapns
         @all.values.map(&:debug)
       end
 
-      def self.detect_environment(app)
-        if app.certificate =~ /Apple Development IOS Push Services/i
-          :development
-        elsif app.certificate =~ /Apple Production IOS Push Services/i
-          :production
-        else
-          Rapns::Daemon.logger.error("Could not detect environment for app '#{app.key}'.")
-          nil
-        end
-      end
-
       def initialize(app, push_host, push_port, feedback_host, feedback_port, feedback_poll)
         @app = app
         @push_host = push_host

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '2.0.0rc1'
+  VERSION = '2.0.0rc2'
 end

data/spec/rapns/daemon/app_runner_spec.rb

@@ -140,8 +140,8 @@ describe Rapns::Daemon::AppRunner, 'ready' do
 end
 
 describe Rapns::Daemon::AppRunner, 'sync' do
-  let(:app) { stub(:key => 'app') }
-  let(:new_app) { stub(:key => 'new_app') }
+  let(:app) { stub(:key => 'app', :environment => 'development') }
+  let(:new_app) { stub(:key => 'new_app', :environment => 'development') }
   let(:runner) { stub(:sync => nil, :stop => nil) }
   let(:new_runner) { stub }
   let(:logger) { stub(:error => nil) }
@@ -166,7 +166,7 @@ describe Rapns::Daemon::AppRunner, 'sync' do
   end
 
 it 'starts a runner for a new app with a production certificate' do
-    new_app.stub(:certificate => 'Apple Production IOS Push Services')
+    new_app.stub(:environment => 'production')
     Rapns::App.stub(:all => [new_app])
     new_runner = stub 
     Rapns::Daemon::AppRunner.should_receive(:new).with(new_app, 'gateway.push.apple.com', 2195,
@@ -176,7 +176,7 @@ it 'starts a runner for a new app with a production certificate' do
   end
 
   it 'starts a runner for a new app with a development certificate' do
-    new_app.stub(:certificate => 'Apple Development IOS Push Services')
+    new_app.stub(:environment => 'development')
     Rapns::App.stub(:all => [new_app])
     new_runner = stub 
     Rapns::Daemon::AppRunner.should_receive(:new).with(new_app, 'gateway.sandbox.push.apple.com', 2195,
@@ -185,20 +185,6 @@ it 'starts a runner for a new app with a production certificate' do
     Rapns::Daemon::AppRunner.sync
   end
 
-  it 'logs an error if the environment cannot be determined from the certificate' do
-    new_app.stub(:certificate => 'wat')
-    Rapns::App.stub(:all => [new_app])
-    Rapns::Daemon.logger.should_receive(:error).with("Could not detect environment for app 'new_app'.")
-    Rapns::Daemon::AppRunner.sync
-  end
-
-  it 'does not attempt to start an AppRunner if the environment could not be detected' do
-    new_app.stub(:certificate => 'wat')
-    Rapns::App.stub(:all => [new_app])
-    Rapns::Daemon::AppRunner.should_not_receive(:new) 
-    Rapns::Daemon::AppRunner.sync
-  end
-
   it 'deletes old apps' do
     Rapns::App.stub(:all => [])
     runner.should_receive(:stop)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 2.0.0rc1
+  version: 2.0.0rc2
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-18 00:00:00.000000000 Z
+date: 2012-06-19 00:00:00.000000000 Z
 dependencies: []
 description: Easy to use library for Apple's Push Notification Service with Rails
   3