amazon-iap 0.2.2 → 0.3.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NGY4MmIwN2MwMzg5YzcyZWFhOTk1NjE3Nzg4MjhlNzllZWZmMjc2Mg==
-  data.tar.gz: !binary |-
-    ODVlMGFhZWFmNzkxYzQ3MmQ3Y2M1NjhjOWFkMTRhY2VhYWM0MjZiZg==
+SHA1:
+  metadata.gz: 7e91f2416ee5969443b5ac801d4249c4f653b52b
+  data.tar.gz: 0e2d7858bb235eaa21e97a238a26c414a35ead36
 SHA512:
-  metadata.gz: !binary |-
-    YTdmYjUxMDdmMWZjMWZjMDc4ZTk0ZTZkNzI3NTc2ZWJmYmFlNTg4NGNhMzAw
-    MzhiOWRjMGE1OWE4MjAyOTg2ZGE1NmNiNDc1NjlkNzdjNTE3YzBmNWNmYWI4
-    YzMzYzZiODQ2NTEwZWI2Y2FlYWFmMzQ5MGYwMTYwODlkM2JhMjk=
-  data.tar.gz: !binary |-
-    YjljZDgxNmMyYzRhOTFhMWQ0YTUyNmUxNzY2MmM1MjAxNzMxYTVjNmZkZjEw
-    MDcwMmRjMWQzNDM5NTNjNDQyNWIzNDhiOWZhNGYwM2FlOGRjNjIxZjg2Yzg5
-    OTBmZmMzMDc3YzcyMTUwMTI3Zjc0NGExYzVjZjhkZmFhOWE1N2U=
+  metadata.gz: 38b757f0e2f13a0ea6cc34c65ce2e175f3b235eab71d90d6ebf23b9bb504e56fafa09efe2acecc147c9385dbc14cd78119e9567fbe8563d0e52eb37d2993f26e
+  data.tar.gz: 161514496dbfc228b10bed920b393fdd856571401817cfae5412e106be79933c42a6dc28c291a26040c4271ec2bd2bf30b6292b15771e084947b26ef6d771b8c

data/README.md

@@ -1,8 +1,10 @@
 # Amazon::Iap
 
-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).
+This gem is a simple implementation of the Amazon Receipt Verfication Service. It supports both V1 and V2 APIs.
 
+[V1 spec](https://developer.amazon.com/sdk/in-app-purchasing/documentation/rvs.html)
+
+[V2 spec](https://developer.amazon.com/public/apis/earn/in-app-purchasing/docs-v2/verifying-receipts-in-iap-2.0)
 
 ## Installation
 
@@ -33,19 +35,28 @@ 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:
+From there, you can call either `verify_v1` or `verify_v2` 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'
+result = client.verify_v1 'some-user-id', 'some-purchase-token'
+result = client.verify_v2 'some-user-id', 'some-purchase-token'
 ```
+Both methods will return the same fields in the same place, while the v2 one will supply some additional data. Mapping is done internally to provide a uniform interface between versions.
 
-By default, the `verify` method will automatically try to renew expired tokens, and will recall `verify`
+For compatibility purposes, the `verify` method is an alias for `verify_v1`.
+
+By default, the `verify_v1` method will automatically try to renew expired tokens, and will recall `verify_v1`
 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
+result = client.verify_v1 'some-user-id', 'some-purchase-token', false
+```
+
+You can also manually renew a token with
+
+```ruby
+result = client.renew 'some-user-id', 'some-purchase-token'
 ```
 
 ## Returned Values
@@ -55,7 +66,7 @@ of the hash keys returned in the JSON object.  For convenience, we also add `sta
 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 = client.verify_v2 'some-user-id', 'some-purchase-token'
 
 result.class.name     # "Amazon::Iap::Result"
 result.item_type      # "SUBSCRIPTION"

data/lib/amazon/iap/client.rb

@@ -1,36 +1,45 @@
 class Amazon::Iap::Client
   require 'net/http'
   require 'uri'
-  
+
   PRODUCTION_HOST = 'https://appstore-sdk.amazon.com'
-  
+
   def initialize(developer_secret, host=nil)
     @developer_secret = developer_secret
     @host = host || PRODUCTION_HOST
   end
-  
-  def verify(user_id, purchase_token, renew_on_failure=true)
+
+  def verify_v1(user_id, purchase_token, renew_on_failure=true)
     begin
-      process :verify, user_id, purchase_token
+      process_v1 :verify, user_id, purchase_token
     rescue Amazon::Iap::Exceptions::ExpiredCredentials => e
       raise e unless renew_on_failure
-            
+
       renewal = renew(user_id, purchase_token)
       verify(user_id, renewal.purchase_token, false)
     end
   end
-  
-  def renew(user_id, purchase_token)
-    process :renew, user_id, purchase_token
+  alias_method :verify, :verify_v1
+
+  def renew_v1(user_id, purchase_token)
+    process_v1 :renew, user_id, purchase_token
   end
-  
+  alias_method :renew, :renew_v1
+
+  def verify_v2(user_id, receipt_id)
+    uri = URI.parse "#{@host}/version/1.0/verifyReceiptId/developer/#{@developer_secret}/user/#{user_id}/receiptId/#{receipt_id}"
+    req = Net::HTTP::Get.new uri.request_uri
+    res = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') { |http| http.request req }
+    Amazon::Iap::Result.new res
+  end
+
   protected
-  
-  def process(path, user_id, purchase_token)
+
+  def process_v1(path, user_id, purchase_token)
     path = "/version/2.0/#{path}/developer/#{@developer_secret}/user/#{user_id}/purchaseToken/#{purchase_token}"
     uri = URI.parse "#{@host}#{path}"
     req = Net::HTTP::Get.new uri.request_uri
     res = Net::HTTP.start(uri.host, uri.port, :use_ssl => uri.scheme == 'https') { |http| http.request req }
     Amazon::Iap::Result.new res
-  end  
-end
+  end
+end

data/lib/amazon/iap/result.rb

@@ -1,21 +1,27 @@
 class Amazon::Iap::Result
-  attr_accessor :item_type, :sku, :start_date, :start_time, :end_date, :end_time, :purchase_token
-  
+  attr_accessor :item_type, :sku, :start_date, :start_time, :end_date, :end_time, :purchase_token, :test_transaction, :beta_product, :parent_product_id, :term, :term_sku, :quantity
+  V2_V1_MAPPING = {
+    productType: :itemType,
+    productId: :sku,
+    receiptId: :purchaseToken,
+    purchaseDate: :startDate,
+    cancelDate: :endDate,
+  }
   def initialize(response)
     case response.code.to_i
     when 200
       parsed = JSON.parse(response.body)
-      
+      V2_V1_MAPPING.each { |v2,v1| parsed[v1.to_s] = parsed.delete(v2.to_s) if parsed.has_key?(v2.to_s) }
       if parsed.has_key? 'startDate'
         parsed['startTime'] = parsed['startDate'].nil? ? nil : Time.at(parsed['startDate'] / 1000)
       end
       if parsed.has_key? 'endDate'
         parsed['endTime'] = parsed['endDate'].nil? ? nil : Time.at(parsed['endDate'] / 1000)
       end
-      
+
       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 respond_to?("#{underscore}=")
       end
     when 400 then raise Amazon::Iap::Exceptions::InvalidTransaction
     when 496 then raise Amazon::Iap::Exceptions::InvalidSharedSecret
@@ -26,4 +32,4 @@ class Amazon::Iap::Result
     else raise Amazon::Iap::Exceptions::General
     end
   end
-end
+end

data/lib/amazon/iap/version.rb

@@ -1,5 +1,5 @@
 module Amazon
   module Iap
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: amazon-iap
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - DailyBurn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2016-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,14 +28,14 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Verify Amazon in app purchases
@@ -66,17 +66,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Verify Amazon in app purchases