zephyr 1.1.7 → 1.1.8

data/Gemfile

@@ -5,7 +5,7 @@ gem "yajl-ruby"
 
 
 group :development do
-  gem "bundler", "~> 1.0.0"
+  gem "bundler", "~> 1.0.21"
   gem "jeweler", "~> 1.6.4"
   gem "shoulda", "~> 2.11.3"
   gem "mocha",   "~> 0.12.0", :require => false

data/Gemfile.lock

@@ -10,7 +10,7 @@ GEM
     mime-types (1.16)
     mocha (0.12.0)
       metaclass (~> 0.0.1)
-    rake (0.9.2)
+    rake (0.9.2.2)
     shoulda (2.11.3)
     typhoeus (0.2.4)
       mime-types
@@ -21,7 +21,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 1.0.0)
+  bundler (~> 1.0.21)
   jeweler (~> 1.6.4)
   mocha (~> 0.12.0)
   shoulda (~> 2.11.3)

data/Rakefile

@@ -17,8 +17,8 @@ Jeweler::Tasks.new do |gem|
   gem.name = "zephyr"
   gem.homepage = "http://github.com/mhat/zephyr"
   gem.license = "MIT"
-  gem.summary = %Q{Simple HTTP client using Typheous, derived from the Riak client}
-  gem.description = %Q{Simple HTTP client using Typheous, derived from the Riak client}
+  gem.summary = %Q{Battle-tested HTTP client using Typhoeus, derived from the Riak client}
+  gem.description = %Q{Battle-tested HTTP client using Typhoeus, derived from the Riak client}
   gem.email = "matt.knopp@gmail.com"
   gem.authors = ["Matt Knopp"]
   # dependencies defined in Gemfile

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/zephyr.rb

@@ -218,6 +218,22 @@ class Zephyr
     perform(:delete, path_components, headers, expected_statuses, timeout)
   end
 
+  # Performs a custom HTTP method request to the specified resource.
+  #
+  # A PURGE request to /users/#{@user.id} which is expecting a 200 OK within 666ms
+  #
+  #   http.custom(:purge, 200, 666, ["users", @user.id])
+  #
+  # This returns a hash with three keys:
+  #   :status       The numeric HTTP status code
+  #   :body         The body of the response entity, if any
+  #   :headers      A hash of header values
+  def custom(method, expected_statuses, timeout, path_components, headers={})
+    headers = default_headers.merge(headers)
+    verify_path!(path_components)
+    perform(method, path_components, headers, expected_statuses, timeout)
+  end
+
   # Creates a URI object, combining the root_uri passed on initialization
   # with the given parts.
   #
@@ -272,6 +288,7 @@ class Zephyr
     params[:timeout] = timeout
     params[:follow_location] = false
     params[:params]  = path_components.pop if path_components.last.is_a?(Hash)
+    params[:method]  = method
 
     # seriously, why is this on by default
     Typhoeus::Hydra.hydra.disable_memoization
@@ -285,9 +302,8 @@ class Zephyr
       params[:body] = data if data != ''
     end
 
-    # request has class methods for :delete, :get, :head, :put, and :post
     http_start = Time.now.to_f
-    response   = Typhoeus::Request.send(method, uri(path_components).to_s, params)
+    response   = Typhoeus::Request.run(uri(path_components).to_s, params)
     http_end   = Time.now.to_f
 
     Zephyr.logger.info "[zephyr:#{$$}:#{Time.now.to_f}] \"%s %s\" %s %0.4f" % [

data/test/test_zephyr.rb

@@ -1,6 +1,15 @@
+# encoding: utf-8
 require 'helper'
 
 class TestZephyr < Test::Unit::TestCase
+  PARAMS = {  :method => :get, :timeout => 1000,
+              :params => [{:query => ["test string", "again"]}] }
+
+  TYPHOEUS_RESPONSE = Typhoeus::Response.new(
+    :code => 200,
+    :body => '',
+    :request => Typhoeus::Request.new("http://www.example.com")
+  )
 
   context "urls" do
     should "be canonicalized" do
@@ -79,15 +88,71 @@ class TestZephyr < Test::Unit::TestCase
     end
 
     should "use Zephyr for escaping" do
-      z = Zephyr.new("http://www.google.com")
-      Zephyr.expects(:percent_encode).times(4)
-      z.get(200, 1000, [{:query => ["test string", "まつもと"]}])
+      r = Typhoeus::Request.new("http://www.google.com", PARAMS)
+      Zephyr.expects(:percent_encode).times(2)
+      r.params_string
     end
 
     should "use Zephyr for building query string" do
-      z = Zephyr.new("http://www.google.com")
+      r = Typhoeus::Request.new("http://www.google.com", PARAMS)
       Zephyr.expects(:build_query_string).times(1)
-      z.get(200, 1000, [{:query => ["test string", "again"]}])
+      r.params_string
     end
   end
+
+  should "support HTTP GET" do
+    z = Zephyr.new("http://www.example.com")
+    Typhoeus::Request.expects(:run).with do |uri, params|
+      params[:method] == :get && uri == 'http://www.example.com/images/1'
+    end.returns(TYPHOEUS_RESPONSE)
+    z.get(200, 1, ["images", "1"])
+  end
+
+  should "support HTTP POST" do
+    post_response = Typhoeus::Response.new(
+      :code => 201,
+      :body => '',
+      :request => Typhoeus::Request.new("http://www.example.com")
+    )
+
+    z = Zephyr.new("http://www.example.com")
+    Typhoeus::Request.expects(:run).with do |uri, params|
+      params[:method] == :post &&
+      params[:params] == {:name => 'Test User'} &&
+      uri == 'http://www.example.com/users'
+    end.returns(post_response)
+    z.post(201, 1, ["users", {:name => 'Test User'}], '')
+  end
+
+  should "support HTTP PUT" do
+    z = Zephyr.new("http://www.example.com")
+    Typhoeus::Request.expects(:run).with do |uri, params|
+      params[:method] == :put &&
+      params[:params] == {:name => 'Test User'} &&
+      uri == 'http://www.example.com/users/1'
+    end.returns(TYPHOEUS_RESPONSE)
+    z.put(200, 1, ["users", 1, {:name => 'Test User'}], '')
+  end
+
+  should "support HTTP DELETE" do
+    delete_response = Typhoeus::Response.new(
+      :code => 204,
+      :body => '',
+      :request => Typhoeus::Request.new("http://www.example.com")
+    )
+
+    z = Zephyr.new("http://www.example.com")
+    Typhoeus::Request.expects(:run).with do |uri, params|
+      params[:method] == :delete && uri == 'http://www.example.com/users/1'
+    end.returns(delete_response)
+    z.delete(204, 1, ["users", 1])
+  end
+
+  should "support custom HTTP methods" do
+    z = Zephyr.new("http://www.example.com")
+    Typhoeus::Request.expects(:run).with do |uri, params|
+      params[:method] == :purge
+    end.returns(TYPHOEUS_RESPONSE)
+    z.custom(:purge, 200, 1, ["images", "4271e4c1594adc92651cf431029429d8"])
+  end
 end

data/zephyr.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = "zephyr"
-  s.version = "1.1.7"
+  s.version = "1.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
   s.date = "2012-07-27"
-  s.description = "Simple HTTP client using Typhoeus, derived from the Riak client"
+  s.description = "Battle-tested HTTP client using Typhoeus, derived from the Riak client"
   s.email = "matt.knopp@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
@@ -35,7 +35,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
   s.rubygems_version = "1.8.11"
-  s.summary = "Simple HTTP client using Typhoeus, derived from the Riak client"
+  s.summary = "Battle-tested HTTP client using Typhoeus, derived from the Riak client"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zephyr
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
   prerelease: 
 platform: ruby
 authors:
@@ -107,7 +107,7 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.12.0
-description: Simple HTTP client using Typhoeus, derived from the Riak client
+description: Battle-tested HTTP client using Typhoeus, derived from the Riak client
 email: matt.knopp@gmail.com
 executables: []
 extensions: []
@@ -152,5 +152,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Simple HTTP client using Typhoeus, derived from the Riak client
+summary: Battle-tested HTTP client using Typhoeus, derived from the Riak client
 test_files: []