zilla 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67835482c78ededdf96d80a81e748354240776a1b8d696e3f8ea61a2e9a07a00
-  data.tar.gz: 1bac88fb8c3db62b72163318331f770e7145b4b55b7792420bf89cf2132f2452
+  metadata.gz: 2e32481b500c093caa4f3e1b78ce31d6aeade29a25e3d15fdd265c49507d21c1
+  data.tar.gz: 41911744a98dda32a5ed0ba2d4e7ef9fe78b81e41e0110cd7b4dad90922dba76
 SHA512:
-  metadata.gz: 646c19b46599f6cfb5791493a5a410e7702a1a706ffa1a0b7e919c56a6b2fb88b07b5f2e2111700bc344533e6810a96023dd627dcb4f1cad27306b5071954592
-  data.tar.gz: 71e3293b3e08583dd862faaf95550fbb9c701c7ddfde921ad1bca13e573127191d7dcd55e0db558c4a5632798fd2152d9222aeec8f04cdf85bf88cafe024d57c
+  metadata.gz: 217131fe7d9574045f798f81e6ed581f7089e29bba55219f59080f4d86f9e53c85c23f38af7859ab00dc5d7d8c2eccc6355eb55019fb207fa7f9ecf5372a3fcc
+  data.tar.gz: 4cd0ae99796911f20056142521927c8c4a6e0f0566c0b6ff10bd120951a64f2e7cceb84f5fa8d6f2c3d995f8ca407997ca79c18a97de0ef7642f472f307443b8

data/.tool-versions

@@ -0,0 +1 @@
+ruby 3.2.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zilla (0.1.3)
+    zilla (0.1.5)
       faraday (~> 2.7.0)
       json_schemer (~> 0.2.0)
       memery (~> 1.4.0)

data/lib/zilla/client_factory.rb

@@ -8,15 +8,15 @@ module Zilla::ClientFactory
   }.freeze
 
   class << self
-    def build(input, host: nil, scheme: nil, &block)
-      definition = Zilla::LoaderFactory.build(input, &block).load
+    def build(input, host: nil, scheme: nil, faraday_config: {}, &block)
+      definition = Zilla::LoaderFactory.build(input, faraday_config:, &block).load
 
       version = definition["swagger"]
 
       raise ArgumentError, "#{input.inspect} is not an OpenAPI definition" if version.nil?
       raise UnsupportedVersion, "usupported version #{version.inspect}" if version && CLIENTS[version].nil?
 
-      CLIENTS[version].new(definition, host:, scheme:, faraday_config_block: block)
+      CLIENTS[version].new(definition, host:, scheme:, faraday_config:, faraday_config_block: block)
     end
   end
 end

data/lib/zilla/loader_factory.rb

@@ -4,13 +4,13 @@ module Zilla::LoaderFactory
   class UnknownLoader < Zilla::Error; end
 
   class << self
-    def build(input, &block)
+    def build(input, faraday_config: {}, &block)
       case input
       when Hash
         Zilla::Loaders::Hash
       when String
         for_string(input)
-      end.new(input, faraday_config_block: block)
+      end.new(input, faraday_config:, faraday_config_block: block)
     rescue NoMethodError
       raise UnknownLoader, "cannot find loader for #{input.inspect}"
     end

data/lib/zilla/loaders/http.rb

@@ -2,8 +2,8 @@
 
 class Zilla::Loaders::HTTP < Zilla::Loaders::Loader
   def load_string
-    Faraday.new(input) do |f|
-      @faraday_config_block.call(f, :loader)
+    Faraday.new(input, **faraday_config) do |f|
+      faraday_config_block.call(f, :loader)
       f.response :raise_error
     end.get.body
   end

data/lib/zilla/loaders/loader.rb

@@ -3,10 +3,11 @@
 class Zilla::Loaders::Loader
   class LoaderError < Zilla::Error; end
 
-  attr_reader :input
+  attr_reader :input, :faraday_config, :faraday_config_block
 
-  def initialize(input, faraday_config_block: nil)
+  def initialize(input, faraday_config: {}, faraday_config_block: nil)
     @input = input
+    @faraday_config = faraday_config
     @faraday_config_block = faraday_config_block || ->(_f, _target) {}
   end
 

data/lib/zilla/version.rb

@@ -4,5 +4,5 @@ module Zilla
   module Version
   end
 
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/zilla/versions/v20/client.rb

@@ -5,12 +5,13 @@ class Zilla::Versions::V20::Client
 
   include Memery
 
-  attr_reader :json, :host, :scheme, :faraday_config_block
+  attr_reader :json, :host, :scheme, :faraday_config_block, :faraday_config
 
-  def initialize(json, host: nil, scheme: nil, faraday_config_block: nil) # rubocop:disable Metrics/AbcSize
+  def initialize(json, host: nil, scheme: nil, faraday_config: {}, faraday_config_block: nil) # rubocop:disable Metrics/AbcSize
     @json = json
     @host = host || api.host || raise(ArgumentError, ":host must be specified")
     @scheme = (scheme || :https).to_s
+    @faraday_config = faraday_config
     @faraday_config_block = faraday_config_block || ->(_f, _target) {}
 
     if api.schemes && !api.schemes.include?(@scheme)
@@ -22,7 +23,7 @@ class Zilla::Versions::V20::Client
 
   memoize def api = API.new(json)
 
-  memoize def executor = Executor.new(scheme, host, faraday_config_block:)
+  memoize def executor = Executor.new(scheme, host, faraday_config:, faraday_config_block:)
 
   private
 

data/lib/zilla/versions/v20/executor.rb

@@ -5,9 +5,10 @@ class Zilla::Versions::V20::Executor
 
   attr_reader :scheme, :host
 
-  def initialize(scheme, host, faraday_config_block:)
+  def initialize(scheme, host, faraday_config:, faraday_config_block:)
     @scheme = scheme
     @host = host
+    @faraday_config = faraday_config
     @faraday_config_block = faraday_config_block || ->(_, _target) {}
   end
 
@@ -23,7 +24,7 @@ class Zilla::Versions::V20::Executor
   private
 
   memoize def connection
-    Faraday.new("#{scheme}://#{host}") do |f|
+    Faraday.new("#{scheme}://#{host}", @faraday_config) do |f|
       @faraday_config_block.call(f, :client)
       f.response :raise_error
     end

data/lib/zilla.rb

@@ -16,8 +16,8 @@ loader.inflector.inflect(
 module Zilla
   class Error < StandardError; end
 
-  def self.for(input, host: nil, scheme: nil, &)
-    Zilla::ClientFactory.build(input, host:, scheme:, &)
+  def self.for(input, host: nil, scheme: nil, faraday_config: {}, &)
+    Zilla::ClientFactory.build(input, host:, scheme:, faraday_config:, &)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zilla
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Gleb Sinyavskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -91,6 +91,7 @@ files:
 - ".overcommit.yml"
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock