vat-gst-calculator 0.4.9 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 366cf261abb53b08f2be204058b98e37fba5cd53bd33b3fd45833e5b98160d37
-  data.tar.gz: 3b621d0a89a6d0500b8e3cb84170e39bf88dc5c19e75e27ac741a328c83b5989
+  metadata.gz: f39992ff401d87c4d256cbbe7da9ef39e03e134b9e21ca5f4ba258d9ad613497
+  data.tar.gz: 118ee1b247f9536cdaf16aad6246ba8d61d48ee817a02ba7510c1245ccf4d52d
 SHA512:
-  metadata.gz: 9668b14728ba8a15d4fe0ab473533c61aa8657747ec52e49e33328e1d8d8b088d8eac7acc7b039a39c940d4896dd72bb6cda02147d68c89a3f0114653653b96b
-  data.tar.gz: 9ed1cf89d9b2aa91de544f340cb9f0d20e860d434ae303e9a69e756107a37206a2b2392c447c0c98a58dfd83937be99244ab6eab35148f3e0faa70ab7b0d8088
+  metadata.gz: 8ba20e1380d4264138c446a675d5e1a6b5147e39713dcf7d441b706d09295214a0661f75e47411136f459dbf38843a38443d400d98cfc29e3d748e39ef426199
+  data.tar.gz: 490338962e3e8146c6a851aaa4c027a491cc6bb9f276206a00d8687af5b80ab2e7891565d3308086cbd099e5cd71913441124e5590e851519622f211824f531b

data/.gitignore

@@ -1,3 +1,6 @@
 .byebug_history
 .rspec_status
 Gemfile.lock
+.idea/*
+*.swp
+tags

data/lib/easyship/sales_tax/calculator/formula.rb

@@ -1,7 +1,18 @@
+require "time"
+
 module Easyship
   module SalesTax
     module Formula
       class Error < StandardError; end
+
+      NO_TAX = {
+        shipment_charge_total: 0,
+        insurance_fee: 0,
+        pickup_fee: 0,
+        residential_surcharge: 0
+      }.freeze
+      DEFAULT_EFFECTIVE_TIMESTAMP = Time.at(0).utc.freeze
+
       class << self
         def build_fee_struct(shipment_charge_total, insurance_fee, pickup_fee, residential_surcharge)
           {
@@ -12,23 +23,41 @@ module Easyship
           }
         end
 
-        def no_taxes
-          build_fee_struct(0, 0, 0, 0)
+        def effective_data(country_alpha2, effective_timestamp = nil)
+          data = DOMESTIC.fetch(country_alpha2, [])
+
+          data.find { |rates| rates[:effective_timestamp] <= effective_time(effective_timestamp) }
+        end
+
+        private
+
+        def effective_time(effective_timestamp)
+          case effective_timestamp
+          when String
+            Time.parse(effective_timestamp).utc
+          when Time
+            effective_timestamp
+          else
+            Time.now.utc
+          end
         end
       end
 
       DOMESTIC = {
-        'AU' => {
+        'AU' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
           sales_tax_website_name: 'GST',
-          sales_tax: { '_ALL': build_fee_struct(0.1, 0, 0.1, 0) },
-          provincial_sales_taxes: { '_ALL': no_taxes }
-        },
-        'GB' => {
+          sales_tax: {'_ALL': build_fee_struct(0.1, 0, 0.1, 0)},
+          provincial_sales_taxes: {'_ALL': NO_TAX}
+        }],
+        'GB' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
           sales_tax_website_name: 'VAT',
-          sales_tax: { '_ALL': build_fee_struct(0.2, 0, 0.2, 0.2) }, # TBC
-          provincial_sales_taxes: { '_ALL': no_taxes }
-        },
-        'CA' => {
+          sales_tax: {'_ALL': build_fee_struct(0.2, 0, 0.2, 0.2)}, # TBC
+          provincial_sales_taxes: {'_ALL': NO_TAX}
+        }],
+        'CA' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
           sales_tax_website_name: 'Taxes',
           sales_tax: {
             'AB' => build_fee_struct(0.05, 0, 0.05, 0.05), # Alberta
@@ -46,41 +75,52 @@ module Easyship
             'YT' => build_fee_struct(0.05, 0, 0.05, 0.05), # Yukon
           },
           provincial_sales_taxes: {
-            'AB' => no_taxes, # Alberta
-            'BC' => no_taxes, # British Columbia
-            'MB' => no_taxes, # Manitoba
-            'NB' => no_taxes, # New Brunswick
-            'NL' => no_taxes, # Newfoundland and Labrador
-            'NT' => no_taxes, # Northwest Territories
-            'NS' => no_taxes, # Nova Scotia
-            'NU' => no_taxes, # Nunavut
-            'ON' => no_taxes, # Ontario
-            'PE' => no_taxes, # Prince Edward Island
+            'AB' => NO_TAX, # Alberta
+            'BC' => NO_TAX, # British Columbia
+            'MB' => NO_TAX, # Manitoba
+            'NB' => NO_TAX, # New Brunswick
+            'NL' => NO_TAX, # Newfoundland and Labrador
+            'NT' => NO_TAX, # Northwest Territories
+            'NS' => NO_TAX, # Nova Scotia
+            'NU' => NO_TAX, # Nunavut
+            'ON' => NO_TAX, # Ontario
+            'PE' => NO_TAX, # Prince Edward Island
             'QC' => build_fee_struct(0.09975, 0, 0.09975, 0.09975), # Quebec
-            'SK' => no_taxes, # Saskatchewan
-            'YT' => no_taxes, # Yukon
+            'SK' => NO_TAX, # Saskatchewan
+            'YT' => NO_TAX, # Yukon
           }
-        },
-        'SG' => {
-          sales_tax_website_name: 'GST',
-          sales_tax: { '_ALL': build_fee_struct(0.07, 0.07, 0.07, 0.07) },
-          provincial_sales_taxes: { '_ALL': no_taxes }
-        },
-        'HK' => {
+        }],
+        'SG' => [
+          {
+            effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
+            sales_tax_website_name: 'GST',
+            sales_tax: {'_ALL': build_fee_struct(0.07, 0.07, 0.07, 0.07)},
+            provincial_sales_taxes: {'_ALL': NO_TAX}
+          },
+          {
+            effective_timestamp: Time.utc(2023, 1, 1, 8),
+            sales_tax_website_name: 'GST',
+            sales_tax: {'_ALL': build_fee_struct(0.08, 0.08, 0.08, 0.08)},
+            provincial_sales_taxes: {'_ALL': NO_TAX}
+          }
+        ],
+        'HK' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
           sales_tax_website_name: nil,
-          sales_tax: { '_ALL': no_taxes },
-          provincial_sales_taxes: { '_ALL': no_taxes }
-        },
+          sales_tax: {'_ALL': NO_TAX},
+          provincial_sales_taxes: {'_ALL': NO_TAX}
+        }],
         # 'NL' => {
         #   sales_tax_website_name: 'VAT',
         #   sales_tax: { '_ALL': build_fee_struct(0.21, 0, 0.21, 0.21) },
         #   provincial_sales_taxes: { '_ALL': no_taxes }
         # },
-        'US' => {
+        'US' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
           sales_tax_website_name: nil,
-          sales_tax: { '_ALL': no_taxes },
-          provincial_sales_taxes: { '_ALL': no_taxes }
-        },
+          sales_tax: {'_ALL': NO_TAX},
+          provincial_sales_taxes: {'_ALL': NO_TAX}
+        }],
         # 'DE' => {
         #   sales_tax_website_name: 'VAT',
         #   sales_tax: { '_ALL': build_fee_struct(0.19, 0, 0, 0) },
@@ -126,11 +166,12 @@ module Easyship
         #   sales_tax: { '_ALL': build_fee_struct(0.2, 0, 0, 0) },
         #   provincial_sales_taxes: { '_ALL': no_taxes }
         # },
-        'AE' => {
+        'AE' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
           sales_tax_website_name: 'VAT',
-          sales_tax: { '_ALL': build_fee_struct(0.05, 0, 0, 0) },
-          provincial_sales_taxes: { '_ALL': no_taxes }
-        },
+          sales_tax: {'_ALL': build_fee_struct(0.05, 0, 0, 0)},
+          provincial_sales_taxes: {'_ALL': NO_TAX}
+        }],
         # 'IE' => {
         #   sales_tax_website_name: 'VAT',
         #   sales_tax: { '_ALL': build_fee_struct(0.23, 0, 0, 0) },
@@ -176,11 +217,12 @@ module Easyship
         #   sales_tax: { '_ALL': build_fee_struct(0.1, 0, 0, 0) },
         #   provincial_sales_taxes: { '_ALL': no_taxes }
         # },
-        # 'NZ' => {
-        #   sales_tax_website_name: 'VAT',
-        #   sales_tax: { '_ALL': build_fee_struct(0.15, 0, 0, 0) },
-        #   provincial_sales_taxes: { '_ALL': no_taxes }
-        # },
+        'NZ' => [{
+          effective_timestamp: DEFAULT_EFFECTIVE_TIMESTAMP,
+          sales_tax_website_name: 'VAT',
+          sales_tax: {'_ALL': build_fee_struct(0.15, 0.15, 0.15, 0.15)},
+          provincial_sales_taxes: {'_ALL': NO_TAX}
+        }],
         # 'IN' => {
         #   sales_tax_website_name: 'VAT',
         #   sales_tax: { '_ALL': build_fee_struct(0.15, 0, 0, 0) },
@@ -196,7 +238,7 @@ module Easyship
         #   sales_tax: { '_ALL': build_fee_struct(0.16, 0, 0, 0) },
         #   provincial_sales_taxes: { '_ALL': no_taxes }
         # }
-      }.freeze
+      }.transform_values { |value| value.sort_by { |rates| -rates[:effective_timestamp].to_i } }.freeze
     end
   end
 end

data/lib/easyship/sales_tax/calculator/version.rb

@@ -1,7 +1,7 @@
 module Easyship
   module SalesTax
     module Calculator
-      VERSION = "0.4.9"
+      VERSION = "0.6.0"
     end
   end
 end

data/lib/easyship/sales_tax/calculator.rb

@@ -6,33 +6,38 @@ module Easyship
     module Calculator
       class Error < StandardError; end
 
-      def self.calculate(origin_country_alpha2: nil, destination_country_alpha2: nil, origin_state: nil, destination_state: nil, fees: nil)
-        return fallback_value if origin_country_alpha2.nil? || origin_country_alpha2.empty? || destination_country_alpha2.nil? || destination_country_alpha2.empty?
-        return fallback_value unless fees.is_a?(Fee)
+      FALLBACK_VALUE = {sales_tax: 0, provincial_sales_tax: 0}.freeze
+
+      def self.calculate(origin_country_alpha2: nil, destination_country_alpha2: nil, origin_state: nil, destination_state: nil, fees: nil, effective_timestamp: nil)
+        return FALLBACK_VALUE if origin_country_alpha2.nil? || origin_country_alpha2.empty? || destination_country_alpha2.nil? || destination_country_alpha2.empty?
+        return FALLBACK_VALUE unless fees.is_a?(Fee)
 
         if domestic?(origin_country_alpha2, destination_country_alpha2) || within_eu?(origin_country_alpha2, destination_country_alpha2)
-          domestic_value(origin_country_alpha2: origin_country_alpha2, origin_state: origin_state, destination_state: destination_state, fees: fees)
+          domestic_value(origin_country_alpha2: origin_country_alpha2, origin_state: origin_state, destination_state: destination_state, fees: fees, effective_timestamp: effective_timestamp)
         else
-          fallback_value
+          FALLBACK_VALUE
         end
       rescue
-        fallback_value
+        FALLBACK_VALUE
+      end
+
+      def self.sales_tax_website_name(country_alpha2, effective_timestamp = nil)
+        rates = Formula.effective_data(country_alpha2, effective_timestamp)
+        (rates || {}).dig(:sales_tax_website_name)
       end
 
-      def self.domestic_value(origin_country_alpha2: nil, origin_state: nil, destination_state: nil, fees: nil)
-        domestic_rates = Formula::DOMESTIC[origin_country_alpha2.to_s]
-        return fallback_value if domestic_rates.nil? || domestic_rates.empty?
+      private
+
+      def self.domestic_value(origin_country_alpha2: nil, origin_state: nil, destination_state: nil, fees: nil, effective_timestamp: nil)
+        rates = Formula.effective_data(origin_country_alpha2, effective_timestamp)
+        return FALLBACK_VALUE if rates.nil?
 
         {
-          sales_tax: tax_calculate(domestic_rates[:sales_tax], nil, destination_state, fees, false),
-          provincial_sales_tax: tax_calculate(domestic_rates[:provincial_sales_taxes], origin_state, destination_state, fees, true)
+          sales_tax: tax_calculate(rates[:sales_tax], nil, destination_state, fees, false),
+          provincial_sales_tax: tax_calculate(rates[:provincial_sales_taxes], origin_state, destination_state, fees, true)
         }
       end
 
-      def self.fallback_value
-        { sales_tax: 0, provincial_sales_tax: 0 }
-      end
-
       def self.tax_calculate(formula, origin_state, destination_state, fees, is_provincial_sales_taxes)
         if (tax_destination_formula = formula[destination_state.to_s.upcase])
           # ONLY CA has provincial_sales_taxes(QST/PST) and it only apply when ship within same state
@@ -46,11 +51,6 @@ module Easyship
         end
       end
 
-      def self.sales_tax_website_name(country_alpha2)
-        return if Formula::DOMESTIC[country_alpha2.to_s].nil? || Formula::DOMESTIC[country_alpha2.to_s].empty?
-        Formula::DOMESTIC[country_alpha2][:sales_tax_website_name]
-      end
-
       def self.in_eu?(country_alpha2)
        %w(NL LU EE LT HU BE PT SK HR CZ IT FI PL MT DE SI RO BG AT SE CY DK FR IE ES GR LV).include?(country_alpha2)
       end

data/vat-gst-calculator.gemspec

@@ -23,8 +23,6 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "byebug"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vat-gst-calculator
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.6.0
 platform: ruby
 authors:
 - Aloha Chen
@@ -9,36 +9,8 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-12-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement