itunes-receipt 0.0.5 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.1.0

data/lib/itunes/receipt.rb

@@ -10,27 +10,38 @@ module Itunes
       end
     end
 
-    attr_reader :quantity, :product_id, :transaction_id, :purchase_date, :app_item_id, :version_external_identifier, :bid, :bvrs, :original
+    # expires_date, receipt_data, and latest (receipt) will only appear for autorenew subscription products
+    attr_reader :quantity, :product_id, :transaction_id, :purchase_date, :app_item_id, :version_external_identifier, :bid, :bvrs, :original, :expires_date, :receipt_data, :latest
 
     def initialize(attributes = {})
-      if attributes[:quantity]
-        @quantity = attributes[:quantity].to_i
+      receipt_attributes = attributes.with_indifferent_access[:receipt]
+      if receipt_attributes[:quantity]
+        @quantity = receipt_attributes[:quantity].to_i
       end
-      @product_id = attributes[:product_id]
-      @transaction_id = attributes[:transaction_id]
-      @purchase_date = if attributes[:purchase_date]
-        Time.parse attributes[:purchase_date].sub('Etc/', '')
+      @product_id = receipt_attributes[:product_id]
+      @transaction_id = receipt_attributes[:transaction_id]
+      @purchase_date = if receipt_attributes[:purchase_date]
+        Time.parse receipt_attributes[:purchase_date].sub('Etc/', '')
       end
-      @app_item_id = attributes[:app_item_id]
-      @version_external_identifier = attributes[:version_external_identifier]
-      @bid = attributes[:bid]
-      @bvrs = attributes[:bvrs]
-      if attributes[:original_transaction_id] || attributes[:original_purchase_date]
-        @original = self.class.new(
-          :transaction_id => attributes[:original_transaction_id],
-          :purchase_date => attributes[:original_purchase_date]
-        )
+      @app_item_id = receipt_attributes[:app_item_id]
+      @version_external_identifier = receipt_attributes[:version_external_identifier]
+      @bid = receipt_attributes[:bid]
+      @bvrs = receipt_attributes[:bvrs]
+      if receipt_attributes[:original_transaction_id] || receipt_attributes[:original_purchase_date]
+        @original = self.class.new(:receipt => {
+          :transaction_id => receipt_attributes[:original_transaction_id],
+          :purchase_date => receipt_attributes[:original_purchase_date]
+        })
       end
+
+      # autorenew subscription handling
+      # attributes[:latest_receipt_info] and attributes[:latest_receipt] will be nil if you already have the receipt for the most recent renewal.
+      if attributes[:latest_receipt_info]
+        full_receipt_data = attributes[:latest_receipt] # should also be in the top-level hash if attributes[:latest_receipt_info] is there, but this won't break if it isn't
+        @latest = self.class.new(:receipt => attributes[:latest_receipt_info], :latest_receipt => full_receipt_data, :receipt_type => :latest)
+      end
+      @expires_date = Time.at(receipt_attributes[:expires_date].to_i / 1000) if receipt_attributes[:expires_date]
+      @receipt_data = attributes[:latest_receipt] if attributes[:receipt_type] == :latest # it feels wrong to include the receipt_data for the latest receipt on anything other than the latest receipt
     end
 
     def self.verify!(receipt_data)
@@ -41,7 +52,7 @@ module Itunes
       response = JSON.parse(response).with_indifferent_access
       case response[:status]
       when 0
-        new response[:receipt]
+        new response
       else
         raise VerificationFailed.new(response)
       end

data/spec/fake_json/autorenew_subscription.json

@@ -0,0 +1,2 @@
+{"receipt":{"original_purchase_date_pst":"2012-10-11 07:45:40 America/Los_Angeles", "unique_identifier":"4d69cc362c5c58ce62da68ee43721ea670907bad", "original_transaction_id":"1000000057005439", "expires_date":"1350157508197", "transaction_id":"1000000055076747", "quantity":"1", "product_id":"com.notkeepingitreal.fizzbuzz.subscription.autorenew1m", "original_purchase_date_ms":"1349966740000", "bid":"com.notkeepingitreal.fizzbuzz", "web_order_line_item_id":"1000000026553289", "bvrs":"1.0", "expires_date_formatted":"2012-10-13 19:45:08 Etc/GMT", "purchase_date":"2012-10-13 19:40:08 Etc/GMT", "purchase_date_ms":"1350157208197", "expires_date_formatted_pst":"2012-10-13 12:45:08 America/Los_Angeles", "purchase_date_pst":"2012-10-13 12:40:08 America/Los_Angeles", "original_purchase_date":"2012-10-11 14:45:40 Etc/GMT", "item_id":"570504929"}, "latest_receipt_info":{"original_purchase_date_pst":"2012-10-11 07:45:40 America/Los_Angeles", "unique_identifier":"4d79cc562c5c58ce62da68ee43721ea670907bad", "original_transaction_id":"1000000057005439", "expires_date":"1350157808000", "transaction_id":"1000000052076747", "quantity":"1", "product_id":"com.notkeepingitreal.fizzbuzz.subscription.autorenew1m", "original_purchase_date_ms":"1349966740000", "bid":"com.notkeepingitreal.fizzbuzz", "web_order_line_item_id":"1000000027293289", "bvrs":"1.0", "expires_date_formatted":"2012-10-13 19:50:08 Etc/GMT", "purchase_date":"2012-10-13 19:40:08 Etc/GMT", "purchase_date_ms":"1350157208000", "expires_date_formatted_pst":"2012-10-13 12:50:08 America/Los_Angeles", "purchase_date_pst":"2012-10-13 12:40:08 America/Los_Angeles", "original_purchase_date":"2012-10-11 14:45:40 Etc/GMT", "item_id":"570504929"}, "status":0, "latest_receipt":"junk="}
+

data/spec/itunes/receipt_spec.rb

@@ -7,7 +7,7 @@ describe Itunes::Receipt do
       sandbox_mode do
         expect do
           Itunes::Receipt.verify! 'receipt-data'
-        end.should post_to Itunes::ENDPOINT[:sandbox]
+        end.to post_to Itunes::ENDPOINT[:sandbox]
       end
     end
 
@@ -19,7 +19,7 @@ describe Itunes::Receipt do
       it 'should raise VerificationFailed' do
         expect do
           Itunes::Receipt.verify! 'invalid'
-        end.should raise_error Itunes::Receipt::VerificationFailed
+        end.to raise_error Itunes::Receipt::VerificationFailed
       end
     end
 
@@ -40,11 +40,59 @@ describe Itunes::Receipt do
         receipt.original.quantity.should be_nil
         receipt.original.transaction_id.should == '1000000001479608'
         receipt.original.purchase_date.should == Time.utc(2011, 2, 17, 6, 20, 57)
+        receipt.expires_date.should be_nil
+        receipt.receipt_data.should be_nil
 
         # Those attributes are not returned from iTunes Connect Sandbox
         receipt.app_item_id.should be_nil
         receipt.version_external_identifier.should be_nil
       end
     end
+
+    context 'when autorenew subscription' do
+      before do
+        fake_json :autorenew_subscription
+      end
+
+      it 'should return valid Receipt instance for autorenew subscription' do
+        original_transaction_id = '1000000057005439'
+        original_purchase_date = Time.utc(2012, 10, 11, 14, 45, 40)
+        receipt = Itunes::Receipt.verify! 'autorenew_subscription'
+        receipt.should be_instance_of Itunes::Receipt
+        receipt.quantity == 1
+        receipt.product_id.should == 'com.notkeepingitreal.fizzbuzz.subscription.autorenew1m'
+        receipt.transaction_id.should == '1000000055076747'
+        receipt.purchase_date.should == Time.utc(2012, 10, 13, 19, 40, 8)
+        receipt.bid.should == 'com.notkeepingitreal.fizzbuzz'
+        receipt.bvrs.should == '1.0'
+        receipt.original.quantity.should be_nil
+        receipt.original.transaction_id.should == original_transaction_id
+        receipt.original.purchase_date.should == original_purchase_date
+        receipt.expires_date.should == Time.utc(2012, 10, 13, 19, 45, 8)
+        receipt.receipt_data.should be_nil
+
+        # Those attributes are not returned from iTunes Connect Sandbox
+        receipt.app_item_id.should be_nil
+        receipt.version_external_identifier.should be_nil
+
+        latest = receipt.latest
+        latest.should be_instance_of Itunes::Receipt
+        latest.quantity == 1
+        latest.product_id.should == 'com.notkeepingitreal.fizzbuzz.subscription.autorenew1m'
+        latest.transaction_id.should == '1000000052076747'
+        latest.purchase_date.should == Time.utc(2012, 10, 13, 19, 40, 8)
+        latest.expires_date.should == Time.utc(2012, 10, 13, 19, 50, 8) # five minutes after the "old" receipt
+        latest.bid.should == 'com.notkeepingitreal.fizzbuzz'
+        latest.bvrs.should == '1.0'
+        latest.original.quantity.should be_nil
+        latest.original.transaction_id.should == original_transaction_id
+        latest.original.purchase_date.should == original_purchase_date
+        latest.receipt_data.should == 'junk='
+       
+        # Those attributes are not returned from iTunes Connect Sandbox
+        latest.app_item_id.should be_nil
+        latest.version_external_identifier.should be_nil
+      end
+    end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itunes-receipt
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,12 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000 +09:00
-default_executable: 
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70319856666960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +21,15 @@ dependencies:
         version: 1.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70319856666960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.4.3
 - !ruby/object:Gem::Dependency
   name: restclient_with_cert
-  requirement: &70319856666540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +37,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319856666540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70319856666000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +53,15 @@ dependencies:
         version: '2.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70319856666000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70319860928480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +69,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70319860928480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70319860927940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +85,15 @@ dependencies:
         version: '0.8'
   type: :development
   prerelease: false
-  version_requirements: *70319860927940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70319860927440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +101,15 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *70319860927440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70319860926980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +117,15 @@ dependencies:
         version: '2'
   type: :development
   prerelease: false
-  version_requirements: *70319860926980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70319860926520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,7 +133,12 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70319860926520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 description: Handle iTunes In App Purchase Receipt Verification
 email: nov@matake.jp
 executables: []
@@ -117,12 +156,12 @@ files:
 - itunes-receipt.gemspec
 - lib/itunes.rb
 - lib/itunes/receipt.rb
+- spec/fake_json/autorenew_subscription.json
 - spec/fake_json/invalid.json
 - spec/fake_json/valid.json
 - spec/helpers/fake_json_helper.rb
 - spec/itunes/receipt_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/nov/itunes-receipt
 licenses: []
 post_install_message: 
@@ -143,11 +182,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Handle iTunes In App Purchase Receipt Verification
 test_files:
+- spec/fake_json/autorenew_subscription.json
 - spec/fake_json/invalid.json
 - spec/fake_json/valid.json
 - spec/helpers/fake_json_helper.rb