rapns 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.0.1 (July 7, 2012) ##
+  * Fix delivery when using Ruby 1.8.
+  * MultiJson support.
+
 ## 2.0.0 (June 19, 2012) ##
 
   * Support for multiple apps.

data/lib/rapns/daemon/delivery_queue.rb

@@ -1,59 +1,41 @@
 module Rapns
   module Daemon
-    class DeliveryQueue
+    if RUBY_VERSION < '1.9'
+      require 'rapns/daemon/delivery_queue_18'
+      ancestor_class = DeliveryQueue18
+    else
+      require 'rapns/daemon/delivery_queue_19'
+      ancestor_class = DeliveryQueue19
+    end
+
+    class DeliveryQueue < ancestor_class
       class WakeupError < StandardError; end
 
       def initialize
-        @mutex = Mutex.new
         @num_notifications = 0
         @queue = []
         @waiting = []
-      end
-
-      def push(notification)
-        @mutex.synchronize do
-          @num_notifications += 1
-          @queue.push(notification)
 
-          begin
-            t = @waiting.shift
-            t.wakeup if t
-          rescue ThreadError
-            retry
-          end
-        end
-      end
-
-      def pop
-        @mutex.synchronize do
-          while true
-            if @queue.empty?
-              @waiting.push Thread.current
-              @mutex.sleep
-            else
-              return @queue.shift
-            end
-          end
-        end
+        super
       end
 
       def wakeup(thread)
-        @mutex.synchronize do
+        synchronize do
           t = @waiting.delete(thread)
           t.raise WakeupError if t
         end
       end
 
       def size
-        @mutex.synchronize { @queue.size }
+        synchronize { @queue.size }
       end
 
       def notification_processed
-        @mutex.synchronize { @num_notifications -= 1 }
+        synchronize { @num_notifications -= 1 }
       end
 
       def notifications_processed?
-        @mutex.synchronize { @num_notifications == 0 }
+        synchronize { @num_notifications == 0 }
       end
     end
   end

data/lib/rapns/daemon/delivery_queue_18.rb

@@ -0,0 +1,44 @@
+module Rapns
+  module Daemon
+  	class DeliveryQueue18
+      def push(obj)
+        Thread.critical = true
+        @queue.push obj
+        @num_notifications += 1
+        begin
+          t = @waiting.shift
+          t.wakeup if t
+        rescue ThreadError
+          retry
+        ensure
+          Thread.critical = false
+        end
+        begin
+          t.run if t
+        rescue ThreadError
+        end
+      end
+
+      def pop
+        while (Thread.critical = true; @queue.empty?)
+          @waiting.push Thread.current
+          Thread.stop
+        end
+        @queue.shift
+      ensure
+        Thread.critical = false
+      end
+
+      protected
+
+      def synchronize
+        Thread.critical = true
+        begin
+          yield
+        ensure
+          Thread.critical = false
+        end
+      end
+  	end
+  end
+end

data/lib/rapns/daemon/delivery_queue_19.rb

@@ -0,0 +1,42 @@
+module Rapns
+  module Daemon
+  	class DeliveryQueue19
+      def initialize
+        @mutex = Mutex.new
+      end
+
+      def push(notification)
+        @mutex.synchronize do
+          @num_notifications += 1
+          @queue.push(notification)
+
+          begin
+            t = @waiting.shift
+            t.wakeup if t
+          rescue ThreadError
+            retry
+          end
+        end
+      end
+
+      def pop
+        @mutex.synchronize do
+          while true
+            if @queue.empty?
+              @waiting.push Thread.current
+              @mutex.sleep
+            else
+              return @queue.shift
+            end
+          end
+        end
+      end
+
+      protected
+
+      def synchronize(&blk)
+      	@mutex.synchronize(&blk)
+      end
+  	end
+  end
+end

data/lib/rapns/notification.rb

@@ -18,7 +18,7 @@ module Rapns
 
     def alert=(alert)
       if alert.is_a?(Hash)
-        write_attribute(:alert, ActiveSupport::JSON.encode(alert))
+        write_attribute(:alert, MultiJson.dump(alert))
         self.alert_is_json = true if has_attribute?(:alert_is_json)
       else
         write_attribute(:alert, alert)
@@ -31,22 +31,22 @@ module Rapns
 
       if has_attribute?(:alert_is_json)
         if alert_is_json?
-          ActiveSupport::JSON.decode(string_or_json)
+          MultiJson.load(string_or_json)
         else
           string_or_json
         end
       else
-        ActiveSupport::JSON.decode(string_or_json) rescue string_or_json
+        MultiJson.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, ActiveSupport::JSON.encode(attrs))
+      write_attribute(:attributes_for_device, MultiJson.dump(attrs))
     end
 
     def attributes_for_device
-      ActiveSupport::JSON.decode(read_attribute(:attributes_for_device)) if read_attribute(:attributes_for_device)
+      MultiJson.load(read_attribute(:attributes_for_device)) if read_attribute(:attributes_for_device)
     end
 
     MDM_OVERIDE_KEY = '__rapns_mdm__'
@@ -71,7 +71,7 @@ module Rapns
     end
 
     def payload
-      as_json.to_json
+      MultiJson.dump(as_json)
     end
 
     def payload_size
@@ -85,4 +85,4 @@ module Rapns
       [1, id_for_pack, expiry, 0, 32, device_token, payload_size, payload].pack("cNNccH*na*")
     end
   end
-end
+end

data/lib/rapns/version.rb

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

data/lib/rapns.rb

@@ -1,8 +1,9 @@
 require 'active_record'
+require 'multi_json'
 
 require 'rapns/version'
 require 'rapns/binary_notification_validator'
 require 'rapns/device_token_format_validator'
 require 'rapns/notification'
 require 'rapns/feedback'
-require 'rapns/app'
+require 'rapns/app'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapns
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-19 00:00:00.000000000 Z
-dependencies: []
+date: 2012-07-08 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: multi_json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: Easy to use library for Apple's Push Notification Service with Rails
   3
 email:
@@ -37,6 +53,8 @@ files:
 - lib/rapns/daemon/delivery_handler.rb
 - lib/rapns/daemon/delivery_handler_pool.rb
 - lib/rapns/daemon/delivery_queue.rb
+- lib/rapns/daemon/delivery_queue_18.rb
+- lib/rapns/daemon/delivery_queue_19.rb
 - lib/rapns/daemon/disconnection_error.rb
 - lib/rapns/daemon/feedback_receiver.rb
 - lib/rapns/daemon/feeder.rb