taxamo-ns 2.3.3 → 2.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee9fb69cbc6137fa0db9bc7864687e916160c46
-  data.tar.gz: 11f055ff30f784eaad541568bbbabfe70a376e60
+  metadata.gz: c7c53636022e0c11dcbd034960570314362aece5
+  data.tar.gz: 8b0d54057aa999764d79127409a05efaf46946d7
 SHA512:
-  metadata.gz: 38742d612539788710c4cd8f0500b3a3b4d9d2965f867affac76ce9e803a3c21b4a85445862b61a73af624c5544919ed969509546f27a628300c1fb52ad53461
-  data.tar.gz: cd291f5bf42d3ff5b6288e823fd1a85cf1e2819cea8f3f552a7f20368a54ea361f725a519cc556fde936de75d9bc08c3bc54809e12e33ca6ae1df8c2b7ce067d
+  metadata.gz: 61eab6790549b2b40cda899eba4ca74fd53756aefef780a9d313084e5ad323f55de58140d2af20e6065c3c5629fec5211727b1f5e14abe935d89046c44418ec9
+  data.tar.gz: 9ede7a0291d735782c2d9a2bcb491814a50aec503ca5b4f9a7cc92bfe3ee9da559f51e1f1cdf1ca5d0b6fa3307850042322ed78521b045b4eaa07fe571d296f2

data/README.md

@@ -20,7 +20,7 @@ The library can also be installed directy - just fetch this repository and issue
 
 ```shell
 $ gem build taxamo.gemspec
-$ gem install taxamo-ns-2.3.2.gem
+$ gem install taxamo-ns-2.3.4.gem
 ```
 
 Finally, you can use this github repo and add the following line to your project's `Gemfile` file:
@@ -37,6 +37,9 @@ gem "taxamo", github: "taxamo/taxamo-ruby", '~> 1.1'
 
 ## Changes
 
+2.3.4 (2017-06-09):
+ * allow configuration to be overridden when making the api call. See `connectivity_test.rb` for examples.
+
 2.3.3 (2017-05-26):
  * remove not needed camel case applied to 1st level attributes in request map
  

data/lib/swagger/configuration.rb

@@ -16,6 +16,47 @@ module Swagger
       @camelize_params = false
     end
 
+    def update(params)
+      if params[:format]
+        @format = params[:format]
+      end
+      if params[:scheme]
+        @scheme = params[:scheme]
+      end
+      if params[:host]
+        @host = params[:host]
+      end
+      if params[:base_path]
+        @base_path = params[:base_path]
+      end
+      if params[:user_agent]
+        @user_agent = params[:user_agent]
+      end
+      if params[:inject_format]
+        @inject_format = params[:inject_format]
+      end
+      if params[:force_ending_format]
+        @force_ending_format = params[:force_ending_format]
+      end
+      if params[:camelize_params]
+        @camelize_params = params[:camelize_params]
+      end
+      if params[:api_key]
+        @api_key = params[:api_key]
+      end
+      if params[:username]
+        @username = params[:username]
+      end
+      if params[:password]
+        @password = params[:password]
+      end
+      if params[:auth_token]
+        @auth_token = params[:auth_token]
+      end
+      if params[:logger]
+        @logger = params[:logger]
+      end
+    end
   end
 
 end

data/lib/swagger/request.rb

@@ -5,20 +5,23 @@ module Swagger
     require 'addressable/uri'
     require 'typhoeus'
 
-    attr_accessor :host, :path, :format, :params, :body, :http_method, :headers
+    attr_accessor :host, :path, :format, :params, :body, :http_method, :headers, :configuration
 
 
     # All requests must have an HTTP method and a path
     # Optionals parameters are :params, :headers, :body, :format, :host
     # 
-    def initialize(http_method, path, attributes={})
-      attributes[:format] ||= Swagger.configuration.format
+    def initialize(http_method, path, attributes={}, configuration={})
+      self.configuration = Swagger.configuration.clone()
+      self.configuration.update(configuration || {})
+
+      attributes[:format] ||= self.configuration.format
       attributes[:params] ||= {}
 
       # Set default headers
       default_headers = {
         'Content-Type' => "application/#{attributes[:format].downcase}",
-        'Token' => Swagger.configuration.api_key,
+        'Token' => self.configuration.api_key,
         'Source-Id' => "taxamo-ruby/" + Taxamo::VERSION
       }
 
@@ -26,20 +29,15 @@ module Swagger
       if attributes[:headers].present? && attributes[:headers].has_key?(:api_key)
         default_headers.delete(:api_key)
       end
-      
+
       # api_key from params hash trumps all others (headers and default_headers)
       if attributes[:params].present? && attributes[:params].has_key?(:api_key)
         default_headers.delete(:api_key)
         attributes[:headers].delete(:api_key) if attributes[:headers].present?
       end
-      
+
       # Merge argument headers into defaults
       attributes[:headers] = default_headers.merge(attributes[:headers] || {})
-      
-      # Stick in the auth token if there is one
-      if Swagger.authenticated?
-        attributes[:headers].merge!({:auth_token => Swagger.configuration.auth_token})
-      end
 
       self.http_method = http_method.to_sym
       self.path = path
@@ -50,20 +48,20 @@ module Swagger
 
     # Construct a base URL
     #
-    def url(options = {})  
+    def url(options = {})
       u = Addressable::URI.new(
-        :scheme => Swagger.configuration.scheme,
-        :host => Swagger.configuration.host,
+        :scheme => self.configuration.scheme,
+        :host => self.configuration.host,
         :path => self.interpreted_path,
         :query => self.query_string.sub(/\?/, '')
       ).to_s
-      
+
       # Drop trailing question mark, if present
       u.sub! /\?$/, ''
-      
+
       # Obfuscate API key?
       u.sub! /api\_key=\w+/, 'api_key=YOUR_API_KEY' if options[:obfuscated]
-      
+
       u
     end
 
@@ -98,13 +96,13 @@ module Swagger
       #
       # p = p.sub("{format}", self.format.to_s)
       #
-      URI.encode [Swagger.configuration.base_path, p].join("/").gsub(/\/+/, '/')
+      URI.encode [self.configuration.base_path, p].join("/").gsub(/\/+/, '/')
     end
-  
+
     # Massage the request body into a state of readiness
     # If body is a hash, camelize all keys then convert to a json string
     #
-    def body=(value)      
+    def body=(value)
       #if value.is_a?(Hash)
       #  value = value.inject({}) do |memo, (k,v)|
       #    memo[k.to_s.camelize(:lower).to_sym] = v
@@ -113,13 +111,13 @@ module Swagger
       #end
       @body = value
     end
-    
+
     # If body is an object, JSONify it before making the actual request.
-    # 
+    #
     def outgoing_body
       body.is_a?(String) ? body : body.to_json
     end
-    
+
     # Construct a query string from the query-string-type params
     def query_string
 
@@ -130,7 +128,7 @@ module Swagger
       self.params.each_pair do |key, value|
         next if self.path.include? "{#{key}}"                                   # skip path params
         next if value.blank? && value.class != FalseClass                       # skip empties
-        if Swagger.configuration.camelize_params
+        if self.configuration.camelize_params
           key = key.to_s.camelize(:lower).to_sym unless key.to_sym == :api_key    # api_key is not a camelCased param
         end
         query_values[key.to_s] = value.to_s
@@ -147,6 +145,7 @@ module Swagger
     end
   
     def make
+      puts self.configuration
       logger = Logger.new STDOUT
       logger.debug self.url
       response = case self.http_method.to_sym

data/lib/taxamo.rb

@@ -64,7 +64,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CreateRefundOut.new(response)
 
     end
@@ -89,7 +89,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       ListRefundsOut.new(response)
 
     end
@@ -136,7 +136,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CreatePaymentOut.new(response)
 
     end
@@ -163,7 +163,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       ListPaymentsOut.new(response)
 
     end
@@ -188,7 +188,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CapturePaymentOut.new(response)
 
     end
@@ -235,7 +235,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       EmailInvoiceOut.new(response)
 
     end
@@ -284,7 +284,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       EmailRefundOut.new(response)
 
     end
@@ -329,7 +329,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CreateTransactionOut.new(response)
 
     end
@@ -354,7 +354,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetTransactionOut.new(response)
 
     end
@@ -401,7 +401,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:PUT, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       UpdateTransactionOut.new(response)
 
     end
@@ -448,7 +448,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       ConfirmTransactionOut.new(response)
 
     end
@@ -473,7 +473,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:DELETE, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CancelTransactionOut.new(response)
 
     end
@@ -520,7 +520,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       UnconfirmTransactionOut.new(response)
 
     end
@@ -559,7 +559,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       ListTransactionsOut.new(response)
 
     end
@@ -604,7 +604,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CalculateTaxOut.new(response)
 
     end
@@ -643,7 +643,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CalculateSimpleTaxOut.new(response)
 
     end
@@ -669,7 +669,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       ValidateTaxNumberOut.new(response)
 
     end
@@ -693,7 +693,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CalculateTaxLocationOut.new(response)
 
     end
@@ -716,7 +716,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       LocateMyIPOut.new(response)
 
     end
@@ -741,7 +741,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       LocateGivenIPOut.new(response)
 
     end
@@ -769,7 +769,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetTransactionsStatsByCountryOut.new(response)
 
     end
@@ -797,7 +797,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetTransactionsStatsOut.new(response)
 
     end
@@ -824,7 +824,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetSettlementStatsByCountryOut.new(response)
 
     end
@@ -851,7 +851,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetSettlementStatsByTaxationTypeOut.new(response)
 
     end
@@ -880,7 +880,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetDailySettlementStatsOut.new(response)
 
     end
@@ -916,7 +916,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetEuViesReportOut.new(response)
 
     end
@@ -948,7 +948,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetDomesticSummaryReportOut.new(response)
 
     end
@@ -976,7 +976,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetDetailedRefundsOut.new(response)
 
     end
@@ -1004,7 +1004,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetRefundsOut.new(response)
 
     end
@@ -1038,7 +1038,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetSettlementOut.new(response)
 
     end
@@ -1067,7 +1067,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetSettlementSummaryOut.new(response)
 
     end
@@ -1112,7 +1112,7 @@ module Taxamo
           end
         end
       end
-      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:POST, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       CreateSMSTokenOut.new(response)
 
     end
@@ -1137,7 +1137,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       VerifySMSTokenOut.new(response)
 
     end
@@ -1160,7 +1160,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetCurrenciesDictOut.new(response)
 
     end
@@ -1183,7 +1183,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetProductTypesDictOut.new(response)
 
     end
@@ -1206,7 +1206,7 @@ module Taxamo
 
       headers = nil
       post_body = nil
-      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }).make.body
+      response = Swagger::Request.new(:GET, path, {:params=>queryopts,:headers=>headers, :body=>post_body }, opts[:configuration]).make.body
       GetCountriesDictOut.new(response)
 
     end

data/lib/taxamo/version.rb

@@ -11,7 +11,7 @@
 # limitations under the License.
 
 module Taxamo
-  VERSION = "2.3.3"
+  VERSION = "2.3.4"
 end
 
 

data/test/taxamo/connectivity_test.rb

@@ -36,20 +36,19 @@ class ConnectivityTest < Test::Unit::TestCase
 
   should 'test_auth' do
     Swagger.configure do |config|
-      config.api_key = 'SamplePrivateTestKey1!'
+      config.api_key = 'SamplePrivateTestKey1'
     end
     assert_raise(AuthenticationError) {
-      Taxamo.calculate_tax ({'__transaction' => {
-                               'currency_code' => 'USD',
-                               'buyer_ip' => '127.0.0.1',
-                               'billing_country_code' => 'IE',
-                               'force_country_code' => 'FR',
-                               'transaction_lines' => [{'amount' => 200,
-                                                        'custom_id' => 'line1'},
-                                                       {'amount' => 100,
-                                                        'product_type' => 'e-book',
-                                                        'custom_id' => 'line2'}]}})}
-
-
+      Taxamo.calculate_tax({'transaction' => {
+                              'currency_code' => 'USD',
+                              'buyer_ip' => '127.0.0.1',
+                              'billing_country_code' => 'IE',
+                              'force_country_code' => 'FR',
+                              'transaction_lines' => [{'amount' => 200,
+                                                       'custom_id' => 'line1'},
+                                                      {'amount' => 100,
+                                                       'product_type' => 'e-book',
+                                                       'custom_id' => 'line2'}]}},
+                                                       {:configuration => {:api_key => 'SamplePrivateTestKey1!'}})}
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: taxamo-ns
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 2.3.4
 platform: ruby
 authors:
 - Tomek Lipski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 2017-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable