rapns 1.0.3 → 1.0.4

data/lib/generators/rapns_generator.rb

@@ -7,18 +7,22 @@ class RapnsGenerator < Rails::Generators::Base
   end
 
   def copy_migration
-    migration_dir = File.expand_path("db/migrate")
-
-    if !self.class.migration_exists?(migration_dir, 'create_rapns_notifications')
-      migration_template "create_rapns_notifications.rb", "db/migrate/create_rapns_notifications.rb"
-    end
-
-    if !self.class.migration_exists?(migration_dir, 'create_rapns_feedback')
-      migration_template "create_rapns_feedback.rb", "db/migrate/create_rapns_feedback.rb"
-    end
+    add_rapns_migration('create_rapns_notifications')
+    add_rapns_migration('create_rapns_feedback')
+    add_rapns_migration('add_alert_is_json_to_rapns_notifications')
   end
 
   def copy_config
-    copy_file "rapns.yml", "config/rapns/rapns.yml"
+    copy_file 'rapns.yml', 'config/rapns/rapns.yml'
+  end
+
+  protected
+
+  def add_rapns_migration(template)
+    migration_dir = File.expand_path('db/migrate')
+
+    if !self.class.migration_exists?(migration_dir, template)
+      migration_template "#{template}.rb", "db/migrate/#{template}.rb"
+    end
   end
 end

data/lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb

@@ -0,0 +1,9 @@
+class AddAlertIsJsonToRapnsNotifications < ActiveRecord::Migration
+  def self.up
+    add_column :rapns_notifications, :alert_is_json, :boolean, :null => true, :default => false
+  end
+
+  def self.down
+    remove_column :rapns_notifications, :alert_is_json
+  end
+end

data/lib/rapns/binary_notification_validator.rb

@@ -2,7 +2,7 @@ module Rapns
   class BinaryNotificationValidator < ActiveModel::Validator
 
     def validate(record)
-      if record.to_binary(:for_validation => true).size > 256
+      if record.payload_size > 256
         record.errors[:base] << "APN notification cannot be larger than 256 bytes. Try condensing your alert and device attributes."
       end
     end

data/lib/rapns/daemon/feedback_receiver.rb

@@ -44,7 +44,7 @@ module Rapns
 
       def self.parse_tuple(tuple)
         failed_at, _, device_token = tuple.unpack("N1n1H*")
-        [Time.at(failed_at), device_token]
+        [Time.at(failed_at).utc, device_token]
       end
 
       def self.create_feedback(failed_at, device_token)

data/lib/rapns/daemon/interruptible_sleep.rb

@@ -4,10 +4,14 @@ module Rapns
       def interruptible_sleep(seconds)
         @_sleep_check, @_sleep_interrupt = IO.pipe
         IO.select([@_sleep_check], nil, nil, seconds)
+        @_sleep_check.close rescue IOError
+        @_sleep_interrupt.close rescue IOError
       end
 
       def interrupt_sleep
-        @_sleep_interrupt.close if @_sleep_interrupt
+        if @_sleep_interrupt
+          @_sleep_interrupt.close rescue IOError
+        end
       end
     end
   end

data/lib/rapns/notification.rb

@@ -1,6 +1,6 @@
 module Rapns
   class Notification < ActiveRecord::Base
-    set_table_name "rapns_notifications"
+    self.table_name = 'rapns_notifications'
 
     validates :device_token, :presence => true
     validates :badge, :numericality => true, :allow_nil => true
@@ -18,14 +18,25 @@ module Rapns
     def alert=(alert)
       if alert.is_a?(Hash)
         write_attribute(:alert, ActiveSupport::JSON.encode(alert))
+        self.alert_is_json = true if has_attribute?(:alert_is_json)
       else
         write_attribute(:alert, alert)
+        self.alert_is_json = false if has_attribute?(:alert_is_json)
       end
     end
 
     def alert
       string_or_json = read_attribute(:alert)
-      ActiveSupport::JSON.decode(string_or_json) rescue string_or_json
+
+      if has_attribute?(:alert_is_json)
+        if alert_is_json?
+          ActiveSupport::JSON.decode(string_or_json)
+        else
+          string_or_json
+        end
+      else
+        ActiveSupport::JSON.decode(string_or_json) rescue string_or_json
+      end
     end
 
     def attributes_for_device=(attrs)
@@ -47,12 +58,19 @@ module Rapns
       json
     end
 
+    def payload
+      as_json.to_json
+    end
+
+    def payload_size
+      payload.bytesize
+    end
+
     # This method conforms to the enhanced binary format.
     # http://developer.apple.com/library/ios/#documentation/NetworkingInternet/Conceptual/RemoteNotificationsPG/CommunicatingWIthAPS/CommunicatingWIthAPS.html#//apple_ref/doc/uid/TP40008194-CH101-SW4
     def to_binary(options = {})
       id_for_pack = options[:for_validation] ? 0 : id
-      json = as_json.to_json
-      [1, id_for_pack, expiry, 0, 32, device_token, 0, json.size, json].pack("cNNccH*cca*")
+      [1, id_for_pack, expiry, 0, 32, device_token, 0, payload_size, payload].pack("cNNccH*cca*")
     end
   end
 end

data/lib/rapns/version.rb

@@ -1,3 +1,3 @@
 module Rapns
-  VERSION = '1.0.3'
+  VERSION = '1.0.4'
 end

data/spec/rapns/daemon/interruptible_sleep_spec.rb

@@ -5,6 +5,9 @@ describe Rapns::Daemon::InterruptibleSleep do
     extend Rapns::Daemon::InterruptibleSleep
   end
 
+  let(:rd) { stub(:close => nil) }
+  let(:wr) { stub(:close => nil) }
+
   before do
     IO.stub(:pipe)
     IO.stub(:select)
@@ -16,15 +19,20 @@ describe Rapns::Daemon::InterruptibleSleep do
   end
 
   it 'selects on the reader' do
-    rd = stub
-    IO.stub(:pipe => [rd, stub])
+    IO.stub(:pipe => [rd, wr])
     IO.should_receive(:select).with([rd], nil, nil, 1)
     SleepTest.interruptible_sleep 1
   end
 
+  it 'closes both ends of the pipe after the timeout' do
+    IO.stub(:pipe => [rd, wr])
+    rd.should_receive(:close)
+    wr.should_receive(:close)
+    SleepTest.interruptible_sleep 1
+  end
+
   it 'closes the writer' do
-    wr = stub
-    IO.stub(:pipe => [stub, wr])
+    IO.stub(:pipe => [rd, wr])
     SleepTest.interruptible_sleep 1
     wr.should_receive(:close)
     SleepTest.interrupt_sleep

data/spec/rapns/notification_spec.rb

@@ -115,3 +115,31 @@ describe Rapns::Notification, "to_binary" do
     notification.to_binary.should == "\x01\x00\x00\x04\xD2\x00\x01Q\x80\x00 \xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\xAA\x00a{\"aps\":{\"alert\":\"Don't panic Mr Mainwaring, don't panic!\",\"badge\":3,\"sound\":\"1.aiff\"},\"hi\":\"mom\"}"
   end
 end
+
+describe Rapns::Notification, "bug #31" do
+  it 'does not confuse a JSON looking string as JSON' do
+    notification = Rapns::Notification.new
+    notification.alert = "{\"one\":2}"
+    notification.alert.should == "{\"one\":2}"
+  end
+
+  it 'does confuse a JSON looking string as JSON if the alert_is_json attribute is not present' do
+    notification = Rapns::Notification.new
+    notification.stub(:has_attribute? => false)
+    notification.alert = "{\"one\":2}"
+    notification.alert.should == {"one" => 2}
+  end
+end
+
+describe Rapns::Notification, "bug #35" do
+  it "should limit payload size to 256 bytes but not the entire packet" do
+    notification = Rapns::Notification.new do |n|
+      n.device_token = "a" * 64
+      n.alert = "a" * 210
+    end
+
+    notification.to_binary(:for_validation => true).size.should > 256
+    notification.payload_size.should < 256
+    notification.should be_valid
+  end
+end

data/spec/spec_helper.rb

@@ -18,8 +18,9 @@ puts "Using #{$adapter} adapter."
 ActiveRecord::Base.establish_connection('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'
 
-[CreateRapnsNotifications, CreateRapnsFeedback].each do |migration|
+[CreateRapnsNotifications, CreateRapnsFeedback, AddAlertIsJsonToRapnsNotifications].each do |migration|
   migration.down rescue ActiveRecord::StatementInvalid
   migration.up
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-13 00:00:00.000000000 Z
+date: 2012-01-31 00:00:00.000000000 Z
 dependencies: []
 description: Easy to use library for Apple's Push Notification Service with Rails
   3
@@ -21,6 +21,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/generators/rapns_generator.rb
+- lib/generators/templates/add_alert_is_json_to_rapns_notifications.rb
 - lib/generators/templates/create_rapns_feedback.rb
 - lib/generators/templates/create_rapns_notifications.rb
 - lib/generators/templates/rapns.yml
@@ -86,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Easy to use library for Apple's Push Notification Service with Rails 3
@@ -107,4 +108,3 @@ test_files:
 - spec/rapns/feedback_spec.rb
 - spec/rapns/notification_spec.rb
 - spec/spec_helper.rb
-has_rdoc: