passbook 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13dcfa4609494b74e55a93ccb7112fd7eb0db940
-  data.tar.gz: 39ca932277b88c4e867fdb243cb59425d2a0636a
+  metadata.gz: 9cbc86e695bdad78634e5ef6ca96bd2dd541e6b2
+  data.tar.gz: 9c8c6fd550bb913acd37630085854759550e2943
 SHA512:
-  metadata.gz: e47891da09c51646de304691bd678b9db7d0a5ac486c3264bb209c2a2496eee105078881fd43ec6eb6363f5c8f454c2b526cf2fc1456a8c2d770c392eec5d77b
-  data.tar.gz: c05ce20890f7b0de157590b681e84cc4f334df65983420eca0fcd7f88d460cecfabead0c19c485fc4268fb72d816c35251d4a8f4078311088f887139c7f8f982
+  metadata.gz: ac675f8951033f88c41d1cd35d1fd222688beb2cfe5556b1b4e3297cff8d5d39d6b06028dcfbdf26f20168f501c63d0722ed4feb98af4932d5863f21eb8260d3
+  data.tar.gz: 0e366333bdb8907eea0afabe38d5052a0613bd4db2364e762213d63f038f85e46f9cac458d70276b812995104a5ed858cb0379aa7fdab7e9ab40f858666a91fe

data/README.md

@@ -27,7 +27,7 @@ Then go to a directory that you want to generate your pass under and use the "pk
 pk generate your_pass_name
 ```
 
-This will generate a directory called your_pass_name.  Edit your pass.json file in the your_pass_directory to have a valid team identifier and passTypeIdentifier and create your certificates if you haven't yet. [See this article for information on how to do this.](http://www.raywenderlich.com/20734/beginning-passbook-part-1#more-20734) 
+This will generate a directory called your_pass_name.  Edit your pass.json file in the your_pass_directory to have a valid team identifier and passTypeIdentifier and create your certificates if you haven't yet. [See this article for information on how to do this.](http://www.raywenderlich.com/20734/beginning-passbook-part-1#more-20734)
 
 Assuming that you have put your certificate files etc. in your working directory.
 
@@ -40,7 +40,7 @@ If you are not building your passes on a mac or just prefer to use the pass cert
 
 ```
 pk build passbook_gem_name -w ./wwdc.pem -c ./your_pass_name_certificate.pem -k your_pass_name_key.pem -p '12345'
-``` 
+```
 
 Now you can drag the file over to a simulator or send it to your iPhone via e-mail to view your pass.
 
@@ -79,6 +79,7 @@ If You are doing push notifications then you will need to add some extra configu
     Passbook.configure do |passbook|
       .....other settings.....
       passbook.notification_gateway = 'gateway.push.apple.com'
+      passbook.notification_passphrase = 'my_hard_password' (optional)
       passbook.notification_cert = 'lib/assets/my_notification_cert.pem'
     end
 ```
@@ -232,7 +233,7 @@ module Passbook
       # you will want to return
       my_pass = PkPass.new 'your pass json'
       # you will want to return the string from the stream of your PkPass object.
-      mypass.stream.string
+      {:status => 200, :latest_pass => mypass.stream.string, :last_modified => '1442120893'}
     end
 
     # This is called whenever there is something from the update process that is a warning
@@ -247,10 +248,10 @@ end
 
 ```
 
-To send a push notification for a updated pass simply call Passbook::PassbookPushNotification.send_notifications_for_promotion with the push token for the pass you are updating
+To send a push notification for a updated pass simply call Passbook::PushNotification.send_notification with the push token for the device you are updating
 
 ```
-  Passbook::PassbookPushNotification.send_notifications_for_promotion the_pass_push_token
+  Passbook::PushNotification.send_notification the_device_push_token
 
 ```
 
@@ -260,7 +261,7 @@ Apple will send out a notification to your phone (usually within 15 minutes or l
 
   To launch tests :
 ```
-  bundle exec rake spec 
+  bundle exec rake spec
 ```
 
 ## Contributing

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/passbook/pkpass.rb

@@ -9,22 +9,22 @@ module Passbook
 
     TYPES = ['boarding-pass', 'coupon', 'event-ticket', 'store-card', 'generic']
 
-    def initialize pass, init_signer = nil
+    def initialize(pass, init_signer = nil)
       @pass           = pass
       @manifest_files = []
       @signer         = init_signer || Passbook::Signer.new
     end
 
-    def addFile file
+    def addFile(file)
       @manifest_files << file
     end
 
-    def addFiles files
+    def addFiles(files)
       @manifest_files += files
     end
 
     # for backwards compatibility
-    def json= json
+    def json=(json)
       @pass = json
     end
 
@@ -37,7 +37,7 @@ module Passbook
       # Create pass signature
       signature = @signer.sign manifest
 
-      return [manifest, signature]
+      [manifest, signature]
     end
 
     # Backward compatibility
@@ -65,7 +65,7 @@ module Passbook
 
     private
 
-    def checkPass manifest
+    def checkPass(manifest)
       # Check for default images
       raise 'Icon missing' unless manifest.include?('icon.png')
       raise 'Icon@2x missing' unless manifest.include?('icon@2x.png')
@@ -92,10 +92,10 @@ module Passbook
         end
       end
 
-      return sha1s.to_json
+      sha1s.to_json
     end
 
-    def outputZip manifest, signature
+    def outputZip(manifest, signature)
 
       Zip::OutputStream.write_buffer do |zip|
         zip.put_next_entry 'pass.json'

data/lib/passbook/push_notification.rb

@@ -1,7 +1,7 @@
 module Passbook
   class PushNotification
     def self.send_notification(device_token)
-      pusher = Grocer.pusher({:certificate => Passbook.notification_cert, :gateway => Passbook.notification_gateway})
+      pusher = Grocer.pusher({:certificate => Passbook.notification_cert, :passphrase => Passbook.notification_passphrase || "", :gateway => Passbook.notification_gateway})
       notification = Grocer::PassbookNotification.new(:device_token => device_token)
 
       pusher.push notification

data/lib/passbook/signer.rb

@@ -5,7 +5,7 @@ module Passbook
   class Signer
     attr_accessor :certificate, :password, :key, :wwdc_cert, :key_hash, :p12_cert
 
-    def initialize params = {}
+    def initialize(params = {})
       @certificate = params[:certificate] || Passbook.p12_certificate
       @password    = params[:password] || Passbook.p12_password
       @key         = params[:key] || (params.empty? ? Passbook.p12_key : nil)
@@ -13,17 +13,17 @@ module Passbook
       compute_cert
     end
 
-    def sign data
+    def sign(data)
       wwdc  = OpenSSL::X509::Certificate.new File.read(wwdc_cert)
       pk7   = OpenSSL::PKCS7.sign key_hash[:cert], key_hash[:key], data.to_s, [wwdc], OpenSSL::PKCS7::BINARY | OpenSSL::PKCS7::DETACHED
       data  = OpenSSL::PKCS7.write_smime pk7
 
       str_debut = "filename=\"smime.p7s\"\n\n"
-      data = data[data.index(str_debut)+str_debut.length..data.length-1]
-      str_end = "\n\n------"
-      data = data[0..data.index(str_end)-1]
+      data      = data[data.index(str_debut)+str_debut.length..data.length-1]
+      str_end   = "\n\n------"
+      data      = data[0..data.index(str_end)-1]
 
-      return Base64.decode64(data)
+      Base64.decode64(data)
     end
 
     def compute_cert

data/lib/passbook/version.rb

@@ -1,3 +1,3 @@
 module Passbook
-  VERSION = "0.0.4"
+  VERSION = "0.4.2"
 end

data/lib/passbook.rb

@@ -7,7 +7,7 @@ require 'grocer/passbook_notification'
 require 'rack/passbook_rack'
 
 module Passbook
-  mattr_accessor :p12_certificate, :p12_password, :wwdc_cert, :p12_key, :notification_cert, :notification_gateway
+  mattr_accessor :p12_certificate, :p12_password, :wwdc_cert, :p12_key, :notification_cert, :notification_gateway, :notification_passphrase
 
   def self.configure
     yield self

data/lib/rack/passbook_rack.rb

@@ -15,7 +15,7 @@ module Rack
         when 'device_register_delete'
           if env['REQUEST_METHOD'] == 'POST'
             [Passbook::PassbookNotification.
-              register_pass(method_and_params[:params].merge! JSON.parse(env['rack.input'].read 1000))[:status], 
+              register_pass(method_and_params[:params].merge! JSON.parse(env['rack.input'].read 1000))[:status],
               {}, ['']]
           elsif env['REQUEST_METHOD'] == 'DELETE'
             [Passbook::PassbookNotification.unregister_pass(method_and_params[:params])[:status], {}, {}]
@@ -25,12 +25,12 @@ module Rack
           [response ? 200 : 204, {}, [response.to_json]]
         when 'latest_pass'
           response = Passbook::PassbookNotification.latest_pass(method_and_params[:params])
-          if response
-            [200, {'Content-Type' => 'application/vnd.apple.pkpass', 
-              'Content-Disposition' => 'attachment', 
-              'filename' => "#{method_and_params[:params]['serialNumber']}.pkpass"}, [response]]
+          if response[:status] == 200
+            [200, {'Content-Type' => 'application/vnd.apple.pkpass',
+              'Content-Disposition' => 'attachment',
+              'filename' => "#{method_and_params[:params]['serialNumber']}.pkpass","last-modified" => response[:last_modified]}, [response[:latest_pass]]]
           else
-            [204, {}, {}]
+            [response[:status], {}, {}]
           end
         when 'log'
           Passbook::PassbookNotification.passbook_log JSON.parse(env['rack.input'].read 10000)
@@ -69,10 +69,10 @@ module Rack
         end
       end
 
-      return nil       
+      return nil
     end
 
-    private 
+    private
 
     def method_and_params_hash(method, path)
       parsed_path = path.split '/'

data/lib/rails/generators/passbook/config/templates/initializer.rb

@@ -6,7 +6,7 @@ Passbook.configure do |passbook|
   passbook.wwdc_cert = '<%= wwdc_cert_path %>'
 
   # Path to your cert.p12 file
-  passbook.p12_cert = '<%= p12_cert_path %>'
+  passbook.p12_certificate = '<%= p12_cert_path %>'
   
   # Password for your certificate
   passbook.p12_password = '<%= p12_password %>'

data/passbook.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: passbook 0.4.1 ruby lib
+# stub: passbook 0.4.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "passbook"
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Thomas Lauro", "Lance Gleason"]
-  s.date = "2014-12-08"
+  s.date = "2016-02-04"
   s.description = "This gem allows you to create IOS Passbooks.  Unlike some,  this works with Rails but does not require it."
   s.email = ["thomas@lauro.fr", "lgleason@polyglotprogramminginc.com"]
   s.executables = ["pk"]
@@ -62,7 +62,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/frozon/passbook"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.2.2"
+  s.rubygems_version = "2.4.8"
   s.summary = "A IOS Passbook generator."
 
   if s.respond_to? :specification_version then

data/spec/lib/passbook/push_notification_spec.rb

@@ -5,15 +5,16 @@ describe Passbook::PushNotification  do
 
   context 'send notification' do
     let(:grocer_pusher) {double 'Grocer'}
-    let(:notification) {double 'Grocer::Notification'} 
-    let(:notification_settings) {{:certificate => './notification_cert.pem', :gateway => 'honeybadger.apple.com'}}
+    let(:notification) {double 'Grocer::Notification'}
+    let(:notification_settings) {{:certificate => './notification_cert.pem', :gateway => 'honeybadger.apple.com', :passphrase => 'ah@rdvintAge'}}
 
     before :each do
       Passbook.should_receive(:notification_cert).and_return './notification_cert.pem'
-      Grocer::PassbookNotification.should_receive(:new).with(:device_token => 'my token').and_return notification 
+      Grocer::PassbookNotification.should_receive(:new).with(:device_token => 'my token').and_return notification
       grocer_pusher.should_receive(:push).with(notification).and_return 55
       Grocer.should_receive(:pusher).with(notification_settings).and_return grocer_pusher
       Passbook.should_receive(:notification_gateway).and_return 'honeybadger.apple.com'
+      Passbook.should_receive(:notification_passphrase).and_return 'ah@rdvintAge'
     end
 
     subject {Passbook::PushNotification.send_notification('my token')}

data/spec/lib/rack/passbook_rack_spec.rb

@@ -48,7 +48,7 @@ describe Rack::PassbookRack  do
         its([:params]) {should eq(register_delete_params) }
       end
 
-      it_behaves_like 'a method that can handle non passbook urls' 
+      it_behaves_like 'a method that can handle non passbook urls'
 
     end
 
@@ -144,7 +144,7 @@ describe Rack::PassbookRack  do
 
     context 'get latest pass' do
       context 'valid pass' do
-        let(:raw_pass) {'some url encoded text'}
+        let(:raw_pass) {{:status => 200, :latest_pass => 'some url encoded text', :last_modified => '1442401010'}}
 
         before do
           Passbook::PassbookNotification.should_receive(:latest_pass).with(latest_pass_params).
@@ -154,15 +154,15 @@ describe Rack::PassbookRack  do
 
         subject {last_response}
         its(:status) {should eq 200}
-        its(:header) {should eq({'Content-Type' => 'application/vnd.apple.pkpass', 
-          'Content-Disposition' => 'attachment', 'filename' => '27-1.pkpass', 'Content-Length' => '21'})}
-        its(:body) {should eq raw_pass}
+        its(:header) {should eq({'Content-Type' => 'application/vnd.apple.pkpass',
+          'Content-Disposition' => 'attachment', 'filename' => '27-1.pkpass', 'last-modified' => '1442401010', 'Content-Length' => '21'})}
+        its(:body) {should eq raw_pass[:latest_pass]}
       end
 
       context 'no pass' do
         before do
           Passbook::PassbookNotification.should_receive(:latest_pass).with(latest_pass_params).
-            and_return(nil)
+            and_return({:status => 204, :latest_pass => nil})
           get latest_pass_path
         end
 
@@ -213,7 +213,7 @@ describe Rack::PassbookRack  do
       subject {last_response}
       its(:status) {should eq 200}
       its(:body) {should eq 'test app'}
-    end    
+    end
   end
 
 end
@@ -224,7 +224,7 @@ include Rack::Test::Methods
 def app
   test_app = lambda do |env|
     [200, {}, 'test app']
-  end 
+  end
 
   Rack::PassbookRack.new test_app
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: passbook
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Thomas Lauro
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -236,7 +236,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A IOS Passbook generator.