diff options
author | Adnan Abdulally <adnan.abdulally@printivity.com> | 2021-01-29 10:24:19 -0800 |
---|---|---|
committer | Noah Silvera <noah@super.gd> | 2021-03-17 07:11:08 -0700 |
commit | 51ff05c3de3500fdc6aee55e2919646028055286 (patch) | |
tree | 8709c1a8a6ea3bb361b52bd50c20dbe3c959c323 /lib/super_good | |
parent | 6fe0283f541a7a2a8c4940f4ce3626e754a292d9 (diff) |
Rename module SolidusTaxJar to SolidusTaxjar
In order for the Zeitwerk loader to properly identity our classes
from the file names, we should remove camel casing from this name
that isn't consistent with underscores in the file name itself.
Co-authored-by: Nick Van Doorn <nick@super.gd>
Diffstat (limited to 'lib/super_good')
-rw-r--r-- | lib/super_good/solidus_taxjar.rb | 6 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/addresses.rb | 4 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/api.rb | 4 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/api_params.rb | 10 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/calculator_helper.rb | 8 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/discount_calculator.rb | 2 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/tax_calculator.rb | 14 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/tax_rate_calculator.rb | 8 | ||||
-rw-r--r-- | lib/super_good/solidus_taxjar/version.rb | 2 |
9 files changed, 29 insertions, 29 deletions
diff --git a/lib/super_good/solidus_taxjar.rb b/lib/super_good/solidus_taxjar.rb index 7bdeb03..9c773be 100644 --- a/lib/super_good/solidus_taxjar.rb +++ b/lib/super_good/solidus_taxjar.rb @@ -12,7 +12,7 @@ require "super_good/solidus_taxjar/discount_calculator" require "super_good/solidus_taxjar/addresses" module SuperGood - module SolidusTaxJar + module SolidusTaxjar class << self attr_accessor :cache_duration attr_accessor :cache_key @@ -28,7 +28,7 @@ module SuperGood attr_accessor :test_mode def api - ::SuperGood::SolidusTaxJar::API.new + ::SuperGood::SolidusTaxjar::API.new end end @@ -38,7 +38,7 @@ module SuperGood APIParams.send("#{record_type}_params", record).to_json } self.custom_order_params = ->(order) { {} } - self.discount_calculator = ::SuperGood::SolidusTaxJar::DiscountCalculator + self.discount_calculator = ::SuperGood::SolidusTaxjar::DiscountCalculator self.exception_handler = ->(e) { Rails.logger.error "An error occurred while fetching TaxJar tax rates - #{e}: #{e.message}" } diff --git a/lib/super_good/solidus_taxjar/addresses.rb b/lib/super_good/solidus_taxjar/addresses.rb index de91af9..7fdf852 100644 --- a/lib/super_good/solidus_taxjar/addresses.rb +++ b/lib/super_good/solidus_taxjar/addresses.rb @@ -1,5 +1,5 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar class Addresses class << self def normalize(spree_address) @@ -11,7 +11,7 @@ module SuperGood end end - def initialize(api: ::SuperGood::SolidusTaxJar.api) + def initialize(api: ::SuperGood::SolidusTaxjar.api) @api = api end diff --git a/lib/super_good/solidus_taxjar/api.rb b/lib/super_good/solidus_taxjar/api.rb index 5c6ab3e..c9cc99f 100644 --- a/lib/super_good/solidus_taxjar/api.rb +++ b/lib/super_good/solidus_taxjar/api.rb @@ -1,5 +1,5 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar class API def self.default_taxjar_client ::Taxjar::Client.new( @@ -17,7 +17,7 @@ module SuperGood def tax_for(order) taxjar_client.tax_for_order(APIParams.order_params(order)).tap do |taxes| - next unless SuperGood::SolidusTaxJar.logging_enabled + next unless SuperGood::SolidusTaxjar.logging_enabled Rails.logger.info( "TaxJar response for #{order.number}: #{taxes.to_h.inspect}" diff --git a/lib/super_good/solidus_taxjar/api_params.rb b/lib/super_good/solidus_taxjar/api_params.rb index a7d1a5b..ac6abf4 100644 --- a/lib/super_good/solidus_taxjar/api_params.rb +++ b/lib/super_good/solidus_taxjar/api_params.rb @@ -1,5 +1,5 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar module APIParams class << self def order_params(order) @@ -8,9 +8,9 @@ module SuperGood .merge(order_address_params(order.tax_address)) .merge(line_items_params(order.line_items)) .merge(shipping: shipping(order)) - .merge(SuperGood::SolidusTaxJar.custom_order_params.call(order)) + .merge(SuperGood::SolidusTaxjar.custom_order_params.call(order)) .tap do |params| - next unless SuperGood::SolidusTaxJar.logging_enabled + next unless SuperGood::SolidusTaxjar.logging_enabled Rails.logger.info( "TaxJar params for #{order.number}: #{params.inspect}" @@ -133,11 +133,11 @@ module SuperGood end def discount(line_item) - ::SuperGood::SolidusTaxJar.discount_calculator.new(line_item).discount + ::SuperGood::SolidusTaxjar.discount_calculator.new(line_item).discount end def shipping(order) - SuperGood::SolidusTaxJar.shipping_calculator.call(order) + SuperGood::SolidusTaxjar.shipping_calculator.call(order) end def sales_tax(order) diff --git a/lib/super_good/solidus_taxjar/calculator_helper.rb b/lib/super_good/solidus_taxjar/calculator_helper.rb index c4803a4..edf0754 100644 --- a/lib/super_good/solidus_taxjar/calculator_helper.rb +++ b/lib/super_good/solidus_taxjar/calculator_helper.rb @@ -1,5 +1,5 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar module CalculatorHelper extend ActiveSupport::Concern @@ -16,14 +16,14 @@ module SuperGood end def taxable_address?(address) - SuperGood::SolidusTaxJar.taxable_address_check.call(address) + SuperGood::SolidusTaxjar.taxable_address_check.call(address) end def cache if !Rails.env.test? Rails.cache.fetch( cache_key, - expires_in: SuperGood::SolidusTaxJar.cache_duration + expires_in: SuperGood::SolidusTaxjar.cache_duration ) { yield } else yield @@ -31,7 +31,7 @@ module SuperGood end def exception_handler - SuperGood::SolidusTaxJar.exception_handler + SuperGood::SolidusTaxjar.exception_handler end end end diff --git a/lib/super_good/solidus_taxjar/discount_calculator.rb b/lib/super_good/solidus_taxjar/discount_calculator.rb index 747a9d0..e5ae91c 100644 --- a/lib/super_good/solidus_taxjar/discount_calculator.rb +++ b/lib/super_good/solidus_taxjar/discount_calculator.rb @@ -1,5 +1,5 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar class DiscountCalculator def initialize(line_item) @line_item = line_item diff --git a/lib/super_good/solidus_taxjar/tax_calculator.rb b/lib/super_good/solidus_taxjar/tax_calculator.rb index 88eee2a..74e6f9b 100644 --- a/lib/super_good/solidus_taxjar/tax_calculator.rb +++ b/lib/super_good/solidus_taxjar/tax_calculator.rb @@ -1,15 +1,15 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar class TaxCalculator include CalculatorHelper - def initialize(order, api: SuperGood::SolidusTaxJar.api) + def initialize(order, api: SuperGood::SolidusTaxjar.api) @order = order @api = api end def calculate - return no_tax if SuperGood::SolidusTaxJar.test_mode + return no_tax if SuperGood::SolidusTaxjar.test_mode return no_tax if incomplete_address?(order.tax_address) || order.line_items.none? return no_tax unless taxable_order? order return no_tax unless taxable_address? order.tax_address @@ -114,22 +114,22 @@ module SuperGood end def cache_key - SuperGood::SolidusTaxJar.cache_key.call(order) + SuperGood::SolidusTaxjar.cache_key.call(order) end def taxable_order?(order) - SuperGood::SolidusTaxJar.taxable_order_check.call(order) + SuperGood::SolidusTaxjar.taxable_order_check.call(order) end def shipping_tax_label(shipment, shipping_tax) - SuperGood::SolidusTaxJar.shipping_tax_label_maker.call( + SuperGood::SolidusTaxjar.shipping_tax_label_maker.call( shipment, shipping_tax ) end def line_item_tax_label(taxjar_line_item, spree_line_item) - SuperGood::SolidusTaxJar.line_item_tax_label_maker.call(taxjar_line_item, spree_line_item) + SuperGood::SolidusTaxjar.line_item_tax_label_maker.call(taxjar_line_item, spree_line_item) end end end diff --git a/lib/super_good/solidus_taxjar/tax_rate_calculator.rb b/lib/super_good/solidus_taxjar/tax_rate_calculator.rb index f9c996c..0096afc 100644 --- a/lib/super_good/solidus_taxjar/tax_rate_calculator.rb +++ b/lib/super_good/solidus_taxjar/tax_rate_calculator.rb @@ -1,14 +1,14 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar class TaxRateCalculator include CalculatorHelper - def initialize(address, api: SuperGood::SolidusTaxJar.api) + def initialize(address, api: SuperGood::SolidusTaxjar.api) @address = address @api = api end def calculate - return no_rate if SuperGood::SolidusTaxJar.test_mode + return no_rate if SuperGood::SolidusTaxjar.test_mode return no_rate if incomplete_address?(address) return no_rate unless taxable_address?(address) cache do @@ -28,7 +28,7 @@ module SuperGood end def cache_key - SuperGood::SolidusTaxJar.cache_key.call(address) + SuperGood::SolidusTaxjar.cache_key.call(address) end end end diff --git a/lib/super_good/solidus_taxjar/version.rb b/lib/super_good/solidus_taxjar/version.rb index 6d001e4..b316dfa 100644 --- a/lib/super_good/solidus_taxjar/version.rb +++ b/lib/super_good/solidus_taxjar/version.rb @@ -1,5 +1,5 @@ module SuperGood - module SolidusTaxJar + module SolidusTaxjar VERSION = "0.17.1" end end |