shopify-gold 5.2.1 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d15786e3bd37ff9291bf4f000c3f580373a56dcf5bd8662df743ec4a30ec5c36
-  data.tar.gz: 9f838172385fffd62d0397c92db4acb8a8bda60c7aac144bfdaf90883d6ba452
+  metadata.gz: 5af1f02e51816d38e9006351b7f2a34cf7e8e72ba868faab7cf1ab2f14fe8c7d
+  data.tar.gz: 817a1c5a99a6099bed127d6eb8af9c7e30363e35f2b219ce66c6d558861c9b95
 SHA512:
-  metadata.gz: 9eb7a98aab47e7948e56b3522586ca3023bbf19e9fd3df2c7cac5036bf8986b8abfc963ec9173056999aef245a0879d0cdc7f0f5dc0b62c5145131f97571c556
-  data.tar.gz: 3c642760a522e4e1c8cac183f6eb2b7f5e36d8bb2d885bb34de7faf83cd0c237ee6d93d6771328efe742a5619cb44178912529a4b9287fd72d383be442f896b7
+  metadata.gz: 1d7ef42beab7002310f8ef6cb9c317fd031a8c55d7d0040b4a9b889183fe7b6cf264f458552fc849bc314ea33f02ad7c100c382300706df9f9fbbdd68b1dfbbd
+  data.tar.gz: 804b615464d2a7d1b0c5f70d84871ce1a8d56cc9770afe978c495671d0e9e2f9a7e23a56f581a218c6d6bc42afa368b9aa74a38da75fd7cc8721fc8ab047dc89

data/README.md

@@ -119,9 +119,6 @@ Gold.configure do |config|
   # The URL to a plan comparison page for the app
   config.plan_comparison_url = "https://heliumdev.com/pricing"
 
-  # The API version used by Shopify (https://help.shopify.com/en/api/versioning)
-  config.shopify_api_version = "2019-04"
-
   # If Gold is allowed to cancel charges (paid -> free) automatically
   config.allow_automated_charge_cancellation = true
 

data/app/controllers/gold/admin/billing_controller.rb

@@ -165,7 +165,7 @@ module Gold
       private
 
       def shopify_session
-        billing.shop.with_shopify_session do
+        billing.with_shopify_session do
           yield
         end
       end

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

@@ -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/jobs/gold/after_authenticate_job.rb

@@ -16,7 +16,7 @@ module Gold
       # cleaned up.
       billing = Billing.find_or_create_by!(shop: shop)
 
-      shop.with_shopify_session do
+      billing.with_shopify_session do
         outcome = InstallOp.new(billing).call
 
         case outcome

data/app/mailers/gold/billing_mailer.rb

@@ -5,7 +5,7 @@ module Gold
 
     # Inform a merchant about their account becoming suspended.
     def suspension(billing)
-      billing.shop.with_shopify_session do
+      billing.with_shopify_session do
         @shop = ShopifyAPI::Shop.current
         mail(to: @shop.email,
              subject: "We have suspended your access to #{Gold.configuration.app_name}")
@@ -14,7 +14,7 @@ module Gold
 
     # Inform a merchant about their non-payment.
     def delinquent(billing)
-      billing.shop.with_shopify_session do
+      billing.with_shopify_session do
         @shop = ShopifyAPI::Shop.current
         mail(to: @shop.email,
              subject: "We need you to approve a charge for " \
@@ -23,7 +23,7 @@ module Gold
     end
 
     def affiliate_to_paid(billing, confirmation_url)
-      billing.shop.with_shopify_session do
+      billing.with_shopify_session do
         @shop = ShopifyAPI::Shop.current
         @confirmation_url = confirmation_url
         app_name = Gold.configuration.app_name

data/app/models/gold/billing.rb

@@ -50,6 +50,8 @@ module Gold
                                            association_name: :transitions)
     end
 
+    delegate :with_shopify_session, to: :shop
+
     delegate :can_transition_to?,
              :transition_to!,
              :transition_to,
@@ -112,7 +114,7 @@ module Gold
 
       Gold.logger.info("Received shop update from '#{shop.shopify_domain}'")
 
-      shop.with_shopify_session do
+      billing.with_shopify_session do
         case current_state
         when :affiliate
           if shopify_plan.paying?

data/app/models/gold/machine.rb

@@ -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)

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/app/views/gold/admin/billing/_active_charge.erb

@@ -3,7 +3,7 @@
     <strong>Active charge</strong>
   </div>
   <div class="card-body">
-    <% billing.shop.with_shopify_session do %>
+    <% billing.with_shopify_session do %>
       <% charge = @active_charge %>
       <% if charge %>
         <% if charge.test %>

data/app/views/gold/admin/billing/_credit.erb

@@ -1,4 +1,4 @@
-<% billing.shop.with_shopify_session do %>
+<% billing.with_shopify_session do %>
   <div class="card mb-3">
     <div class="card-header">
       <strong>Credit</strong>

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

@@ -7,7 +7,6 @@ module Gold
                   :plan_comparison_url,
                   :logger,
                   :admin_credentials,
-                  :shopify_api_version,
                   :allow_automated_charge_cancellation,
                   :days_until_delinquent,
                   :days_until_cleanup,
@@ -64,9 +63,6 @@ module Gold
         password: "password123"
       }
 
-      # The API version used by Shopify (https://help.shopify.com/en/api/versioning)
-      @shopify_api_version = "2019-04"
-
       # If Gold is allowed to cancel charges (paid -> free) automatically
       @allow_automated_charge_cancellation = true
 

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "5.2.1".freeze
+  VERSION = "6.0.0".freeze
 end

data/lib/tasks/gold_tasks.rake

@@ -51,7 +51,7 @@ namespace :gold do
     Gold::Billing.all.each do |billing|
       next unless billing.state_machine.can_transition_to?(:check_charge)
 
-      billing.shop.with_shopify_session do
+      billing.with_shopify_session do
         outcome = Gold::CheckChargeOp.new(billing).call
 
         if outcome.ok?
@@ -66,8 +66,7 @@ namespace :gold do
         Gold::UninstallOp.new(billing).call
       rescue ActiveResource::ClientError => e
         puts "Error for '#{billing.shop.shopify_domain}', #{e}"
-      rescue Statesman::GuardFailedError,
-             Statesman::TransitionFailedError => e
+      rescue Statesman::GuardFailedError => e
         puts "Cannot transition: #{e.message}"
       end
     end
@@ -78,7 +77,7 @@ namespace :gold do
     Gold::Billing.all.each do |billing|
       next unless billing.state_machine.can_transition_to?(:cleanup)
 
-      billing.shop.with_shopify_session do
+      billing.with_shopify_session do
         outcome = Gold::CleanupOp.new(billing).call
         puts "Cleanup for shop '#{billing.shop.shopify_domain}': #{outcome}"
       end
@@ -92,7 +91,7 @@ namespace :gold do
         next unless billing.state_machine.can_transition_to?(:marked_as_delinquent)
       end
 
-      billing.shop.with_shopify_session do
+      billing.with_shopify_session do
         domain = billing.shop.shopify_domain
 
         begin

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 6.0.0
 platform: ruby
 authors:
 - Andrew Smith
 - Nick Mealey
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2021-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,16 +43,16 @@ dependencies:
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '16'
 - !ruby/object:Gem::Dependency
   name: statesman
   requirement: !ruby/object:Gem::Requirement
@@ -155,16 +155,16 @@ dependencies:
   name: shopify_app
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '13'
+        version: '16'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -302,7 +302,7 @@ files:
 homepage: https://gitlab.com/helium-development/infrastructure/gold
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -317,8 +317,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.10
+signing_key:
 specification_version: 4
 summary: Helium's approach to billing for Shopify apps
 test_files: []