lucid_shopify 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dcddf4a0022ae6ecd4762d3f0bf79a2cc1845c90f1ac1b374d2d98756e92a33
-  data.tar.gz: aba5d5ec84a89489c0ba7f87a55999bec6f99dcf4d7bed575c8e71f23aa7562b
+  metadata.gz: ffb571433eeb8cf5658df59664fcdd0a6f6263abbc0e344dbb72aca4696b9194
+  data.tar.gz: d6039441bdedc23549bd096089898e7904265f9b1613fea10bb9a97f23f76a36
 SHA512:
-  metadata.gz: 78de01cbe2b28c74378d20e444a172e3124e8f33d856660bc98bedad97776d65986567cb0f5eb2ae0e8f6dd7ad2aafab0a264354dfa72ea9dd2556333bdb929f
-  data.tar.gz: a81e06f56c4d2ab91bb0152cc43c9e649fc83bada677bc9f7f04cd282a4ecb48d37593882731acd7e9c502c1579d274d91fc653e0538e314f02b479a5a4981a6
+  metadata.gz: 2f670bb4a773274e4b48c5a01ae96528b0b18f0443387a6ed08dec67096efc387623949a701425ddf1cd8a5ea6479db2935e96b4567068895d6daef9a94e5053
+  data.tar.gz: ee826b6b538b45f0674e75db7726785a097550b7cf2207db84b6c12d3decf5fb70b075db8685da8167e40aab602e240c0a83adb1a9fa72d1ef2f3b147e21dd1f

data/lib/lucid_shopify.rb

@@ -5,7 +5,6 @@ require 'dry/initializer'
 module LucidShopify
   autoload :ActivateCharge, 'lucid_shopify/activate_charge'
   autoload :Authorize, 'lucid_shopify/authorize'
-  autoload :Charge, 'lucid_shopify/charge'
   autoload :Client, 'lucid_shopify/client'
   autoload :Config, 'lucid_shopify/config'
   autoload :Container, 'lucid_shopify/container'

data/lib/lucid_shopify/create_charge.rb

@@ -15,12 +15,14 @@ module LucidShopify
     # Create a new recurring application charge.
     #
     # @param request_credentials [RequestCredentials]
-    # @param charge [#to_h]
+    # @param charge [Hash]
     #
     # @return [Hash] the pending charge
     #
     def call(request_credentials, charge)
-      data = @client.post_json(request_credentials, 'recurring_application_charges', charge.to_h)
+      data = @client.post_json(request_credentials, 'recurring_application_charges', {
+        return_url: LucidShopify.config.billing_callback_uri
+      }.merge(charge))
 
       data['recurring_application_charge']
     end

data/lib/lucid_shopify/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LucidShopify
-  VERSION = '0.11.0'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucid_shopify
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Kelsey Judson
@@ -118,7 +118,6 @@ files:
 - lib/lucid_shopify.rb
 - lib/lucid_shopify/activate_charge.rb
 - lib/lucid_shopify/authorize.rb
-- lib/lucid_shopify/charge.rb
 - lib/lucid_shopify/client.rb
 - lib/lucid_shopify/config.rb
 - lib/lucid_shopify/container.rb

data/lib/lucid_shopify/charge.rb

@@ -1,70 +0,0 @@
-# frozen_string_literal: true
-
-require 'lucid_shopify'
-
-module LucidShopify
-  #
-  # @example Subclass to provide application defaults
-  #   class Charge < LucidShopify::Charge
-  #     def initialize(shop)
-  #       super('Application name',
-  #             9,
-  #             test: test?,
-  #             trial_days: shop.trial_started_at?.nil? ? 30 : nil)
-  #     end
-  #
-  #     def test?
-  #       # ...
-  #     end
-  #   end
-  #
-  class Charge
-    #
-    # @param plan_name [String]
-    # @param price [Integer]
-    # @param price_cap [Integer] requires price_terms
-    # @param price_terms [String] requires price_cap
-    # @param test [Boolean] is this a test_charge?
-    # @param trial_days [Integer]
-    #
-    def initialize(plan_name,
-                   price,
-                   price_cap: nil,
-                   price_terms: nil,
-                   test: false,
-                   trial_days: nil)
-      @plan_name = plan_name
-      @price = price
-      @price_cap = price_cap
-      @price_terms = price_terms
-      @test = test
-      @trial_days = trial_days
-
-      freeze
-    end
-
-    #
-    # Map to the Shopify API structure.
-    #
-    # @return [Hash]
-    #
-    def to_h
-      {}.tap do |h|
-        h[:name] = @plan_name
-        h[:price] = @price
-        h[:capped_amount] = @price_cap if usage_based_billing?
-        h[:terms] = @price_terms if usage_based_billing?
-        h[:return_url] = LucidShopify.config.billing_callback_uri
-        h[:test] = @test if @test
-        h[:trial_days] = @trial_days if @trial_days
-      end
-    end
-
-    #
-    # @return [Boolean]
-    #
-    private def usage_based_billing?
-      @price_cap && @price_terms
-    end
-  end
-end