http_mini 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2043cd9aeffdf055e5fde5eadcc7f0b41f77e15
-  data.tar.gz: fe4aa4a6c61b5e69adb0e507389264e89d2a83d4
+  metadata.gz: 166acd0db0024022ec7e07c1de9c80541df9b499
+  data.tar.gz: 876d20b39d257334c356b19196efa1b15417ecb7
 SHA512:
-  metadata.gz: f4c28d37b8acafd27471987a48633b3fe36c27e052ff80cd8f879603963078bab050a29e55b0509324a1e5ef236fb896bdfbf571dc9e7809c4cc397209af2e88
-  data.tar.gz: 32119819d2015104e88e0aeb377522a0e2eede3d5dbf20172fc9d439c658b09b93b4b893f9b61b09616998947a9fcca11075a109b5d660d8abf9c24bb6c80aec
+  metadata.gz: 4dc9413dcbdb34d68a6b22a8949cb7596b3f5bae1a311facc2808bcc5a28028bfcef317fe834ca1a3981b0dcc1870c79ede099d177515c420b7bb4a8dc0ef845
+  data.tar.gz: 7d90442a228947c494491a61775cc8d96e33b6d7a1ee09e130d77ee192ba2a9c8e688e45a5b4b4bf1a144b1cc41acfed15079bca5b894f3136d2e78bef3192cb

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## vNEXT
 
+## v3.0.0
+* Performance improvements
+* Refactoring. As part of the refactoring, there is now only one option for timeout used for both open and read
+and no more default values.
+
 ## v0.2.3
 * Allow to set request headers via options hash
 * Remove unnecessary code since 0.2.2 improved uri handling

data/lib/http_mini.rb

@@ -5,12 +5,10 @@ class HttpMini
 
   attr_accessor :opts
 
-  OPEN_TIMEOUT = 2
-  READ_TIMEOUT = 2
   IGNORE_ERROR = true
 
   def self.VERSION
-    '0.2.3'
+    '0.3.0'
   end
 
   def initialize(uri, opts = {})
@@ -19,27 +17,27 @@ class HttpMini
   end
 
   def head
-    request Net::HTTP::Head.new(full_path)
+    request Net::HTTP::Head.new(full_path, headers)
   end
 
   def get
-    request Net::HTTP::Get.new(full_path)
+    request Net::HTTP::Get.new(full_path, headers)
   end
 
   def post(data)
-    request Net::HTTP::Post.new(full_path), data
+    request Net::HTTP::Post.new(full_path, headers), data
   end
 
   def put(data)
-    request Net::HTTP::Put.new(full_path), data
+    request Net::HTTP::Put.new(full_path, headers), data
   end
 
   def delete
-    request Net::HTTP::Delete.new(full_path)
+    request Net::HTTP::Delete.new(full_path, headers)
   end
 
   def options
-    request Net::HTTP::Options.new(full_path)
+    request Net::HTTP::Options.new(full_path, headers)
   end
 
   def poke
@@ -65,7 +63,7 @@ class HttpMini
   end
 
   def path(path=nil)
-    path.nil? ? default_path(@uri.path) : set_path(path)
+    path.nil? ? @uri.request_uri : set_path(path)
   end
 
   private
@@ -75,23 +73,18 @@ class HttpMini
   end
 
   def handle_missing_scheme(uri)
-    uri.match(/https?:\/\//) ? uri : "http://#{uri}"
+    uri[0..3] == 'http' ? uri : "http://#{uri}"
   end
 
   def request(req, data=nil)
-    Net::HTTP.start(host, port, :use_ssl => ssl?) { |http| set_timeout(http) and http.request(set_headers(req), data) }
+    http.start { |http| http.request(req, data) }
   end
 
-  def ssl?
-    @uri.scheme == 'https'
-  end
-
-  def set_timeout(http)
-    http.open_timeout, http.read_timeout = timeouts
-  end
-
-  def set_headers(req)
-    headers.each { |key, value|  req[key] = value } and return req
+  def http
+    http = Net::HTTP.new(@uri.host, @uri.port)
+    http.use_ssl = @uri.instance_of?(URI::HTTPS)
+    http.open_timeout = http.read_timeout = opts[:timeout] if opts.key? :timeout
+    http
   end
 
   def headers
@@ -99,11 +92,7 @@ class HttpMini
   end
 
   def full_path
-    @uri.query ? path + '?' + @uri.query : path
-  end
-
-  def default_path(path)
-    path.to_s.empty? ? '/' : path
+    @uri.request_uri
   end
 
   def set_path(path)
@@ -116,18 +105,6 @@ class HttpMini
     path.gsub /\?.*/, ''
   end
 
-  def timeouts
-    [open_timeout, read_timeout]
-  end
-
-  def open_timeout
-    opts[:open_timeout].nil? ? OPEN_TIMEOUT : opts[:open_timeout]
-  end
-
-  def read_timeout
-    opts[:read_timeout].nil? ? READ_TIMEOUT : opts[:read_timeout]
-  end
-
   def ignore_error?
     opts[:ignore_error].nil? ? IGNORE_ERROR : opts[:ignore_error]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: http_mini
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jerome Touffe-Blin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-02 00:00:00.000000000 Z
+date: 2013-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -76,7 +76,6 @@ extra_rdoc_files:
 - CHANGELOG.md
 files:
 - lib/http_mini.rb
-- lib/request.rb
 - LICENSE
 - README.md
 - CHANGELOG.md

data/lib/request.rb

@@ -1,17 +0,0 @@
-require 'net/http'
-require "uri"
-
-class Request
-
-  @@request = HttpMini.new nil
-
-  class << self
-
-    def get(uri, opts={})
-      @@request.opts = opts
-      @@request.uri(uri).get
-    end
-
-  end
-
-end