quaderno 1.15.2 → 2.0.1

data/lib/quaderno-ruby/behavior/deliver.rb

@@ -13,11 +13,15 @@ module Quaderno::Behavior
 
         party_response = api_model.get("#{authentication_data[:url]}#{api_model.api_path}/#{id}/deliver.json",
           basic_auth: authentication_data[:basic_auth],
-          headers: self.class.version_header.merge(authentication_data[:headers])
+          headers: self.class.default_headers.merge(authentication_data[:headers])
         )
 
         api_model.check_exception_for(party_response, { rate_limit: true, subdomain_or_token: true, id: true, required_fields: true })
-        { limit: party_response.headers["x-ratelimit-limit"].to_i, remaining: party_response.headers["x-ratelimit-remaining"].to_i }
+
+        data = Quaderno::Base.new(success: true)
+        data.rate_limit_info = party_response
+
+        data
       end
     end
   end

data/lib/quaderno-ruby/behavior/payment.rb

@@ -11,13 +11,13 @@ module Quaderno::Behavior
       def add_payment(params = {})
         if (params.keys.map(&:to_s) & %w(auth_token access_token api_url mode api_model)).any?
           self.authentication_data = get_authentication(params.merge(api_model: api_model))
-          params = params.delete_if { |k, _| %w(auth_token access_token api_url mode api_model).include? k.to_s }
+          params = params.dup.delete_if { |k, _| %w(auth_token access_token api_url mode api_model).include? k.to_s }
         end
 
         response = api_model.post("#{authentication_data[:url]}#{api_model.api_path}/#{id}/payments.json",
           body: params,
           basic_auth: authentication_data[:basic_auth],
-          headers: self.class.version_header.merge(authentication_data[:headers])
+          headers: self.class.default_headers.merge(authentication_data[:headers])
         )
 
         api_model.check_exception_for(response, { rate_limit: true, subdomain_or_token: true, required_fields: true })
@@ -25,23 +25,29 @@ module Quaderno::Behavior
         instance = Quaderno::Payment.new(response.parsed_response)
         self.payments << instance
 
-        Quaderno::Payment.new instance
+        instance.rate_limit_info = response
+
+        instance
       end
 
       def remove_payment(payment_id, options = nil)
         self.authentication_data = get_authentication(options.merge(api_model: api_model)) if options.is_a?(Hash)
 
-
         response = HTTParty.delete("#{authentication_data[:url]}#{api_model.api_path}/#{id}/payments/#{payment_id}.json",
           basic_auth: authentication_data[:basic_auth],
-          headers: self.class.version_header.merge(authentication_data[:headers])
+          headers: self.class.default_headers.merge(authentication_data[:headers])
         )
 
         api_model.check_exception_for(response, { rate_limit: true, subdomain_or_token: true, id: true })
 
         self.payments.delete_if { |payment| payment.id == payment_id }
 
-        true
+        hash = { deleted: true, id: payment_id}
+
+        object = Quaderno::Payment.new(hash)
+        object.rate_limit_info = response
+
+        object
       end
     end
   end

data/lib/quaderno-ruby/behavior/retrieve.rb

@@ -13,14 +13,17 @@ module Quaderno::Behavior
 
         response = get("#{authentication[:url]}#{gateway}/#{@_retrieve_path}/#{gateway_id}.json",
           basic_auth: authentication[:basic_auth],
-          headers: version_header.merge(authentication[:headers])
+          headers: default_headers.merge(authentication[:headers])
         )
 
         check_exception_for(response, { rate_limit: true, subdomain_or_token: true, id: true })
         hash = response.parsed_response
         hash[:authentication_data] = authentication
 
-        new hash
+        object = new hash
+        object.rate_limit_info = response
+
+        object
       end
       alias_method :retrieve_customer, :retrieve
 

data/lib/quaderno-ruby/checkout_session.rb

@@ -0,0 +1,4 @@
+class Quaderno::CheckoutSession < Quaderno::Base
+  api_model Quaderno::CheckoutSession
+  api_path 'checkout/sessions'
+end

data/lib/quaderno-ruby/collection.rb

@@ -1,22 +1,28 @@
 class Quaderno::Collection < Array
+  include Quaderno::Helpers::RateLimit
 
-  def current_page=(page_number)
-    @page = page_number
+  def request_options=(options)
+    @request_options = options
   end
 
-  def current_page
-    @page.to_i || 1
+  def collection_type=(collection_type)
+    @collection_type = collection_type
   end
 
-  def total_pages=(total_pages)
-    @total_pages = total_pages
+  def has_more=(has_more_response)
+    @has_more = has_more_response
   end
 
-  def total_pages
-    @total_pages.to_i || 1
+  def next_page_url=(next_page_url)
+    @next_page_url = next_page_url
   end
 
-  def pagination_info
-    { current_page: current_page, total_pages: total_pages }
+  def has_more?
+    @has_more == 'true'
   end
-end
+
+  def next_page
+    return Quaderno::Collection.new unless has_more?
+    @collection_type.all_from_url(@next_page_url, @request_options)
+  end
+end

data/lib/quaderno-ruby/exceptions/exceptions.rb

@@ -1,5 +1,6 @@
 module Quaderno::Exceptions
   class BaseException < StandardError
+    include Quaderno::Helpers::RateLimit
   end
 
   class InvalidSubdomainOrToken < BaseException
@@ -29,26 +30,33 @@ module Quaderno::Exceptions
 
   module ClassMethods
     def check_exception_for(party_response, params = {})
-      raise(Quaderno::Exceptions::UnsupportedApiVersion, 'Unsupported API version') if !!(party_response.body =~ /Unsupported API version/)
+      raise_exception(Quaderno::Exceptions::UnsupportedApiVersion, 'Unsupported API version', party_response) if !!(party_response.body =~ /Unsupported API version/)
 
-      if params[:throttle_limit].nil? == false
-       raise(Quaderno::Exceptions::ThrottleLimitExceeded, 'Throttle limit exceeded, please try again later') if party_response.response.class == Net::HTTPServiceUnavailable
+      if params[:throttle_limit].nil? == false && party_response.response.class == Net::HTTPServiceUnavailable
+        raise_exception(Quaderno::Exceptions::ThrottleLimitExceeded, 'Throttle limit exceeded, please try again later', party_response)
       end
-      if params[:rate_limit].nil? == false
-        raise(Quaderno::Exceptions::RateLimitExceeded, 'Rate limit exceeded') if party_response.response.class == Net::HTTPForbidden
+      if params[:rate_limit].nil? == false && party_response.response.class == Net::HTTPForbidden
+        raise_exception(Quaderno::Exceptions::RateLimitExceeded, 'Rate limit exceeded', party_response)
       end
       if params[:subdomain_or_token].nil? == false
-        raise(Quaderno::Exceptions::InvalidSubdomainOrToken, 'Invalid subdomain or token') if party_response.response.class == Net::HTTPUnauthorized
+        raise_exception(Quaderno::Exceptions::InvalidSubdomainOrToken, 'Invalid subdomain or token', party_response) if party_response.response.class == Net::HTTPUnauthorized
       end
       if params[:id].nil? == false
-        raise(Quaderno::Exceptions::InvalidID, "Invalid #{ api_model } instance identifier") if (party_response.response.class == Net::HTTPInternalServerError) || (party_response.response.class == Net::HTTPNotFound)
+        raise_exception(Quaderno::Exceptions::InvalidID, "Invalid #{ api_model } instance identifier", party_response) if (party_response.response.class == Net::HTTPInternalServerError) || (party_response.response.class == Net::HTTPNotFound)
       end
       if params[:required_fields].nil? == false
-        raise(Quaderno::Exceptions::RequiredFieldsEmptyOrInvalid, party_response.body) if party_response.response.class == Net::HTTPUnprocessableEntity
+        raise_exception(Quaderno::Exceptions::RequiredFieldsEmptyOrInvalid, party_response.body, party_response) if party_response.response.class == Net::HTTPUnprocessableEntity
       end
       if params[:has_documents].nil? == false
-        raise(Quaderno::Exceptions::HasAssociatedDocuments, party_response.body) if party_response.response.class == Net::HTTPClientError
+        raise_exception(Quaderno::Exceptions::HasAssociatedDocuments, party_response.body, party_response) if party_response.response.class == Net::HTTPClientError
       end
     end
+
+    def raise_exception(klass, message, response)
+      exception = klass.new(message)
+      exception.rate_limit_info = response
+
+      raise exception
+    end
   end
 end

data/lib/quaderno-ruby/helpers/rate_limit.rb

@@ -0,0 +1,12 @@
+module Quaderno::Helpers
+  module RateLimit
+
+    def rate_limit_info=(response)
+      @rate_limit_info = { reset: response.headers['x-ratelimit-reset'].to_i, remaining: response.headers["x-ratelimit-remaining"].to_i }
+    end
+
+    def rate_limit_info
+      @rate_limit_info
+    end
+  end
+end

data/lib/quaderno-ruby/payment.rb

@@ -1,2 +1,3 @@
 class Quaderno::Payment < OpenStruct
+  include Quaderno::Helpers::RateLimit
 end

data/lib/quaderno-ruby/report.rb

@@ -8,12 +8,12 @@ class Quaderno::Report < Quaderno::Base
 
   def self.journal(options = {})
     authentication = get_authentication(options.merge(api_model: api_model))
-    filter = options.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
+    filter = options.dup.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
 
     response = get("#{authentication[:url]}#{api_model.api_path}/journal.json",
       query: filter,
       basic_auth: authentication[:basic_auth],
-      headers: version_header.merge(authentication[:headers])
+      headers: default_headers.merge(authentication[:headers])
     )
 
     check_exception_for(response, { rate_limit: true, subdomain_or_token: true })
@@ -23,12 +23,12 @@ class Quaderno::Report < Quaderno::Base
 
   def self.taxes(options = {})
     authentication = get_authentication(options.merge(api_model: api_model))
-    filter = options.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
+    filter = options.dup.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
 
     response = get("#{authentication[:url]}#{api_model.api_path}/taxes.json",
       query: filter,
       basic_auth: authentication[:basic_auth],
-      headers: version_header.merge(authentication[:headers])
+      headers: default_headers.merge(authentication[:headers])
     )
 
     check_exception_for(response, { rate_limit: true, subdomain_or_token: true })
@@ -60,12 +60,12 @@ class Quaderno::Report < Quaderno::Base
 
   def self.request_tax_report(tax_report_type, options)
     authentication = get_authentication(options.merge(api_model: api_model))
-    filter = options.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
+    filter = options.dup.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
 
     response = get("#{authentication[:url]}#{api_model.api_path}/#{tax_report_type}.json",
       query: filter,
       basic_auth: authentication[:basic_auth],
-      headers: version_header.merge(authentication[:headers])
+      headers: default_headers.merge(authentication[:headers])
     )
 
     check_exception_for(response, { rate_limit: true, subdomain_or_token: true })
@@ -75,4 +75,4 @@ class Quaderno::Report < Quaderno::Base
 
     collection
   end
-end
+end

data/lib/quaderno-ruby/tax.rb

@@ -11,44 +11,51 @@ class Quaderno::Tax < Quaderno::Base
 
   def self.calculate(options = {})
     authentication = get_authentication(options.merge(api_model: api_model))
-    params = options.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
+    params = options.dup.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
 
-    response = get("#{authentication[:url]}taxes/calculate.json",
+    response = get("#{authentication[:url]}tax_rates/calculate.json",
       query: params,
       basic_auth: authentication[:basic_auth],
-      headers: version_header.merge(authentication[:headers])
+      headers: default_headers.merge(authentication[:headers])
     )
 
     check_exception_for(response, { rate_limit: true, subdomain_or_token: true, id: true })
-    new response.parsed_response
+    data = new response.parsed_response
+    data.rate_limit_info = response
+
+    data
   end
 
   def self.validate_vat_number(country, vat_number, options = {})
     authentication = get_authentication(options.merge(api_model: api_model))
 
-    response = get("#{authentication[:url]}taxes/validate.json",
+    response = get("#{authentication[:url]}tax_ids/validate.json",
       query: { country: country, vat_number: vat_number },
       basic_auth: authentication[:basic_auth],
-      headers: version_header.merge(authentication[:headers])
+      headers: default_headers.merge(authentication[:headers])
     )
 
     check_exception_for(response, { rate_limit: true, subdomain_or_token: true, id: true })
 
-    response.parsed_response['valid']
+    data = new({ valid: response.parsed_response['valid'] })
+    data.rate_limit_info = response
+
+    data
   end
 
   def self.reports(options = {})
     authentication = get_authentication(options.merge(api_model: api_model))
-    params = options.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
+    params = options.dup.delete_if { |k,v| %w(auth_token access_token api_url mode api_model).include? k.to_s }
 
     response = get("#{authentication[:url]}taxes/reports.json",
       query: params,
       basic_auth: authentication[:basic_auth],
-      headers: version_header.merge(authentication[:headers])
+      headers: default_headers.merge(authentication[:headers])
     )
 
     array = response.parsed_response
     collection = Quaderno::Collection.new
+    collection.rate_limit_info = response
     collection.current_page = response.headers['x-pages-currentpage']
     collection.total_pages = response.headers['x-pages-totalpages']
 

data/lib/quaderno-ruby/version.rb

@@ -1,3 +1,3 @@
 class Quaderno
-  VERSION = "1.15.2"
+  VERSION = "2.0.1"
 end

data/quaderno.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = %w(lib)
-  spec.date = "2017-12-21"
+  spec.date = "2018-05-07"
   spec.extra_rdoc_files = %w(LICENSE.txt README.md)
 
 
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency('activesupport', "~> 4.2.0")
   spec.add_development_dependency('webmock', "~> 1.22.6")
   spec.add_development_dependency('vcr', ">= 0")
-  spec.add_development_dependency("bundler", "~> 1.11")
-  spec.add_development_dependency("rake", "~> 10.0")
+  spec.add_development_dependency("bundler", "~> 2.2")
+  spec.add_development_dependency("rake", ">= 12.3.3")
   spec.add_development_dependency("rspec", "~> 3.0")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: quaderno
 version: !ruby/object:Gem::Version
-  version: 1.15.2
+  version: 2.0.1
 platform: ruby
 authors:
 - Recrea
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 12.3.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -146,6 +146,7 @@ files:
 - lib/quaderno-ruby/behavior/deliver.rb
 - lib/quaderno-ruby/behavior/payment.rb
 - lib/quaderno-ruby/behavior/retrieve.rb
+- lib/quaderno-ruby/checkout_session.rb
 - lib/quaderno-ruby/collection.rb
 - lib/quaderno-ruby/contact.rb
 - lib/quaderno-ruby/credit.rb
@@ -155,6 +156,7 @@ files:
 - lib/quaderno-ruby/exceptions/exceptions.rb
 - lib/quaderno-ruby/expense.rb
 - lib/quaderno-ruby/helpers/authentication.rb
+- lib/quaderno-ruby/helpers/rate_limit.rb
 - lib/quaderno-ruby/income.rb
 - lib/quaderno-ruby/invoice.rb
 - lib/quaderno-ruby/item.rb
@@ -185,8 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby wrapper for the Quaderno API (https://quaderno.io/docs/api)