shopify-gold 5.3.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0c1d7836dbfa17bc2904e5b3e28db56c975615067cec4ab0f333db6342b7a56
-  data.tar.gz: 602576cfdf68190454a2ad5e62bd7aa50d87f7e2607b10f01f0204f29f54f089
+  metadata.gz: b682f8f59b0df993ebf70c91b08e0132c1954f50f27f29ff5b6a157bb2ef14e8
+  data.tar.gz: 557b87e2c2bfe5ec5c65201c80a1baee3080060ae938dff53a4ef31e9a770bc9
 SHA512:
-  metadata.gz: e91088357efbc98973a9aa90d8095cedb0d5cf51dfaae13cb478dcb4b8a00ec990fcd70994a390d4b2d3598173c26f48e8b104193940d47cf75b4447d07b35a8
-  data.tar.gz: 4f69024f139ccc4d8760e94162c21d53796edc2918786ee65ea4f08fb3aa793e7d57936c317a4f989eab4cd3b10c406c7e8c583f1e600ebc530e3ae9767c89fd
+  metadata.gz: a6a09be3d17dd4506fc6b58134024908247bbc24ae1bcc4b93c4a9fbb5d0dfd18aba7230c2d84e178c0b268056072c80f05ef3babe9a62ff66865ab7306f7c70
+  data.tar.gz: bee0d8908af7ec53e8e742e8ae100612df945845a417acfe9b55d3d7f23f5f066863573bdddf2835a4d971560455da5270a1fbcf3f9ec6d092934ba72cb38c86

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/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
+      with_shopify_session do
         case current_state
         when :affiliate
           if shopify_plan.paying?

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/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.3.0".freeze
+  VERSION = "6.0.1".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?
@@ -77,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
@@ -91,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.3.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Andrew Smith
 - Nick Mealey
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-09 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: '15'
+        version: '16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '15'
+        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: '15'
+        version: '16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">"
       - !ruby/object:Gem::Version
-        version: '15'
+        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.1.2
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.8
+signing_key:
 specification_version: 4
 summary: Helium's approach to billing for Shopify apps
 test_files: []