ezclient 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a950272f16611080c183b2873c85c2b78d23d36c9d226d900b511f720b7647ba
-  data.tar.gz: a52ca73d8ff2abc0de9d8811c608394d52f537275951f4cbad5d7d52ceee3710
+  metadata.gz: 2d81a3d064c7c1c1e2f07ddfa4e7d47ccb76cc9bb2d7f768f1b48e16276c9c35
+  data.tar.gz: def8245e39d85eca05f573c9b2b1e1d37971829c2bba90bfb9d8cb73ea44ef99
 SHA512:
-  metadata.gz: d3e3bab868b24417979497778c55e08efaa861b155e45f174847749cebeff75b895a97b6e6d3a8c22fd04eb7cadedd92f4cb2cf5dee60378854f558e2678cc95
-  data.tar.gz: 68fc9ff7949547044d9aaf28ed11ec7e0477e5cbdf533e0bcfd7efc0b1894232f1d19c8c5c60dbc22c0523f8bc601a2619b48ceb7d608dfea943783014f96ca3
+  metadata.gz: bef1ed2b0a0fcfa92cdaa4cf40414576afaa11acf0b87b4654749e5af98413d3c774be66350eaf45563d70f9e08d2c77759e184b89a1d1cb81d08c46d44aa28d
+  data.tar.gz: 07f2897cb918736f2a72469c01cb6188c69ebc4f60a22aaf65c83594cec341ed2016237cc9f9e2fc9f2ba06bc6cc9aa7db5ce38d2bfc9c84397f58b08a5fbe45

data/.travis.yml

@@ -5,3 +5,10 @@ rvm:
   - 2.4.2
   - 2.5.0
 before_install: gem install bundler -v 1.16.1
+env: SUITE="rspec"
+matrix:
+  fast_finish: true
+  # Only run RuboCop on the latest Ruby
+  include:
+    - rvm: 2.5.0
+      env: SUITE="rubocop"

data/lib/ezclient/request.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class EzClient::Request
-  DEFAULT_TIMEOUT = 15
-
   attr_accessor :verb, :url, :options
 
   def initialize(verb, url, options)
@@ -42,11 +40,11 @@ class EzClient::Request
   private
 
   def http_client
-    options.fetch(:client).timeout(timeout)
-  end
-
-  def timeout
-    options.fetch(:timeout, DEFAULT_TIMEOUT).to_f
+    @http_client ||= begin
+      client = options.fetch(:client)
+      client.timeout(timeout) if timeout
+      client
+    end
   end
 
   def http_request
@@ -54,7 +52,12 @@ class EzClient::Request
   end
 
   def http_options
-    options.slice(:params, :form, :json, :body, :headers)
+    # RUBY25: Hash#slice
+    options.select { |key| [:params, :form, :json, :body, :headers].include?(key) }
+  end
+
+  def timeout
+    options[:timeout]
   end
 
   def on_complete

data/lib/ezclient/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class EzClient
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/ezclient.rb

@@ -6,10 +6,9 @@ require "ezclient/request"
 require "ezclient/response"
 
 class EzClient
-  def initialize(on_complete: nil, on_error: nil)
+  def initialize(options = {})
+    self.options = options
     self.clients = {}
-    self.on_complete = on_complete
-    self.on_error = on_error
   end
 
   def request(verb, url, **options)
@@ -21,15 +20,23 @@ class EzClient
       client = HTTP::Client.new
     end
 
-    Request.new(verb, url, client: client, on_complete: on_complete, on_error: on_error, **options)
+    Request.new(verb, url, client: client, **default_options, **options)
   end
 
   private
 
-  attr_accessor :clients, :on_complete, :on_error
+  attr_accessor :options, :clients
 
   def persistent_client_for(url, timeout: 600)
     uri = HTTP::URI.parse(url)
     clients[uri.origin] ||= HTTP.persistent(uri.origin, timeout: timeout)
   end
+
+  def default_options()
+    {
+      on_complete: options[:on_complete],
+      on_error: options[:on_error],
+      timeout: options[:default_timeout],
+    }
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ezclient
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Yuri Smirnov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http