taxjar-ruby 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd133d25374b0e81e58a96fdb951329848e577a5
-  data.tar.gz: da271f53ff9fdd4eef5123da7fcf320ae78b99fd
+  metadata.gz: 638c573bdfd19c15d48c1cc87d79fb2292a8f031
+  data.tar.gz: b3382222c75bc4b8299d8d8aee75ae3ba919b40b
 SHA512:
-  metadata.gz: e996b3715a70f75c10b8a7048c1049c949c55fe8e4d1f9e06c0d81b1b8d5765692bc0778ff7bdae1822b18f0ae7c501f1cb00024a44cab23d1951a6e3f9ea867
-  data.tar.gz: f1ce3c2e1a23462cd7a9f6f44c08b45a3b827a364ca2a4c24066513843a644a77ceeea306959232ec6f69c9463cc1183bf778f49b7540ce842f90b36109f642a
+  metadata.gz: 0bdbf7a23361f1caa03825f8561e95dd88495bd29d4627a21e6049b4fcdf436430bb3578db00a88a6c05caa5a89a91ac4bfbc7bef24697546448d1df37e35127
+  data.tar.gz: 2271da6641e398fbb4f7e16b87cd563503f07e4be5f9d347d1ec6e3760bd3bd0da121300732938f416e5eccc5fba9a9eaf08e46174a20538c0e591998677ba75

data/Gemfile

@@ -5,7 +5,7 @@ gem 'yard'
 group :test do
   gem 'rspec', '~>3'
   gem 'webmock', '~>1'
-
 end
+
 # Specify your gem's dependencies in taxjar-ruby.gemspec
 gemspec

data/README.md

@@ -103,14 +103,32 @@ client.rates_for_location
 require 'taxjar'
 client = Taxjar::Client.new(api_key: '48ceecccc8af930bd02597aec0f84a78')
 
-client.rates_for_location('10001')
+# United States (ZIP+4)
+rates = client.rates_for_location('90404-3370')
+
+# United States (ZIP w/ Optional Params)
+rates = client.rates_for_location('90404', {
+  :city => 'SANTA MONICA',
+  :country => 'US'
+})
+
+# International Examples (Requires City and Country)
+rates = client.rates_for_location('V5K0A1', {
+  :city => 'VANCOUVER',
+  :country => 'CA'
+})
+
+rates = client.rates_for_location('00150', {
+  :city => 'HELSINKI',
+  :country => 'FI'
+})
 ```
 
 #### Example Response
 
 ```ruby
 #<Taxjar::Rate:0x007fc47056a928 @attrs={
-  :zip => 90002, 
+  :zip => "90002", 
   :state => "CA",
   :state_rate => 0.065,
   :county => "LOS ANGELES",
@@ -178,7 +196,7 @@ client.tax_for_order({
     :special_district_tax_collectable => 0.22,
     :line_items => [
       {
-        :id => "1",
+        :id => 1,
         :state_taxable_amount => 15.0,
         :state_sales_tax_rate => 0.065,
         :county_taxable_amount => 15.0,
@@ -238,7 +256,7 @@ client.show_order('123')
 
 ```ruby
 #<Taxjar::Order:0x007fd3e514a940 @attrs={
-  :transaction_id => 123,
+  :transaction_id => "123",
   :user_id => 11836,
   :transaction_date => "2015-05-14T00:00:00Z",
   :transaction_reference_id => nil,
@@ -312,7 +330,7 @@ client.create_order({
 
 ```ruby
 #<Taxjar::Order:0x007f6d65b252d0 @attrs={
-  :transaction_id => 20,
+  :transaction_id => "20",
   :user_id => 11836,
   :transaction_date => "2015-05-14T00:00:00Z",
   :transaction_reference_id => nil,
@@ -372,7 +390,7 @@ client.update_order({
 
 ```ruby
 #<Taxjar::Order:0x007f6d65b252d0 @attrs={
-  :transaction_id => 123,
+  :transaction_id => "123",
   :user_id => 11836,
   :transaction_date => "2015-05-14T00:00:00Z",
   :transaction_reference_id => nil,
@@ -425,7 +443,7 @@ client.delete_order(123)
 
 ```ruby
 #<Taxjar::Order:0x007f6d65b252d0 @attrs={
-  :transaction_id => 123,
+  :transaction_id => "123",
   :user_id => 11836,
   :transaction_date => "2015-05-14T00:00:00Z",
   :transaction_reference_id => nil,
@@ -502,7 +520,7 @@ client.show_refund('321')
 
 ```ruby
 #<Taxjar::Refund:0x007f6da40e33a0 @attrs={
-  :transaction_id => 321,
+  :transaction_id => "321",
   :user_id => 11836,
   :transaction_date => "2015-06-14T00:00:00Z",
   :transaction_reference_id => 123,
@@ -577,10 +595,10 @@ refund = client.create_refund({
 
 ```ruby
 #<Taxjar::Refund:0x007f6da40e33a0 @attrs={
-  :transaction_id => 321,
+  :transaction_id => "321",
   :user_id => 11836,
   :transaction_date => "2015-06-14T00:00:00Z",
-  :transaction_reference_id => 123,
+  :transaction_reference_id => "123",
   :from_country => "US",
   :from_zip => 93107,
   :from_state => "CA",
@@ -637,10 +655,10 @@ refund = client.update_refund{
 
 ```ruby
 #<Taxjar::Refund:0x007f6da40e33a0 @attrs={
-  :transaction_id => 321,
+  :transaction_id => "321",
   :user_id => 11836,
   :transaction_date => "2015-06-14T00:00:00Z",
-  :transaction_reference_id => 123,
+  :transaction_reference_id => "123",
   :from_country => "US",
   :from_zip => 93107,
   :from_state => "CA",
@@ -687,10 +705,10 @@ client.delete_refund(321)
 
 ```ruby
 #<Taxjar::Refund:0x007f6da40e33a0 @attrs={
-  :transaction_id => 321,
+  :transaction_id => "321",
   :user_id => 11836,
   :transaction_date => "2015-06-14T00:00:00Z",
-  :transaction_reference_id => 123,
+  :transaction_reference_id => "123",
   :from_country => "US",
   :from_zip => 93107,
   :from_state => "CA",

data/lib/taxjar/api/api.rb

@@ -1,4 +1,5 @@
 require 'taxjar/api/utils'
+
 module Taxjar
   module API
     include Taxjar::API::Utils
@@ -14,6 +15,5 @@ module Taxjar
     def tax_for_order(options = {})
       perform_post_with_object("/v2/taxes", 'tax', options, Taxjar::Tax)
     end
-
   end
 end

data/lib/taxjar/api/order.rb

@@ -1,4 +1,5 @@
 require 'taxjar/api/utils'
+
 module Taxjar
   module API
     module Order

data/lib/taxjar/api/refund.rb

@@ -1,4 +1,5 @@
 require 'taxjar/api/utils'
+
 module Taxjar
   module API
     module Refund

data/lib/taxjar/api/request.rb

@@ -31,40 +31,37 @@ module Taxjar
 
       private
 
+        def set_request_headers
+          @headers = {}
+          @headers[:user_agent] = client.user_agent
+          @headers[:authorization] = "Bearer #{client.api_key}"
+        end
 
-      def set_request_headers
-        @headers = {}
-        @headers[:user_agent] = client.user_agent
-        @headers[:authorization] = "Bearer #{client.api_key}"
-      end
-
-      def symbolize_keys!(object)
-        if object.is_a?(Array)
-          object.each_with_index do |val, index|
-            object[index] = symbolize_keys!(val)
-          end
-        elsif object.is_a?(Hash)
-          object.keys.each do |key|
-            object[key.to_sym] = symbolize_keys!(object.delete(key))
+        def symbolize_keys!(object)
+          if object.is_a?(Array)
+            object.each_with_index do |val, index|
+              object[index] = symbolize_keys!(val)
+            end
+          elsif object.is_a?(Hash)
+            object.keys.each do |key|
+              object[key.to_sym] = symbolize_keys!(object.delete(key))
+            end
           end
+          object
         end
-        object
-      end
 
-      def fail_or_return_response_body(code, body)
-        e = extract_error(code, body)
-        fail(e) if e
-        body[object_key.to_sym]
-      end
-
-      def extract_error(code, body)
-        klass = Taxjar::Error::ERRORS[code]
-        if !klass.nil?
-          klass.from_response(body)
+        def fail_or_return_response_body(code, body)
+          e = extract_error(code, body)
+          fail(e) if e
+          body[object_key.to_sym]
         end
-      end
-
 
+        def extract_error(code, body)
+          klass = Taxjar::Error::ERRORS[code]
+          if !klass.nil?
+            klass.from_response(body)
+          end
+        end
     end
   end
 end

data/lib/taxjar/api/utils.rb

@@ -3,7 +3,6 @@ require 'taxjar/api/request'
 module Taxjar
   module API
     module Utils
-
       def perform_request(request_method, path, object_key, options = {})
         Taxjar::API::Request.new(self, request_method, path, object_key, options).perform
       end

data/lib/taxjar/base.rb

@@ -1,6 +1,7 @@
 require 'addressable/uri'
 require 'forwardable'
 require 'memoizable'
+require 'model_attribute'
 
 if !Array.new.respond_to?(:to_h)
   module Enumerable
@@ -70,9 +71,8 @@ module Taxjar
       end
     end
 
-    def initialize(attrs = {})
-      attrs = values_as_floats_where_possible(attrs)
-      @attrs = attrs || {}
+    def initialize(attributes = {})
+      @attrs = set_attributes(attributes)
     end
 
     def [](method)
@@ -96,14 +96,5 @@ module Taxjar
         attrs.delete(key1).merge(key2 => attrs)
       end
     end
-
-    def values_as_floats_where_possible(attrs)
-      attrs.map{|k, v| [k, to_f_or_i_or_s(v)]}.to_h
-    end
-
-    def to_f_or_i_or_s(v)
-        ((float = Float(v)) && (float % 1.0 == 0) ? float.to_i : float) rescue v
-    end
-
   end
 end

data/lib/taxjar/breakdown.rb

@@ -3,9 +3,16 @@ require 'taxjar/shipping'
 
 module Taxjar
   class Breakdown < Taxjar::Base
-    attr_reader :state_taxable_amount, :state_tax_collectable, :county_taxable_amount,
-                :county_tax_collectable, :city_taxable_amount, :city_tax_collectable, 
-                :special_district_taxable_amount, :special_district_tax_collectable
+    extend ModelAttribute
+    
+    attribute :state_taxable_amount,             :float
+    attribute :state_tax_collectable,            :float
+    attribute :county_taxable_amount,            :float
+    attribute :county_tax_collectable,           :float
+    attribute :city_taxable_amount,              :float
+    attribute :city_tax_collectable,             :float
+    attribute :special_district_taxable_amount,  :float
+    attribute :special_district_tax_collectable, :float
 
     object_attr_reader Taxjar::Shipping, :shipping
 

data/lib/taxjar/breakdown_line_item.rb

@@ -2,9 +2,21 @@ require 'taxjar/base'
 
 module Taxjar
   class BreakdownLineItem < Taxjar::Base
-    attr_reader :id, :tax_collectable, :state_taxable_amount, :state_sales_tax_rate, :state_amount, 
-    :county_taxable_amount, :county_tax_rate, :county_amount, :city_taxable_amount, :city_tax_rate, :city_amount, 
-    :special_district_taxable_amount, :special_tax_rate, :special_district_amount
-
+    extend ModelAttribute
+      
+    attribute :id,                              :integer
+    attribute :tax_collectable,                 :float
+    attribute :state_taxable_amount,            :float
+    attribute :state_sales_tax_rate,            :float
+    attribute :state_amount,                    :float
+    attribute :county_taxable_amount,           :float
+    attribute :county_tax_rate,                 :float
+    attribute :county_amount,                   :float
+    attribute :city_taxable_amount,             :float
+    attribute :city_tax_rate,                   :float
+    attribute :city_amount,                     :float
+    attribute :special_district_taxable_amount, :float
+    attribute :special_tax_rate,                :float
+    attribute :special_district_amount,         :float
   end
 end

data/lib/taxjar/category.rb

@@ -2,6 +2,10 @@ require 'taxjar/base'
 
 module Taxjar
   class Category < Taxjar::Base
-    attr_reader :name, :product_tax_code, :description
+    extend ModelAttribute
+    
+    attribute :name,             :string
+    attribute :product_tax_code, :string
+    attribute :description,      :string
   end
 end

data/lib/taxjar/client.rb

@@ -4,6 +4,7 @@ require 'taxjar/api/refund'
 require 'taxjar/error'
 require 'taxjar/api/request'
 require 'taxjar/api/utils'
+
 module Taxjar
   class Client
     include Taxjar::API

data/lib/taxjar/error.rb

@@ -69,6 +69,5 @@ module Taxjar
     end
 
     ConfigurationError = Class.new(::ArgumentError)
-
   end
 end

data/lib/taxjar/line_item.rb

@@ -2,8 +2,14 @@ require 'taxjar/base'
 
 module Taxjar
   class LineItem < Taxjar::Base
-    attr_reader :quantity, :product_identifier, :description, :unit_price, :discount, 
-      :sales_tax
-
+    extend ModelAttribute
+    
+    attribute :id,                 :integer
+    attribute :quantity,           :integer
+    attribute :product_identifier, :string
+    attribute :description,        :string
+    attribute :unit_price,         :float
+    attribute :discount,           :float
+    attribute :sales_tax,          :float
   end
 end

data/lib/taxjar/order.rb

@@ -2,12 +2,22 @@ require 'taxjar/base'
 
 module Taxjar
   class Order < Taxjar::Base
-    attr_reader :transaction_id, :user_id, :transaction_date, :to_country, :to_zip,
-      :to_state, :to_city, :to_street, :amount, :shipping, :sales_tax
+    extend ModelAttribute
+    
+    attribute :transaction_id,   :string
+    attribute :user_id,          :integer
+    attribute :transaction_date, :string
+    attribute :to_country,       :string
+    attribute :to_zip,           :string
+    attribute :to_state,         :string
+    attribute :to_city,          :string
+    attribute :to_street,        :string
+    attribute :amount,           :float
+    attribute :shipping,         :float
+    attribute :sales_tax,        :float
 
     def line_items
       map_collection(Taxjar::LineItem, :line_items)
     end
-
   end
 end

data/lib/taxjar/rate.rb

@@ -2,8 +2,16 @@ require 'taxjar/base'
 
 module Taxjar
   class Rate < Taxjar::Base
-    attr_reader :zip, :state, :state_rate, :county, :county_rate, :city, :city_rate,
-      :combined_district_rate, :combined_rate
+    extend ModelAttribute
 
+    attribute :zip,                    :string
+    attribute :state,                  :string
+    attribute :state_rate,             :float
+    attribute :county,                 :string
+    attribute :county_rate,            :float
+    attribute :city,                   :string
+    attribute :city_rate,              :float
+    attribute :combined_district_rate, :float
+    attribute :combined_rate,          :float
   end
 end

data/lib/taxjar/refund.rb

@@ -2,9 +2,20 @@ require 'taxjar/base'
 
 module Taxjar
   class Refund < Taxjar::Base
-
-    attr_reader :transaction_id, :user_id, :transaction_date, :transaction_reference_id, :to_country, :to_zip,
-      :to_state, :to_city, :to_street, :amount, :shipping, :sales_tax
+    extend ModelAttribute
+    
+    attribute :transaction_id,           :string
+    attribute :user_id,                  :integer
+    attribute :transaction_date,         :string
+    attribute :transaction_reference_id, :string
+    attribute :to_country,               :string
+    attribute :to_zip,                   :string
+    attribute :to_state,                 :string
+    attribute :to_city,                  :string
+    attribute :to_street,                :string
+    attribute :amount,                   :float
+    attribute :shipping,                 :float
+    attribute :sales_tax,                :float
 
     def line_items
       map_collection(Taxjar::LineItem, :line_items)

data/lib/taxjar/shipping.rb

@@ -2,9 +2,17 @@ require 'taxjar/base'
 
 module Taxjar
   class Shipping < Taxjar::Base
-    attr_reader :taxable_amount, :tax_collectable, :state_amount, :state_sales_tax_rate,
-                :county_amount, :county_tax_rate, :city_amount, :city_tax_rate, :special_district_amount,
-                :special_tax_rate
-
+    extend ModelAttribute
+    
+    attribute :taxable_amount,          :float
+    attribute :tax_collectable,         :float
+    attribute :state_amount,            :float
+    attribute :state_sales_tax_rate,    :float
+    attribute :county_amount,           :float
+    attribute :county_tax_rate,         :float
+    attribute :city_amount,             :float
+    attribute :city_tax_rate,           :float
+    attribute :special_district_amount, :float
+    attribute :special_tax_rate,        :float
   end
 end

data/lib/taxjar/tax.rb

@@ -2,10 +2,17 @@ require 'taxjar/base'
 
 module Taxjar
   class Tax < Taxjar::Base
-    attr_reader :order_total_amount, :shipping, :taxable_amount, :amount_to_collect, :rate, 
-                :has_nexus, :freight_taxable, :tax_source
+    extend ModelAttribute
+    
+    attribute :order_total_amount, :float
+    attribute :shipping,           :float
+    attribute :taxable_amount,     :float
+    attribute :amount_to_collect,  :float
+    attribute :rate,               :float
+    attribute :has_nexus,          :boolean
+    attribute :freight_taxable,    :boolean
+    attribute :tax_source,         :string
 
     object_attr_reader Taxjar::Breakdown, :breakdown
-
   end
 end

data/lib/taxjar/version.rb

@@ -1,17 +1,16 @@
 module Taxjar
   module Version
   module_function
-
     def major
       1
     end
 
     def minor
-      1
+      2
     end
 
     def patch
-      3
+      0
     end
 
     def pre

data/spec/helper.rb

@@ -10,7 +10,6 @@ RSpec.configure do |config|
   end
 end
 
-
 def a_get(path)
   a_request(:get, Taxjar::API::Request::BASE_URL + path)
 end
@@ -50,4 +49,3 @@ end
 def fixture(file)
     File.new(fixture_path + '/' + file)
 end
-

data/spec/taxjar/api/api_spec.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe Taxjar::API do
-
   before do
     @client = Taxjar::Client.new(api_key: 'AK')
   end
@@ -23,6 +22,8 @@ describe Taxjar::API do
       expect(categories).to be_an Array
       expect(categories.first).to be_a Taxjar::Category
       expect(categories.first.name).to eq('Digital Goods')
+      expect(categories.first.product_tax_code).to eq('31000')
+      expect(categories.first.description).to eq('Digital products transferred electronically, meaning obtained by the purchaser by means other than tangible storage media.')
     end
   end
 
@@ -42,7 +43,15 @@ describe Taxjar::API do
     it 'returns the requested rates' do
       rates = @client.rates_for_location(@postal_code)
       expect(rates).to be_a Taxjar::Rate
+      expect(rates.zip).to eq('90002')
+      expect(rates.state).to eq('CA')
+      expect(rates.state_rate).to eq(0.065)
       expect(rates.county).to eq('LOS ANGELES')
+      expect(rates.county_rate).to eq(0.01)
+      expect(rates.city).to eq('WATTS')
+      expect(rates.city_rate).to eq(0.0)
+      expect(rates.combined_district_rate).to eq(0.015)
+      expect(rates.combined_rate).to eq(0.09)
     end
   end
 
@@ -71,12 +80,48 @@ describe Taxjar::API do
     it 'returns the requested taxes' do
       tax = @client.tax_for_order(@order)
       expect(tax).to be_a Taxjar::Tax
+      expect(tax.order_total_amount).to eq(16.5)
+      expect(tax.amount_to_collect).to eq(1.16)
+      expect(tax.has_nexus).to eq(true)
+      expect(tax.freight_taxable).to eq(true)
       expect(tax.tax_source).to eq('destination')
     end
+    
+    it 'allows access to breakdown' do
+      tax = @client.tax_for_order(@order)
+      expect(tax.breakdown.state_taxable_amount).to eq(16.5)
+      expect(tax.breakdown.state_tax_collectable).to eq(1.16)
+      expect(tax.breakdown.county_taxable_amount).to eq(0)
+      expect(tax.breakdown.county_tax_collectable).to eq(0)
+      expect(tax.breakdown.city_taxable_amount).to eq(0)
+      expect(tax.breakdown.city_tax_collectable).to eq(0)
+      expect(tax.breakdown.special_district_taxable_amount).to eq(0)
+      expect(tax.breakdown.special_district_tax_collectable).to eq(0)
+    end
+    
+    it 'allows access to breakdown.shipping' do
+      tax = @client.tax_for_order(@order)
+      expect(tax.breakdown.shipping.state_amount).to eq(0.11)
+      expect(tax.breakdown.shipping.state_sales_tax_rate).to eq(0.07)
+      expect(tax.breakdown.shipping.county_amount).to eq(0)
+      expect(tax.breakdown.shipping.county_tax_rate).to eq(0)
+      expect(tax.breakdown.shipping.city_amount).to eq(0)
+      expect(tax.breakdown.shipping.city_tax_rate).to eq(0)
+      expect(tax.breakdown.shipping.special_district_amount).to eq(0)
+      expect(tax.breakdown.shipping.special_tax_rate).to eq(0)
+    end
 
     it 'allows access to breakdown.line_items' do
       tax = @client.tax_for_order(@order)
       expect(tax.breakdown.line_items[0].id).to eq(1)
+      expect(tax.breakdown.line_items[0].state_taxable_amount).to eq(15)
+      expect(tax.breakdown.line_items[0].state_sales_tax_rate).to eq(0.07)
+      expect(tax.breakdown.line_items[0].county_taxable_amount).to eq(0)
+      expect(tax.breakdown.line_items[0].county_tax_rate).to eq(0)
+      expect(tax.breakdown.line_items[0].city_taxable_amount).to eq(0)
+      expect(tax.breakdown.line_items[0].city_tax_rate).to eq(0)
+      expect(tax.breakdown.line_items[0].special_district_taxable_amount).to eq(0)
+      expect(tax.breakdown.line_items[0].special_tax_rate).to eq(0)
     end
   end
 end

data/spec/taxjar/api/order_spec.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe Taxjar::API::Order do
-
   before do
     @client = Taxjar::Client.new(api_key: 'AK')
   end
@@ -66,12 +65,27 @@ describe Taxjar::API::Order do
     it 'returns the requested order' do
       order = @client.show_order('123')
       expect(order).to be_an Taxjar::Order
-      expect(order.transaction_id).to eq(123)
+      expect(order.transaction_id).to eq('123')
+      expect(order.user_id).to eq(10649)
+      expect(order.transaction_date).to eq('2015-05-14T00:00:00Z')
+      expect(order.to_country).to eq('US')
+      expect(order.to_zip).to eq('90002')
+      expect(order.to_state).to eq('CA')
+      expect(order.to_city).to eq('LOS ANGELES')
+      expect(order.to_street).to eq('123 Palm Grove Ln')
+      expect(order.amount).to eq(17.45)
+      expect(order.shipping).to eq(1.5)
+      expect(order.sales_tax).to eq(0.95)
     end
 
     it 'allows access to line_items' do
       order = @client.show_order('123')
+      expect(order.line_items[0].id).to eq(1)
       expect(order.line_items[0].quantity).to eq(1)
+      expect(order.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(order.line_items[0].description).to eq('Fuzzy Widget')
+      expect(order.line_items[0].unit_price).to eq(15.0)
+      expect(order.line_items[0].sales_tax).to eq(0.95)
     end
   end
 
@@ -89,9 +103,10 @@ describe Taxjar::API::Order do
                 :amount => 17.45,
                 :shipping => 1.5,
                 :sales_tax => 0.95,
-                :line_items => [{:quantity => 1,
+                :line_items => [{:id => 1,
+                                 :quantity => 1,
                                  :product_identifier => '12-34243-9',
-                                 :descriptiion => 'Fuzzy Widget',
+                                 :description => 'Fuzzy Widget',
                                  :unit_price => 15.0,
                                  :sales_tax => 0.95}]
       }
@@ -105,7 +120,27 @@ describe Taxjar::API::Order do
     it 'returns the created order' do
       order = @client.create_order(@order)
       expect(order).to be_a Taxjar::Order
-      expect(order.transaction_id).to eq(123)
+      expect(order.transaction_id).to eq('123')
+      expect(order.user_id).to eq(10649)
+      expect(order.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(order.to_country).to eq('US')
+      expect(order.to_zip).to eq('90002')
+      expect(order.to_state).to eq('CA')
+      expect(order.to_city).to eq('LOS ANGELES')
+      expect(order.to_street).to eq('123 Palm Grove Ln')
+      expect(order.amount).to eq(17.45)
+      expect(order.shipping).to eq(1.5)
+      expect(order.sales_tax).to eq(0.95)
+    end
+    
+    it 'allows access to line_items' do
+      order = @client.create_order(@order)
+      expect(order.line_items[0].id).to eq(1)
+      expect(order.line_items[0].quantity).to eq(1)
+      expect(order.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(order.line_items[0].description).to eq('Fuzzy Widget')
+      expect(order.line_items[0].unit_price).to eq(15.0)
+      expect(order.line_items[0].sales_tax).to eq(0.95)
     end
   end
 
@@ -118,9 +153,10 @@ describe Taxjar::API::Order do
       @order = {:transaction_id => '123',
                 :amount => 17.95,
                 :shipping => 2.0,
-                :line_items => [{:quantity => 1,
+                :line_items => [{:id => 1,
+                                 :quantity => 1,
                                  :product_identifier => '12-34243-0',
-                                 :descriptiion => 'Heavy  Widget',
+                                 :description => 'Heavy  Widget',
                                  :unit_price => 15.0,
                                  :discount => 0.0,
                                  :sales_tax => 0.95}]
@@ -135,7 +171,27 @@ describe Taxjar::API::Order do
     it 'returns the updated order' do
       order = @client.update_order(@order)
       expect(order).to be_a Taxjar::Order
-      expect(order.transaction_id).to eq(123)
+      expect(order.transaction_id).to eq('123')
+      expect(order.user_id).to eq(10649)
+      expect(order.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(order.to_country).to eq('US')
+      expect(order.to_zip).to eq('90002')
+      expect(order.to_state).to eq('CA')
+      expect(order.to_city).to eq('LOS ANGELES')
+      expect(order.to_street).to eq('123 Palm Grove Ln')
+      expect(order.amount).to eq(17.45)
+      expect(order.shipping).to eq(1.5)
+      expect(order.sales_tax).to eq(0.95)
+    end
+    
+    it 'allows access to line_items' do
+      order = @client.update_order(@order)
+      expect(order.line_items[0].id).to eq(1)
+      expect(order.line_items[0].quantity).to eq(1)
+      expect(order.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(order.line_items[0].description).to eq('Fuzzy Widget')
+      expect(order.line_items[0].unit_price).to eq(15.0)
+      expect(order.line_items[0].sales_tax).to eq(0.95)
     end
   end
 
@@ -154,7 +210,27 @@ describe Taxjar::API::Order do
     it 'returns the deleted order' do
       order = @client.delete_order('123')
       expect(order).to be_an Taxjar::Order
-      expect(order.transaction_id).to eq(123)
+      expect(order.transaction_id).to eq('123')
+      expect(order.user_id).to eq(10649)
+      expect(order.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(order.to_country).to eq('US')
+      expect(order.to_zip).to eq('90002')
+      expect(order.to_state).to eq('CA')
+      expect(order.to_city).to eq('LOS ANGELES')
+      expect(order.to_street).to eq('123 Palm Grove Ln')
+      expect(order.amount).to eq(17.45)
+      expect(order.shipping).to eq(1.5)
+      expect(order.sales_tax).to eq(0.95)
+    end
+    
+    it 'allows access to line items' do
+      order = @client.delete_order('123')
+      expect(order.line_items[0].id).to eq(1)
+      expect(order.line_items[0].quantity).to eq(1)
+      expect(order.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(order.line_items[0].description).to eq('Fuzzy Widget')
+      expect(order.line_items[0].unit_price).to eq(15.0)
+      expect(order.line_items[0].sales_tax).to eq(0.95)
     end
   end
 

data/spec/taxjar/api/refund_spec.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe Taxjar::API::Refund do
-
   before do
     @client = Taxjar::Client.new(api_key: 'AK')
   end
@@ -66,12 +65,29 @@ describe Taxjar::API::Refund do
     it 'returns the requested refund' do
       refund = @client.show_refund('321')
       expect(refund).to be_an Taxjar::Refund
-      expect(refund.transaction_id).to eq(321)
+      expect(refund.transaction_id).to eq('321')
+      expect(refund.user_id).to eq(10649)
+      expect(refund.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(refund.transaction_reference_id).to eq("123")
+      expect(refund.to_country).to eq('US')
+      expect(refund.to_zip).to eq('90002')
+      expect(refund.to_state).to eq('CA')
+      expect(refund.to_city).to eq('LOS ANGELES')
+      expect(refund.to_street).to eq('123 Palm Grove Ln')
+      expect(refund.amount).to eq(17.45)
+      expect(refund.shipping).to eq(1.5)
+      expect(refund.sales_tax).to eq(0.95)
     end
     
     it 'allows access to line_items' do
       refund = @client.show_refund('321')
+      expect(refund.line_items[0].id).to eq(1)
       expect(refund.line_items[0].quantity).to eq(1)
+      expect(refund.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(refund.line_items[0].description).to eq('Fuzzy Widget')
+      expect(refund.line_items[0].unit_price).to eq(15.0)
+      expect(refund.line_items[0].discount).to eq(0.0)
+      expect(refund.line_items[0].sales_tax).to eq(0.95)
     end
   end
 
@@ -93,7 +109,7 @@ describe Taxjar::API::Refund do
                 :sales_tax => 0.95,
                 :line_items => [{:quantity => 1,
                                  :product_identifier => '12-34243-9',
-                                 :descriptiion => 'Fuzzy Widget',
+                                 :description => 'Fuzzy Widget',
                                  :unit_price => 15.0,
                                  :sales_tax => 0.95}]
       }
@@ -105,9 +121,31 @@ describe Taxjar::API::Refund do
     end
 
     it 'returns the created refund' do
-      refund  = @client.create_refund(@refund)
+      refund = @client.create_refund(@refund)
       expect(refund).to be_a Taxjar::Refund
-      expect(refund.transaction_id).to eq(321)
+      expect(refund.transaction_id).to eq('321')
+      expect(refund.user_id).to eq(10649)
+      expect(refund.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(refund.transaction_reference_id).to eq("123")
+      expect(refund.to_country).to eq('US')
+      expect(refund.to_zip).to eq('90002')
+      expect(refund.to_state).to eq('CA')
+      expect(refund.to_city).to eq('LOS ANGELES')
+      expect(refund.to_street).to eq('123 Palm Grove Ln')
+      expect(refund.amount).to eq(17.45)
+      expect(refund.shipping).to eq(1.5)
+      expect(refund.sales_tax).to eq(0.95)
+    end
+    
+    it 'allows access to line_items' do
+      refund = @client.create_refund(@refund)
+      expect(refund.line_items[0].id).to eq(1)
+      expect(refund.line_items[0].quantity).to eq(1)
+      expect(refund.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(refund.line_items[0].description).to eq('Fuzzy Widget')
+      expect(refund.line_items[0].unit_price).to eq(15.0)
+      expect(refund.line_items[0].discount).to eq(0.0)
+      expect(refund.line_items[0].sales_tax).to eq(0.95)
     end
   end
 
@@ -123,7 +161,7 @@ describe Taxjar::API::Refund do
                 :sales_tax => 0.95,
                 :line_items => [{:quantity => 1,
                                  :product_identifier => '12-34243-9',
-                                 :descriptiion => 'Heavy Widget',
+                                 :description => 'Heavy Widget',
                                  :unit_price => 15.0,
                                  :sales_tax => 0.95}]
       }
@@ -137,7 +175,29 @@ describe Taxjar::API::Refund do
     it 'returns the updated refund' do
       refund = @client.update_refund(@refund)
       expect(refund).to be_a Taxjar::Refund
-      expect(refund.transaction_id).to eq(321)
+      expect(refund.transaction_id).to eq('321')
+      expect(refund.user_id).to eq(10649)
+      expect(refund.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(refund.transaction_reference_id).to eq("123")
+      expect(refund.to_country).to eq('US')
+      expect(refund.to_zip).to eq('90002')
+      expect(refund.to_state).to eq('CA')
+      expect(refund.to_city).to eq('LOS ANGELES')
+      expect(refund.to_street).to eq('123 Palm Grove Ln')
+      expect(refund.amount).to eq(17.45)
+      expect(refund.shipping).to eq(1.5)
+      expect(refund.sales_tax).to eq(0.95)
+    end
+    
+    it 'allows access to line_items' do
+      refund = @client.update_refund(@refund)
+      expect(refund.line_items[0].id).to eq(1)
+      expect(refund.line_items[0].quantity).to eq(1)
+      expect(refund.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(refund.line_items[0].description).to eq('Fuzzy Widget')
+      expect(refund.line_items[0].unit_price).to eq(15.0)
+      expect(refund.line_items[0].discount).to eq(0.0)
+      expect(refund.line_items[0].sales_tax).to eq(0.95)
     end
   end
 
@@ -156,7 +216,29 @@ describe Taxjar::API::Refund do
     it 'returns the delete refund' do
       refund = @client.delete_refund('321')
       expect(refund).to be_an Taxjar::Refund
-      expect(refund.transaction_id).to eq(321)
+      expect(refund.transaction_id).to eq('321')
+      expect(refund.user_id).to eq(10649)
+      expect(refund.transaction_date).to eq("2015-05-14T00:00:00Z")
+      expect(refund.transaction_reference_id).to eq("123")
+      expect(refund.to_country).to eq('US')
+      expect(refund.to_zip).to eq('90002')
+      expect(refund.to_state).to eq('CA')
+      expect(refund.to_city).to eq('LOS ANGELES')
+      expect(refund.to_street).to eq('123 Palm Grove Ln')
+      expect(refund.amount).to eq(17.45)
+      expect(refund.shipping).to eq(1.5)
+      expect(refund.sales_tax).to eq(0.95)
+    end
+    
+    it 'allows access to line_items' do
+      refund = @client.delete_refund('321')
+      expect(refund.line_items[0].id).to eq(1)
+      expect(refund.line_items[0].quantity).to eq(1)
+      expect(refund.line_items[0].product_identifier).to eq('12-34243-9')
+      expect(refund.line_items[0].description).to eq('Fuzzy Widget')
+      expect(refund.line_items[0].unit_price).to eq(15.0)
+      expect(refund.line_items[0].discount).to eq(0.0)
+      expect(refund.line_items[0].sales_tax).to eq(0.95)
     end
   end
 end

data/spec/taxjar/api/request_spec.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe Taxjar::API::Request do
-
   describe "#BASE_URL" do
     it 'should have taxjar api url' do
       expect(Taxjar::API::Request::BASE_URL).to eq('https://api.taxjar.com')
@@ -130,5 +129,4 @@ describe Taxjar::API::Request do
       end
     end
   end
-
 end

data/spec/taxjar/client_spec.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe Taxjar::Client do
-
   describe '#api_key?' do 
     it 'returns true if api_key is present' do
       client = Taxjar::Client.new(api_key: 'AK')

data/spec/taxjar/error_spec.rb

@@ -1,7 +1,6 @@
 require 'helper'
 
 describe Taxjar::Error do
-
   describe 'attributes' do
     let(:error) { Taxjar::Error.new('unprocessable entity', 422)}
 

data/taxjar-ruby.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'addressable', '~>2.3'
   spec.add_dependency 'http', '~>0.8.12'
   spec.add_dependency 'memoizable', '~>0.4.0'
+  spec.add_dependency 'taxjar-model_attribute', '~> 3.1'
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taxjar-ruby
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - TaxJar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-12 00:00:00.000000000 Z
+date: 2015-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: taxjar-model_attribute
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +140,6 @@ files:
 - spec/taxjar/api/order_spec.rb
 - spec/taxjar/api/refund_spec.rb
 - spec/taxjar/api/request_spec.rb
-- spec/taxjar/base_spec.rb
 - spec/taxjar/client_spec.rb
 - spec/taxjar/error_spec.rb
 - spec/taxjar/version_spec.rb
@@ -168,7 +181,6 @@ test_files:
 - spec/taxjar/api/order_spec.rb
 - spec/taxjar/api/refund_spec.rb
 - spec/taxjar/api/request_spec.rb
-- spec/taxjar/base_spec.rb
 - spec/taxjar/client_spec.rb
 - spec/taxjar/error_spec.rb
 - spec/taxjar/version_spec.rb

data/spec/taxjar/base_spec.rb

@@ -1,28 +0,0 @@
-require 'helper'
-
-require 'helper'
-
-describe Taxjar::Base do
-
-  describe "#initialize" do
-    before do
-      @klass = Class.new(Taxjar::Base)
-      @klass.attr_reader(:field)
-    end
-
-    it 'should convert string fields to floats if it can be done' do
-      b = @klass.new(:field => '3.0')
-      expect(b.field).to eq(3.0)
-    end
-
-    it 'should convert string fields to integers if it can be done' do
-      b = @klass.new(:field => '3')
-      expect(b.field).to eq(3)
-    end
-
-    it 'it should leave string as strings' do
-      b = @klass.new(:field => 'a')
-      expect(b.field).to eq('a')
-    end
-  end
-end