em-net-http 0.1.0 → 0.1.1

data/Gemfile

@@ -1,4 +1,8 @@
 source :rubygems
 
 gem 'em-http-request'
-gem 'right_aws'
+group :development do
+  gem 'rspec', '>= 1.2.9'
+  gem 'weary'
+  gem 'right_aws'
+end

data/Rakefile

@@ -11,6 +11,9 @@ begin
     gem.homepage = "http://github.com/jfairbairn/em-net-http"
     gem.authors = ["James Fairbairn"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
+    gem.add_development_dependency "weary"
+    gem.add_development_dependency "right_aws"
+    
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/em-net-http.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{em-net-http}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Fairbairn"]
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
      "em-net-http.gemspec",
      "lib/em-net-http.rb",
      "lib/test.rb",
+     "lib/test_weary.rb",
      "spec/em-net-http_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"
@@ -47,11 +48,17 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_development_dependency(%q<weary>, [">= 0"])
+      s.add_development_dependency(%q<right_aws>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<weary>, [">= 0"])
+      s.add_dependency(%q<right_aws>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<weary>, [">= 0"])
+    s.add_dependency(%q<right_aws>, [">= 0"])
   end
 end
 

data/lib/em-net-http.rb

@@ -6,19 +6,21 @@ require 'fiber'
 
 module EventMachine
   class NetHTTPResponse
-    include Enumerable
-    def each(&blk)
-      @header.each(&blk)
-    end
-    
-    attr_reader :code, :body, :header
+    attr_reader :code, :body, :header, :message, :http_version
+    alias_method :msg, :message
     
     def initialize(res)
-      @code = res.response_header.status.to_s
+      @code = res.response_header.http_status
+      @message = res.response_header.http_reason
+      @http_version = res.response_header.http_version
       @header = res.response_header
       @body = res.response
     end
     
+    def content_type
+      self['content-type']
+    end
+    
     def [](k)
       @header[key(k)]
     end
@@ -31,11 +33,28 @@ module EventMachine
       @body
     end
     
+    def to_hash
+      h={}
+      @header.each do |k, v|
+        h[fromkey(k)] = v
+      end
+      h
+    end
+      
     private
     def key(k)
       k.upcase.tr('-','_')
     end
     
+    def fromkey(k)
+      k.tr('_', '-').split('-').map{|i|i.capitalize}.join('-')
+    end
+    
+    include Enumerable
+    def each(&blk)
+      @header.each(&blk)
+    end
+    
   end
 end
   
@@ -43,10 +62,18 @@ end
 module Net
   class HTTP
     def request(req, body = nil, &block)
-      uri = Addressable::URI.parse("#{use_ssl? ? 'https://' : 'http://'}#{addr_port}#{req.path}")
-      req = EM::HttpRequest.new(uri).send(req.class::METHOD.downcase.to_sym)
       f=Fiber.current
-      req.callback {|res|f.resume(EM::NetHTTPResponse.new(res))}
+      uri = Addressable::URI.parse("#{use_ssl? ? 'https://' : 'http://'}#{addr_port}#{req.path}")
+      opts = body.nil? ? {} : {:body => body}
+      if use_ssl?
+        sslopts = opts[:ssl] = {}
+        sslopts[:verify_peer] = verify_mode == OpenSSL::SSL::VERIFY_PEER
+        sslopts[:private_key_file] = key if key
+        sslopts[:cert_chain_file] = ca_file if ca_file
+      end
+      httpreq = EM::HttpRequest.new(uri).send(req.class::METHOD.downcase.to_sym, opts)
+      httpreq.callback {|res|f.resume(EM::NetHTTPResponse.new(res))}
+      httpreq.errback {|res|f.resume(EM::NetHTTPResponse.new(res))}
       res = Fiber.yield
       yield res if block_given?
       res

data/lib/test.rb

@@ -3,10 +3,9 @@ require File.dirname(__FILE__) + '/em-net-http'
 
 EM.run do
   Fiber.new do
-    http = Net::HTTP.new('www.google.com') 
-    http.start do |http|
+    Net::HTTP.start('encrypted.google.com', :use_ssl=>true, :verify_mode => OpenSSL::SSL::VERIFY_NONE) do |http|
       res = http.get('/search?q=james')
-      p res['transfer-encoding']
+      puts res.body
     end
     EM.stop_event_loop
   end.resume

data/lib/test_weary.rb

@@ -0,0 +1,44 @@
+$: << '.'
+require File.dirname(__FILE__) + '/em-net-http'
+require 'weary'
+
+module Weary
+  class Response
+    def content_type ; @content_type.split(';').first ; end
+    
+    def value ; self ; end
+  end
+ 
+  class Request
+    def perform!(&block)
+      @on_complete = block if block_given?
+      before_send.call(self) if before_send
+      req = http.request(request)
+      response = Response.new(req, self)
+      if response.redirected? && follows?
+        response.follow_redirect
+      else
+        on_complete.call(response) if on_complete
+        response
+      end
+    end
+  end
+end
+
+EM.run do
+  Fiber.new do
+    class TwitterUser < Weary::Base
+        domain "http://twitter.com/users/"
+
+        get "show" do |resource|
+            resource.with = [:id, :user_id, :screen_name]
+        end
+    end
+
+    user = TwitterUser.new
+    me = user.show(:id => "jfairbairn").perform
+    puts me['status']['text']
+    
+    EM.stop_event_loop
+  end.resume
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - James Fairbairn
@@ -32,6 +32,32 @@ dependencies:
         version: 1.2.9
   type: :development
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: weary
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: right_aws
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
 description: Monkeypatching Net::HTTP to use em-http-request under the hood.
 email: james@netlagoon.com
 executables: []
@@ -52,6 +78,7 @@ files:
 - em-net-http.gemspec
 - lib/em-net-http.rb
 - lib/test.rb
+- lib/test_weary.rb
 - spec/em-net-http_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb