shopify-gold 4.2.1 → 5.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f9ca0609c1661eb388a4354255e2a6b57d7b9fea7ae027ff2aaf9a801ac0994
-  data.tar.gz: c53b34671832011bb809d682df5bb6404ce930b7f45963ec4876627cd7dd1b62
+  metadata.gz: b0c1d7836dbfa17bc2904e5b3e28db56c975615067cec4ab0f333db6342b7a56
+  data.tar.gz: 602576cfdf68190454a2ad5e62bd7aa50d87f7e2607b10f01f0204f29f54f089
 SHA512:
-  metadata.gz: 2619bf2701596b63b8ef70857f2c0642b68f75a028f4c0f525ccb5f8b671c3aa5a11df0e8400db925310b2397e119f84d326a48c6c93fd9e0a38cf83ce4e123e
-  data.tar.gz: 275bcc0bc5f9e387688e01e2956e5d3c40dcf10d1665f761d4c044a1518ae73e9388afbfb9fa035ca427d471a8cc3664081c2f62bf62ce13e746232d63ae2c85
+  metadata.gz: e91088357efbc98973a9aa90d8095cedb0d5cf51dfaae13cb478dcb4b8a00ec990fcd70994a390d4b2d3598173c26f48e8b104193940d47cf75b4447d07b35a8
+  data.tar.gz: 4f69024f139ccc4d8760e94162c21d53796edc2918786ee65ea4f08fb3aa793e7d57936c317a4f989eab4cd3b10c406c7e8c583f1e600ebc530e3ae9767c89fd

data/app/controllers/gold/authenticated_controller.rb

@@ -1,4 +1,4 @@
-require_dependency "gold/application_controller"
+require "gold/application_controller"
 
 module Gold
   # Inherit from Shopify's authenticated module

data/app/controllers/gold/billing_controller.rb

@@ -7,7 +7,7 @@ module Gold
     layout "gold/billing"
 
     rescue_from Statesman::TransitionFailedError do |e|
-      billing = Billing.find_by!(shop_id: session[:shopify])
+      billing = Billing.find_by!(shop_id: session[:shop_id])
       Gold.logger.error("Shop '#{billing.shop.shopify_domain}' failed to " \
                         "transtion '#{e}'")
       render "gold/billing/transition_error", layout: "gold/billing",
@@ -57,7 +57,7 @@ module Gold
       case outcome
       when SameTier, TierApplied
         cookies.delete(:gold_tier_id)
-        redirect_to main_app.root_url
+        redirect_to Gold.configuration.after_tier_redirect_path
       when CannotSelectTier
         flash.now[:error] = "Your shop is not eligible for this plan"
         render :tier
@@ -98,7 +98,7 @@ module Gold
           Gold.logger.info("[#{billing.id}] Charge is ready")
         end
 
-        redirect_to main_app.root_url
+        redirect_to Gold.configuration.after_tier_redirect_path
       else
         raise "Not sure how to handle #{outcome} on outstanding charge"
       end
@@ -112,7 +112,7 @@ module Gold
       case outcome
       when ActiveCharge
         ApplyTierOp.new(billing).call
-        outer_redirect_to_main
+        outer_redirect(Gold.configuration.after_tier_redirect_path)
       when DeclinedCharge
         redirect_to declined_charge_url
       when ExpiredCharge
@@ -165,14 +165,14 @@ module Gold
 
     # If embedded app, redirect directly through the Shopify admin. This can provide
     # a better experience than the page rendering and JS kicking off a redirect
-    def outer_redirect_to_main
+    def outer_redirect(redirect_path)
       if ShopifyApp.configuration.embedded_app
         shopify_domain = billing.shop.shopify_domain
         api_key = ShopifyApp.configuration.api_key
-        fullpath = "/admin/apps/#{api_key}#{main_app.root_path}"
+        fullpath = "/admin/apps/#{api_key}#{redirect_path}"
         redirect_to URI::HTTPS.build(host: shopify_domain, path: fullpath).to_s
       else
-        redirect_to main_app.root_url
+        redirect_to redirect_path
       end
     end
 

data/app/controllers/gold/concerns/merchant_facing.rb

@@ -9,7 +9,7 @@ module Gold
 
       # Returns the Gold::Billing instance for the currently logged-in merchant.
       def billing
-        @billing ||= Billing.find_by!(shop_id: session[:shopify])
+        @billing ||= Billing.find_by!(shop_id: session[:shop_id])
       rescue ActiveRecord::RecordNotFound
         raise Gold::Exceptions::BillingNotFound
       end
@@ -49,7 +49,7 @@ module Gold
           Gold.logger.info("Confronting billing, state is '#{state}'")
 
           case state
-          when nil, :new
+          when nil, :new, :install
             Gold.logger.info("Redirecting to terms page...")
             return @context.redirect_to(@engine.terms_url)
           when :select_tier, :reinstalled, :accepted_terms

data/app/models/gold/concerns/gilded.rb

@@ -1,4 +1,4 @@
-require_dependency "statesman"
+require "statesman"
 
 module Gold
   module Concerns

data/app/models/gold/machine.rb

@@ -1,4 +1,4 @@
-require_dependency "statesman"
+require "statesman"
 
 module Gold
   # This is the finite state machine specification that governs how shops may
@@ -12,6 +12,9 @@ module Gold
 
     state :new, initial: true
 
+    # A merchant has installed the app
+    state :install
+
     # Before merchants can use our app, they will need to review and accept our
     # Terms of Service.
     state :accepted_terms
@@ -165,7 +168,8 @@ module Gold
 
     # Transitions
 
-    transition from: :new, to: %i[accepted_terms marked_as_uninstalled]
+    transition from: :new, to: %i[install marked_as_uninstalled]
+    transition from: :install, to: %i[accepted_terms marked_as_uninstalled]
     transition from: :accepted_terms, to: %i[select_tier marked_as_uninstalled]
 
     before_transition to: :select_tier, &require_metadata(:tier_id)
@@ -230,7 +234,8 @@ module Gold
                                           apply_free_tier
                                           change_tier
                                           staff
-                                          optional_charge]
+                                          optional_charge
+                                          marked_as_uninstalled]
 
     before_transition to: :optional_charge, &require_metadata(:charge_id)
     guard_transition to: :optional_charge, &ensure_plan_is(:paying?)
@@ -238,7 +243,8 @@ module Gold
                                               optional_charge_accepted
                                               optional_charge_declined
                                               marked_as_uninstalled]
-    transition from: :optional_charge_declined, to: :billing
+    transition from: :optional_charge_declined, to: %i[billing
+                                                       marked_as_uninstalled]
 
     transition from: :optional_charge_accepted, to: %i[charge_activated
                                                        marked_as_uninstalled]
@@ -256,13 +262,17 @@ module Gold
                                                       marked_as_uninstalled]
 
     transition from: :delayed_charge_expired, to: %i[delayed_charge
-                                                     marked_as_delinquent]
+                                                     marked_as_delinquent
+                                                     marked_as_uninstalled]
     transition from: :delayed_charge_declined, to: %i[marked_as_delinquent
-                                                      delayed_charge]
+                                                      delayed_charge
+                                                      marked_as_uninstalled]
 
     guard_transition to: :marked_as_delinquent,
                      &ensure_min_days_in_state(Gold.configuration.days_until_delinquent)
-    transition from: :marked_as_delinquent, to: :delinquent
+    transition from: :marked_as_delinquent, to: %i[delinquent
+                                                   marked_as_uninstalled]
+
     transition from: :delinquent, to: %i[marked_as_uninstalled delayed_charge cleanup]
 
     guard_transition to: :affiliate, &ensure_plan_is(:affiliate?)

data/app/models/gold/shopify_plan.rb

@@ -20,14 +20,16 @@ module Gold
 
     # Returns true if this is a development (non-live) shop.
     def affiliate?
-      plan == "affiliate"
+      plans = %w[affiliate partner_test]
+      plans.include?(plan)
     end
 
     # Returns true if this is a shop owned by Shopify staff. This specifically
     # excludes Shopify Business shops, as we believe those are paid stores that
     # Shopify employees use for their own businesses.
     def staff?
-      plan == "staff"
+      plans = %w[plus_partner_sandbox staff]
+      plans.include?(plan)
     end
 
     # Returns true if this shop has been frozen by Shopify for non-payment.

data/app/models/gold/tier.rb

@@ -79,11 +79,11 @@ module Gold
     end
 
     def qualifications
-      parent ? parent.qualifications : @qualifications
+      parent ? parent.qualifications.merge(@qualifications) : @qualifications
     end
 
     def features
-      parent ? parent.features : @features
+      parent ? parent.features.merge(@features) : @features
     end
 
     def parent

data/app/operations/gold/install_op.rb

@@ -10,11 +10,13 @@ module Gold
     end
 
     def call
-      # If possible, transition to reinstalled
+      # Transition to reinstalled, if possible
       @billing.transition_to(:reinstalled)
 
       case @billing.current_state
       when :new, :reinstalled
+        # Transition to install, if possible
+        @billing.transition_to(:install)
         Gold.configuration.on_install&.call(@billing)
       when :frozen
         return CheckChargeOp.new(@billing).call

data/lib/gold/billing_migrator.rb

@@ -45,6 +45,8 @@ module Gold
         trial_starts_at: @trial_starts_at
       )
 
+      @billing.transition_to! :install
+
       lookup_tier!
       accept_terms
       select_tier

data/lib/gold/configuration.rb

@@ -13,7 +13,8 @@ module Gold
                   :days_until_cleanup,
                   :shop_domain_attribute,
                   :force_embedded_redirect,
-                  :app_listing_url
+                  :app_listing_url,
+                  :after_tier_redirect_path
 
     # Callbacks
     attr_accessor :on_terms,
@@ -72,6 +73,10 @@ module Gold
       # The URL to follow after a referral code is tracked
       # (e.g. https://apps.shopify.com/customr)
       @app_listing_url = "https://apps.shopify.com/"
+
+      # The redirect path after a tier is applied. Use this path to welcome a
+      # merchant if they just installed
+      @after_tier_redirect_path = "/"
     end
 
     def shop_class

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "4.2.1".freeze
+  VERSION = "5.3.0".freeze
 end

data/lib/tasks/gold_tasks.rake

@@ -66,6 +66,8 @@ namespace :gold do
         Gold::UninstallOp.new(billing).call
       rescue ActiveResource::ClientError => e
         puts "Error for '#{billing.shop.shopify_domain}', #{e}"
+      rescue Statesman::GuardFailedError => e
+        puts "Cannot transition: #{e.message}"
       end
     end
   end
@@ -90,8 +92,17 @@ namespace :gold do
       end
 
       billing.shop.with_shopify_session do
-        Gold::MarkAsDelinquentOp.new(billing).call
-        puts "Shop '#{billing.shop.shopify_domain}' is delinquent"
+        domain = billing.shop.shopify_domain
+
+        begin
+          Gold::MarkAsDelinquentOp.new(billing).call
+          puts "Shop '#{domain}' is delinquent"
+        rescue ActiveResource::UnauthorizedAccess
+          puts "It looks like '#{domain}' uninstalled, running op..."
+          Gold::UninstallOp.new(billing).call
+        rescue ActiveResource::ClientError => e
+          puts "Error for '#{domain}', #{e}"
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 5.3.0
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-08 00:00:00.000000000 Z
+date: 2020-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
@@ -43,28 +43,28 @@ dependencies:
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: statesman
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -73,14 +73,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '2.7'
 - !ruby/object:Gem::Dependency
   name: faker
   requirement: !ruby/object:Gem::Requirement
@@ -155,16 +155,16 @@ dependencies:
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '15'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -183,16 +183,16 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.4.2
+        version: '3'
 description: |
   Gold is Helium's approach to billing for Shopify apps. It provides a
   framework to build Rails apps upon.