zephyr 1.0.1 → 1.0.2

data/Gemfile

@@ -6,5 +6,6 @@ gem "typhoeus", ">= 0.2.4"
 group :development do
   gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
+  gem "shoulda", "~> 2.11.3"
 end
 

data/Gemfile.lock

@@ -8,6 +8,7 @@ GEM
       rake
     mime-types (1.16)
     rake (0.9.2)
+    shoulda (2.11.3)
     typhoeus (0.2.4)
       mime-types
       mime-types
@@ -18,4 +19,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
+  shoulda (~> 2.11.3)
   typhoeus (>= 0.2.4)

data/Rakefile

@@ -42,12 +42,3 @@ end
 
 task :default => :test
 
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "zephyr #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

data/lib/zephyr.rb

@@ -15,20 +15,22 @@
 
 # Splits headers into < 8KB chunks
 # @private
-module Net::HTTPHeader
-  def each_capitalized
-    # 1.9 check
-    respond_to?(:enum_for) and (block_given? or return enum_for(__method__))
-    @header.each do |k,v|
-      base_length = "#{k}: \r\n".length
-      values = v.map { |i| i.to_s.split(', ') }.flatten
-      while !values.empty?
-        current_line = ""
-        while values.first && current_line.length + base_length + values.first.length + 2 < 8192
-          val = values.shift.strip
-          current_line += current_line.empty? ? val : ", #{val}"
+module Net
+  module HTTPHeader
+    def each_capitalized
+      # 1.9 check
+      respond_to?(:enum_for) and (block_given? or return enum_for(__method__))
+      @header.each do |k,v|
+        base_length = "#{k}: \r\n".length
+        values = v.map { |i| i.to_s.split(', ') }.flatten
+        while !values.empty?
+          current_line = ""
+          while values.first && current_line.length + base_length + values.first.length + 2 < 8192
+            val = values.shift.strip
+            current_line += current_line.empty? ? val : ", #{val}"
+          end
+          yield capitalize(k), current_line
         end
-        yield capitalize(k), current_line
       end
     end
   end
@@ -64,8 +66,6 @@ class Zephyr
     perform(:head, path_components, headers, expected_statuses, timeout)
   end
 
-  Workfeed::Timer.time_method self, :head, 'http_head'
-
   # Performs a GET request to the specified resource.
   #
   # A request to /users/#{@user.id}/things?q=woof with an Accept header of
@@ -83,8 +83,6 @@ class Zephyr
     perform(:get, path_components, headers, expected_statuses, timeout)
   end
 
-  Workfeed::Timer.time_method self, :get, 'http_get'
-
   # The same thing as #get, but decodes the response entity as JSON (if it's
   # application/json) and adds it under the :json key in the returned hash.
   def get_json(expected_statuses, timeout, path_components, headers={}, yajl_opts={})
@@ -118,8 +116,6 @@ class Zephyr
     perform(:put, path_components, headers, expected_statuses, timeout, entity)
   end
 
-  Workfeed::Timer.time_method self, :put, 'http_put'
-
   # The same thing as #put, but encodes the entity as JSON and specifies
   # "application/json" as the request entity content type.
   def put_json(expected_statuses, timeout, path_components, entity, headers={})
@@ -144,8 +140,6 @@ class Zephyr
     perform(:post, path_components, headers, expected_statuses, timeout, entity)
   end
 
-  Workfeed::Timer.time_method self, :post, 'http_post'
-
   # The same thing as #post, but encodes the entity as JSON and specifies
   # "application/json" as the request entity content type.
   def post_json(expected_statuses, timeout, path_components, entity, headers={})
@@ -175,8 +169,6 @@ class Zephyr
     perform(:delete, path_components, headers, expected_statuses, timeout)
   end
 
-  Workfeed::Timer.time_method self, :delete, 'http_delete'
-
   # Creates a URI object, combining the root_uri passed on initialization
   # with the given parts.
   #

data/test/helper.rb

@@ -9,6 +9,7 @@ rescue Bundler::BundlerError => e
 end
 require 'test/unit'
 require 'shoulda'
+require 'typhoeus'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))

data/test/test_zephyr.rb

@@ -1,7 +1,78 @@
 require 'helper'
 
 class TestZephyr < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
+
+  context "urls" do
+    should "be canonicalized" do
+      assert_equal 'http://example.com/', Zephyr.new('http://example.com').uri.to_s
+      assert_equal 'http://example.com/', Zephyr.new('http://example.com/').uri.to_s
+      assert_equal 'http://example.com/', Zephyr.new('http://example.com//').uri.to_s
+    end
+  end
+
+  context "query string parameters" do
+    should "be sorted" do 
+      zephyr   = Zephyr.new
+      duples   = ('a'..'z').zip('A'..'Z') # [ [ 'a', 'A' ], [ 'b', 'B' ], ... ]
+      expected = duples.map { |l,u| '%s=%s' % [ l, u ] }.sort.join('&')
+
+      assert_equal expected, zephyr.build_query_string(Hash[duples.shuffle])
+    end
+
+    should "be constructed for arrays" do
+      zephyr = Zephyr.new
+      assert_equal 'a=1&a=2', zephyr.build_query_string(:a => [ 2, 1 ])
+    end
+  end
+
+  context "percent encoding" do
+    should "be correct" do
+      zephyr = Zephyr.new
+
+      # RFC 3986 Reserved Characters
+      assert_equal '%21', zephyr.percent_encode('!')
+      assert_equal '%2A', zephyr.percent_encode('*')
+      assert_equal '%27', zephyr.percent_encode("'")
+      assert_equal '%28', zephyr.percent_encode('(')
+      assert_equal '%29', zephyr.percent_encode(')')
+      assert_equal '%3B', zephyr.percent_encode(';')
+      assert_equal '%3A', zephyr.percent_encode(':')
+      assert_equal '%40', zephyr.percent_encode('@')
+      assert_equal '%26', zephyr.percent_encode('&')
+      assert_equal '%3D', zephyr.percent_encode('=')
+      assert_equal '%2B', zephyr.percent_encode('+')
+      assert_equal '%24', zephyr.percent_encode('$')
+      assert_equal '%2C', zephyr.percent_encode(',')
+      assert_equal '%2F', zephyr.percent_encode('/')
+      assert_equal '%3F', zephyr.percent_encode('?')
+      assert_equal '%23', zephyr.percent_encode('#')
+      assert_equal '%5B', zephyr.percent_encode('[')
+      assert_equal '%5D', zephyr.percent_encode(']')
+
+      # Common Percent Encodings
+      assert_equal '%3C', zephyr.percent_encode('<')
+      assert_equal '%3E', zephyr.percent_encode('>')
+      assert_equal '%22', zephyr.percent_encode('"')
+      assert_equal '%7B', zephyr.percent_encode('{')
+      assert_equal '%7D', zephyr.percent_encode('}')
+      assert_equal '%7C', zephyr.percent_encode('|')
+      assert_equal '%5C', zephyr.percent_encode('\\')
+      assert_equal '%60', zephyr.percent_encode('`')
+      assert_equal '%5E', zephyr.percent_encode('^')
+      assert_equal '%25', zephyr.percent_encode('%')
+      assert_equal '%20', zephyr.percent_encode(' ')
+
+      # Should test for \n as %0A or %0D or %0D%0A
+      assert_contains ['%0A', '%0D', '%0D%0A'], zephyr.percent_encode("\n")
+
+      # Should figure out why the will not be percent encoded by libcurl
+      #assert_equal '%2E', zephyr.percent_encode('.')
+      #assert_equal '%2D', zephyr.percent_encode('-')
+      #assert_equal '%5F', zephyr.percent_encode('_')
+      #assert_equal '%7E', zephyr.percent_encode('~')
+
+      # Fancy
+      assert_equal '%E3%81%BE%E3%81%A4%E3%82%82%E3%81%A8', zephyr.percent_encode('まつもと')
+    end
   end
 end

data/zephyr.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{zephyr}
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Matt Knopp"]
-  s.date = %q{2011-09-30}
+  s.date = %q{2011-10-03}
   s.description = %q{Simple HTTP client using Typheous, derived from the Riak client}
   s.email = %q{matt.knopp@gmail.com}
   s.extra_rdoc_files = [
@@ -42,15 +42,18 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<typhoeus>, [">= 0.2.4"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_development_dependency(%q<shoulda>, ["~> 2.11.3"])
     else
       s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+      s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
     end
   else
     s.add_dependency(%q<typhoeus>, [">= 0.2.4"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
+    s.add_dependency(%q<shoulda>, ["~> 2.11.3"])
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zephyr
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Matt Knopp
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-30 00:00:00 -07:00
+date: 2011-10-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -66,6 +66,22 @@ dependencies:
   prerelease: false
   type: :development
   requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 37
+        segments: 
+        - 2
+        - 11
+        - 3
+        version: 2.11.3
+  prerelease: false
+  type: :development
+  requirement: *id004
 description: Simple HTTP client using Typheous, derived from the Riak client
 email: matt.knopp@gmail.com
 executables: []