monza 1.3.4 → 1.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dbed8295d16cca5672b895abfa7f90dc28ca5eabf6e36f05e4fcd5eadf01b98c
-  data.tar.gz: f4a6cace88d1ce3664f4576e359cbb7406355015d29f31a2f91a30d9851097e7
+  metadata.gz: 352558d4ab4014083ece9624e7361abf178e7930b85f734eadc1b7bf7f2ae251
+  data.tar.gz: 59fbaee7463a1e76f28cca6ab8f8d677b6461249d7f5e84d6eb1fe75f21117ee
 SHA512:
-  metadata.gz: cfe794f5ebf8af1880a65cfe8ca18711c6ed36e33f0a6c57f026a64892f3ace2ee499e73250bda1b9db7918e047461f51d34d9d244c3b53a92b60b1c320d16b5
-  data.tar.gz: 7fc5075d7056c6c8b2287770c4115cdc380666970638d72fea0e2c59541091b6fbcdabf7800d2d4cb024d6f6a6801e5894d3d920fc3104edc8f11050d1727ff1
+  metadata.gz: ab12f4fa179c45495ada0bd05b6a706cdd94948aff4af9dd9f8e84c00adc19b49fec36b52483687989b92a2c25e679a5a7ce205d47d713ee22e15140dae4de30
+  data.tar.gz: 1911b4a5e8dea7cfd152394fcb92b58affc6a5a0c610f9b8a48ff70a073296889209de90d06725ab640b9aab074126e98d91089338c3a42e6412b7dbe7f70995

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
 
@@ -19,10 +21,15 @@ module Monza
       @auto_renew_product_id = attributes['auto_renew_product_id']
       @original_transaction_id = attributes['original_transaction_id']
 
-      @grace_period_expires_date = DateTime.parse(attributes['grace_period_expires_date'])
-      @grace_period_expires_date_ms = Time.zone.at(attributes['grace_period_expires_date_ms'].to_i / 1000)
-      @grace_period_expires_date_pst = DateTime.parse(attributes['grace_period_expires_date_pst'].gsub("America/Los_Angeles","PST"))
-
+      if attributes['grace_period_expires_date']
+        @grace_period_expires_date = DateTime.parse(attributes['grace_period_expires_date'])
+      end
+      if attributes['grace_period_expires_date_ms']
+        @grace_period_expires_date_ms = Time.zone.at(attributes['grace_period_expires_date_ms'].to_i / 1000)
+      end
+      if attributes['grace_period_expires_date_pst']
+        @grace_period_expires_date_pst = DateTime.parse(attributes['grace_period_expires_date_pst'].gsub("America/Los_Angeles","PST"))
+      end
       if attributes['expiration_intent']
         @expiration_intent = attributes['expiration_intent']
       end

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,8 +65,20 @@ 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']
+      @expiration_intent = attributes['expiration_intent']
+
+      @latest_receipt = attributes['latest_receipt'] || attributes['latest_expired_receipt']
       @notification_type = attributes['notification_type']
 
       if attributes['password'] 
@@ -95,6 +130,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 +154,42 @@ 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
 

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

@@ -37,30 +37,19 @@ module Monza
     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.4"
+  VERSION = '1.3.9'
 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.4
+  version: 1.3.9
 platform: ruby
 authors:
 - Gabriel Garza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-30 00:00:00.000000000 Z
+date: 2020-10-08 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