lhc 11.0.0 → 11.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b98d689381652202d5204b16f76d5171c7650362ed047d733447f04de02dbac5
-  data.tar.gz: cb43cb26d090cb3e387e9e1b17ece3c96a7aab2b07fb54592f1a594af0dd3d6a
+  metadata.gz: 19e2069105d325acde5b2d89abcb267604658239dfc8808acc58637aac94a97a
+  data.tar.gz: f1795b3999b8307cca582bfd55318a663a823b87057535e9652b1c611d952292
 SHA512:
-  metadata.gz: 02d1689b6669a88dee07d03916d8d3972a5733abb577af695509bbe8c867c6357daefc94bb9008205378a0ccfc65f6de7006fcf66f3425e651ebc92b76e1d1bf
-  data.tar.gz: 4149bfbcb67cd51d4c3743353357d663548a20812035b1d9e051ed9990ca4de73936dff7075db59193113009f8866ccce94a09816bd29942345e2e146cf6f2c9
+  metadata.gz: 2b0da63bf8c0ff0a66c37e7c3ca3b28f14e4940c2c16d432734b56ff957c4b305ca408660b5448c5f81e87cf19faf76578ddf52b0fbe826a2f63d1ad8c59468d
+  data.tar.gz: bd50aacfc4667b1d30cf9e1c1b2961d31b46e5603868a6d14ebcc2690deb4e9e3691e5ef65881f5b1744994d342eaf11be47b48cbd60bb33c1a9065033b32e5c

data/lib/lhc/concerns/lhc/basic_methods_concern.rb

@@ -27,7 +27,7 @@ module LHC
       private
 
       def parallel_requests(options)
-        hydra = Typhoeus::Hydra.hydra
+        hydra = Typhoeus::Hydra.new # do not use memoization !
         requests = []
         options.each do |option|
           request = LHC::Request.new(option, false)

data/lib/lhc/concerns/lhc/formats_concern.rb

@@ -5,6 +5,10 @@ module LHC
     extend ActiveSupport::Concern
 
     module ClassMethods
+      def form
+        LHC::Formats::Form
+      end
+
       def json
         LHC::Formats::JSON
       end

data/lib/lhc/error.rb

@@ -59,6 +59,10 @@ class LHC::Error < StandardError
     self.response = response
   end
 
+  def self.to_a
+    [self]
+  end
+
   def to_s
     return response if response.is_a?(String)
     request = response.request

data/lib/lhc/formats.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module LHC::Formats
+  autoload :Form, 'lhc/formats/form'
   autoload :JSON, 'lhc/formats/json'
   autoload :Multipart, 'lhc/formats/multipart'
   autoload :Plain, 'lhc/formats/plain'

data/lib/lhc/formats/form.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module LHC::Formats
+  class Form < LHC::Format
+    include LHC::BasicMethodsConcern
+
+    def self.request(options)
+      options[:format] = new
+      super(options)
+    end
+
+    def format_options(options)
+      options[:headers] ||= {}
+      no_content_type_header!(options)
+      options[:headers]['Content-Type'] = 'application/x-www-form-urlencoded'
+      options
+    end
+
+    def as_json(input)
+      parse(input)
+    end
+
+    def as_open_struct(input)
+      parse(input)
+    end
+
+    def to_body(input)
+      input
+    end
+
+    def to_s
+      'form'
+    end
+
+    def to_sym
+      to_s.to_sym
+    end
+
+    private
+
+    def parse(input)
+      input
+    end
+  end
+end

data/lib/lhc/interceptors/auth.rb

@@ -66,7 +66,7 @@ class LHC::Auth < LHC::Interceptor
   end
 
   def bearer_header_present?
-    @has_bearer_header ||= request.headers['Authorization'] =~ /^Bearer [0-9a-f-]+$/i
+    @has_bearer_header ||= request.headers['Authorization'] =~ /^Bearer .+$/i
   end
 
   def refresh_client_token_option

data/lib/lhc/interceptors/prometheus.rb

@@ -15,9 +15,15 @@ class LHC::Prometheus < LHC::Interceptor
   def initialize(request)
     super(request)
     return if LHC::Prometheus.registered || LHC::Prometheus.client.blank?
-    LHC::Prometheus.client.registry.counter(LHC::Prometheus::REQUEST_COUNTER_KEY, 'Counter of all LHC requests.')
-    LHC::Prometheus.client.registry.histogram(LHC::Prometheus::REQUEST_HISTOGRAM_KEY, 'Request timings for all LHC requests in seconds.')
-    LHC::Prometheus.registered = true
+
+    begin
+      LHC::Prometheus.client.registry.counter(LHC::Prometheus::REQUEST_COUNTER_KEY, 'Counter of all LHC requests.')
+      LHC::Prometheus.client.registry.histogram(LHC::Prometheus::REQUEST_HISTOGRAM_KEY, 'Request timings for all LHC requests in seconds.')
+    rescue Prometheus::Client::Registry::AlreadyRegisteredError => e
+      Rails.logger.error(e) if defined?(Rails)
+    ensure
+      LHC::Prometheus.registered = true
+    end
   end
 
   def after_response

data/lib/lhc/request.rb

@@ -15,7 +15,7 @@ class LHC::Request
   attr_accessor :response, :options, :raw, :format, :error_handler, :errors_ignored, :source
 
   def initialize(options, self_executing = true)
-    self.errors_ignored = (options.fetch(:ignored_errors, []) || []).compact
+    self.errors_ignored = (options.fetch(:ignored_errors, []) || []).to_a.compact
     self.source = options&.dig(:source)
     self.options = format!(options.deep_dup || {})
     self.error_handler = options.delete :error_handler

data/lib/lhc/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module LHC
-  VERSION ||= '11.0.0'
+  VERSION ||= '11.2.0'
 end

data/spec/formats/form_spec.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe LHC do
+  include ActionDispatch::TestProcess
+
+  context 'form' do
+    it 'formats requests to be application/x-www-form-urlencoded' do
+      stub = stub_request(:post, 'http://local.ch/')
+        .with(body: 'client_id=1234&client_secret=4567&grant_type=client_credentials')
+        .with(headers: { 'Content-Type': 'application/x-www-form-urlencoded' })
+        .to_return(status: 200)
+
+      LHC.form.post(
+        'http://local.ch',
+        body: {
+          client_id: '1234',
+          client_secret: '4567',
+          grant_type: 'client_credentials'
+        }
+      )
+
+      expect(stub).to have_been_requested
+    end
+  end
+end

data/spec/formats/multipart_spec.rb

@@ -10,7 +10,7 @@ describe LHC do
     let(:body) { { size: 2231 }.to_json }
     let(:location) { 'http://local.ch/uploads/image.jpg' }
 
-    it 'leaves plains requests unformatted' do
+    it 'formats requests to be multipart/form-data' do
       stub_request(:post, 'http://local.ch/') do |request|
         raise 'Content-Type header wrong' unless request.headers['Content-Type'] == 'multipart/form-data'
         raise 'Body wrongly formatted' unless request.body.match(/file=%23%3CActionDispatch%3A%3AHttp%3A%3AUploadedFile%3A.*%3E&type=Image/)

data/spec/interceptors/auth/reauthentication_spec.rb

@@ -31,4 +31,14 @@ describe LHC::Auth do
     LHC.config.endpoint(:local, 'http://local.ch', auth: options.merge(reauthenticated: true))
     expect { LHC.get(:local) }.to raise_error(LHC::Unauthorized)
   end
+
+  context 'token format' do
+    let(:initial_token) { 'BAsZ-98-ZZZ' }
+
+    it 'refreshes tokens with various formats' do
+      LHC.config.endpoint(:local, 'http://local.ch', auth: options)
+      LHC.get(:local)
+      expect(auth_suceeding_after_recovery).to have_been_made.once
+    end
+  end
 end

data/spec/request/ignore_errors_spec.rb

@@ -62,4 +62,12 @@ describe LHC::Request do
       }.to raise_error(LHC::NotFound)
     end
   end
+
+  context 'passing keys instead of arrays' do
+    before { stub_request(:get, 'http://local.ch').to_return(status: 404) }
+
+    it "does not raise an error when ignored errors is a key instead of an array" do
+      LHC.get('http://local.ch', ignored_errors: LHC::NotFound)
+    end
+  end
 end

data/spec/request/parallel_requests_spec.rb

@@ -37,4 +37,23 @@ describe LHC::Request do
       expect(@called).to eq 2
     end
   end
+
+  context 'webmock disabled' do
+    before do
+      WebMock.disable!
+    end
+
+    after do
+      WebMock.enable!
+    end
+
+    it 'does not memorize parallelization handlers in typhoeus (hydra) in case one request of the parallization fails' do
+      begin
+        LHC.request([{ url: 'https://www.google.com/' }, { url: 'https://nonexisting123' }, { url: 'https://www.google.com/' }, { url: 'https://nonexisting123' }])
+      rescue LHC::UnknownError
+      end
+
+      LHC.request([{ url: 'https://www.google.com' }])
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lhc
 version: !ruby/object:Gem::Version
-  version: 11.0.0
+  version: 11.2.0
 platform: ruby
 authors:
 - https://github.com/local-ch/lhc/contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-03 00:00:00.000000000 Z
+date: 2020-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -230,6 +230,7 @@ files:
 - lib/lhc/errors/unknown_error.rb
 - lib/lhc/format.rb
 - lib/lhc/formats.rb
+- lib/lhc/formats/form.rb
 - lib/lhc/formats/json.rb
 - lib/lhc/formats/multipart.rb
 - lib/lhc/formats/plain.rb
@@ -316,6 +317,7 @@ files:
 - spec/error/response_spec.rb
 - spec/error/timeout_spec.rb
 - spec/error/to_s_spec.rb
+- spec/formats/form_spec.rb
 - spec/formats/json_spec.rb
 - spec/formats/multipart_spec.rb
 - spec/formats/plain_spec.rb
@@ -465,6 +467,7 @@ test_files:
 - spec/error/response_spec.rb
 - spec/error/timeout_spec.rb
 - spec/error/to_s_spec.rb
+- spec/formats/form_spec.rb
 - spec/formats/json_spec.rb
 - spec/formats/multipart_spec.rb
 - spec/formats/plain_spec.rb