monza 1.1.3 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6310733b91ee0e2693424b6e76816e4f2d54a3a3
-  data.tar.gz: dbc0ef6617ddd2ee490045a05f9f95d2dae7286a
+  metadata.gz: 9964737ff15c89dbd259e27531882476fefef34d
+  data.tar.gz: ac1a4b1288efd6afc7a00a0628e94307b0d3d67b
 SHA512:
-  metadata.gz: 828839e92a07a4686e7e42f3a8e13241f7777785b230186e274a57e41b5c4cddb09d529d4271a4d74efd59c372b3e996f3ae2a7758af769e028b54b9bae16a94
-  data.tar.gz: 7670f2ac2bdb93b371c1af0e97b49bcb7742efe60826f781d2cbb6f86846667db3888cd2a8c88d82cafdb1d6841d517f33d03c4e5e105d5637960fdd1dc74f65
+  metadata.gz: 71770d975dd49fbdbd779fe7ffea8e15eacba18b597fff750dc94b3bdb634de5d836a33d65139e924de7fcad9f8563e5faabe16736fb621ed4965bec34f690c3
+  data.tar.gz: 90fb4fd6e051f3a5d4feb8a49205e1a0a8eb98b39e30d8508e4c171f89f7ded633fa332708e4ad9357d7ed9fe9cefefd11898d56fb4b8d3b14a9104bf6e36e19

data/.travis.yml

@@ -6,6 +6,5 @@ rvm:
   - 2.2.7
   - 2.3.4
   - 2.4.1
-  - ruby-head
 
 before_install: gem install bundler -v 1.10.6

data/README.md

@@ -1,6 +1,6 @@
 [![Build Status](https://travis-ci.org/gabrielgarza/monza.svg?branch=master)](https://travis-ci.org/gabrielgarza/monza)
 
-![monza_asset](https://cloud.githubusercontent.com/assets/1076706/16257552/1baa36f8-380e-11e6-8730-cbbd1fe73c6c.png)
+![monza_asset](https://user-images.githubusercontent.com/1076706/30770801-8dc83b60-9fee-11e7-8532-c486dacaea07.png)
 
 #### Monza is a ruby gem that makes In-App Purchase receipt and Auto-Renewable subscription validation easy.
 
@@ -33,7 +33,7 @@ options = { shared_secret: "your shared secret" }
 response = Monza::Receipt.verify(data, options)
 
 ```
-You can also pass in `exclude-old-transactions` as an option in the options hash for [iOS7 style app receipts](https://developer.apple.com/library/content/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html#//apple_ref/doc/uid/TP40010573-CH104-SW3).
+You can also pass in `exclude_old_transactions` with value `true` as an option in the options hash for [iOS7 style app receipts](https://developer.apple.com/library/content/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html#//apple_ref/doc/uid/TP40010573-CH104-SW3).
 
 ##### Useful Methods
 ```ruby

data/lib/monza.rb

@@ -1,6 +1,8 @@
 require "monza/version"
 require "monza/client"
+require "monza/renewal_info"
 require "monza/verification_response"
+require "monza/status_response"
 require "monza/receipt"
 require "monza/transaction_receipt"
 require "monza/bool_typecasting"

data/lib/monza/receipt.rb

@@ -38,12 +38,14 @@ module Monza
       @bundle_id = attributes['bundle_id']
       @application_version = attributes['application_version']
       @download_id = attributes['download_id']
-      @receipt_creation_date = DateTime.parse(attributes['receipt_creation_date'])
-      @receipt_creation_date_ms = Time.zone.at(attributes['receipt_creation_date_ms'].to_i / 1000)
-      @receipt_creation_date_pst = DateTime.parse(attributes['receipt_creation_date_pst'].gsub("America/Los_Angeles","PST"))
-      @request_date = DateTime.parse(attributes['request_date'])
-      @request_date_ms = Time.zone.at(attributes['request_date_ms'].to_i / 1000)
-      @request_date_pst = DateTime.parse(attributes['request_date_pst'].gsub("America/Los_Angeles","PST"))
+
+      @receipt_creation_date = DateTime.parse(attributes['receipt_creation_date']) rescue nil
+      @receipt_creation_date_ms = Time.zone.at(attributes['receipt_creation_date_ms'].to_i / 1000) rescue nil
+      @receipt_creation_date_pst = DateTime.parse(attributes['receipt_creation_date_pst'].gsub("America/Los_Angeles","PST")) rescue nil
+      @request_date = DateTime.parse(attributes['request_date']) rescue nil
+      @request_date_ms = Time.zone.at(attributes['request_date_ms'].to_i / 1000) rescue nil
+      @request_date_pst = DateTime.parse(attributes['request_date_pst'].gsub("America/Los_Angeles","PST")) rescue nil
+
       @original_purchase_date = DateTime.parse(attributes['original_purchase_date'])
       @original_purchase_date_ms = Time.zone.at(attributes['original_purchase_date_ms'].to_i / 1000)
       @original_purchase_date_pst = DateTime.parse(attributes['original_purchase_date_pst'].gsub("America/Los_Angeles","PST"))

data/lib/monza/renewal_info.rb

@@ -0,0 +1,46 @@
+module Monza
+  class RenewalInfo
+    # Receipt Fields Documentation
+    # https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ReceiptFields.html#//apple_ref/doc/uid/TP40010573-CH106-SW1
+
+    attr_reader :expiration_intent
+    attr_reader :product_id
+    attr_reader :auto_renew_product_id
+    attr_reader :original_transaction_id
+    attr_reader :is_in_billing_retry_period
+    attr_reader :will_renew
+
+    def initialize(attributes)
+
+      @product_id = attributes['product_id']
+      @auto_renew_product_id = attributes['auto_renew_product_id']
+      @original_transaction_id = attributes['original_transaction_id']
+
+      if attributes['expiration_intent']
+        @expiration_intent = attributes['expiration_intent']
+      end
+
+      if attributes['is_in_billing_retry_period']
+        @is_in_billing_retry_period = attributes['is_in_billing_retry_period'].to_bool
+      end
+
+      if attributes['auto_renew_status']
+        @will_renew = attributes['auto_renew_status'].to_bool 
+      end
+    end # end initialize
+
+  end # end class
+end # end module
+
+#
+# Sample JSON Object
+# "pending_renewal_info": [
+#   {
+#     "expiration_intent": "1",
+#     "auto_renew_product_id": "renew_product_id",
+#     "original_transaction_id": "1000000218147500",
+#     "is_in_billing_retry_period": "0",
+#     "product_id": "product_id",
+#     "auto_renew_status": "0"
+#   }
+# ]

data/lib/monza/status_response.rb

@@ -0,0 +1,141 @@
+require 'time'
+
+module Monza
+  class StatusResponse
+    # https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html
+
+    attr_reader :auto_renew_product_id
+    attr_reader :auto_renew_status
+    attr_reader :environment
+    attr_reader :latest_receipt
+
+    attr_reader :notification_type
+    attr_reader :password
+
+    attr_reader :bundle_id
+    attr_reader :bvrs
+    attr_reader :item_id
+    attr_reader :product_id
+    attr_reader :transaction_id
+    attr_reader :original_transaction_id
+    attr_reader :purchase_date
+    attr_reader :purchase_date_ms
+    attr_reader :purchase_date_pst
+    attr_reader :original_purchase_date
+    attr_reader :original_purchase_date_ms
+    attr_reader :original_purchase_date_pst
+    attr_reader :web_order_line_item_id
+    attr_reader :quantity
+    attr_reader :unique_identifier
+    attr_reader :unique_vendor_identifier
+    attr_reader :expires_date
+    attr_reader :expires_date_ms
+    attr_reader :expires_date_pst
+    attr_reader :is_in_intro_offer_period
+    attr_reader :is_trial_period
+    attr_reader :cancellation_date
+
+    attr_reader :original_json_response
+
+    def initialize(attributes)
+      @original_json_response = attributes
+
+      @auto_renew_product_id = attributes['auto_renew_product_id']
+      @auto_renew_status = attributes['auto_renew_status'].to_bool
+      @environment = attributes['environment']
+      @latest_receipt = attributes['latest_receipt']
+      @notification_type = attributes['notification_type']
+
+      if attributes['password'] 
+        @password = attributes['password'] 
+      end
+
+      # There'll only be one latest receipt info, so lets just flatten it out here
+      latest_receipt_info = attributes['latest_receipt_info']
+
+      # If the receipt is cancelled / expired, we'll get this instead
+      if latest_receipt_info.nil?
+        latest_receipt_info = attributes['latest_expired_receipt_info']
+      end
+
+      @bundle_id = latest_receipt_info['bid']
+      @bvrs = latest_receipt_info['bvrs'].to_i
+      @item_id = latest_receipt_info['item_id'].to_i
+      @product_id = latest_receipt_info['product_id']
+      @transaction_id = latest_receipt_info['transaction_id']
+      @original_transaction_id = latest_receipt_info['original_transaction_id']
+      @purchase_date = DateTime.parse(latest_receipt_info['purchase_date']) if latest_receipt_info['purchase_date']
+      @purchase_date_ms = Time.zone.at(latest_receipt_info['purchase_date_ms'].to_i / 1000)
+      @purchase_date_pst = date_for_pacific_time(latest_receipt_info['purchase_date_pst']) if latest_receipt_info['purchase_date_pst']
+      @original_purchase_date = DateTime.parse(latest_receipt_info['original_purchase_date']) if latest_receipt_info['original_purchase_date']
+      @original_purchase_date_ms = Time.zone.at(latest_receipt_info['original_purchase_date_ms'].to_i / 1000) 
+      @original_purchase_date_pst = date_for_pacific_time(latest_receipt_info['original_purchase_date_pst']) if latest_receipt_info['original_purchase_date_pst']
+      @web_order_line_item_id = latest_receipt_info['web_order_line_item_id']
+      @quantity = latest_receipt_info['quantity'].to_i
+      
+      @unique_identifier = latest_receipt_info['unique_identifier']
+      @unique_vendor_identifier = latest_receipt_info['unique_vendor_identifier']
+      
+      # Here we coerce the field names to match what the receipt verify response returns
+      if latest_receipt_info['expires_date_formatted']
+        @expires_date = DateTime.parse(latest_receipt_info['expires_date_formatted'])
+      end
+      if latest_receipt_info['expires_date']
+        @expires_date_ms = Time.zone.at(latest_receipt_info['expires_date'].to_i / 1000)
+      end
+      if latest_receipt_info['expires_date_formatted_pst']
+        @expires_date_pst = date_for_pacific_time(latest_receipt_info['expires_date_formatted_pst'])
+      end
+      if latest_receipt_info['is_in_intro_offer_period']
+        @is_in_intro_offer_period = latest_receipt_info['is_in_intro_offer_period'].to_bool
+      end
+      if latest_receipt_info['is_trial_period']
+        @is_trial_period = latest_receipt_info['is_trial_period'].to_bool
+      end
+      if latest_receipt_info['cancellation_date']
+        @cancellation_date = DateTime.parse(latest_receipt_info['cancellation_date'])
+      end
+    end    
+
+    def date_for_pacific_time pt
+      # The field is labelled "PST" by apple, but the "America/Los_Angelus" time zone is actually Pacific Time, 
+      # which is different, because it observes DST.
+      ActiveSupport::TimeZone["Pacific Time (US & Canada)"].parse(pt).to_datetime
+    end
+
+  end # class
+end # module
+
+# Sample JSON Response
+#
+# {
+#     "auto_renew_product_id": "product_id.quarterly",
+#     "auto_renew_status": "true",
+#     "environment": "Sandbox",
+#     "latest_receipt": "<base 64>",
+#     "latest_receipt_info": {
+#         "bid": "co.bundle.id",
+#         "bvrs": "1004",
+#         "expires_date": "1521161603000",
+#         "expires_date_formatted": "2018-03-16 00:53:23 Etc/GMT",
+#         "expires_date_formatted_pst": "2018-03-15 17:53:23 America/Los_Angeles",
+#         "is_in_intro_offer_period": "false",
+#         "is_trial_period": "false",
+#         "item_id": "1359908036",
+#         "original_purchase_date": "2018-03-15 23:23:05 Etc/GMT",
+#         "original_purchase_date_ms": "1521156185000",
+#         "original_purchase_date_pst": "2018-03-15 16:23:05 America/Los_Angeles",
+#         "original_transaction_id": "1000000383185294",
+#         "product_id": "product_id.quarterly",
+#         "purchase_date": "2018-03-16 00:38:23 Etc/GMT",
+#         "purchase_date_ms": "1521160703000",
+#         "purchase_date_pst": "2018-03-15 17:38:23 America/Los_Angeles",
+#         "quantity": "1",
+#         "transaction_id": "1000000383189543",
+#         "unique_identifier": "3a142176fee52ba64ddc3ba3b685786bd58cb4fe",
+#         "unique_vendor_identifier": "D8E8B1EB-7A35-4E88-A21C-584E4FEB6543",
+#         "web_order_line_item_id": "1000000038128465"
+#     },
+#     "notification_type": "RENEWAL",
+#     "password": "password"
+# }

data/lib/monza/transaction_receipt.rb

@@ -38,10 +38,18 @@ module Monza
       @web_order_line_item_id = attributes['web_order_line_item_id']
 
       if attributes['expires_date']
-        @expires_date = DateTime.parse(attributes['expires_date'])
+        begin
+          # Attempt to parse as RFC 3339 timestamp (new-style receipt)
+          @expires_date = DateTime.parse(attributes['expires_date'])
+        rescue
+          # Attempt to parse as integer ms epoch (old-style receipt)
+          @expires_date = Time.at(attributes['expires_date'].to_i / 1000).to_datetime
+        end
       end
       if attributes['expires_date_ms']
         @expires_date_ms = Time.zone.at(attributes['expires_date_ms'].to_i / 1000)
+      elsif attributes['expires_date']
+        @expires_date_ms = Time.zone.at(attributes['expires_date'].to_i / 1000)
       end
       if attributes['expires_date_pst']
         @expires_date_pst = DateTime.parse(attributes['expires_date_pst'].gsub("America/Los_Angeles","PST"))

data/lib/monza/verification_response.rb

@@ -8,6 +8,7 @@ module Monza
     attr_reader :environment
     attr_reader :receipt
     attr_reader :latest_receipt_info
+    attr_reader :renewal_info
     attr_reader :latest_receipt
     attr_reader :original_json_response
 
@@ -18,10 +19,19 @@ module Monza
       @environment = attributes['environment']
       @receipt = Receipt.new(attributes['receipt'])
       @latest_receipt_info = []
-      if attributes['latest_receipt_info']
+      case attributes['latest_receipt_info']
+      when Array
         attributes['latest_receipt_info'].each do |transaction_receipt_attributes|
           @latest_receipt_info << TransactionReceipt.new(transaction_receipt_attributes)
         end
+      when Hash
+        @latest_receipt_info << TransactionReceipt.new(attributes['latest_receipt_info'])
+      end
+      @renewal_info = []
+      if attributes['pending_renewal_info']
+        attributes['pending_renewal_info'].each do |renewal_info_attributes|
+          @renewal_info << RenewalInfo.new(renewal_info_attributes)
+        end
       end
       @latest_receipt = attributes['latest_receipt']
     end
@@ -133,5 +143,15 @@ end # module
 #       "is_trial_period": "true"
 #     }
 #   ],
-#   "latest_receipt": "base 64"
+#   "latest_receipt": "base 64",
+#   "pending_renewal_info": [
+#     {
+#       "expiration_intent": "1",
+#       "auto_renew_product_id": "renew_product_id",
+#       "original_transaction_id": "1000000218147500",
+#       "is_in_billing_retry_period": "0",
+#       "product_id": "product_id",
+#       "auto_renew_status": "0"
+#     }
+#   ]
 # }

data/lib/monza/version.rb

@@ -1,3 +1,3 @@
 module Monza
-  VERSION = "1.1.3"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monza
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.3.0
 platform: ruby
 authors:
 - Gabriel Garza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-02 00:00:00.000000000 Z
+date: 2018-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -103,6 +103,8 @@ files:
 - lib/monza/client.rb
 - lib/monza/config.rb
 - lib/monza/receipt.rb
+- lib/monza/renewal_info.rb
+- lib/monza/status_response.rb
 - lib/monza/transaction_receipt.rb
 - lib/monza/verification_response.rb
 - lib/monza/version.rb