shopify-gold 5.1.1 → 5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27bbc1ba14621fd2a39291faa1df4d52e004cb512858d82f04e29fdefd4f43fc
-  data.tar.gz: 237848311344321a2b5a218ddbfaed88e133efb7ec9ca3b094718c4db1ac382b
+  metadata.gz: 34d7f2d1cc46f58bf46bbaa7760f62960a12e700d1cffc8c9162d8700cf1a44e
+  data.tar.gz: 450137076ab921618217e131fba822ea95a81f3c3a002bfb9bbba6f024cb571e
 SHA512:
-  metadata.gz: f3293e0897c04ad38929c80a2dbb528f5ebfd3f24563e3dcfdcaa68b0a37562ff97406112f4821711ef74d3d539f336a7ccd22de171d6496839be838fc5bde7c
-  data.tar.gz: 06c96b494db7fd61e25a3d4189d004b7cedfe4a93d1636795bcf0923f3036f9fb6cc67be48944991d881195564287ab066fc8866b83c8639aefe3ce50b1b2c9c
+  metadata.gz: e102a20b20e1f0fcee6703bc917dc7500c4f1d024cb340dad8b685518e330e60b63f4f21d28793de48131c06d74d6568cd6e584b69ab670e2e3b751332c17fb0
+  data.tar.gz: ba91515f4ace85d9ad0c13d7aa65546e9cb2a86e5ad2c507b39d4b8289c8c769a46baa1243be1342dda85d34930a2ca1a35aa724919ac217fed7a0752dc53c09

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/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/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/version.rb

@@ -1,3 +1,3 @@
 module Gold
-  VERSION = "5.1.1".freeze
+  VERSION = "5.4.1".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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.4.1
 platform: ruby
 authors:
 - Andrew Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-03 00:00:00.000000000 Z
+date: 2021-01-13 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