shopify-gold 5.1.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27bbc1ba14621fd2a39291faa1df4d52e004cb512858d82f04e29fdefd4f43fc
-  data.tar.gz: 237848311344321a2b5a218ddbfaed88e133efb7ec9ca3b094718c4db1ac382b
+  metadata.gz: bc350b0d446abe5859b2fd037803a15465163c684532f8f9c65a31aa30aee03a
+  data.tar.gz: 190287a79e30730c8873e7150a3c1e30163f7e8b4aaab27fcd1433831ea16e84
 SHA512:
-  metadata.gz: f3293e0897c04ad38929c80a2dbb528f5ebfd3f24563e3dcfdcaa68b0a37562ff97406112f4821711ef74d3d539f336a7ccd22de171d6496839be838fc5bde7c
-  data.tar.gz: 06c96b494db7fd61e25a3d4189d004b7cedfe4a93d1636795bcf0923f3036f9fb6cc67be48944991d881195564287ab066fc8866b83c8639aefe3ce50b1b2c9c
+  metadata.gz: 6dff593d4596f5c7d627ae98812f53bb12395cd5df06fa59dbe6ac2eb2b81d73640e22d311bc81728c98bff0a1120e5f2e5ff8f624924950facf6a882bedb607
+  data.tar.gz: 3b33761e82d90e0698380096ed23dfdeefc1a0dab7004ee28395f46b654d4c4ef06a04d404a6c7f29693cccccca5b323820177306b1b54a40f238ab00ff5d42c

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shopify-gold
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.2.0
 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: 2020-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails