rapnd 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/rapnd

@@ -29,7 +29,11 @@ OptionParser.new do |opts|
   end
   
   opts.on("--environment=OPTIONAL", "Specify sandbox or production") do |env|
-    options[:env] = env
+    if env == 'production'
+      options[:host] = 'gateway.push.apple.com'
+    else
+      options[:host] = 'gateway.sandbox.push.apple.com'
+    end
   end
   
   opts.on("--queue=OPTIONAL", "Name of the redis queue") do |queue|

data/lib/rapnd/notification.rb

@@ -3,21 +3,21 @@ module Rapnd
     attr_accessor :badge, :alert, :sound, :custom, :device_token
     
     def initialize(hash)
-      [:badge, :alert, :sound, :custom, :device_token].each do |k|
-        self.instance_variable_set("@#{k}".to_sym, hash[k]) if hash[k]
+      [:badge, :alert, :sound, :device_token].each do |k|
+        self.instance_variable_set("@#{k}".to_sym, hash.delete(k)) if hash[k]
       end
+      @custom = hash
       raise 'Must provide device token' if self.device_token.nil?
       self.device_token = self.device_token.delete(' ')
     end
     
     def payload
       p = Hash.new
-      [:badge, :alert, :sound, :custom].each do |k|
+      [:badge, :alert, :sound].each do |k|
         p[k] = send(k) if send(k)
       end
-      custom = p.delete(:custom)
       aps = {:aps => p}
-      aps.merge!(:custom => custom) if custom
+      aps.merge!(custom) if custom
       aps
     end
     

data/rapnd.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "rapnd"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Symonds"]

data/spec/daemon_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Rapnd::Daemon" do
   before do
-    @daemon = Rapnd::Daemon.new(:redis_port => 9876, :apn_cert => '')
+    @daemon = Rapnd::Daemon.new(:redis_port => 9876, :cert => '')
   end
   
   it "initializes a redis connection" do

data/spec/notification_spec.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Rapnd::Notification" do
   before do
-    @notification = Rapnd::Notification.new(:badge => 99, :alert => 'Big test time', :custom => 'This is a test!', :device_token => '1234 5')
+    @notification = Rapnd::Notification.new(:badge => 99, :alert => 'Big test time', :custom_key => 'This is a test!', :spid => 1234, :device_token => '1234 5')
   end
   
   it 'removes whitespace from the device token' do
@@ -11,18 +11,18 @@ describe "Rapnd::Notification" do
   
   it "automatically assigns hash variables to instance variables" do
     @notification.badge.should == 99
-    @notification.custom.should == 'This is a test!'
+    @notification.custom.should == {:custom_key => 'This is a test!', :spid => 1234}
   end
   
   it 'creates a hash payload' do
-    @notification.payload.should == {:aps=>{:badge=>99, :alert=>"Big test time"}, :custom=>"This is a test!"}
+    @notification.payload.should == {:aps=>{:badge=>99, :alert=>"Big test time"}, :custom_key => "This is a test!", :spid => 1234}
   end
   
   it 'jsonifies the hash payload' do
-    ActiveSupport::JSON.decode(@notification.json_payload).should == {"aps"=>{"badge"=>99, "alert"=>"Big test time"}, "custom"=>"This is a test!"}
+    ActiveSupport::JSON.decode(@notification.json_payload).should == {"aps"=>{"badge"=>99, "alert"=>"Big test time"}, "custom_key"=>"This is a test!", "spid"=>1234}
   end
   
   it 'turns into bytes sensibly' do
-    @notification.to_bytes.should == "\x00\x00 \x124P\x00G{\"aps\":{\"badge\":99,\"alert\":\"Big test time\"},\"custom\":\"This is a test!\"}"
+    @notification.to_bytes.should == "\x00\x00 \x124P\x00W{\"aps\":{\"badge\":99,\"alert\":\"Big test time\"},\"custom_key\":\"This is a test!\",\"spid\":1234}"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rapnd
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70188716324960 !ruby/object:Gem::Requirement
+  requirement: &70151479510280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *70188716324960
+  version_requirements: *70151479510280
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70188716338380 !ruby/object:Gem::Requirement
+  requirement: &70151479574920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70188716338380
+  version_requirements: *70151479574920
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70188716333400 !ruby/object:Gem::Requirement
+  requirement: &70151479584240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188716333400
+  version_requirements: *70151479584240
 - !ruby/object:Gem::Dependency
   name: foreverb
-  requirement: &70188716349580 !ruby/object:Gem::Requirement
+  requirement: &70151479578180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70188716349580
+  version_requirements: *70151479578180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70188716347940 !ruby/object:Gem::Requirement
+  requirement: &70151480017760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188716347940
+  version_requirements: *70151480017760
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70188716345660 !ruby/object:Gem::Requirement
+  requirement: &70151480044060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188716345660
+  version_requirements: *70151480044060
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70188716782900 !ruby/object:Gem::Requirement
+  requirement: &70151480049460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188716782900
+  version_requirements: *70151480049460
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70188716780920 !ruby/object:Gem::Requirement
+  requirement: &70151480061160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188716780920
+  version_requirements: *70151480061160
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70188716779360 !ruby/object:Gem::Requirement
+  requirement: &70151480057820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70188716779360
+  version_requirements: *70151480057820
 description: redis APN daemon
 email: veraticus@gmail.com
 executables:
@@ -151,7 +151,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 152164358108278698
+      hash: -2587970993024958806
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: