hatetepe 0.4.0 → 0.4.1

data/Gemfile

@@ -4,6 +4,3 @@ gemspec
 
 gem "rake"
 gem "awesome_print"
-
-gem "yard"
-gem "rdiscount"

data/README.md

@@ -11,7 +11,7 @@ Install it via `gem install hatetepe` or add `gem "hatetepe"` to your Gemfile.
 Hatetepe only implements core HTTP functionality. If you need stuff like
 automatic JSON or form-data encoding, have a look at
 [Faraday](https://github.com/technoweenie/faraday), there's also an
-[Hatetepe adapter](https://github.com/lgierth/faraday/tree/hatetepe-support)
+[Hatetepe adapter](https://github.com/technoweenie/faraday/pull/108)
 for it being worked on.
 
 [![Build status](https://secure.travis-ci.org/lgierth/hatetepe.png?branch=master)](http://travis-ci.org/lgierth/hatetepe)
@@ -39,8 +39,10 @@ Getting Started (Client)
 The `Hatetepe::Client` class can be used to make requests to an HTTP server.
 
     client = Hatetepe::Client.start(:host => "example.org", :port => 80)
+
     request = Hatetepe::Request.new(:post, "/search", {}, :q => "herp derp")
     client << request
+
     request.callback do |response|
       puts "Results:"
       puts response.body.read

data/hatetepe.gemspec

@@ -21,6 +21,8 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "rspec"
   s.add_development_dependency "fakefs"
+  s.add_development_dependency "yard"
+  s.add_development_dependency "rdiscount"
 
   s.files         = `git ls-files`.split("\n") - [".gitignore", ".rspec", ".travis.yml", ".yardopts"]
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/lib/hatetepe/client/keep_alive.rb

@@ -10,32 +10,6 @@ class Hatetepe::Client
     #     i think it doesn't matter if we send it as we don't wait
     #     for the first response to see if we're talking to an HTTP/1.1
     #     server. we're sending more requests anyway.
-    
-    # priority
-    # 1. if X-Hatetepe-Single then Connection header, Client#request closes
-    # 2. if req.Connection == close then Connection header and close
-    # 3. if res.Connection == close then close
-    def call(request)
-      req, conn = request, request.connection
-      
-      single = req.headers.delete("X-Hatetepe-Single")
-      req.headers["Connection"] ||= if single
-        "close"
-      else
-        "keep-alive"
-      end
-      close = req.headers["Connection"] == "close"
-      
-      # stop processing further requests as early as possible
-      conn.processing_enabled = false if close
-      
-      app.call(request).tap do |response|
-        if !single && response.headers["Connection"] == "close"
-          conn.processing_enabled = false
-        end
-      end
-    end
-    
     def call(request)
       req, conn = request, request.connection
       

data/lib/hatetepe/client.rb

@@ -76,6 +76,8 @@ class Hatetepe::Client
   end
   
   def <<(request)
+    request.headers["Host"] ||= "#{config[:host]}:#{config[:port]}"
+
     request.connection = self
     unless processing_enabled?
       request.fail
@@ -101,18 +103,17 @@ class Hatetepe::Client
   end
   
   def request(verb, uri, headers = {}, body = nil, http_version = "1.1")
-    headers["Host"] ||= "#{config[:host]}:#{config[:port]}"
     headers["User-Agent"] ||= "hatetepe/#{Hatetepe::VERSION}"
     
     body = wrap_body(body)
-    if headers["Content-Type"] == "application/x-www-form-urlencoded"
-      enum = Enumerator.new(body)
-      headers["Content-Length"] = enum.inject(0) {|a, e| a + e.length }
-    end
+    headers, body = encode_body(headers.dup, body)
     
     request = Hatetepe::Request.new(verb, uri, headers, body, http_version)
     self << request
+
+    # XXX shouldn't this happen in ::request ?
     self.processing_enabled = false
+    
     EM::Synchrony.sync request
     
     request.response.body.close_write if request.verb == "HEAD"
@@ -161,6 +162,37 @@ class Hatetepe::Client
     end
   end
   
+  def encode_body(headers, body)
+    multipart, urlencoded = false, false
+    if Hash === body
+      query = lambda do |value|
+        case value
+        when Array
+          value.each &query
+        when Hash
+          value.values.each &query
+        when Rack::Multipart::UploadedFile
+          multipart = true
+        end
+      end
+      body.values.each &query
+      urlencoded = !multipart
+    end
+    
+    body = if multipart
+      boundary = Rack::Multipart::MULTIPART_BOUNDARY
+      headers["Content-Type"] = "multipart/form-data; boundary=#{boundary}"
+      [Rack::Multipart.build_multipart(body)]
+    elsif urlencoded
+      headers["Content-Type"] = "application/x-www-form-urlencoded"
+      [Rack::Utils.build_nested_query(body)]
+    else
+      body
+    end
+    
+    [headers, body]
+  end
+  
   class << self
     def start(config)
       EM.connect config[:host], config[:port], self, config

data/lib/hatetepe/version.rb

@@ -1,3 +1,3 @@
 module Hatetepe
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/unit/client_spec.rb

@@ -154,6 +154,13 @@ describe Hatetepe::Client do
       Fiber.stub(:new) {|blk| blk.call; fiber }
     end
     
+    it "sets a Host header if none is set" do
+      app.should_receive :call do |req|
+        req.headers["Host"].should == "example.net:8080"
+      end
+      client << request
+    end
+    
     it "sets the request's connection" do
       request.should_receive(:connection=).with client
       client << request
@@ -218,25 +225,11 @@ describe Hatetepe::Client do
   end
   
   describe "#request(verb, uri, headers, body)" do
-    let :config do
-      {
-        :host => "example.org",
-        :port => 8080
-      }
-    end
-    
     before do
       EM::Synchrony.stub :sync
       client.stub :<<
     end
     
-    it "sets a Host header if none is set" do
-      client.should_receive :<< do |request|
-        request.headers["Host"].should == "example.org:8080"
-      end
-      client.request :get, uri
-    end
-    
     it "sets the User-Agent header" do
       client.should_receive :<< do |request|
         request.headers["User-Agent"].should == "hatetepe/#{Hatetepe::VERSION}"
@@ -252,35 +245,9 @@ describe Hatetepe::Client do
       end
       client.request :get, uri, "User-Agent" => user_agent
     end
-    
-    describe "with Content-Type: application/x-www-form-urlencoded" do
-      let :headers do
-        {"Content-Type" => "application/x-www-form-urlencoded"}
-      end
-      
-      let :body do
-        [
-          stub("body#1", :length => 12),
-          stub("body#2", :length => 13),
-          stub("body#3", :length => 14)
-        ]
-      end
-      
-      it "computes the body's length" do
-        client.should_receive :<< do |request|
-          request.headers["Content-Length"].should equal(39)
-        end
-        client.request :get, uri, headers, body
-      end
-      
-      it "sets Content-Length to 0 if no body was passed" do
-        client.should_receive :<< do |request|
-          request.headers["Content-Length"].should equal(0)
-        end
-        client.request :get, uri, headers
-      end
-    end
-    
+
+    it "passes the body through #encode_body"
+
     it "doesn't close the body" do
       body.should_not_receive :close_write
       client.request :get, uri, {}, body
@@ -350,6 +317,10 @@ describe Hatetepe::Client do
       client.wrap_body(nil).should == []
     end
   end
+
+  describe "#encode_body(headers, body)" do
+    it ""
+  end
   
   describe ".start(config)" do
     let(:config) { {:host => "0.0.0.0", :port => 1234} }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hatetepe
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
-  requirement: &86213170 !ruby/object:Gem::Requirement
+  requirement: &69946770 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *86213170
+  version_requirements: *69946770
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &86212940 !ruby/object:Gem::Requirement
+  requirement: &69946160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86212940
+  version_requirements: *69946160
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &86212670 !ruby/object:Gem::Requirement
+  requirement: &69945450 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *86212670
+  version_requirements: *69945450
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &86212370 !ruby/object:Gem::Requirement
+  requirement: &69944990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86212370
+  version_requirements: *69944990
 - !ruby/object:Gem::Dependency
   name: async-rack
-  requirement: &86212030 !ruby/object:Gem::Requirement
+  requirement: &69944610 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86212030
+  version_requirements: *69944610
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &86211710 !ruby/object:Gem::Requirement
+  requirement: &69883990 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *86211710
+  version_requirements: *69883990
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &86211400 !ruby/object:Gem::Requirement
+  requirement: &69883740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86211400
+  version_requirements: *69883740
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &86211060 !ruby/object:Gem::Requirement
+  requirement: &69883520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,29 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *86211060
+  version_requirements: *69883520
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &69883290 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69883290
+- !ruby/object:Gem::Dependency
+  name: rdiscount
+  requirement: &69883080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *69883080
 description: 
 email:
 - lars.gierth@gmail.com