amazon-iap2 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e2ea5bc00fa3737874d5678fc2dc174da91728a
-  data.tar.gz: ab7cb4564cf7c4a8c4e5d8ba46d162acd1c1f505
+  metadata.gz: d71a8c3964b2b99ff8b1ba4b55f58fd2e96c788a
+  data.tar.gz: 254d4f47003497c215295325218777a09be96831
 SHA512:
-  metadata.gz: 60f70a661b9c409e6d73b55e65ce97f5e9fac4281fc5d1b97fb71acf1bd9303becba9b73aa7afddb0b79c72e4666e9ba6c84313b589f5d347da5a0cfea6b1574
-  data.tar.gz: 2021fbb12b7a4ed45a3538b2a62fe57977930c29456775c40d03e42287c7da5a63c3af82c4decbc0fc75c19874570c648705351f420e453e081b88bf98a8389c
+  metadata.gz: f6b717e79ad9a3aca11c30ab8729b4f7ad2467b66375249445ec65031ba3dbdbb53beca6d27e9ae4f803f67fea8f8890211eb1d9c09016eb6906a8017977ee97
+  data.tar.gz: 67787a971156ee81687e054369a7cf7d4229a88659f45181bf94418e2068eb2a64f9190d0d96627b75b5ef7b9dba7c6e4de828e7c4f29605c1e71acec8aa2c42

data/README.md

@@ -1,14 +1,18 @@
-# Amazon::Iap
+# Amazon::Iap2
+
+[![Codeship Status for blinkist/amazon-iap2](https://www.codeship.io/projects/e6c868f0-2f7e-0132-4314-02ba1e9dff5b/status)](https://www.codeship.io/projects/39519)
+[![Dependency Status](https://www.versioneye.com/user/projects/5645bcefb5b03d002200084e/badge.svg?style=flat)](https://www.versioneye.com/user/projects/5645bcefb5b03d002200084e)
+[![Gem Version](https://badge.fury.io/rb/amazon-iap2.svg)](http://badge.fury.io/rb/amazon-iap2)
 
 This gem is a simple implementation of the Amazon receipt verfication service outlined
-[here](https://developer.amazon.com/sdk/in-app-purchasing/documentation/rvs.html).
+[here](https://developer.amazon.com/sdk/in-app-purchasing/documentation/rvs.html) with migrations from [here](https://developer.amazon.com/public/apis/earn/in-app-purchasing/docs-v2/verifying-receipts-in-iap-2.0)
 
 
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'amazon-iap'
+    gem 'amazon-iap2'
 
 And then execute:
 
@@ -16,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install amazon-iap
+    $ gem install amazon-iap2
 
 ## Usage
 
@@ -33,73 +37,56 @@ client = Amazon::Iap::Client.new 'my_developer_secret', 'http://iap-staging.doma
 client = Amazon::Iap::Client.new 'my_developer_secret' # production server
 ```
 
-From there, you can call either `verify` or `renew` on the client and pass in the user id and purchase token:
-
-```ruby
-result = client.verify 'some-user-id', 'some-purchase-token'
-result = client.renew 'some-user-id', 'some-purchase-token'
-```
-
-By default, the `verify` method will automatically try to renew expired tokens, and will recall `verify`
-against the new token returned.  If you do not want this behavior, simply pass in `false` as the third
-attribute to the `verify` method:
-
-```ruby
-result = client.verify 'some-user-id', 'some-purchase-token', false
-```
 
 ## Returned Values
 
-An instance of Amazon::Iap::Result is returned from both methods, the attributes being the underscored versions
-of the hash keys returned in the JSON object.  For convenience, we also add `start_time` and `end_time` attributes
-which are `Time` representations of the milliseconds returned in `start_date` and `end_date` respectively.  E.g.,
-
-```ruby
-result = client.verify 'some-user-id', 'some-purchase-token'
-
-result.class.name     # "Amazon::Iap::Result"
-result.item_type      # "SUBSCRIPTION"
-result.sku            # "some-sku"
-result.start_date     # 1378751554943
-result.start_time     # 2013-09-09 14:32:34 -0400 
-result.end_date       # nil
-result.end_time       # nil
-result.purchase_token # "some-purchase-token"
-```
-
-<!-- -->
+An instance of Amazon::Iap2::Result is returned from both methods, the attributes being the underscored versions
+of the hash keys returned in the JSON object.  For convenience, we also add `purchase_time` and `cancel_time` attributes
+which are `Time` representations of the milliseconds returned in `cancel_date` and `cancel_date` respectively.  E.g.,
 
 ```ruby
-result = client.renew 'some-user-id', 'some-purchase-token'
-
-result.class.name     # "Amazon::Iap::Result"
-result.purchase_token # "some-new-purchase-token"
+result = client.verify 'some-user-id', 'some-receipt-id'
+
+result.class.name        # "Amazon::Iap2::Result"
+result.product_type      # "SUBSCRIPTION"
+result.product_id        # "some-sku"
+result.parent_product_id # nil
+result.purchase_date     # 1378751554943
+result.purchase_time     # 2013-09-09 14:32:34 -0400 
+result.cancel_date       # nil
+result.cancel_time       # nil
+result.quantity          # 1
+result.test_transaction  # false
+result.beta_product      # false
+result.term              # term length of product type is Subscription e.g"1 YEAR" 
+result.term_sku          # sku of the product subscription 
+result.renewal_date      # renewal date of subscription product (in ms)
 ```
 
 ## Exception Handling
 
 Any non-200 status code will raise an exception.  For convenience in internal controls, each status code raises
-a distinct exception.  Take a look at the [Amazon::Iap::Result class](lib/amazon/iap/result.rb) for specifics.
+a distinct exception.  Take a look at the [Amazon::Iap2::Result class](lib/amazon/iap2/result.rb) for specifics.
 
 Example exception handling:
 
 ```ruby
 begin
-  result = client.verify 'some-user-id', 'some-purchase-token'
-rescue Amazon::Iap::Exceptions::InternalError => e
+  result = client.verify 'some-user-id', 'some-receipt-id'
+rescue Amazon::Iap2::Exceptions::InternalError => e
   # enqueue to try again later
 end
 ```
 
-For convenience, all exceptions inherit from `Amazon::Iap::Exceptions::Exception` so you can rescue from
+For convenience, all exceptions inherit from `Amazon::Iap2::Exceptions::Exception` so you can rescue from
 any exception (or as a default):
 
 ```ruby
 begin
-  result = client.verify 'some-user-id', 'some-purchase-token'
-rescue Amazon::Iap::Exceptions::InternalError => e
+  result = client.verify 'some-user-id', 'receipt-id'
+rescue Amazon::Iap2::Exceptions::InternalError => e
   # enqueue to try again later
-rescue Amazon::Iap::Exceptions::Exception => e
+rescue Amazon::Iap2::Exceptions::Exception => e
   # log the exception
 end
 ```

data/lib/amazon/iap2/result.rb

@@ -7,7 +7,26 @@ class Amazon::Iap2::Result
                 :receipt_id,
                 :quantity,
                 :test_transaction,
-                :beta_product
+                :beta_product,
+                :term, :term_sku,
+                :renewal_date
+
+    VALID_ATTRIBUTES = %w(
+      product_type
+      product_id
+      parent_product_id
+      purchase_date
+      purchase_time
+      cancel_date
+      cancel_time
+      receipt_id
+      quantity
+      test_transaction
+      beta_product
+      term
+      term_sku
+      renewal_date
+    )
 
   def initialize(response)
     case response.code.to_i
@@ -25,7 +44,7 @@ class Amazon::Iap2::Result
 
       parsed.each do |key, value|
         underscore = key.gsub(/::/, '/').gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2').gsub(/([a-z\d])([A-Z])/, '\1_\2').tr('-', '_').downcase
-        send "#{underscore}=", value
+        send "#{underscore}=", value if VALID_ATTRIBUTES.include?(underscore.to_s.downcase)
       end
     when 400 then raise Amazon::Iap2::Exceptions::InvalidTransaction
     when 496 then raise Amazon::Iap2::Exceptions::InvalidSharedSecret

data/lib/amazon/iap2/version.rb

@@ -1,5 +1,5 @@
 module Amazon
   module Iap2
-    VERSION = "0.1"
+    VERSION = "0.2"
   end
 end

data/spec/specs/client_spec.rb

@@ -35,9 +35,18 @@ describe Amazon::Iap2::Client do
 
       expect(result.purchase_date).to eql(response["purchaseDate"])
       expect(result.purchase_time).to eql(Time.at(response["purchaseDate"] / 1000))
-      expect(result.cancel_date).to eql(response["cancelDate"])
-      expect(result.cancel_time).to eql(Time.at(response["cancelDate"] / 1000))
+      expect(result.cancel_date).to eql nil
 
+      expect(result.term).to eql(response["term"])
+      expect(result.term_sku).to eql(response["termSku"])
+      expect(result.renewal_date).to eql(response["renewalDate"])
+    end
+
+    it 'should succeed if unexpected key is returned' do
+      response = unexpected_response receipt_id
+      build_stub user_id, receipt_id, 200, response
+
+      result = subject.verify user_id, receipt_id
     end
 
   end
@@ -56,13 +65,23 @@ describe Amazon::Iap2::Client do
   def build_response(receipt_id)
     {
       "betaProduct" => true,
-      "cancelDate" => (Time.now.to_i + 2629743) * 1000, # one month from now
-      "productId" => "sub1",
+      "cancelDate" => nil,
+      "productId" => "sub1.sku",
       "productType" => "SUBSCRIPTION",
       "purchaseDate" => Time.now.to_i * 1000,
       "receiptId" => "#{receipt_id}",
-      "testTransaction" => true
+      "testTransaction" => true,
+      "term" =>  "1 YEAR",
+      "termSku" => "sub1",
+      "renewalDate" => (Time.now.to_i + 2629743) * 1000,
     }
   end
 
+  def unexpected_response(receipt_id)
+    {
+      "newValue" => 1
+    }
+  end
+
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: amazon-iap2
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Blinkist
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-02 00:00:00.000000000 Z
+date: 2015-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,10 +65,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Verify Amazon in app purchases with IAP 2
 test_files:
 - spec/spec_helper.rb
 - spec/specs/client_spec.rb
+has_rdoc: