monza 1.3.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7eb3c42faa182696449307917a570e0a8a9206d7d49aad26300e0137939621c
-  data.tar.gz: 4a9e08e3b637335402e1b34c078c8c990a80a121d5054e76e5ff38329014902c
+  metadata.gz: 2a3e8797fbfd911982c72952571bf74f4a2bc43d661ab5453e75c7094a5c58b8
+  data.tar.gz: f6cc849f16e7d9043fde46a8e8a89a1b410305d1f71e3520d73d7a24b34ddefa
 SHA512:
-  metadata.gz: ddd4c029f5d1006b3f2cf062567638731917e5306a0ae542b4a9bdec9b4d6d15f24064926045861ef88dc8f0d061b57aff20901f5982e93cce752d8266ba3804
-  data.tar.gz: c068e9330a65d54b594fcde47a31f57a6618ddf0652499d97d08b0bc7cb874de8d79cd395489a1925b0ba2454a80a24d634b99a160bbcf9134278ec893fab327
+  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/README.md

@@ -41,11 +41,6 @@ You can also pass in `exclude_old_transactions` with value `true` as an option i
 # this checks if latest transaction receipt expiry_date is in today or the future
 response.is_subscription_active? # => true or false
 
-# Check if subscription is active
-# this checks if ANY transaction receipt expiry_date is in today or the future
-# this is helpful in case the most recent transaction was cancelled but the user still has a previous transaction or subscription that is active
-response.is_any_subscription_active? # => true or false
-
 # Returns the active subscription TransactionReceipt or nil
 response.latest_active_transaction_receipt # => TransactionReceipt instance
 

data/lib/monza.rb

@@ -1,3 +1,4 @@
+require "monza/bool_typecasting"
 require "monza/version"
 require "monza/client"
 require "monza/renewal_info"
@@ -5,5 +6,4 @@ require "monza/verification_response"
 require "monza/status_response"
 require "monza/receipt"
 require "monza/transaction_receipt"
-require "monza/bool_typecasting"
 require "monza/config"

data/lib/monza/bool_typecasting.rb

@@ -1,35 +1,38 @@
-class String
-  def to_bool
-    return true if self == true || self =~ (/^(true|t|yes|y|1)$/i)
-    return false if self == false || self.empty? || self =~ (/^(false|f|no|n|0)$/i)
-    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+module BoolTypecasting
+  refine String do
+    def to_bool
+      return true if self == true || self =~ (/^(true|t|yes|y|1)$/i)
+      return false if self == false || self.empty? || self =~ (/^(false|f|no|n|0)$/i)
+      raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+    end
+    #  if using Rails empty? can be changed for blank?
   end
-  #  if using Rails empty? can be changed for blank?
-end
 
-if RUBY_VERSION >= "2.4"
-  integer_class = Object.const_get("Integer")
-else
-  integer_class = Object.const_get("Fixnum")
-end
-integer_class::class_eval do
-  def to_bool
-    return true if self == 1
-    return false if self == 0
-    raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+  if RUBY_VERSION >= "2.4"
+    integer_class = Object.const_get("Integer")
+  else
+    integer_class = Object.const_get("Fixnum")
   end
-end
 
-class TrueClass
-  def to_i; 1; end
-  def to_bool; self; end
-end
+  refine integer_class do
+    def to_bool
+      return true if self == 1
+      return false if self == 0
+      raise ArgumentError.new("invalid value for Boolean: \"#{self}\"")
+    end
+  end
 
-class FalseClass
-  def to_i; 0; end
-  def to_bool; self; end
-end
+  refine TrueClass do
+    def to_i; 1; end
+    def to_bool; self; end
+  end
 
-class NilClass
-  def to_bool; false; end
+  refine FalseClass do
+    def to_i; 0; end
+    def to_bool; self; end
+  end
+
+  refine NilClass do
+    def to_bool; false; end
+  end
 end

data/lib/monza/renewal_info.rb

@@ -1,5 +1,7 @@
 module Monza
   class RenewalInfo
+    using BoolTypecasting
+
     # Receipt Fields Documentation
     # https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ReceiptFields.html#//apple_ref/doc/uid/TP40010573-CH106-SW1
 

data/lib/monza/status_response.rb

@@ -1,17 +1,40 @@
+# frozen_string_literal: true
+
 require 'time'
 
 module Monza
   class StatusResponse
+    using BoolTypecasting
+
     # https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ValidateRemotely.html
+    # https://developer.apple.com/documentation/appstoreservernotifications/responsebody
+    module Type
+      CANCEL = 'CANCEL'
+      DID_CHANGE_RENEWAL_PREF = 'DID_CHANGE_RENEWAL_PREF'
+      DID_CHANGE_RENEWAL_STATUS = 'DID_CHANGE_RENEWAL_STATUS'
+      DID_FAIL_TO_RENEW = 'DID_FAIL_TO_RENEW'
+      DID_RECOVER = 'DID_RECOVER'
+      INITIAL_BUY = 'INITIAL_BUY'
+      INTERACTIVE_RENEWAL = 'INTERACTIVE_RENEWAL'
+      RENEWAL = 'RENEWAL'
+      REFUND = 'REFUND'
+    end
 
     attr_reader :auto_renew_product_id
     attr_reader :auto_renew_status
+    attr_reader :auto_renew_status_change_date
+    attr_reader :auto_renew_status_change_date_ms
+    attr_reader :auto_renew_status_change_date_pst
     attr_reader :environment
+    attr_reader :expiration_intent
+
     attr_reader :latest_receipt
 
     attr_reader :notification_type
     attr_reader :password
 
+    attr_reader :latest_receipt_info
+    attr_reader :renewal_info
     attr_reader :bundle_id
     attr_reader :bvrs
     attr_reader :item_id
@@ -42,22 +65,40 @@ module Monza
 
       @auto_renew_product_id = attributes['auto_renew_product_id']
       @auto_renew_status = attributes['auto_renew_status'].to_bool
+      if attributes['auto_renew_status_change_date']
+        @auto_renew_status_change_date = DateTime.parse(attributes['auto_renew_status_change_date'])
+      end
+      if attributes['auto_renew_status_change_date_ms']
+        @auto_renew_status_change_date_ms = Time.zone.at(attributes['auto_renew_status_change_date_ms'].to_i / 1000)
+      end
+      if attributes['auto_renew_status_change_date_pst']
+        @auto_renew_status_change_date_pst = DateTime.parse(attributes['auto_renew_status_change_date_pst'].gsub("America/Los_Angeles", "PST"))
+      end
+      
       @environment = attributes['environment']
-      @latest_receipt = attributes['latest_receipt']
-      @notification_type = attributes['notification_type']
+      @expiration_intent = attributes['expiration_intent']
 
-      if attributes['password'] 
-        @password = attributes['password'] 
-      end
+      @latest_receipt = attributes.dig('unified_receipt', 'latest_receipt')
+      @notification_type = attributes['notification_type']
 
-      # 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
@@ -66,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
       
@@ -81,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
@@ -95,6 +146,22 @@ module Monza
       if latest_receipt_info['cancellation_date']
         @cancellation_date = DateTime.parse(latest_receipt_info['cancellation_date'])
       end
+
+      @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 << TransactionReceipt.new(transaction_receipt_attributes)
+        end
+      when Hash
+        @latest_receipt_info << TransactionReceipt.new(attributes.dig('unified_receipt', 'latest_receipt_info'))
+      end
+      @renewal_info = []
+      if attributes.dig('unified_receipt', 'pending_renewal_info')
+        attributes.dig('unified_receipt', 'pending_renewal_info').each do |renewal_info_attributes|
+          @renewal_info << RenewalInfo.new(renewal_info_attributes)
+        end
+      end
     end    
 
     def date_for_pacific_time pt
@@ -103,6 +170,41 @@ module Monza
       ActiveSupport::TimeZone["Pacific Time (US & Canada)"].parse(pt).to_datetime
     end
 
+    def cancel?
+      notification_type == Type::CANCEL
+    end
+
+    def did_change_renewal_pref?
+      notification_type == Type::DID_CHANGE_RENEWAL_PREF
+    end
+
+    def did_change_renewal_status?
+      notification_type == Type::DID_CHANGE_RENEWAL_STATUS
+    end
+
+    def did_fail_to_renew?
+      notification_type == Type::DID_FAIL_TO_RENEW
+    end
+
+    def did_recover?
+      notification_type == Type::DID_RECOVER
+    end
+
+    def initial_buy?
+      notification_type == Type::INITIAL_BUY
+    end
+
+    def interactive_renewal?
+      notification_type == Type::INTERACTIVE_RENEWAL
+    end
+
+    def renewal?
+      notification_type == Type::RENEWAL
+    end
+
+    def refund?
+      notification_type == Type::REFUND
+    end
   end # class
 end # module
 
@@ -112,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/transaction_receipt.rb

@@ -3,6 +3,8 @@ require 'active_support/core_ext/time'
 
 module Monza
   class TransactionReceipt
+    using BoolTypecasting
+
     # Receipt Fields Documentation
     # https://developer.apple.com/library/ios/releasenotes/General/ValidateAppStoreReceipt/Chapters/ReceiptFields.html#//apple_ref/doc/uid/TP40010573-CH106-SW1
 
@@ -22,9 +24,15 @@ module Monza
     attr_reader :expires_date_ms
     attr_reader :expires_date_pst
     attr_reader :is_trial_period
+    attr_reader :cancellation_reason
     attr_reader :cancellation_date
+    attr_reader :cancellation_date_ms
+    attr_reader :cancellation_date_pst
+    attr_reader :is_in_intro_offer_period
+    attr_reader :original_attributes
 
     def initialize(attributes)
+      @original_attributes = attributes
       @quantity = attributes['quantity'].to_i
       @product_id = attributes['product_id']
       @transaction_id = attributes['transaction_id']
@@ -36,6 +44,10 @@ module Monza
       @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")) if attributes['original_purchase_date_pst']
       @web_order_line_item_id = attributes['web_order_line_item_id']
+      @cancellation_reason = attributes['cancellation_reason'] if attributes['cancellation_reason']
+      @cancellation_date = DateTime.parse(attributes['cancellation_date']) if attributes['cancellation_date']
+      @cancellation_date_ms = Time.zone.at(attributes['cancellation_date_ms'].to_i / 1000) if attributes['cancellation_date_ms']
+      @cancellation_date_pst = DateTime.parse(attributes['cancellation_date_pst'].gsub("America/Los_Angeles","PST")) if attributes['cancellation_date_pst']
 
       if attributes['expires_date']
         begin
@@ -57,8 +69,8 @@ module Monza
       if attributes['is_trial_period']
         @is_trial_period = attributes['is_trial_period'].to_bool
       end
-      if attributes['cancellation_date']
-        @cancellation_date = DateTime.parse(attributes['cancellation_date'])
+      if attributes['is_in_intro_offer_period']
+        @is_in_intro_offer_period = attributes['is_in_intro_offer_period'].to_bool
       end
     end # end initialize
 

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,34 +36,23 @@ 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?
-      if @latest_receipt_info.last
-        if @latest_receipt_info.last.cancellation_date
-          false
-        else
-          @latest_receipt_info.last.expires_date_ms >= Time.zone.now
-        end
-      else
-        false
-      end
+      latest_active_transaction_receipt.present?
     end
 
+    # Deprecated, only left here for backwards compatibility, please use is_subscription_active?
     def is_any_subscription_active?
-      expires_dates_ms = @latest_receipt_info.reject(&:cancellation_date).map(&:expires_date_ms)
-      latest_expires_date_ms = expires_dates_ms.max
-
-      if latest_expires_date_ms
-        latest_expires_date_ms >= Time.zone.now
-      else
-        false
-      end
+      is_subscription_active?
     end
 
     def latest_active_transaction_receipt
-      latest_active_sub = @latest_receipt_info.sort_by(&:expires_date_ms).last
+      latest_active_sub = @latest_receipt_info
+                          .reject(&:cancellation_date)
+                          .select(&:expires_date_ms)
+                          .max_by(&:expires_date_ms)
 
       if latest_active_sub && latest_active_sub.expires_date_ms >= Time.zone.now
         return latest_active_sub

data/lib/monza/version.rb

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

data/monza.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "json"
   spec.add_dependency "activesupport"
 
-  spec.add_development_dependency "bundler", "~> 1.10"
+  spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monza
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Gabriel Garza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-01 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement