grocer 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 907e31ec8991cc7e09d08d4eebf0a3e59e46df03
-  data.tar.gz: 7615fdc0dd345d9714cdb036f3feaafa94ae1d35
+  metadata.gz: 6e424c4a3e8c5ff0fdce9bb8f16fca576382e254
+  data.tar.gz: 8e99095c9208eb9e11378c32d68413d73cbf3869
 SHA512:
-  metadata.gz: 799ca81894f2c703eb4997fe6d9ffaaaa41a5c3ff1105a90d27c2acb0b01f6104ecedf2730a8db0de6fed5cccc4f2e752f58e329f0cc196336be9a451249c501
-  data.tar.gz: fa7b760b7c12fc8992c7c2ebf6b1695403466a8128242b86ce0df365ef16ec79825c816fe2426dead79dbe51ab1d610f53f7ad10dc1f8bc7400336397c568418
+  metadata.gz: 7451c8895a50c7366f095f3484852f5144db26e0f8efb1aa881bd5b86247639278db9767d9ac182b55975db321255ee409a2fc05da2628b17c597e82e6b109cd
+  data.tar.gz: c156b71a10de32edd60e5cf224c240cf1d97637c441cd67f15ae316918bc23b59bdf049e42da914ea9fddbe2f6ac7c0b070215fd16ef10d51067b802c80d8f03

data/.travis.yml

@@ -1,13 +1,13 @@
 language: ruby
 rvm:
-  - 2.1.1
-  - 2.1.0
+  - 2.1.4
   - 2.0.0
   - 1.9.3
   - 1.9.2
   - jruby-19mode
   - rbx
   - rbx-2
+  - rbx-2.3
 addons:
   code_climate:
     repo_token: d414084f17a07a6b2d7da72eaa35d92281554a4266ab8d6246fee1f6c0c161b6

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Unreleased
 
+## 0.6.1
+
+* Support SafariNotifications in the test server. ([Will
+  Schenk](https://github.com/wschenk))
+
 ## 0.6.0
 
 * Add `category` option for custom notification actions. ([Michel

data/Gemfile

@@ -12,6 +12,3 @@ gemspec
 # Code coverage
 gem 'codeclimate-test-reporter', :group => :test, :require => nil
 
-# Require Simplecov explicitly. Remove this explicit dependency when
-# the following is fixed: https://github.com/colszowka/simplecov/issues/281
-gem 'simplecov', '~> 0.7.1'

data/README.md

@@ -80,7 +80,7 @@ notification = Grocer::Notification.new(
   content_available: true                  # optional; any truthy value will set 'content-available' to 1
 )
 
-pusher.push(notification)
+pusher.push(notification) # return value is the number of bytes sent successfully
 ```
 
 It is desirable to reuse the same connection to send multiple notifications, as
@@ -151,7 +151,6 @@ notification = Grocer::SafariNotification.new(
   body: 'Hi',                 # required
   action: 'Read',             # optional; the label of the action button
   url_args: ['arg1']          # required (array); values that are paired with the placeholders inside the urlFormatString.
-                              # Apple's documention lists url-args as optional, but in testing it was found to be required
 )
 ```
 
@@ -201,7 +200,8 @@ end
 ### Acceptance Testing
 
 Grocer ships with framework to setup a real looking APNS server. It listens on
-a real SSL-capable socket bound to localhost.
+a real SSL-capable socket bound to localhost. See the [Connecting
+Notes](#notes) above for details.
 
 You can setup an APNS client to talk to it, then inspect the notifications the
 server received.
@@ -284,9 +284,15 @@ Save the items as a `.p12` file. Open a terminal window and run the following
 command:
 
 ```bash
-openssl pkcs12 -in exported_certificate.p12 -out certificate.pem -nodes -clcerts
+openssl pkcs12 -in exported_certificate.p12 -out certificate.pem -nodes -clcerts -des3
 ```
 
+You will be prompted for two password. The first one is the password
+that you used when you exported the private key and certificate from
+Keychain Access. The second password will be used to encrypt and lock
+the private key. This will be the passphrase used when configuring
+**grocer** to connect to APNs.
+
 The `certificate.pem` file that is generated can be used with **grocer**.
 
 ## Support Channels
@@ -296,3 +302,4 @@ Requests](https://github.com/grocer/grocer/pulls) are the primary venues for
 communicating issues and discussing possible features. Several of us also
 regularly hang out in the `#grocer` channel on Freenode; feel free to pop in
 and ask questions there as well. Thanks! :heart:
+

data/grocer.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Grocer::VERSION
 
-  gem.add_development_dependency 'rspec', '~> 3.0.0.rc1'
-  gem.add_development_dependency 'pry', '~> 0.9.8'
+  gem.add_development_dependency 'rspec', '~> 3.1'
+  gem.add_development_dependency 'pry', '~> 0.10.1'
   gem.add_development_dependency 'mocha'
   gem.add_development_dependency 'bourne'
   gem.add_development_dependency 'rake'

data/lib/grocer/notification_reader.rb

@@ -17,6 +17,14 @@ module Grocer
 
     private
 
+    def build_notification(payload)
+      if payload[:url_args]
+        Grocer::SafariNotification.new(payload)
+      else
+        Grocer::Notification.new(payload)
+      end
+    end
+
     def read_notification
       @io.read(1) # version (not used for now)
 
@@ -35,7 +43,7 @@ module Grocer
 
       payload[:custom] = payload_hash
 
-      Grocer::Notification.new(payload)
+      build_notification(payload)
     end
 
     def sanitize_keys(hash)

data/lib/grocer/version.rb

@@ -1,3 +1,3 @@
 module Grocer
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/spec/grocer/server_spec.rb

@@ -29,6 +29,19 @@ describe Grocer::Server do
     }
   end
 
+  it "accepts a client connection and reads safari notifications into a queue" do
+    n = Grocer::SafariNotification.new(title: "title", body: "body")
+    expect( n ).to be_valid
+    mock_client.write(n.to_bytes)
+    mock_client.rewind
+
+    subject.accept
+    Timeout.timeout(5) {
+      notification = subject.notifications.pop
+      expect(notification.alert).to eq({:title=>"title", :body=>"body"})
+    }
+  end
+
   it "closes the socket" do
     ssl_server.expects(:close).at_least(1)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grocer
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Andy Lindeman
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-13 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.10.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: Pushing Apple notifications since 2012.
@@ -204,3 +204,4 @@ test_files:
 - spec/grocer_spec.rb
 - spec/spec_helper.rb
 - spec/support/notification_helpers.rb
+has_rdoc: