monza 1.3.9 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 352558d4ab4014083ece9624e7361abf178e7930b85f734eadc1b7bf7f2ae251
-  data.tar.gz: 59fbaee7463a1e76f28cca6ab8f8d677b6461249d7f5e84d6eb1fe75f21117ee
+  metadata.gz: 2a3e8797fbfd911982c72952571bf74f4a2bc43d661ab5453e75c7094a5c58b8
+  data.tar.gz: f6cc849f16e7d9043fde46a8e8a89a1b410305d1f71e3520d73d7a24b34ddefa
 SHA512:
-  metadata.gz: ab12f4fa179c45495ada0bd05b6a706cdd94948aff4af9dd9f8e84c00adc19b49fec36b52483687989b92a2c25e679a5a7ce205d47d713ee22e15140dae4de30
-  data.tar.gz: 1911b4a5e8dea7cfd152394fcb92b58affc6a5a0c610f9b8a48ff70a073296889209de90d06725ab640b9aab074126e98d91089338c3a42e6412b7dbe7f70995
+  metadata.gz: ba834db0521e45098e1234d314c68a33b01e0d21ba46be4f119ca4a65d8d78e7a0170697fec7439995ff5367058eebf1e5585725931fdf9ddb7d362f94bde5fc
+  data.tar.gz: a873a6aa9d162d2557a348d9a9438edeb6172f03283d9f5a278cfb1506ce89796b3fb10df9b8a970b24e57b1804a258258858f2d348bb20a41c4a03fe5783c6b

data/.travis.yml

@@ -3,8 +3,7 @@ sudo: false
 cache: bundler
 
 rvm:
-  - 2.2.7
   - 2.3.4
   - 2.4.1
 
-before_install: gem install bundler -v 1.10.6
+before_install: gem install bundler

data/lib/monza/status_response.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'time'
 
 module Monza
@@ -7,7 +8,7 @@ module Monza
 
     # https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html
     # https://developer.apple.com/documentation/appstoreservernotifications/responsebody
-    module Type 
+    module Type
       CANCEL = 'CANCEL'
       DID_CHANGE_RENEWAL_PREF = 'DID_CHANGE_RENEWAL_PREF'
       DID_CHANGE_RENEWAL_STATUS = 'DID_CHANGE_RENEWAL_STATUS'
@@ -19,7 +20,6 @@ module Monza
       REFUND = 'REFUND'
     end
 
-
     attr_reader :auto_renew_product_id
     attr_reader :auto_renew_status
     attr_reader :auto_renew_status_change_date
@@ -78,21 +78,27 @@ module Monza
       @environment = attributes['environment']
       @expiration_intent = attributes['expiration_intent']
 
-      @latest_receipt = attributes['latest_receipt'] || attributes['latest_expired_receipt']
+      @latest_receipt = attributes.dig('unified_receipt', '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']
+      @password = attributes['password'] if attributes['password']
 
-      # If the receipt is cancelled / expired, we'll get this instead
-      if latest_receipt_info.nil?
-        latest_receipt_info = attributes['latest_expired_receipt_info']
+      latest_receipt_info = []
+      case attributes.dig('unified_receipt', 'latest_receipt_info')
+      when Array
+        attributes.dig('unified_receipt', 'latest_receipt_info').each do |transaction_receipt_attributes|
+          latest_receipt_info << transaction_receipt_attributes
+        end
+      when Hash
+        latest_receipt_info << attributes.dig('unified_receipt', 'latest_receipt_info')
+      end
+      @renewal_info = []
+      attributes.dig('unified_receipt', 'pending_renewal_info')&.each do |renewal_info_attributes|
+        renewal_info << RenewalInfo.new(renewal_info_attributes)
       end
 
+      latest_receipt_info = latest_receipt_info.first
+
       @bundle_id = latest_receipt_info['bid']
       @bvrs = latest_receipt_info['bvrs'].to_i
       @item_id = latest_receipt_info['item_id'].to_i
@@ -101,10 +107,16 @@ module Monza
       @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']
+      if latest_receipt_info['purchase_date_pst']
+        @purchase_date_pst = date_for_pacific_time(latest_receipt_info['purchase_date_pst'])
+      end
+      if latest_receipt_info['original_purchase_date']
+        @original_purchase_date = DateTime.parse(latest_receipt_info['original_purchase_date'])
+      end
+      @original_purchase_date_ms = Time.zone.at(latest_receipt_info['original_purchase_date_ms'].to_i / 1000)
+      if latest_receipt_info['original_purchase_date_pst']
+        @original_purchase_date_pst = date_for_pacific_time(latest_receipt_info['original_purchase_date_pst'])
+      end
       @web_order_line_item_id = latest_receipt_info['web_order_line_item_id']
       @quantity = latest_receipt_info['quantity'].to_i
       
@@ -116,10 +128,14 @@ module Monza
         @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)
+        @expires_date_ms = if latest_receipt_info['expires_date'].size == 13
+                             Time.zone.at(latest_receipt_info['expires_date'].to_i / 1000)
+                           else
+                             DateTime.parse(latest_receipt_info['expires_date'])
+                           end
       end
       if latest_receipt_info['expires_date_formatted_pst']
-        @expires_date_pst = date_for_pacific_time(latest_receipt_info['expires_date_formatted_pst'])
+        @expires_date_pst = date_for_pacific_time(latest_receipt_info['expires_date_formatted_pst'] || latest_receipt_info['expires_date_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
@@ -189,7 +205,6 @@ module Monza
     def refund?
       notification_type == Type::REFUND
     end
-
   end # class
 end # module
 
@@ -199,29 +214,31 @@ end # module
 #     "auto_renew_product_id": "product_id.quarterly",
 #     "auto_renew_status": "true",
 #     "environment": "Sandbox",
+#     "unified_receipt": {
+#         "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"
+#          },
 #     "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/verification_response.rb

@@ -19,13 +19,16 @@ module Monza
       @environment = attributes['environment']
       @receipt = Receipt.new(attributes['receipt'])
       @latest_receipt_info = []
-      case attributes['latest_receipt_info']
+
+      latest_receipt_info = attributes['latest_receipt_info'] || attributes.dig('unified_receipt', 'latest_receipt_info')
+
+      case latest_receipt_info
       when Array
-        attributes['latest_receipt_info'].each do |transaction_receipt_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'])
+        @latest_receipt_info << TransactionReceipt.new(latest_receipt_info)
       end
       @renewal_info = []
       if attributes['pending_renewal_info']
@@ -33,7 +36,7 @@ module Monza
           @renewal_info << RenewalInfo.new(renewal_info_attributes)
         end
       end
-      @latest_receipt = attributes['latest_receipt']
+      @latest_receipt = attributes['latest_receipt'] || attributes.dig('unified_receipt', 'latest_receipt')
     end
 
     def is_subscription_active?

data/lib/monza/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Monza
-  VERSION = '1.3.9'
+  VERSION = '1.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monza
 version: !ruby/object:Gem::Version
-  version: 1.3.9
+  version: 1.5.0
 platform: ruby
 authors:
 - Gabriel Garza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-10-08 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json