solidus_avatax 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3f13da28a6ec0b6a5dedfc5db7f298ae881ba1c
-  data.tar.gz: bbf4d9d57e5b13968824d4c9d8520c135fdb9e3e
+  metadata.gz: 4525b6e8313606fbd57767df4d08f36d55fa200b
+  data.tar.gz: 51e8687c4913ed18239ec2d4b49c69fb52a18d82
 SHA512:
-  metadata.gz: a79dfd4cfd4739b2c4de0bb977bbddecc2dd95da488b22f9c45c1dbf9616826d28063db60cc43b51526384cece47d486f5a0ed9d71bb04fd484fdfa21cf1fce2
-  data.tar.gz: 6da751a3e486acca13773199cfef7eb2d37774b1a1a4887838be4f115a55a27ad10a6e4b1b555d875a3f8b3ecdd88ff7e3956ea7c1a8e76c184aae536f7d1727
+  metadata.gz: b344c75e4567fb07469a05caa6956a9c4df9ba79f60226a3c87ef7582636abced2c66d47e2214421691886e63f52e662ada8b84c5dcac2bb1bd650128c040ef3
+  data.tar.gz: c50aa1946c3e50fcb4d252edfdbc54384445129c0554cc91f393aee18c6bb77ec4ab43353aef221f5b1bb57e56e663644a3bba334718d6367c05f3952c45fe97

data/.travis.yml

@@ -0,0 +1,14 @@
+sudo: false
+cache: bundler
+language: ruby
+env:
+  matrix:
+    - SOLIDUS_BRANCH=v1.1   DB=mysql
+    - SOLIDUS_BRANCH=v1.2   DB=mysql
+    - SOLIDUS_BRANCH=v1.1   DB=postgres
+    - SOLIDUS_BRANCH=v1.2   DB=postgres
+script:
+  - bundle exec rake test_app
+  - bundle exec rspec
+rvm:
+  - 2.1.8

data/Gemfile

@@ -1,8 +1,12 @@
 source "https://rubygems.org"
 
-gem "solidus", github: "solidusio/solidus", branch: "master"
+branch = ENV.fetch('SOLIDUS_BRANCH', 'v1.2')
+gem "solidus", github: "solidusio/solidus", branch: branch
 gem "solidus_auth_devise", "~> 1.0"
 
+gem 'pg'
+gem 'mysql2'
+
 group :development, :test do
   gem "pry-rails"
   gem 'pry-byebug'

data/README.md

@@ -22,6 +22,22 @@ rails g solidus_avatax:install
 Configuration
 -------------
 
+#### Disabling Avatax and Avatax API Timeouts
+
+In case of service problems or outages on Avatax's end, you can disable Avatax
+or change the API timeout. These values are stored in the database so that they
+can be applied instantly and without restarting your application.  To change the
+values create a new SpreeAvatax::Config. The default values are:
+
+```ruby
+SpreeAvatax::Config.create!(enabled: true, timeout: SpreeAvatax::Config::DEFAULT_TIMEOUT)
+```
+
+This is an append-only table and solidus_avatax will read these config values
+from the last record (by id).
+
+#### Short Ships
+
 If you want to notify Avatax about short ships you should configure the
 following:
 

data/app/models/spree_avatax/config.rb

@@ -0,0 +1,38 @@
+module SpreeAvatax
+  class Config < Spree::Base
+    DEFAULT_TIMEOUT = 20
+
+    class << self
+      attr_accessor :username
+      attr_accessor :password
+      attr_accessor :company_code
+      attr_accessor :service_url
+      # These error handlers should be objects that respond to "call" and accept an order and an
+      # exception as arguments.  This allows you to ignore certain errors or handle them in
+      # specific ways.
+      attr_accessor :sales_invoice_generate_error_handler
+      attr_accessor :sales_invoice_commit_error_handler
+      attr_accessor :sales_invoice_cancel_error_handler
+
+      # These configurations are stored in the database so that they can be
+      # updated immediately and synchronously across all servers in the event of
+      # an outage, without a redeploy or restart.
+      def timeout
+        (config = active) ? config.timeout : DEFAULT_TIMEOUT
+      end
+
+      def enabled
+        (config = active) ? config.enabled : true
+      end
+
+      private
+
+      def active
+        order(:id).last
+      end
+    end
+
+    validates :enabled, inclusion: {in: [true, false]}
+    validates :timeout, presence: true
+  end
+end

data/app/models/spree_avatax/return_invoice.rb

@@ -31,6 +31,11 @@ class SpreeAvatax::ReturnInvoice < ActiveRecord::Base
     # After the reimbursement completes the ".finalize" method will get called and we'll commit the
     #   return invoice.
     def generate(reimbursement)
+      if !SpreeAvatax::Config.enabled
+        logger.info("Avatax disabled. Skipping ReturnInvoice.generate for reimbursement #{reimbursement.number}")
+        return
+      end
+
       success_result = get_tax(reimbursement)
 
       if reimbursement.return_invoice
@@ -74,6 +79,11 @@ class SpreeAvatax::ReturnInvoice < ActiveRecord::Base
     # On failure it will raise.
     # On success it markes the invoice as committed.
     def finalize(reimbursement)
+      if !SpreeAvatax::Config.enabled
+        logger.info("Avatax disabled. Skipping ReturnInvoice.finalize for reimbursement #{reimbursement.number}")
+        return
+      end
+
       post_tax(reimbursement.return_invoice)
 
       reimbursement.return_invoice.update!(committed: true)
@@ -87,7 +97,7 @@ class SpreeAvatax::ReturnInvoice < ActiveRecord::Base
       avatax_logger.info "AVATAX_REQUEST context=get_tax reimbursement_id=#{reimbursement.id}"
       avatax_logger.debug params.to_json
 
-      result = tax_svc.gettax(params)
+      result = SpreeAvatax::Shared.get_tax(params)
       require_success!(result, reimbursement, 'get_tax')
 
       result
@@ -99,7 +109,7 @@ class SpreeAvatax::ReturnInvoice < ActiveRecord::Base
       avatax_logger.info "AVATAX_REQUEST context=post_tax reimbursement_id=#{return_invoice.reimbursement.id} return_invoice_id=#{return_invoice.id}"
       avatax_logger.debug params.to_json
 
-      result = tax_svc.posttax(params)
+      result = SpreeAvatax::Shared.post_tax(params)
       require_success!(result, return_invoice.reimbursement, 'post_tax')
 
       result
@@ -184,14 +194,5 @@ class SpreeAvatax::ReturnInvoice < ActiveRecord::Base
         totaltax:    return_invoice.additional_tax_total,
       }
     end
-
-    def tax_svc
-      @tax_svc ||= AvaTax::TaxService.new({
-        username:               SpreeAvatax::Config.username,
-        password:               SpreeAvatax::Config.password,
-        service_url:            SpreeAvatax::Config.service_url,
-        clientname:             'Spree::Avatax',
-      })
-    end
   end
 end

data/app/models/spree_avatax/sales_invoice.rb

@@ -23,6 +23,11 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
     def generate(order)
       bench_start = Time.now
 
+      if !SpreeAvatax::Config.enabled
+        logger.info("Avatax disabled. Skipping SalesInvoice.generate for order #{order.number}")
+        return
+      end
+
       return if order.completed? || !SpreeAvatax::Shared.taxable_order?(order)
 
       taxable_records = order.line_items + order.shipments
@@ -42,6 +47,8 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
         end
       end
 
+      SpreeAvatax::SalesShared.update_taxes(order, tax_line_data)
+
       sales_invoice = order.create_avatax_sales_invoice!({
         transaction_id:        result[:transaction_id],
         doc_id:                result[:doc_id],
@@ -51,8 +58,6 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
         additional_tax_total:  result[:total_tax],
       })
 
-      SpreeAvatax::SalesShared.update_taxes(order, tax_line_data)
-
       sales_invoice
     rescue Exception => e
       if SpreeAvatax::Config.sales_invoice_generate_error_handler
@@ -66,6 +71,11 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
     end
 
     def commit(order)
+      if !SpreeAvatax::Config.enabled
+        logger.info("Avatax disabled. Skipping SalesInvoice.commit for order #{order.number}")
+        return
+      end
+
       return if !SpreeAvatax::Shared.taxable_order?(order)
 
       raise CommitInvoiceNotFound.new("No invoice for order #{order.number}") if order.avatax_sales_invoice.nil?
@@ -84,6 +94,11 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
     end
 
     def cancel(order)
+      if !SpreeAvatax::Config.enabled
+        logger.info("Avatax disabled. Skipping SalesInvoice.cancel for order #{order.number}")
+        return
+      end
+
       return if order.avatax_sales_invoice.nil?
 
       result = cancel_tax(order.avatax_sales_invoice)
@@ -108,7 +123,7 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
       logger.info "[avatax] posttax sales_invoice=#{sales_invoice.id} order=#{sales_invoice.order_id}"
       logger.debug { "[avatax] params: #{params.to_json}" }
 
-      response = SpreeAvatax::Shared.tax_svc.posttax(params)
+      response = SpreeAvatax::Shared.post_tax(params)
       SpreeAvatax::Shared.require_success!(response)
 
       response
@@ -120,8 +135,7 @@ class SpreeAvatax::SalesInvoice < ActiveRecord::Base
       logger.info "[avatax] canceltax sales_invoice=#{sales_invoice.id}"
       logger.debug { "[avatax] params: #{params.to_json}" }
 
-      response = SpreeAvatax::Shared.tax_svc.canceltax(params)
-
+      response = SpreeAvatax::Shared.cancel_tax(params)
       SpreeAvatax::Shared.require_success!(response)
 
       response

data/app/models/spree_avatax/sales_shared.rb

@@ -18,7 +18,8 @@ module SpreeAvatax::SalesShared
       logger.info "[avatax] gettax order=#{order.id} doc_type=#{doc_type}"
       logger.debug { "[avatax] params: #{params.to_json}" }
 
-      response = SpreeAvatax::Shared.tax_svc.gettax(params)
+      response = SpreeAvatax::Shared.get_tax(params)
+
       SpreeAvatax::Shared.require_success!(response)
 
       response
@@ -30,7 +31,7 @@ module SpreeAvatax::SalesShared
       tax_line_data.each do |data|
         record, tax_line = data[:record], data[:tax_line]
 
-        record.update_column(:pre_tax_amount, record.discounted_amount)
+        record.update_column(:pre_tax_amount, record.discounted_amount.round(2))
 
         tax = BigDecimal.new(tax_line[:tax]).abs
 
@@ -72,7 +73,7 @@ module SpreeAvatax::SalesShared
         if data[avatax_id]
           data[avatax_id][:tax_line] = tax_line
         else
-          raise InvalidApiResponse.new("Couldn't find #{avatax_id.inspect}")
+          raise InvalidApiResponse.new("Couldn't find #{avatax_id.inspect} from avatax response in known ids #{data.keys.inspect}")
         end
       end
 
@@ -98,19 +99,32 @@ module SpreeAvatax::SalesShared
     def reset_tax_attributes(order)
       return if order.completed?
 
+      # Delete the avatax_sales_invoice to avoid accidentally committing it
+      # later.
+      if invoice = order.avatax_sales_invoice
+        if invoice.committed_at
+          raise SpreeAvatax::SalesInvoice::AlreadyCommittedError.new(
+            "Tried to clear tax attributes for already-committed order #{order.number}"
+          )
+        else
+          invoice.destroy!
+        end
+      end
+
       destroyed_adjustments = order.all_adjustments.tax.destroy_all
       return if destroyed_adjustments.empty?
 
-      order.line_items.each do |line_item|
-        line_item.update_attributes!({
+      taxable_records = order.line_items + order.shipments
+      taxable_records.each do |taxable_record|
+        taxable_record.update_attributes!({
           additional_tax_total: 0,
           adjustment_total: 0,
-          pre_tax_amount: 0,
+          pre_tax_amount: taxable_record.discounted_amount.round(2),
           included_tax_total: 0,
         })
 
-        Spree::ItemAdjustments.new(line_item).update
-        line_item.save!
+        Spree::ItemAdjustments.new(taxable_record).update
+        taxable_record.save!
       end
 
       order.update_attributes!({

data/app/models/spree_avatax/shared.rb

@@ -28,6 +28,18 @@ module SpreeAvatax::Shared
       order.line_items.present? && order.ship_address.present?
     end
 
+    def get_tax(params)
+      call_tax_svc_with_timeout(:gettax, params)
+    end
+
+    def post_tax(params)
+      call_tax_svc_with_timeout(:posttax, params)
+    end
+
+    def cancel_tax(params)
+      call_tax_svc_with_timeout(:canceltax, params)
+    end
+
     def tax_svc
       @tax_svc ||= AvaTax::TaxService.new({
         username:               SpreeAvatax::Config.username,
@@ -37,6 +49,13 @@ module SpreeAvatax::Shared
       })
     end
 
+    # We looked at the code in the AvaTax gem and using timeout here seems safe.
+    def call_tax_svc_with_timeout(method, *args)
+      Timeout.timeout(SpreeAvatax::Config.timeout, SpreeAvatax::AvataxTimeout) do
+        tax_svc.public_send(method, *args)
+      end
+    end
+
     def require_success!(response)
       if response[:result_code] == 'Success'
         logger.info "[avatax] response - result=success doc_id=#{response[:doc_id]} doc_code=#{response[:doc_code]} transaction_id=#{response[:transaction_id]}"

data/app/models/spree_avatax/short_ship_return_invoice.rb

@@ -22,6 +22,11 @@ class SpreeAvatax::ShortShipReturnInvoice < ActiveRecord::Base
     #
     # On failure it will raise.
     def generate(unit_cancels:)
+      if !SpreeAvatax::Config.enabled
+        logger.info("Avatax disabled. Skipping ShortShipReturnInvoice.generate for unit_cancels #{unit_cancels.map(&:id)}")
+        return
+      end
+
       inventory_units = unit_cancels.map(&:inventory_unit)
 
       order_ids = inventory_units.map(&:order_id).uniq
@@ -48,7 +53,7 @@ class SpreeAvatax::ShortShipReturnInvoice < ActiveRecord::Base
       logger.info("[avatax] gettax unit_cancel_ids=#{unit_cancels.map(&:id)} doc_type=#{DOC_TYPE}")
       logger.debug("[avatax] params: " + params.to_json)
 
-      response = SpreeAvatax::Shared.tax_svc.gettax(params)
+      response = SpreeAvatax::Shared.get_tax(params)
       SpreeAvatax::Shared.require_success!(response)
 
       response

data/db/migrate/20151130195450_add_spree_avatax_configs.rb

@@ -0,0 +1,10 @@
+class AddSpreeAvataxConfigs < ActiveRecord::Migration
+  def change
+    create_table 'spree_avatax_configs' do |t|
+      t.boolean 'enabled', null: false
+      t.float 'timeout', null: false
+
+      t.datetime 'created_at', null: false
+    end
+  end
+end

data/lib/solidus_avatax.rb

@@ -1,4 +1,7 @@
 require 'spree_core'
-require "spree_avatax/config"
 require 'spree_avatax/engine'
 require 'avatax_taxservice'
+
+module SpreeAvatax
+  class AvataxTimeout < Timeout::Error; end
+end

data/lib/spree_avatax/factories.rb

@@ -22,4 +22,9 @@ FactoryGirl.define do
     pre_tax_total { reimbursement.return_items.sum(:pre_tax_amount) }
     additional_tax_total { reimbursement.return_items.sum(:additional_tax_total) }
   end
+
+  factory :avatax_config, class: SpreeAvatax::Config do
+    enabled true
+    timeout SpreeAvatax::Config::DEFAULT_TIMEOUT
+  end
 end

data/lib/tasks/commit_backfill.rake

@@ -29,13 +29,6 @@ namespace :spree_avatax do
 
     # PREP TO ITERATE OVER ORDERS
 
-    tax_svc = AvaTax::TaxService.new({
-      username:               SpreeAvatax::Config.username,
-      password:               SpreeAvatax::Config.password,
-      service_url:            SpreeAvatax::Config.service_url,
-      clientname:             'Spree::Avatax',
-    })
-
     handle_result_errors = ->(result, order, request_method) do
       puts
       puts "** Error on order id=#{order.id} number=#{order.number} **"
@@ -63,7 +56,7 @@ namespace :spree_avatax do
         detaillevel: 'Tax',
       }
 
-      history_result = tax_svc.gettaxhistory(history_request)
+      history_result = SpreeAvatax::Shared.tax_svc.gettaxhistory(history_request)
 
       if history_result[:result_code] != 'Success'
         error_count += 1
@@ -91,7 +84,7 @@ namespace :spree_avatax do
         totaltax:    history_result[:get_tax_result][:total_tax],
       }
 
-      post_result = tax_svc.posttax(post_request)
+      post_result = SpreeAvatax::Shared.tax_svc.posttax(post_request)
 
       if post_result[:result_code] != 'Success'
         error_count += 1

data/solidus_avatax.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = "solidus_avatax"
-  s.version     = "1.0.0"
+  s.version     = "1.1.0"
   s.summary     = "Avatax extension for Solidus"
   s.description = "Solidus extension to retrieve tax rates via Avalara's SOAP API."
   s.required_ruby_version = ">= 2.1"
@@ -17,13 +17,12 @@ Gem::Specification.new do |s|
   s.require_path = "lib"
   s.requirements << "none"
 
-  s.add_dependency "solidus_core", "~> 1.1.0.pre"
+  s.add_dependency "solidus_core", ">= 1.1.0.pre", "< 1.3"
   s.add_dependency "hashie",      "~> 2.l.5"
   s.add_dependency "multi_json"
   s.add_dependency "Avatax_TaxService", "~> 2.0.0"
 
   s.add_development_dependency "rspec-rails","~> 3.2"
-  s.add_development_dependency "simplecov"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "sass-rails"
   s.add_development_dependency "coffee-rails"

data/spec/features/store_credits_spec.rb

@@ -54,12 +54,24 @@ RSpec.describe "Taxes with Store Credits" do
         fill_in "Phone", with: "(555) 555-5555"
       end
       click_on "Save and Continue"
-
     end
 
     it "adjusts the credits to cover taxes" do
       # Use a cassette so that we don't hit the Avatax API all of the time.
       VCR.use_cassette("taxes_with_store_credits") do
+        expect(SpreeAvatax::SalesShared).to(
+          receive(:avatax_id).
+            with(an_instance_of(Spree::LineItem)).
+            at_least(:once).
+            and_return('Spree::LineItem-1')
+        )
+        expect(SpreeAvatax::SalesShared).to(
+          receive(:avatax_id).
+            with(an_instance_of(Spree::Shipment)).
+            at_least(:once).
+            and_return('Spree::Shipment-1')
+        )
+
         click_on "Save and Continue"
       end
 

data/spec/features/tax_calculation_spec.rb

@@ -5,6 +5,7 @@ describe "Tax Calculation" do
   let(:address) { create(:address, address1: "35 Crosby St", city: "New York", zipcode: 10013) }
   let(:line_item_1) { order.line_items.first }
   let(:line_item_2) { order.line_items.last }
+  let(:shipment) { order.shipments.first }
 
   before do
     # Set up Avatax (just in case we don't have a cassette)
@@ -14,6 +15,25 @@ describe "Tax Calculation" do
     SpreeAvatax::Config.company_code = ENV["AVATAX_COMPANY_CODE"]
 
     order.line_items.first.product.tax_category.tax_rates << Spree::TaxRate.first
+
+    expect(SpreeAvatax::SalesShared).to(
+      receive(:avatax_id).
+        with(line_item_1).
+        at_least(:once).
+        and_return('Spree::LineItem-1')
+    )
+    expect(SpreeAvatax::SalesShared).to(
+      receive(:avatax_id).
+        with(line_item_2).
+        at_least(:once).
+        and_return('Spree::LineItem-2')
+    )
+    expect(SpreeAvatax::SalesShared).to(
+      receive(:avatax_id).
+        with(shipment).
+        at_least(:once).
+        and_return('Spree::Shipment-1')
+    )
   end
 
   context "without discounts" do

data/spec/models/spree_avatax/return_invoice_spec.rb

@@ -56,8 +56,8 @@ describe SpreeAvatax::ReturnInvoice do
       BigDecimal.new(gettax_response_return_item_tax_line[:tax]).abs
     end
 
-    before do
-      expect(SpreeAvatax::ReturnInvoice.send(:tax_svc))
+    let!(:tax_svc_expectation) do
+      expect(SpreeAvatax::Shared.tax_svc)
         .to receive(:gettax)
         .with(expected_gettax_params)
         .and_return(gettax_response)
@@ -150,6 +150,17 @@ describe SpreeAvatax::ReturnInvoice do
         subject
       end
     end
+
+    context 'when avatax is disabled' do
+      let!(:config) { create(:avatax_config, enabled: false) }
+      let!(:tax_svc_expectation) { expect(SpreeAvatax::Shared).to_not receive(:tax_svc) }
+
+      it 'does nothing' do
+        expect {
+          subject
+        }.to_not change { SpreeAvatax::ReturnInvoice.count }
+      end
+    end
   end
 
   describe '.finalize' do
@@ -170,8 +181,8 @@ describe SpreeAvatax::ReturnInvoice do
       }
     end
 
-    before do
-      expect(SpreeAvatax::ReturnInvoice.send(:tax_svc))
+    let!(:tax_svc_expectation) do
+      expect(SpreeAvatax::Shared.tax_svc)
         .to receive(:posttax)
         .with(expected_posttax_params)
         .and_return(
@@ -188,6 +199,16 @@ describe SpreeAvatax::ReturnInvoice do
         subject
       }.to change { return_invoice.reload.committed? }.from(false).to(true)
     end
+
+    context 'when avatax is disabled' do
+      let!(:config) { create(:avatax_config, enabled: false) }
+      let!(:tax_svc_expectation) { expect(SpreeAvatax::Shared).to_not receive(:tax_svc) }
+
+      it 'does nothing' do
+        subject
+        expect(return_invoice.reload.committed?).to be_falsey
+      end
+    end
   end
 
 end

data/spec/models/spree_avatax/sales_invoice_spec.rb

@@ -93,7 +93,7 @@ describe SpreeAvatax::SalesInvoice do
       BigDecimal.new(gettax_response_shipment_tax_line[:tax]).abs
     end
 
-    let!(:gettax_stub) do
+    let!(:tax_svc_expectation) do
       expect(SpreeAvatax::Shared.tax_svc)
         .to receive(:gettax)
         .with(expected_gettax_params)
@@ -180,7 +180,7 @@ describe SpreeAvatax::SalesInvoice do
 
     context 'when an error occurs' do
       let(:error) { StandardError.new('just testing') }
-      let!(:gettax_stub) { }
+      let!(:tax_svc_expectation) { }
       let(:order) do
         create(:order_with_line_items,
                line_items_count: 2,
@@ -200,7 +200,7 @@ describe SpreeAvatax::SalesInvoice do
           .to receive(:get_tax)
           .and_raise(error)
 
-        order.line_items.update_all(pre_tax_amount: nil)
+        order.line_items.update_all(pre_tax_amount: 0)
         order.reload
       end
 
@@ -288,7 +288,7 @@ describe SpreeAvatax::SalesInvoice do
     context 'when the order is not taxable' do
       let(:order) { create(:order_with_line_items, ship_address: nil, line_items_count: 1) }
 
-      let!(:gettax_stub) { }
+      let!(:tax_svc_expectation) { }
 
       it 'does not create a sales invoice' do
         expect {
@@ -306,7 +306,7 @@ describe SpreeAvatax::SalesInvoice do
     context 'when the order is already completed' do
       let(:order) { create(:completed_order_with_totals) }
 
-      let!(:gettax_stub) { }
+      let!(:tax_svc_expectation) { }
 
       it 'does not create a sales invoice' do
         expect {
@@ -320,6 +320,33 @@ describe SpreeAvatax::SalesInvoice do
         subject
       end
     end
+
+    context 'when avatax is disabled' do
+      let!(:config) { create(:avatax_config, enabled: false) }
+      let!(:tax_svc_expectation) { expect(SpreeAvatax::Shared).to_not receive(:tax_svc) }
+
+      it 'does nothing' do
+        expect {
+          subject
+        }.to_not change { SpreeAvatax::SalesInvoice.count }
+      end
+    end
+
+    context 'when an error occurs during tax updating' do
+      it 'does not create a SalesInvoice record' do
+        error = StandardError.new
+
+        expect(SpreeAvatax::SalesShared)
+          .to receive(:update_taxes)
+          .and_raise(error)
+
+        expect {
+          expect { subject }.to raise_error(error)
+        }.to_not change {
+          SpreeAvatax::SalesInvoice.count
+        }
+      end
+    end
   end
 
   describe '.commit' do
@@ -417,6 +444,16 @@ describe SpreeAvatax::SalesInvoice do
         end
       end
     end
+
+    context 'when avatax is disabled' do
+      let!(:config) { create(:avatax_config, enabled: false) }
+      let!(:tax_svc_expectation) { expect(SpreeAvatax::Shared).to_not receive(:tax_svc) }
+
+      it 'does nothing' do
+        subject
+        expect(sales_invoice.reload.committed_at?).to be_falsey
+      end
+    end
   end
 
   describe '.cancel' do
@@ -439,7 +476,7 @@ describe SpreeAvatax::SalesInvoice do
 
       let(:canceltax_response) { sales_invoice_canceltax_response }
 
-      let!(:canceltax_stub) do
+      let!(:tax_svc_expectation) do
         expect(SpreeAvatax::Shared.tax_svc)
           .to receive(:canceltax)
           .with(expected_canceltax_params)
@@ -455,7 +492,7 @@ describe SpreeAvatax::SalesInvoice do
 
       context 'when an error occurs' do
         let(:error) { StandardError.new('just testing') }
-        let!(:canceltax_stub) { }
+        let!(:tax_svc_expectation) { }
 
         before do
           expect(SpreeAvatax::SalesInvoice)
@@ -486,6 +523,16 @@ describe SpreeAvatax::SalesInvoice do
           end
         end
       end
+
+      context 'when avatax is disabled' do
+        let!(:config) { create(:avatax_config, enabled: false) }
+        let!(:tax_svc_expectation) { expect(SpreeAvatax::Shared).to_not receive(:tax_svc) }
+
+        it 'does nothing' do
+          subject
+          expect(sales_invoice.canceled_at?).to be_falsey
+        end
+      end
     end
   end
 end

data/spec/models/spree_avatax/sales_shared_spec.rb

@@ -7,10 +7,19 @@ describe SpreeAvatax::SalesShared do
       SpreeAvatax::SalesShared.reset_tax_attributes(order)
     end
 
-    let(:order) { create(:order_with_line_items, additional_tax_total: 1, adjustment_total: 1, included_tax_total: 1, line_items_count: 1) }
+    let(:order) do
+      create(:order_with_line_items,
+        line_items_count: 1, # quantity set to 2 below
+        line_items_price: 3,
+        shipment_cost: 5,
+      )
+    end
     let(:line_item) { order.line_items.first }
+    let(:shipment) { order.shipments.first }
 
     before do
+      line_item.update_attributes!(quantity: 2)
+
       line_item.adjustments.eligible.tax.additional.create!({
         adjustable: line_item,
         amount: 1.23,
@@ -43,5 +52,34 @@ describe SpreeAvatax::SalesShared do
       subject
       expect(line_item.adjustments.tax.count).to eq 0
     end
+
+    it 'sets pre_tax_amount to discounted_amount' do
+      subject
+      expect(line_item.reload.pre_tax_amount).to eq(2 * 3)
+      expect(shipment.reload.pre_tax_amount).to eq(5)
+    end
+
+    context 'when a SalesInvoice record is present' do
+      let!(:sales_invoice) { create(:avatax_sales_invoice, order: order) }
+
+      it 'deletes the SalesInvoice record if present' do
+        subject
+        expect(order.reload.avatax_sales_invoice).to eq(nil)
+      end
+
+      context 'when the SalesInvoice is committed' do
+        before do
+          sales_invoice.update!(committed_at: Time.now)
+        end
+
+        it 'raises without clearing anything' do
+          expect {
+            subject
+          }.to raise_error(SpreeAvatax::SalesInvoice::AlreadyCommittedError)
+
+          expect(line_item.adjustments.tax.count).to eq(1)
+        end
+      end
+    end
   end
 end

data/spec/models/spree_avatax/shared_spec.rb

@@ -86,4 +86,58 @@ describe SpreeAvatax::Shared do
       end
     end
   end
+
+  describe '.get_tax' do
+    it 'calls gettax' do
+      params = {}
+      expect(SpreeAvatax::Shared.tax_svc).to receive(:gettax).with(params)
+      SpreeAvatax::Shared.get_tax(params)
+    end
+
+    context 'with a timeout' do
+      let!(:config) { create(:avatax_config, timeout: 0.001) }
+      it 'times out' do
+        expect(SpreeAvatax::Shared.tax_svc).to(receive(:gettax) { sleep 0.1 })
+        expect {
+          SpreeAvatax::Shared.get_tax({})
+        }.to raise_error(SpreeAvatax::AvataxTimeout)
+      end
+    end
+  end
+
+  describe '.post_tax' do
+    it 'calls posttax' do
+      params = {}
+      expect(SpreeAvatax::Shared.tax_svc).to receive(:posttax).with(params)
+      SpreeAvatax::Shared.post_tax(params)
+    end
+
+    context 'with a timeout' do
+      let!(:config) { create(:avatax_config, timeout: 0.001) }
+      it 'times out' do
+        expect(SpreeAvatax::Shared.tax_svc).to(receive(:posttax) { sleep 0.1 })
+        expect {
+          SpreeAvatax::Shared.post_tax({})
+        }.to raise_error(SpreeAvatax::AvataxTimeout)
+      end
+    end
+  end
+
+  describe '.cancel_tax' do
+    it 'calls canceltax' do
+      params = {}
+      expect(SpreeAvatax::Shared.tax_svc).to receive(:canceltax).with(params)
+      SpreeAvatax::Shared.cancel_tax(params)
+    end
+
+    context 'with a timeout' do
+      let!(:config) { create(:avatax_config, timeout: 0.001) }
+      it 'times out' do
+        expect(SpreeAvatax::Shared.tax_svc).to(receive(:canceltax) { sleep 0.1 })
+        expect {
+          SpreeAvatax::Shared.cancel_tax({})
+        }.to raise_error(SpreeAvatax::AvataxTimeout)
+      end
+    end
+  end
 end

data/spec/models/spree_avatax/short_ship_return_invoice_spec.rb

@@ -131,6 +131,17 @@ describe SpreeAvatax::ShortShipReturnInvoice do
 
         SpreeAvatax::ShortShipReturnInvoice.generate(unit_cancels: unit_cancels)
       end
+
+      context 'when avatax is disabled' do
+        let!(:config) { create(:avatax_config, enabled: false) }
+
+        it 'does nothing' do
+          expect(SpreeAvatax::Shared).to_not receive(:tax_svc)
+          expect {
+            subject
+          }.to_not change { SpreeAvatax::ShortShipReturnInvoice.count }
+        end
+      end
     end
 
     context 'with a successful response' do

data/spec/spec_helper.rb

@@ -1,15 +1,3 @@
-# Run Coverage report
-require "simplecov"
-SimpleCov.start do
-  add_filter "spec/dummy"
-  add_group "Controllers", "app/controllers"
-  add_group "Helpers", "app/helpers"
-  add_group "Mailers", "app/mailers"
-  add_group "Models", "app/models"
-  add_group "Views", "app/views"
-  add_group "Libraries", "lib"
-end
-
 # Configure Rails Environment
 ENV["RAILS_ENV"] = "test"
 

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: solidus_avatax
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0.pre
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0.pre
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +86,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -200,6 +192,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -213,6 +206,7 @@ files:
 - app/models/spree/reimbursement_decorator.rb
 - app/models/spree/tax_rate_decorator.rb
 - app/models/spree_avatax/calculator.rb
+- app/models/spree_avatax/config.rb
 - app/models/spree_avatax/return_invoice.rb
 - app/models/spree_avatax/sales_invoice.rb
 - app/models/spree_avatax/sales_shared.rb
@@ -234,10 +228,10 @@ files:
 - db/migrate/20140911215422_add_canceled_at_and_cancel_transaction_id_to_sales_invoices.rb
 - db/migrate/20150427154942_create_spree_avatax_short_ship_return_invoices.rb
 - db/migrate/20150518172627_fix_avatax_short_ship_index.rb
+- db/migrate/20151130195450_add_spree_avatax_configs.rb
 - lib/generators/solidus_avatax/install/install_generator.rb
 - lib/generators/solidus_avatax/install/templates/config/initializers/avatax.rb
 - lib/solidus_avatax.rb
-- lib/spree_avatax/config.rb
 - lib/spree_avatax/engine.rb
 - lib/spree_avatax/factories.rb
 - lib/tasks/commit_backfill.rake
@@ -285,29 +279,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - none
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Avatax extension for Solidus
-test_files:
-- spec/features/store_credits_spec.rb
-- spec/features/tax_calculation_spec.rb
-- spec/fixtures/vcr_cassettes/sales_invoice_gettax_with_discounts.yml
-- spec/fixtures/vcr_cassettes/sales_invoice_gettax_without_discounts.yml
-- spec/fixtures/vcr_cassettes/taxes_with_store_credits.yml
-- spec/models/spree/adjustment_spec.rb
-- spec/models/spree/order_contents_spec.rb
-- spec/models/spree/order_spec.rb
-- spec/models/spree/shipping_rate_spec.rb
-- spec/models/spree/tax_rate_spec.rb
-- spec/models/spree_avatax/calculator.rb
-- spec/models/spree_avatax/return_invoice_spec.rb
-- spec/models/spree_avatax/sales_invoice_spec.rb
-- spec/models/spree_avatax/sales_shared_spec.rb
-- spec/models/spree_avatax/shared_spec.rb
-- spec/models/spree_avatax/short_ship_return_invoice_spec.rb
-- spec/spec_helper.rb
-- spec/support/return_invoice_soap_responses.rb
-- spec/support/sales_invoice_soap_responses.rb
-- spec/support/short_ship_return_invoice_soap_responses.rb
-- spec/support/zone_support.rb
+test_files: []

data/lib/spree_avatax/config.rb

@@ -1,16 +0,0 @@
-module SpreeAvatax
-  class Config
-    class << self
-      attr_accessor :username
-      attr_accessor :password
-      attr_accessor :company_code
-      attr_accessor :service_url
-      # These error handlers should be objects that respond to "call" and accept an order and an
-      # exception as arguments.  This allows you to ignore certain errors or handle them in
-      # specific ways.
-      attr_accessor :sales_invoice_generate_error_handler
-      attr_accessor :sales_invoice_commit_error_handler
-      attr_accessor :sales_invoice_cancel_error_handler
-    end
-  end
-end