http 0.0.1 → 0.0.2

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.rvmrc

data/.travis.yml

@@ -0,0 +1,5 @@
+rvm:
+  - 1.8.7
+  - 1.9.2
+  - rbx-2.0
+  - jruby

data/README.md

@@ -72,3 +72,15 @@ our URLs because the existing mechanisms make it too hard. It should be easy:
 
 This adds the appropriate Accept header for retrieving a JSON response for the
 given resource.
+
+Contributing to Http
+--------------------
+
+* Fork Http on github
+* Make your changes and send me a pull request
+* If I like them I'll merge them and give you commit access to my repository
+
+Copyright
+---------
+
+Copyright (c) 2011 Tony Arcieri, Carl Lerche. See LICENSE.txt for further details.

data/lib/http.rb

@@ -3,6 +3,8 @@ require 'http/chainable'
 require 'http/client'
 require 'http/mime_type'
 require 'http/parameters'
+require 'http/response'
+
 
 # THIS IS ENTIRELY TEMPORARY, I ASSURE YOU
 require 'net/https'

data/lib/http/chainable.rb

@@ -2,7 +2,7 @@ module Http
   module Chainable
     # Request a get sans response body
     def head(uri, options = {})
-      request :head, uri, options
+      request :head, uri, {:response => :object}.merge(options)
     end
 
     # Get a resource
@@ -47,6 +47,8 @@ module Http
 
     # Make an HTTP request with the given verb
     def request(verb, uri, options = {})
+      options[:response] ||= :parsed_body
+
       if options[:headers]
         headers = default_headers.merge options[:headers]
       else

data/lib/http/client.rb

@@ -10,7 +10,7 @@ module Http
         @uri = URI(uri)
       end
 
-      @options = {:response => :parsed_body}.merge(options)
+      @options = {:response => :object}.merge(options)
     end
 
     # Request a get sans response body
@@ -77,24 +77,24 @@ module Http
       request = request_class.new(@uri.request_uri, headers)
       request.set_form_data(options[:form]) if options[:form]
 
-      response = http.request(request)
+      net_http_response = http.request(request)
+
+      response = Http::Response.new
+      net_http_response.each_header do |header, value|
+        response[header] = value
+      end
+      response.status = Integer(net_http_response.code) # WTF again Net::HTTP
+      response.body   = net_http_response.body
 
       case options[:response]
+      when :object
+        response
       when :parsed_body
-        parse_response response
-      else
+        response.parse_body
+      when :body
         response.body
+      else raise ArgumentError, "invalid response type: #{options[:response]}"
       end
     end
-
-    # Parse the response body according to its content type
-    def parse_response(response)
-      if response['content-type']
-        mime_type = MimeType[response['content-type'].split(/;\s*/).first]
-        return mime_type.parse(response.body) if mime_type
-      end
-
-      response.body
-    end
   end
 end

data/lib/http/response.rb

@@ -0,0 +1,46 @@
+module Http
+  class Response
+    attr_accessor :status
+    attr_accessor :headers
+    attr_accessor :body
+
+    # Status aliases! TIMTOWTDI!!! (Want to be idiomatic? Just use status :)
+    alias_method :code,  :status
+    alias_method :code=, :status=
+
+    alias_method :status_code,  :status
+    alias_method :status_code=, :status
+
+    def initialize
+      @headers = {}
+    end
+
+    # Set a header value
+    def []=(header, value)
+      key = header.to_s.downcase
+
+      # Check if the header has already been set and group
+      old_value = @headers[key]
+      if old_value
+        @headers[key] = [old_value].flatten << key
+      else
+        @headers[key] = value
+      end
+    end
+
+    # Get a header value
+    def [](header)
+      @headers[header.to_s.downcase]
+    end
+
+    # Parse the response body according to its content type
+    def parse_body
+      if @headers['content-type']
+        mime_type = MimeType[@headers['content-type'].split(/;\s*/).first]
+        return mime_type.parse(@body) if mime_type
+      end
+
+      @body
+    end
+  end
+end

data/lib/http/version.rb

@@ -1,3 +1,3 @@
 module Http
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/http_spec.rb

@@ -27,4 +27,12 @@ describe Http do
       response.should match(/HTML5/)
     end
   end
+
+  context "head requests" do
+    it "should be easy" do
+      response = Http.head "http://www.google.com"
+      response.status.should == 200
+      response['content-type'].should match(/html/)
+    end
+  end
 end

metadata

@@ -1,63 +1,61 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: http
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.0.2
   prerelease: 
-  version: 0.0.1
 platform: ruby
-authors: 
+authors:
 - Tony Arcieri
 - Carl Lerche
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-11 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70233139252940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70233139252940
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70233139252380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70233139252380
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70233139251960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-description: HTTP so awesome it will lure Catherine Zeta Jones into your unicorn petting zoo
-email: 
+  prerelease: false
+  version_requirements: *70233139251960
+description: HTTP so awesome it will lure Catherine Zeta Jones into your unicorn petting
+  zoo
+email:
 - tony.arcieri@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rspec
+- .travis.yml
 - CHANGES.md
 - Gemfile
 - LICENSE.txt
@@ -70,6 +68,7 @@ files:
 - lib/http/mime_type.rb
 - lib/http/mime_types/json.rb
 - lib/http/parameters.rb
+- lib/http/response.rb
 - lib/http/version.rb
 - parser/common.rl
 - parser/http.rl
@@ -78,31 +77,29 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/tarcieri/http
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Made entirely of Ruby (and Ragel and C and Java)
-test_files: 
+test_files:
 - spec/http_spec.rb
 - spec/spec_helper.rb
+has_rdoc: