sale 0.2.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d3a677bb61cfa0802ba091302eac81313419d154288c92d7fc4777f6d8eac45
-  data.tar.gz: e480347c0acd0c4c614117bb2cd9735d9a1cd67834d184fc45c222ef8dc3f30a
+  metadata.gz: 47f45ce3b44b7b5fbb12004cd48c036ed4311b1636d066e710cf893b9054501f
+  data.tar.gz: 706f16546a82e63010784563e5b5d071ae670a7a451af813fd7b7fdeea3a96d7
 SHA512:
-  metadata.gz: c1db560494d74856dc9190d8dc058cd6c6e72c24d4866123cba083a00685fb53ab572a84c5ef1dda52867ca4a48da2c0c85ff1f88a18ecb9b396e7fc9a8f85f0
-  data.tar.gz: 0ba64f08387d786591f456388b9ca02089c2bb07d3b89fff2e12fc5f5fd4902d5ddba80554460b568939df35e433917202ded87bfd7b69151dd1b5b5775d23aa
+  metadata.gz: bc691f52018bd5cc2981b9738331d2c58278209e69d51107e06283e1d21b8b476d8da3cc17572fc08d2d15023dcfb2025a12bcbcb4629e9d78867a5eaed07f9e
+  data.tar.gz: cd1e8be8565f92513c86df4206670d3bc82dfde2d18cc571155afe19896a473885766f25a9416f8ad1768ec99ebb48130898eb212e4ea6fd7eff8350d43677dc

data/.gitignore

@@ -0,0 +1,2 @@
+gems.locked
+pkg

data/lib/sale/base.rb

@@ -4,6 +4,8 @@ require_relative './entity'
 
 module Bsale
   class InvalidResponseError < StandardError; end
+  class ClientError < InvalidResponseError; end
+  class ServerError < InvalidResponseError; end
 
   class APIBase
     ENDPOINT = 'https://api.bsale.cl'.freeze
@@ -39,22 +41,27 @@ module Bsale
       headers = { 'access_token' => @token }
       url = path['://'] ? path : [ ENDPOINT, VERSION, path ].join('/')
 
-      if @http
-        @http.request(method, url, body, { json: true, follow: 3, headers: headers })
+      resp = if @http
+        @http.request(method, url, body, { json: true, follow: 3, retries: 3, headers: headers })
       else
-        Dagger.request(method, url, body, { json: true, follow: 3, headers: headers })
+        Dagger.request(method, url, body, { json: true, follow: 3, retries: 3, headers: headers })
       end
-    rescue InvalidResponseError, Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ETIMEDOUT, Errno::EINVAL, Timeout::Error, \
-      SocketError, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, OpenSSL::SSL::SSLError => e
 
+      if resp.code > 500
+        raise ServerError.new("#{resp.code}: #{resp.body}")
+      else
+        resp
+      end
+
+    rescue ServerError => e
       raise if attempt > MAX_RETRIES
-      puts "Connection refused. Retrying in a few secs... (attempt #{attempt})"
-      sleep(attempt * 5) # 5 secs, 10 secs, 15 secs, 20 secs
+      puts "#{e.class}. Retrying in a few secs... (attempt #{attempt})"
+      sleep(attempt * 3) # 3 secs, 6 secs, 9 secs, 12 secs
       request(method, path, body, attempt + 1)
     end
 
-    def connect
-      @http ||= Dagger.open(ENDPOINT)
+    def connect(opts = {})
+      @http ||= Dagger.open(ENDPOINT, opts)
     end
 
     def disconnect
@@ -68,8 +75,10 @@ module Bsale
       if resp.success?
         data = parse_json(resp.body)
         return data ? Entity.new(data, self, original_params) : nil
+      # elsif resp.code > 500
+      #   raise ServerError.new("#{resp.code}: #{resp.body}")
       else
-        raise InvalidResponseError.new("#{resp.code}: #{resp.body}")
+        raise ClientError.new("#{resp.code}: #{resp.body}")
       end
     end
 

data/lib/sale/entity.rb

@@ -1,3 +1,6 @@
+require 'cgi'
+require 'dagger'
+
 class Entity
   include Enumerable
 
@@ -40,6 +43,10 @@ class Entity
     to_a.size
   end
 
+  def total_entries
+    data['count']
+  end
+
   alias_method :size, :count
 
   def items
@@ -56,19 +63,19 @@ class Entity
   end
 
   def has_prev_page?
-    data['prev']
+    !!data['prev']
   end
 
   def has_next_page?
-    data['next']
+    !!data['next']
   end
 
   def prev_page
-    data['prev'] ? follow_link(data['prev'], @original_params) : nil
+    data['prev'] ? follow_link(fix_link(data['prev']), @original_params) : nil
   end
 
   def next_page
-    data['next'] ? follow_link(data['next'], @original_params) : nil
+    data['next'] ? follow_link(fix_link(data['next']), @original_params) : nil
   end
 
   def method_missing(name, *args)
@@ -97,13 +104,21 @@ class Entity
   #   false
   # end
 
+  def fix_link(href)
+    uri = URI.parse(href)
+    link_params = CGI.parse(uri.query || '').transform_values(&:first)
+    new_params  = maybe_stringify(@original_params || {}).merge(link_params)
+    uri.query   = Dagger::Utils.encode(new_params) if new_params.any?
+    uri.to_s
+  end
+
   def is_hash?(obj)
     obj.is_a?(Hash)
   end
 
   def maybe_stringify(obj)
     return obj unless is_hash?(obj)
-    obj.inject({}) { |memo,(k,v) | memo[k.to_s] = v; memo }
+    obj.inject({}) { |memo,(k,v)| memo[k.to_s] = v; memo }
   end
 
   def follow_link(href, params = nil)

data/lib/sale/invoices.rb

@@ -17,16 +17,23 @@ class Bsale::Invoices
     end
   end
 
-  def create(codeSii:, emissionDate:, expirationDate:, declareSii:, priceListId:, \
+  def create(codeSii: nil, documentTypeId: nil, emissionDate:, expirationDate:, declareSii:, priceListId:, \
     officeId: nil, clientId: nil, client: nil, details: nil, payments: nil)
 
     body = {
-      codeSii: codeSii, # we could also use "documentTypeId"
       declareSii: declareSii,
       emissionDate: emissionDate,
       expirationDate: expirationDate
     }
 
+    if documentTypeId
+      body[:documentTypeId] = documentTypeId
+    elsif codeSii
+      body[:codeSii] = codeSii
+    else
+      raise ArgumentError, "Either codeSii or documentTypeId required"
+    end
+
     body[:officeId] = officeId if officeId
     body[:priceListId] = priceListId if priceListId
 
@@ -35,7 +42,7 @@ class Bsale::Invoices
     elsif client
       body[:client] = client
     elsif [33, 34].include?(codeSii.to_i) # facturas requiren clientId
-      raise 'clientId or client required' 
+      raise 'clientId or client required'
     end
 
     body[:details]  = details  if details

data/sale.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'sale'
-  s.version     = '0.2.1'
+  s.version     = '0.4.0'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Tomás Pollak']
   s.email       = ['tomas@bootic.net']
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rspec-mocks"
   s.add_development_dependency "rspec-expectations"
 
-  s.add_runtime_dependency "dagger", "~> 0.9.0"
+  s.add_runtime_dependency "dagger", "~> 1.8.0"
 
   s.files        = `git ls-files`.split("\n")
   s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact

data/spec/base_spec.rb

@@ -13,7 +13,7 @@ describe 'APIBase' do
   describe '#request' do
     it 'explodes with 401 error if invalid token' do
       expect do
-        resp = subject.get('foo')
+        resp = subject.get('foo.json')
       end.to raise_error(Bsale::InvalidResponseError)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sale
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Tomás Pollak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-24 00:00:00.000000000 Z
+date: 2020-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 1.8.0
 description: A wrapper around the Bsale API.
 email:
 - tomas@bootic.net
@@ -87,6 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".gitignore"
 - Rakefile
 - gems.rb
 - lib/sale.rb