grocer 0.0.13 → 0.1.0

data/.travis.yml

@@ -3,5 +3,5 @@ rvm:
   - 1.9.2
   - 1.9.3
   - ruby-head
-  - rbx-19mode
-  # - jruby-19mode
+  - jruby-head
+  # - rbx-19mode # rubinius still incorrectly defaults to 'US-ASCII'

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 0.1.0
+
+* Enables socket keepalive option on APNS client sockets (Kyle Drake)
+* Supports non-ASCII characters in notifications (Patrick Van Stee, Andy Lindeman)
+* Certificate can be any object that responds to #read (Kyle Drake)
+
 ## 0.0.13
 
 * Fixes a bug where closing a Grocer.server could result in an

data/README.md

@@ -13,8 +13,7 @@ cleanest, most extensible, and friendliest.
 
 ## Requirements
 
-* Ruby/MRI 1.9.x *or* Rubinius in 1.9 mode (JRuby in 1.9 is broken due to some
-  problem with `json` not being in the stdlib?)
+* Ruby/MRI 1.9.x or JRuby 1.7.x in 1.9 mode
 
 ## Installation
 
@@ -45,6 +44,9 @@ pusher = Grocer.pusher(
 
 #### Notes
 
+* `certificate`: If you don't have the certificate stored in a file, you 
+  can pass any object that responds to `read`.
+  Example: `certificate: StringIO.new(pem_string)`
 * `gateway`: Defaults to different values depending on the `RAILS_ENV` or
   `RACK_ENV` environment variables. If set to `production`, defaults to
   `gateway.push.apple.com`, if set to `test`, defaults to `localhost` (see

data/grocer.gemspec

@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
                           extensible, and friendliest.
                       DESC
   gem.homepage      = 'https://github.com/highgroove/grocer'
+  gem.license       = 'MIT'
 
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   gem.files         = `git ls-files`.split("\n")

data/lib/grocer/extensions/deep_symbolize_keys.rb

@@ -5,7 +5,10 @@ module Grocer
       def deep_symbolize_keys
         result = {}
         each do |key, value|
-          result[(key.to_sym rescue key)] = value.is_a?(Hash) ?
+          # Workaround for JRuby defining Fixnum#to_sym even in 1.9 mode
+          symbolized_key = key.is_a?(Fixnum) ? key : (key.to_sym rescue key)
+
+          result[symbolized_key] = value.is_a?(Hash) ?
             (value.extend DeepSymbolizeKeys).deep_symbolize_keys : value
         end
         result

data/lib/grocer/notification.rb

@@ -18,7 +18,15 @@ module Grocer
       validate_payload
       payload = encoded_payload
 
-      [1, identifier, expiry_epoch_time, device_token_length, sanitized_device_token, payload.length].pack('CNNnH64n') << payload
+      [
+        1,
+        identifier,
+        expiry_epoch_time,
+        device_token_length,
+        sanitized_device_token,
+        payload.bytesize,
+        payload
+      ].pack('CNNnH64nA*')
     end
 
     private

data/lib/grocer/ssl_connection.rb

@@ -1,6 +1,7 @@
 require 'socket'
 require 'openssl'
 require 'forwardable'
+require 'stringio'
 
 module Grocer
   class SSLConnection
@@ -23,14 +24,22 @@ module Grocer
       context = OpenSSL::SSL::SSLContext.new
 
       if certificate
-        cert_data    = File.read(certificate)
+
+        if certificate.respond_to?(:read)
+          cert_data = certificate.read
+          certificate.rewind if certificate.respond_to?(:rewind)
+        else
+          cert_data = File.read(certificate)
+        end
+
         context.key  = OpenSSL::PKey::RSA.new(cert_data, passphrase)
         context.cert = OpenSSL::X509::Certificate.new(cert_data)
       end
 
-      @sock     = TCPSocket.new(gateway, port)
-      @ssl      = OpenSSL::SSL::SSLSocket.new(@sock, context)
-      @ssl.sync = true
+      @sock            = TCPSocket.new(gateway, port)
+      @sock.setsockopt   Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, true
+      @ssl             = OpenSSL::SSL::SSLSocket.new(@sock, context)
+      @ssl.sync        = true
       @ssl.connect
     end
 

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.0.13'
+  VERSION = '0.1.0'
 end

data/spec/grocer/notification_spec.rb

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 require 'spec_helper'
 require 'grocer/notification'
 
@@ -8,47 +10,47 @@ describe Grocer::Notification do
     let(:payload_dictionary_from_bytes) { JSON.parse(payload_from_bytes, symbolize_names: true) }
     let(:payload_options) { { alert: 'hi', badge: 2, sound: 'siren.aiff' } }
 
-    subject { notification.to_bytes }
+    subject(:bytes) { notification.to_bytes }
 
     it 'sets the command byte to 1' do
-      subject[0].should == "\x01"
+      bytes[0].should == "\x01"
     end
 
     it 'defaults the identifer to 0' do
-      subject[1...5].should == "\x00\x00\x00\x00"
+      bytes[1...5].should == "\x00\x00\x00\x00"
     end
 
     it 'allows the identifier to be set' do
       notification.identifier = 1234
-      subject[1...5].should == [1234].pack('N')
+      bytes[1...5].should == [1234].pack('N')
     end
 
     it 'defaults expiry to zero' do
-      subject[5...9].should == "\x00\x00\x00\x00"
+      bytes[5...9].should == "\x00\x00\x00\x00"
     end
 
     it 'allows the expiry to be set' do
       expiry = notification.expiry = Time.utc(2013, 3, 24, 12, 34, 56)
-      subject[5...9].should == [expiry.to_i].pack('N')
+      bytes[5...9].should == [expiry.to_i].pack('N')
     end
 
     it 'encodes the device token length as 32' do
-      subject[9...11].should == "\x00\x20"
+      bytes[9...11].should == "\x00\x20"
     end
 
     it 'encodes the device token as a 256-bit integer' do
       token = notification.device_token = 'fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
-      subject[11...43].should == ['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*')
+      bytes[11...43].should == ['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*')
     end
 
     it 'as a convenience, flattens the device token to remove spaces' do
       token = notification.device_token = 'fe15 a27d 5df3c3 4778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'
-      subject[11...43].should == ['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*')
+      bytes[11...43].should == ['fe15a27d5df3c34778defb1f4f3880265cc52c0c047682223be59fb68500a9a2'].pack('H*')
     end
 
     it 'encodes the payload length' do
       notification.alert = 'Hello World!'
-      subject[43...45].should == [payload_from_bytes.length].pack('n')
+      bytes[43...45].should == [payload_from_bytes.bytesize].pack('n')
     end
 
     it 'encodes alert as part of the payload' do
@@ -71,6 +73,16 @@ describe Grocer::Notification do
       payload_dictionary_from_bytes[:foo].should == 'bar'
     end
 
+    it 'encodes UTF-8 characters' do
+      notification.alert = '私'
+      payload_dictionary_from_bytes[:aps][:alert].force_encoding("UTF-8").should == '私'
+    end
+
+    it 'encodes the payload length correctly for multibyte UTF-8 strings' do
+      notification.alert = '私'
+      bytes[43...45].should == [payload_from_bytes.bytesize].pack('n')
+    end
+
     context 'invalid payload' do
       let(:payload_options) { Hash.new }
 

data/spec/grocer/ssl_connection_spec.rb

@@ -24,6 +24,21 @@ describe Grocer::SSLConnection do
     }
   }
 
+  describe 'configuration with pre-read certificate' do
+    before do
+      stub_certificate
+    end
+
+    subject {
+      string_io = File.read(connection_options[:certificate])
+      described_class.new(connection_options.merge(certificate: string_io))
+    }
+
+    it 'is initialized with a certificate IO' do
+      subject.certificate.should == File.read(connection_options[:certificate])
+    end
+  end
+  
   subject { described_class.new(connection_options) }
 
   describe 'configuration' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -155,7 +155,8 @@ files:
 - spec/grocer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/highgroove/grocer
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -168,7 +169,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2773558114449338672
+      hash: 1241833556512094426
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -177,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2773558114449338672
+      hash: 1241833556512094426
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24