shopify-gold 2.1.7.pre → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6c8ace5d4d8ead0014d2c86ead25ad9bde3cb2685e41260a578675ab679165f
-  data.tar.gz: 05be6423251f44f471acf1f3dce5169092f9dfc77cd4b891bc9816edcae21d0b
+  metadata.gz: 99f0de847ec187bfbbd0dc8d7bde7a2b23320851b61d637f3bd028c16f6f16e6
+  data.tar.gz: dc0efcde47cdf3355c17d47e700c3e36e6b94dd581ad26aa1dea3bbc30efdf3d
 SHA512:
-  metadata.gz: 4c19091ad6be5d1c454b2cafa6e84b91f3576d5b21355753d05b6d90bd4260b2b51d6b221c68cae5bcd52b075112b160d720325c3bb2eadd58b600007fa555b4
-  data.tar.gz: b18102a095dcd2500cb45d369a701ac4627b5a5c74707998bbb39578751bbc7cb895c13d718c03a6b6ac65c73691cc58fe748aa93ce098299bcd1b2b0b2d1dc8
+  metadata.gz: d6a1c4ec0719da7869e3612e8c017082a0c320cca04788f48457e436d2128d50d9f494207c1ecd3fb5f61501e10186f427099d5642dc8f6766e2f30031c92053
+  data.tar.gz: 230f2b0972feaf7a0a748fbd4baf76c50d3dbd80a3c4c8bf1f2523556c54c20b3a91444d488258cc9b0dff0cd36ba99fb5d659e18ce89118e9791c32be9e3026

data/README.md

@@ -147,6 +147,10 @@ Gold.configure do |config|
     puts "Applied tier..."
   }
 
+  config.on_activate_charge = proc { |billing, charge|
+    puts "Activated charge..."
+  }
+
   config.on_uninstall = proc {
     puts "Uninstalling Gold..."
   }
@@ -154,6 +158,10 @@ Gold.configure do |config|
   config.on_cleanup = proc { |billing|
     puts "Cleaning up shop"
   }
+
+  config.on_check_charge = proc { |billing, active_charge|
+    puts "Check charge for shop"
+  }
 end
 ```
 

data/app/operations/gold/accept_or_decline_charge_op.rb

@@ -112,6 +112,7 @@ module Gold
       request_with_retries do
         charge.activate
         @billing.transition_to!(activated_state)
+        Gold.configuration.on_activate_charge&.call(@billing, charge)
         return ActiveCharge.new(charge.id)
       end
     end

data/app/operations/gold/check_charge_op.rb

@@ -23,18 +23,21 @@ module Gold
       active_charge = charges.find { |charge| charge.status == "active" }
       frozen_charge = charges.find { |charge| charge.status == "frozen" }
 
-      if active_charge && billing_matches_charge?(active_charge)
-        @billing.transition_to!(:billing)
-        return ActiveCharge.new(active_charge.id)
-      elsif frozen_charge && @billing.transition_to(:frozen)
-        return FrozenCharge.new
-      elsif active_charge
-        @billing.transition_to!(:charge_missing)
-        return MismatchCharge.new
-      else
-        @billing.transition_to!(:charge_missing)
-        return MissingCharge.new
-      end
+      outcome = if active_charge && billing_matches_charge?(active_charge)
+                  @billing.transition_to!(:billing)
+                  ActiveCharge.new(active_charge.id)
+                elsif frozen_charge && @billing.transition_to(:frozen)
+                  FrozenCharge.new
+                elsif active_charge
+                  @billing.transition_to!(:charge_missing)
+                  MismatchCharge.new
+                else
+                  @billing.transition_to!(:charge_missing)
+                  MissingCharge.new
+                end
+
+      Gold.configuration.on_check_charge&.call(@billing, active_charge)
+      outcome
     end
 
     private

data/lib/gold.rb

@@ -1,5 +1,6 @@
-require "gold/engine"
 require "gold/billing_migrator"
+require "gold/configuration"
+require "gold/engine"
 require "gold/outcomes"
 require "statesman"
 
@@ -23,81 +24,4 @@ module Gold
     self.configuration ||= Configuration.new
     yield(configuration)
   end
-
-  # Config for Gold
-  class Configuration
-    attr_accessor :test_charge,
-                  :app_name,
-                  :contact_email,
-                  :plan_comparison_url,
-                  :logger,
-                  :admin_credentials,
-                  :shopify_api_version,
-                  :allow_automated_charge_cancellation,
-                  :days_until_delinquent,
-                  :days_until_cleanup,
-                  :shop_domain_attribute
-
-    # Callbacks
-    attr_accessor :on_terms,
-                  :on_install,
-                  :on_uninstall,
-                  :on_cleanup,
-                  :on_apply_tier
-
-    attr_writer :shop_class
-
-    def initialize
-      # The class name (string) of the the app's Active Record Shop model
-      @shop_class = nil
-
-      # The attribute of the *.myshopify.com domain on the Shop model
-      @shop_domain_attribute = nil
-
-      # Should Gold create test charges? Helpful in a development environment
-      @test_charge = false
-
-      # The logger Gold will use
-      @logger = Logger.new(STDOUT)
-
-      # How many days we'll wait before cleaning up an uninstalled shop
-      @days_until_cleanup = 30
-
-      # How many days we'll wait before we uninstall a shop without payment
-      @days_until_delinquent = 7
-
-      # The name of the app using gold (used in the charge name)
-      @app_name = "My App"
-
-      # The email Gold uses to send emails from
-      @contact_email = nil
-
-      # The URL to a plan comparison page for the app
-      @plan_comparison_url = nil
-
-      # Login credential's to Gold's backend
-      @admin_credentials = {
-        user: "admin",
-        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
-    end
-
-    def shop_class
-      @shop_constant ||= @shop_class.to_s.constantize
-    rescue NameError
-      raise "'#{@shop_class}' is not a valid class name for shop class. " \
-            "You must specify one in your Gold config file with " \
-            "'config.shop'"
-    end
-
-    def test_charge?
-      @test_charge
-    end
-  end
 end

data/lib/gold/billing_migrator.rb

@@ -56,7 +56,9 @@ module Gold
     rescue ActiveResource::UnauthorizedAccess,
            ActiveResource::ForbiddenAccess,
            ActiveResource::ResourceNotFound
-      Gold.logger.info("Shop '#{@shop.shopify_domain}' is uninstalled, skipping...")
+      Gold.logger.info("Shop '#{@shop.shopify_domain}' is uninstalled")
+      UninstallOp.new(@billing).call
+      true
     end
 
     private

data/lib/gold/configuration.rb

@@ -0,0 +1,80 @@
+module Gold
+  # Config for Gold
+  class Configuration
+    attr_accessor :test_charge,
+                  :app_name,
+                  :contact_email,
+                  :plan_comparison_url,
+                  :logger,
+                  :admin_credentials,
+                  :shopify_api_version,
+                  :allow_automated_charge_cancellation,
+                  :days_until_delinquent,
+                  :days_until_cleanup,
+                  :shop_domain_attribute
+
+    # Callbacks
+    attr_accessor :on_terms,
+                  :on_install,
+                  :on_activate_charge,
+                  :on_apply_tier,
+                  :on_uninstall,
+                  :on_cleanup,
+                  :on_check_charge
+
+    attr_writer :shop_class
+
+    def initialize
+      # The class name (string) of the the app's Active Record Shop model
+      @shop_class = nil
+
+      # The attribute of the *.myshopify.com domain on the Shop model
+      @shop_domain_attribute = nil
+
+      # Should Gold create test charges? Helpful in a development environment
+      @test_charge = false
+
+      # The logger Gold will use
+      @logger = Logger.new(STDOUT)
+
+      # How many days we'll wait before cleaning up an uninstalled shop
+      @days_until_cleanup = 30
+
+      # How many days we'll wait before we uninstall a shop without payment
+      @days_until_delinquent = 7
+
+      # The name of the app using gold (used in the charge name)
+      @app_name = "My App"
+
+      # The email Gold uses to send emails from
+      @contact_email = nil
+
+      # The URL to a plan comparison page for the app
+      @plan_comparison_url = nil
+
+      # Login credential's to Gold's backend
+      @admin_credentials = {
+        user: "admin",
+        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
+    end
+
+    def shop_class
+      @shop_constant ||= @shop_class.to_s.constantize
+    rescue NameError
+      raise "'#{@shop_class}' is not a valid class name for shop class. " \
+            "You must specify one in your Gold config file with " \
+            "'config.shop'"
+    end
+
+    def test_charge?
+      @test_charge
+    end
+  end
+end

data/lib/gold/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "2.1.7.pre".freeze
+  VERSION = "2.1.8".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 2.1.7.pre
+  version: 2.1.8
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -279,6 +279,7 @@ files:
 - lib/gold.rb
 - lib/gold/admin_engine.rb
 - lib/gold/billing_migrator.rb
+- lib/gold/configuration.rb
 - lib/gold/coverage.rb
 - lib/gold/diagram.rb
 - lib/gold/engine.rb
@@ -302,9 +303,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.1
 signing_key: