rapns 2.0.1 → 2.0.3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.3 (July 26, 2012) ##
+  * JRuby support.
+  * Explicitly list all attributes instead of calling column_names (#53).
+
+## 2.0.2 (July 25, 2012) ##
+  * Support MultiJson < 1.3.0.
+  * Make all model attributes accessible.
+
 ## 2.0.1 (July 7, 2012) ##
   * Fix delivery when using Ruby 1.8.
   * MultiJson support.

data/README.md

@@ -24,7 +24,7 @@
 Add rapns to your Gemfile:
 
     gem 'rapns'
-  
+
 Generate the migration, rapns.yml and migrate:
 
     rails g rapns
@@ -62,7 +62,7 @@ Generate the migration, rapns.yml and migrate:
 
     cd /path/to/rails/app
     bundle exec rapns <Rails environment> [options]
-    
+
 ### Options
 
 * `-f` `--foreground` Prevent rapns from forking into a daemon.
@@ -125,7 +125,7 @@ Although rapns makes such errors highly unlikely due to validation, the APNs rep
 `error` is set to Apple's code for the error.
 `error_description` is set to a (somewhat brief) description of the error.
 
-rapns will not attempt to deliver the notification again. 
+rapns will not attempt to deliver the notification again.
 
 ### Via the Feedback Service.
 
@@ -141,6 +141,7 @@ After updating you should run `rails g rapns` to check for any new migrations.
 
 ## Wiki
 
+* [Deploying to Heroku](https://github.com/ileitch/rapns/wiki/Heroku)
 * [Why open multiple connections to the APNs?](https://github.com/ileitch/rapns/wiki/Why-open-multiple-connections-to-the-APNs%3F)
 
 ## Contributing to rapns
@@ -162,4 +163,5 @@ Thank you to the following wonderful people for contributing to rapns:
 * [@taybenlor](https://github.com/taybenlor)
 * [@tompesman](https://github.com/tompesman)
 * [@EpicDraws](https://github.com/EpicDraws)
-* [@dei79](https://github.com/dei79)
+* [@dei79](https://github.com/dei79)
+* [@adorr](https://github.com/adorr)

data/bin/rapns

@@ -43,4 +43,4 @@ if config.pid_file && !Pathname.new(config.pid_file).absolute?
   config.pid_file = File.join(Rails.root, config.pid_file)
 end
 
-Rapns::Daemon.start(environment, config)
+Rapns::Daemon.start(config)

data/lib/rapns/app.rb

@@ -2,6 +2,8 @@ module Rapns
   class App < ActiveRecord::Base
     self.table_name = 'rapns_apps'
 
+    attr_accessible :key, :environment, :certificate, :password, :connections
+
     validates :key, :presence => true, :uniqueness => true
     validates :environment, :presence => true, :inclusion => { :in => %w(development production) }
     validates :certificate, :presence => true

data/lib/rapns/daemon/database_reconnectable.rb

@@ -1,11 +1,14 @@
 class PGError < StandardError; end if !defined?(PGError)
 class Mysql; class Error < StandardError; end; end if !defined?(Mysql)
 module Mysql2; class Error < StandardError; end; end if !defined?(Mysql2)
+module ActiveRecord; end
+class ActiveRecord::JDBCError < StandardError; end if !defined?(ActiveRecord::JDBCError)
 
 module Rapns
   module Daemon
     module DatabaseReconnectable
-      ADAPTER_ERRORS = [ActiveRecord::StatementInvalid, PGError, Mysql::Error, Mysql2::Error]
+      ADAPTER_ERRORS = [ActiveRecord::StatementInvalid, PGError, Mysql::Error,
+                        Mysql2::Error, ActiveRecord::JDBCError]
 
       def with_database_reconnect_and_retry
         begin

data/lib/rapns/daemon.rb

@@ -1,6 +1,7 @@
 require 'thread'
 require 'socket'
 require 'pathname'
+require 'openssl'
 
 require 'rapns/daemon/interruptible_sleep'
 require 'rapns/daemon/delivery_error'
@@ -23,7 +24,7 @@ module Rapns
       attr_accessor :logger, :config
     end
 
-    def self.start(environment, config)
+    def self.start(config)
       self.config = config
       self.logger = Logger.new(:foreground => config.foreground, :airbrake_notify => config.airbrake_notify)
       setup_signal_hooks

data/lib/rapns/feedback.rb

@@ -2,6 +2,8 @@ module Rapns
   class Feedback < ActiveRecord::Base
     self.table_name = 'rapns_feedback'
 
+    attr_accessible :device_token, :failed_at, :app
+
     validates :device_token, :presence => true
     validates :failed_at, :presence => true
 

data/lib/rapns/notification.rb

@@ -2,6 +2,9 @@ module Rapns
   class Notification < ActiveRecord::Base
     self.table_name = 'rapns_notifications'
 
+    attr_accessible :badge, :device_token, :sound, :alert, :attributes_for_device, :expiry,:delivered,
+      :delivered_at, :failed, :failed_at, :error_code, :error_description, :deliver_after, :alert_is_json, :app
+
     validates :app, :presence => true
     validates :device_token, :presence => true
     validates :badge, :numericality => true, :allow_nil => true
@@ -18,7 +21,7 @@ module Rapns
 
     def alert=(alert)
       if alert.is_a?(Hash)
-        write_attribute(:alert, MultiJson.dump(alert))
+        write_attribute(:alert, multi_json_dump(alert))
         self.alert_is_json = true if has_attribute?(:alert_is_json)
       else
         write_attribute(:alert, alert)
@@ -31,22 +34,22 @@ module Rapns
 
       if has_attribute?(:alert_is_json)
         if alert_is_json?
-          MultiJson.load(string_or_json)
+          multi_json_load(string_or_json)
         else
           string_or_json
         end
       else
-        MultiJson.load(string_or_json) rescue string_or_json
+        multi_json_load(string_or_json) rescue string_or_json
       end
     end
 
     def attributes_for_device=(attrs)
       raise ArgumentError, "attributes_for_device must be a Hash" if !attrs.is_a?(Hash)
-      write_attribute(:attributes_for_device, MultiJson.dump(attrs))
+      write_attribute(:attributes_for_device, multi_json_dump(attrs))
     end
 
     def attributes_for_device
-      MultiJson.load(read_attribute(:attributes_for_device)) if read_attribute(:attributes_for_device)
+      multi_json_load(read_attribute(:attributes_for_device)) if read_attribute(:attributes_for_device)
     end
 
     MDM_OVERIDE_KEY = '__rapns_mdm__'
@@ -71,7 +74,7 @@ module Rapns
     end
 
     def payload
-      MultiJson.dump(as_json)
+      multi_json_dump(as_json)
     end
 
     def payload_size
@@ -84,5 +87,21 @@ module Rapns
       id_for_pack = options[:for_validation] ? 0 : id
       [1, id_for_pack, expiry, 0, 32, device_token, payload_size, payload].pack("cNNccH*na*")
     end
+
+
+    private
+
+    def multi_json_load(string, options = {})
+      # Calling load on multi_json less than v1.3.0 attempts to load a file from disk. Check the version explicitly.
+      if Gem.loaded_specs['multi_json'].version >= Gem::Version.create('1.3.0')
+        MultiJson.load(string, options)
+      else
+        MultiJson.decode(string, options)
+      end
+    end
+
+    def multi_json_dump(string, options = {})
+      MultiJson.respond_to?(:dump) ? MultiJson.dump(string, options) : MultiJson.encode(string, options)
+    end
   end
 end

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '2.0.1'
+  VERSION = '2.0.3'
 end

data/spec/rapns/daemon/database_reconnectable_spec.rb

@@ -29,6 +29,8 @@ describe Rapns::Daemon::DatabaseReconnectable do
       Mysql::Error
     when 'mysql2'
       Mysql2::Error
+    when 'jdbcpostgresql'
+      ActiveRecord::JDBCError
     else
       raise "Please update #{__FILE__} for adapter #{$adapter}"
     end

data/spec/rapns/daemon_spec.rb

@@ -21,45 +21,45 @@ describe Rapns::Daemon, "when starting" do
     config.stub(:foreground => false)
     ActiveRecord::Base.stub(:establish_connection)
     Rapns::Daemon.should_receive(:daemonize)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "does not fork into a daemon if the foreground option is true" do
     config.stub(:foreground => true)
     Rapns::Daemon.should_not_receive(:daemonize)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "writes the process ID to the PID file" do
     Rapns::Daemon.should_receive(:write_pid_file)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "logs an error if the PID file could not be written" do
     config.stub(:pid_file => '/rails_root/rapns.pid')
     File.stub(:open).and_raise(Errno::ENOENT)
     logger.should_receive(:error).with("Failed to write PID to '/rails_root/rapns.pid': #<Errno::ENOENT: No such file or directory>")
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "starts the feeder" do
     Rapns::Daemon::Feeder.should_receive(:start).with(2)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "syncs apps" do
     Rapns::Daemon::AppRunner.should_receive(:sync)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "sets up the logger" do
     config.stub(:airbrake_notify => true)
     Rapns::Daemon::Logger.should_receive(:new).with(:foreground => true, :airbrake_notify => true)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it "makes the logger accessible" do
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
     Rapns::Daemon.logger.should == logger
   end
 
@@ -67,20 +67,20 @@ describe Rapns::Daemon, "when starting" do
     Rapns::App.stub(:count => 0)
     Rapns::Daemon.should_receive(:puts).any_number_of_times
     Rapns::Daemon.should_receive(:exit).with(1)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it 'prints a warning exists if rapns has not been upgraded' do
     Rapns::App.stub(:count).and_raise(ActiveRecord::StatementInvalid)
     Rapns::Daemon.should_receive(:puts).any_number_of_times
     Rapns::Daemon.should_receive(:exit).with(1)
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 
   it 'warns if rapns.yml still exists' do
     File.should_receive(:exists?).with('/rails_root/config/rapns/rapns.yml').and_return(true)
     logger.should_receive(:warn).with("Since 2.0.0 rapns uses command-line options instead of a configuration file. Please remove config/rapns/rapns.yml.")
-    Rapns::Daemon.start("development", config)
+    Rapns::Daemon.start(config)
   end
 end
 

data/spec/rapns/notification_spec.rb

@@ -161,4 +161,38 @@ describe Rapns::Notification, "bug #35" do
     notification.payload_size.should < 256
     notification.should be_valid
   end
+end
+
+describe Rapns::Notification, "multi_json usage" do
+  describe Rapns::Notification, "alert" do
+    it "should call MultiJson.load when multi_json version is 1.3.0" do
+      notification = Rapns::Notification.new(:alert => { :a => 1 }, :alert_is_json => true)
+      Gem.stub(:loaded_specs).and_return( { 'multi_json' => Gem::Specification.new('multi_json', '1.3.0') } )
+      MultiJson.should_receive(:load).with(any_args())
+      notification.alert
+    end
+
+    it "should call MultiJson.decode when multi_json version is 1.2.9" do
+      notification = Rapns::Notification.new(:alert => { :a => 1 }, :alert_is_json => true)
+      Gem.stub(:loaded_specs).and_return( { 'multi_json' => Gem::Specification.new('multi_json', '1.2.9') } )
+      MultiJson.should_receive(:decode).with(any_args())
+      notification.alert
+    end
+  end
+
+  describe Rapns::Notification, "attributes_for_device=" do
+    it "should call MultiJson.dump when multi_json responds to :dump" do
+      notification = Rapns::Notification.new
+      MultiJson.stub(:respond_to?).with(:dump).and_return(true)
+      MultiJson.should_receive(:dump).with(any_args())
+      notification.attributes_for_device = { :pirates => 1 }
+    end
+
+    it "should call MultiJson.encode when multi_json does not respond to :dump" do
+      notification = Rapns::Notification.new
+      MultiJson.stub(:respond_to?).with(:dump).and_return(false)
+      MultiJson.should_receive(:encode).with(any_args())
+      notification.attributes_for_device = { :ninjas => 1 }
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -10,8 +10,28 @@ rescue LoadError
 end
 
 require 'active_record'
-adapters = ['mysql', 'mysql2', 'postgresql']
-$adapter = ENV['ADAPTER'] || 'postgresql'
+adapters = ['mysql', 'mysql2', 'postgresql', 'jdbcpostgresql']
+
+jruby = defined?(RUBY_ENGINE) && RUBY_ENGINE == 'jruby'
+
+$adapter = if ENV['ADAPTER']
+  ENV['ADAPTER']
+elsif jruby
+  'jdbcpostgresql'
+else
+  'postgresql'
+end
+
+if jruby
+  if ENV['TRAVIS']
+    username = 'postgres'
+  else
+    require 'etc'
+    username = Etc.getlogin
+  end
+else
+  username = nil
+end
 
 if !adapters.include?($adapter)
   puts "No such adapter '#{$adapter}'. Valid adapters are #{adapters.join(', ')}."
@@ -20,7 +40,7 @@ end
 
 puts "Using #{$adapter} adapter."
 
-ActiveRecord::Base.establish_connection('adapter' => $adapter, 'database' => 'rapns_test')
+ActiveRecord::Base.establish_connection('username' => username, 'adapter' => $adapter, 'database' => 'rapns_test')
 require 'generators/templates/create_rapns_notifications'
 require 'generators/templates/create_rapns_feedback'
 require 'generators/templates/add_alert_is_json_to_rapns_notifications'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -27,8 +27,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-description: Easy to use library for Apple's Push Notification Service with Rails
-  3
+description: Easy to use, full featured APNs daemon for Rails 3
 email:
 - port001@gmail.com
 executables:
@@ -109,7 +108,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: Easy to use library for Apple's Push Notification Service with Rails 3
+summary: Easy to use, full featured APNs daemon for Rails 3
 test_files:
 - spec/rapns/daemon/app_runner_spec.rb
 - spec/rapns/daemon/connection_spec.rb
@@ -126,3 +125,4 @@ test_files:
 - spec/rapns/feedback_spec.rb
 - spec/rapns/notification_spec.rb
 - spec/spec_helper.rb
+has_rdoc: