summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdnan Abdulally <adnan.abdulally@printivity.com>2021-01-29 10:27:06 -0800
committerNoah Silvera <noah@super.gd>2021-03-17 07:11:08 -0700
commit37fa5e7c81ee44012c86eabb140db760d55eae3b (patch)
tree0d8b8b9efe31b8999f06b3d18ea5f6f50049ef96
parent51ff05c3de3500fdc6aee55e2919646028055286 (diff)
Rename classes that have API in their name to Api
This done so Zeitwerk can correctly can correctly load the class from the filename. Co-authored-by: Nick Van Doorn <nick@super.gd>
-rw-r--r--lib/super_good/solidus_taxjar.rb4
-rw-r--r--lib/super_good/solidus_taxjar/api.rb16
-rw-r--r--lib/super_good/solidus_taxjar/api_params.rb2
-rw-r--r--spec/super_good/solidus_taxjar/addresses_spec.rb4
-rw-r--r--spec/super_good/solidus_taxjar/api_params_spec.rb2
-rw-r--r--spec/super_good/solidus_taxjar/api_spec.rb16
-rw-r--r--spec/super_good/solidus_taxjar/tax_calculator_spec.rb2
-rw-r--r--spec/super_good/solidus_taxjar/tax_rate_calculator_spec.rb2
-rw-r--r--spec/super_good/solidus_taxjar_spec.rb2
9 files changed, 25 insertions, 25 deletions
diff --git a/lib/super_good/solidus_taxjar.rb b/lib/super_good/solidus_taxjar.rb
index 9c773be..36b5d85 100644
--- a/lib/super_good/solidus_taxjar.rb
+++ b/lib/super_good/solidus_taxjar.rb
@@ -28,14 +28,14 @@ module SuperGood
attr_accessor :test_mode
def api
- ::SuperGood::SolidusTaxjar::API.new
+ ::SuperGood::SolidusTaxjar::Api.new
end
end
self.cache_duration = 3.hours
self.cache_key = ->(record) {
record_type = record.class.name.demodulize.underscore
- APIParams.send("#{record_type}_params", record).to_json
+ ApiParams.send("#{record_type}_params", record).to_json
}
self.custom_order_params = ->(order) { {} }
self.discount_calculator = ::SuperGood::SolidusTaxjar::DiscountCalculator
diff --git a/lib/super_good/solidus_taxjar/api.rb b/lib/super_good/solidus_taxjar/api.rb
index c9cc99f..ca6ff6c 100644
--- a/lib/super_good/solidus_taxjar/api.rb
+++ b/lib/super_good/solidus_taxjar/api.rb
@@ -1,6 +1,6 @@
module SuperGood
module SolidusTaxjar
- class API
+ class Api
def self.default_taxjar_client
::Taxjar::Client.new(
api_key: ENV.fetch("TAXJAR_API_KEY"),
@@ -16,7 +16,7 @@ module SuperGood
end
def tax_for(order)
- taxjar_client.tax_for_order(APIParams.order_params(order)).tap do |taxes|
+ taxjar_client.tax_for_order(ApiParams.order_params(order)).tap do |taxes|
next unless SuperGood::SolidusTaxjar.logging_enabled
Rails.logger.info(
@@ -26,19 +26,19 @@ module SuperGood
end
def tax_rate_for(address)
- taxjar_client.tax_for_order(APIParams.tax_rate_address_params(address)).rate
+ taxjar_client.tax_for_order(ApiParams.tax_rate_address_params(address)).rate
end
def tax_rates_for(address)
- taxjar_client.rates_for_location(*APIParams.address_params(address))
+ taxjar_client.rates_for_location(*ApiParams.address_params(address))
end
def create_transaction_for(order)
- taxjar_client.create_order APIParams.transaction_params(order)
+ taxjar_client.create_order ApiParams.transaction_params(order)
end
def update_transaction_for(order)
- taxjar_client.update_order APIParams.transaction_params(order)
+ taxjar_client.update_order ApiParams.transaction_params(order)
end
def delete_transaction_for(order)
@@ -46,11 +46,11 @@ module SuperGood
end
def create_refund_for(reimbursement)
- taxjar_client.create_refund APIParams.refund_params(reimbursement)
+ taxjar_client.create_refund ApiParams.refund_params(reimbursement)
end
def validate_spree_address(spree_address)
- taxjar_client.validate_address APIParams.validate_address_params(spree_address)
+ taxjar_client.validate_address ApiParams.validate_address_params(spree_address)
end
private
diff --git a/lib/super_good/solidus_taxjar/api_params.rb b/lib/super_good/solidus_taxjar/api_params.rb
index ac6abf4..ebf034d 100644
--- a/lib/super_good/solidus_taxjar/api_params.rb
+++ b/lib/super_good/solidus_taxjar/api_params.rb
@@ -1,6 +1,6 @@
module SuperGood
module SolidusTaxjar
- module APIParams
+ module ApiParams
class << self
def order_params(order)
{}
diff --git a/spec/super_good/solidus_taxjar/addresses_spec.rb b/spec/super_good/solidus_taxjar/addresses_spec.rb
index b62de7b..4995b12 100644
--- a/spec/super_good/solidus_taxjar/addresses_spec.rb
+++ b/spec/super_good/solidus_taxjar/addresses_spec.rb
@@ -38,7 +38,7 @@ RSpec.describe SuperGood::SolidusTaxjar::Addresses do
}
let(:dummy_api) {
- instance_double ::SuperGood::SolidusTaxjar::API
+ instance_double ::SuperGood::SolidusTaxjar::Api
}
context "when there are no possibilities for the address" do
@@ -171,7 +171,7 @@ RSpec.describe SuperGood::SolidusTaxjar::Addresses do
}
let(:dummy_api) {
- instance_double ::SuperGood::SolidusTaxjar::API
+ instance_double ::SuperGood::SolidusTaxjar::Api
}
context "when there are no possibilities for the address" do
diff --git a/spec/super_good/solidus_taxjar/api_params_spec.rb b/spec/super_good/solidus_taxjar/api_params_spec.rb
index 4c729e6..0fc54f6 100644
--- a/spec/super_good/solidus_taxjar/api_params_spec.rb
+++ b/spec/super_good/solidus_taxjar/api_params_spec.rb
@@ -1,6 +1,6 @@
require "spec_helper"
-RSpec.describe SuperGood::SolidusTaxjar::APIParams do
+RSpec.describe SuperGood::SolidusTaxjar::ApiParams do
let(:order) do
Spree::Order.create!(
additional_tax_total: BigDecimal("9.87"),
diff --git a/spec/super_good/solidus_taxjar/api_spec.rb b/spec/super_good/solidus_taxjar/api_spec.rb
index 189ff17..a1282a7 100644
--- a/spec/super_good/solidus_taxjar/api_spec.rb
+++ b/spec/super_good/solidus_taxjar/api_spec.rb
@@ -1,6 +1,6 @@
require "spec_helper"
-RSpec.describe SuperGood::SolidusTaxjar::API do
+RSpec.describe SuperGood::SolidusTaxjar::Api do
describe ".new" do
subject { described_class.new }
@@ -27,7 +27,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:order) { Spree::Order.new }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:order_params)
.with(order)
.and_return({order: "params"})
@@ -51,7 +51,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:response) { double(rate: tax_rate) }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:tax_rate_address_params)
.with(address)
.and_return({address: "params"})
@@ -73,7 +73,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:address) { Spree::Address.new }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:address_params)
.with(address)
.and_return(["zipcode", {address: "params"}])
@@ -95,7 +95,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:order) { Spree::Order.new }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:transaction_params)
.with(order)
.and_return({transaction: "params"})
@@ -117,7 +117,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:order) { Spree::Order.new }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:transaction_params)
.with(order)
.and_return({transaction: "params"})
@@ -156,7 +156,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:reimbursement) { Spree::Reimbursement.new }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:refund_params)
.with(reimbursement)
.and_return({refund: "params"})
@@ -178,7 +178,7 @@ RSpec.describe SuperGood::SolidusTaxjar::API do
let(:spree_address) { build :address }
before do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:validate_address_params)
.with(spree_address)
.and_return({address: "params"})
diff --git a/spec/super_good/solidus_taxjar/tax_calculator_spec.rb b/spec/super_good/solidus_taxjar/tax_calculator_spec.rb
index 7609a83..3386022 100644
--- a/spec/super_good/solidus_taxjar/tax_calculator_spec.rb
+++ b/spec/super_good/solidus_taxjar/tax_calculator_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe ::SuperGood::SolidusTaxjar::TaxCalculator do
let(:calculator) { described_class.new(order, api: dummy_api) }
let(:dummy_api) do
- instance_double ::SuperGood::SolidusTaxjar::API
+ instance_double ::SuperGood::SolidusTaxjar::Api
end
let(:order) do
diff --git a/spec/super_good/solidus_taxjar/tax_rate_calculator_spec.rb b/spec/super_good/solidus_taxjar/tax_rate_calculator_spec.rb
index de7eb26..1757d19 100644
--- a/spec/super_good/solidus_taxjar/tax_rate_calculator_spec.rb
+++ b/spec/super_good/solidus_taxjar/tax_rate_calculator_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe ::SuperGood::SolidusTaxjar::TaxRateCalculator do
let(:calculator) { described_class.new(address, api: dummy_api) }
let(:dummy_api) do
- instance_double ::SuperGood::SolidusTaxjar::API
+ instance_double ::SuperGood::SolidusTaxjar::Api
end
let(:dummy_tax_rate) { BigDecimal(0) }
diff --git a/spec/super_good/solidus_taxjar_spec.rb b/spec/super_good/solidus_taxjar_spec.rb
index 865ed8b..6236b2f 100644
--- a/spec/super_good/solidus_taxjar_spec.rb
+++ b/spec/super_good/solidus_taxjar_spec.rb
@@ -12,7 +12,7 @@ RSpec.describe SuperGood::SolidusTaxjar do
let(:order) { Spree::Order.new }
it "returns the API params converted to JSON" do
- allow(SuperGood::SolidusTaxjar::APIParams)
+ allow(SuperGood::SolidusTaxjar::ApiParams)
.to receive(:order_params)
.with(order)
.and_return({some: "hash", with: "stuff", in: "it"})