sham_rack 1.1.2 → 1.2.0

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 27-Nov-2009 [mdub@dogbiscuit.org]
+
+* Change of approach: extend rather than reimplement Net:HTTP.  This should improve coverage of all the weird and wonderful ways of using the Net:HTTP API.
+
 ## 5-Jun-2009 [mdub@dogbiscuit.org]
 
 * Add support for Net::HTTP.get_response.

data/README.markdown

@@ -6,14 +6,16 @@ ShamRack plumbs Net:HTTP into [Rack][rack].
 What's it for, again?
 ---------------------
 
-Well, you can _test your HTTP client code_, using ShamRack to stub out an external web-service. Think of it as [FakeWeb][fakeweb] on steriods.
+Well, it makes it easy to _stub out external (HTTP) services_, which is handy in development and testing environments, or when you want to _test your HTTP client code_.
 
-Or, you can _test your Rack application_ (or Sinatra, or Rails, or Merb) using arbitrary HTTP client libraries, to check interoperability. For instance, you could hit a local app using:
+You can also use it to _test your Rack application_ (or Sinatra, or Rails, or Merb) using arbitrary HTTP client libraries, to check interoperability. For instance, you could test your app using:
 
 * [`rest-client`][rest-client]
 * [`httparty`][httparty]
 * [`oauth`][oauth]
 
+all without having to boot it in a server.
+
 Installing it
 -------------
 

data/Rakefile

@@ -1,6 +1,8 @@
 require "rubygems"
 require "rake"
 
+require File.dirname(__FILE__) + "/lib/sham_rack/version.rb"
+
 require "spec/rake/spectask"
 
 task "default" => "spec"
@@ -10,21 +12,8 @@ Spec::Rake::SpecTask.new do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-require "jeweler"
-
-Jeweler::Tasks.new do |g|
-  g.name = "sham_rack"
-  g.summary = "Net::HTTP-to-Rack plumbing"
-  g.email = "mdub@dogbiscuit.org"
-  g.homepage = "http://github.com/mdub/sham_rack"
-  g.description = "ShamRack plumbs Net::HTTP directly into Rack, for quick and easy HTTP testing."
-  g.authors = ["Mike Williams"]
-  g.rubyforge_project = "shamrack"
-end
-
-Jeweler::RubyforgeTasks.new
-
 require 'rake/rdoctask'
+
 Rake::RDocTask.new do |rdoc|
   if File.exist?('VERSION.yml')
     config = YAML.load(File.read('VERSION.yml'))
@@ -34,7 +23,36 @@ Rake::RDocTask.new do |rdoc|
   end
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "ShamRack #{version}"
+  rdoc.title = "ShamRack #{ShamRack::VERSION}"
   rdoc.main = "ShamRack"
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+def after_requiring(lib, options = {})
+  begin
+    require(lib)
+  rescue LoadError
+    gem_name = options[:gem] || lib
+    $stderr.puts "WARNING: can't load #{lib}.  Install it with: sudo gem install #{gem_name}"
+    return false
+  end
+  yield
+end
+
+after_requiring "jeweler" do
+
+  Jeweler::Tasks.new do |g|
+    g.name = "sham_rack"
+    g.version = ShamRack::VERSION
+    g.summary = "Net::HTTP-to-Rack plumbing"
+    g.email = "mdub@dogbiscuit.org"
+    g.homepage = "http://github.com/mdub/sham_rack"
+    g.description = "ShamRack plumbs Net::HTTP directly into Rack, for quick and easy HTTP testing."
+    g.authors = ["Mike Williams"]
+    g.rubyforge_project = "shamrack"
+  end
+
+  Jeweler::GemcutterTasks.new
+  # Jeweler::RubyforgeTasks.new
+
+end

data/benchmark/benchmark.rb

@@ -0,0 +1,49 @@
+require "rubygems"
+
+require "pathname"
+dir = Pathname(__FILE__).parent
+$LOAD_PATH.unshift(dir.parent + "lib")
+
+require dir + "hello_app"
+require "sham_rack"
+require "restclient"
+
+# mount an instance of the app using ShamRack
+ShamRack.mount(HelloApp.new, "hello.sham")
+
+# run another instance in a separate process
+server_pid = fork do
+  puts "Starting HTTP server on port 3333"
+  $stdout = File.new('/dev/null', 'w')
+  HelloApp.run!(:port => 3333)
+end
+
+at_exit do
+  puts "Killing HTTP server"
+  Process.kill("TERM", server_pid)
+  Process.wait(server_pid)
+end
+
+puts "Waiting for server to come up"
+begin
+  puts RestClient.get("http://localhost:3333/hello/stranger")
+rescue SystemCallError => e
+  retry
+end
+
+iterations = (ARGV.shift || 1000).to_i
+
+%w(hello.sham localhost:3333).each do |site|
+
+  start = Time.now
+
+  iterations.times do
+    x = RestClient.get("http://#{site}/hello/stranger").to_s
+  end
+
+  elapsed_time = (Time.now - start)
+  requests_per_second = iterations / elapsed_time.to_f
+
+  printf "%-20s     #{iterations} requests in %f; %f per second\n", site, elapsed_time, requests_per_second
+  
+end

data/benchmark/hello_app.rb

@@ -0,0 +1,10 @@
+require "rubygems"
+require "sinatra/base"
+
+class HelloApp < Sinatra::Base
+
+  get "/hello/:subject" do
+    "Hello, #{params[:subject]}"
+  end
+          
+end

data/lib/sham_rack.rb

@@ -5,3 +5,4 @@
 module ShamRack; end
 
 require "sham_rack/core_ext/net/http"
+require "sham_rack/version"

data/lib/sham_rack/core_ext/net/http.rb

@@ -2,16 +2,19 @@ require "net/http"
 require "sham_rack/registry"
 require "sham_rack/http"
 
-module Net
+class << Net::HTTP  
 
-  def HTTP.new(address, port = nil, *proxy_args)
-    port ||= HTTP.default_port
+  alias :new_without_sham_rack :new
+  
+  def new(address, port = nil, *proxy_args)
+    port ||= Net::HTTP.default_port
     rack_app = ShamRack.application_for(address, port)
+    http_object = new_without_sham_rack(address, port, *proxy_args)
     if rack_app
-      ShamRack::HTTP.new(address, port, rack_app)
-    else
-      super(address, port, *proxy_args)
+      http_object.extend(ShamRack::HTTP::Extensions)
+      http_object.rack_app = rack_app
     end
+    http_object
   end
 
-end
+end

data/lib/sham_rack/http.rb

@@ -1,120 +1,101 @@
 module ShamRack
-  
-  # a sham version of Net::HTTP
-  class HTTP
-
-    def initialize(address, port, rack_app)
-      @address = address
-      @port = port
-      @rack_app = rack_app
-    end
 
-    attr_reader :address, :port, :rack_app
-    
-    attr_accessor :read_timeout, :open_timeout
-    attr_accessor :use_ssl,:key, :cert, :ca_file, :ca_path, :verify_mode, :verify_callback, :verify_depth, :cert_store
+  module HTTP
 
-    def start
-      yield self
-    end
+    module Extensions
 
-    def request(req, body = nil)
-      env = default_env
-      env.merge!(path_env(req.path))
-      env.merge!(method_env(req))
-      env.merge!(header_env(req))
-      env.merge!(io_env(req, body))
-      response = build_response(@rack_app.call(env))
-      yield response if block_given?
-      return response
-    end
-    
-    def request_get(path, initheader = nil, &block)
-      request Net::HTTP::Get.new(path, initheader), &block
-    end
+      attr_accessor :rack_app
 
-    def request_head(path, initheader = nil, &block)
-      request Net::HTTP::Head.new(path, initheader), &block
-    end
+      attr_accessor :read_timeout, :open_timeout
+      attr_accessor :use_ssl,:key, :cert, :ca_file, :ca_path, :verify_mode, :verify_callback, :verify_depth, :cert_store
 
-    def request_post(path, data, initheader = nil, &block)
-      request Net::HTTP::Post.new(path, initheader), data, &block
-    end
+      def start
+        yield self
+      end
 
-    def request_put(path, data, initheader = nil, &block) 
-      request Net::HTTP::Put.new(path, initheader), data, &block
-    end
+      def request(req, body = nil)
+        env = default_env
+        env.merge!(path_env(req.path))
+        env.merge!(method_env(req))
+        env.merge!(header_env(req))
+        env.merge!(io_env(req, body))
+        response = build_response(@rack_app.call(env))
+        yield response if block_given?
+        return response
+      end
 
-    private
-
-    def default_env
-      {
-        "SCRIPT_NAME" => "",
-        "SERVER_NAME" => @address,
-        "SERVER_PORT" => @port.to_s,   
-        "rack.version" => [0,1],
-        "rack.url_scheme" => "http",
-        "rack.multithread" => true,
-        "rack.multiprocess" => true,
-        "rack.run_once" => false
-      }
-    end
-    
-    def method_env(request)
-      {
-        "REQUEST_METHOD" => request.method
-      }
-    end
-    
-    def io_env(request, body)
-      raise(ArgumentError, "both request.body and body argument were provided") if (request.body && body)
-      body ||= request.body || ""
-      { 
-        "rack.input" => StringIO.new(body),
-        "rack.errors" => $stderr
-      }
-    end
-    
-    def path_env(path)
-      uri = URI.parse(path)
-      {
-        "PATH_INFO" => uri.path,
-        "QUERY_STRING" => (uri.query || ""),
-      }
-    end
-    
-    def header_env(request)
-      result = {}
-      request.each do |header, content|
-        result["HTTP_" + header.upcase.gsub('-', '_')] = content
+      private
+
+      def default_env
+        {
+          "SCRIPT_NAME" => "",
+          "SERVER_NAME" => @address,
+          "SERVER_PORT" => @port.to_s,   
+          "rack.version" => [0,1],
+          "rack.url_scheme" => "http",
+          "rack.multithread" => true,
+          "rack.multiprocess" => true,
+          "rack.run_once" => false
+        }
       end
-      %w(TYPE LENGTH).each do |x|
-        result["CONTENT_#{x}"] = result.delete("HTTP_CONTENT_#{x}") if result.has_key?("HTTP_CONTENT_#{x}")
+
+      def method_env(request)
+        {
+          "REQUEST_METHOD" => request.method
+        }
       end
-      return result
-    end
-    
-    def build_response(rack_response)
-      status, headers, body = rack_response
-      code, message = status.to_s.split(" ", 2)
-      response = Net::HTTPResponse.send(:response_class, code).new("Sham", code, message)
-      response.instance_variable_set(:@body, assemble_body(body))
-      response.instance_variable_set(:@read, true)
-      headers.each do |k,v|
-        response.add_field(k, v)
+
+      def io_env(request, body)
+        raise(ArgumentError, "both request.body and body argument were provided") if (request.body && body)
+        body ||= request.body || ""
+        { 
+          "rack.input" => StringIO.new(body),
+          "rack.errors" => $stderr
+        }
+      end
+
+      def path_env(path)
+        uri = URI.parse(path)
+        {
+          "PATH_INFO" => uri.path,
+          "QUERY_STRING" => (uri.query || ""),
+        }
+      end
+
+      def header_env(request)
+        result = {}
+        request.each do |header, content|
+          result["HTTP_" + header.upcase.gsub('-', '_')] = content
+        end
+        %w(TYPE LENGTH).each do |x|
+          result["CONTENT_#{x}"] = result.delete("HTTP_CONTENT_#{x}") if result.has_key?("HTTP_CONTENT_#{x}")
+        end
+        return result
+      end
+
+      def build_response(rack_response)
+        status, headers, body = rack_response
+        code, message = status.to_s.split(" ", 2)
+        response = Net::HTTPResponse.send(:response_class, code).new("Sham", code, message)
+        response.instance_variable_set(:@body, assemble_body(body))
+        response.instance_variable_set(:@read, true)
+        headers.each do |k,v|
+          response.add_field(k, v)
+        end
+        response.extend ShamRack::ResponseExtensions
+        return response
+      end
+
+      def assemble_body(body)
+        content = ""
+        body.each { |fragment| content << fragment }
+        return content
       end
-      response.extend ShamRack::ResponseExtensions
-      return response
-    end
 
-    def assemble_body(body)
-      content = ""
-      body.each { |fragment| content << fragment }
-      return content
     end
-    
+
   end
-  
+
   module ResponseExtensions
 
     def read_body(dest = nil)
@@ -122,7 +103,7 @@ module ShamRack
       dest << @body if dest
       return @body
     end
-    
+
   end
 
 end

data/lib/sham_rack/version.rb

@@ -0,0 +1,3 @@
+module ShamRack
+  VERSION = "1.2.0"
+end

data/sham_rack.gemspec

@@ -1,12 +1,15 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{sham_rack}
-  s.version = "1.1.2"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Mike Williams"]
-  s.date = %q{2009-06-05}
+  s.date = %q{2009-11-27}
   s.description = %q{ShamRack plumbs Net::HTTP directly into Rack, for quick and easy HTTP testing.}
   s.email = %q{mdub@dogbiscuit.org}
   s.extra_rdoc_files = [
@@ -17,21 +20,22 @@ Gem::Specification.new do |s|
      "CHANGES.markdown",
      "README.markdown",
      "Rakefile",
-     "VERSION.yml",
+     "benchmark/benchmark.rb",
+     "benchmark/hello_app.rb",
      "lib/sham_rack.rb",
      "lib/sham_rack/core_ext/net/http.rb",
      "lib/sham_rack/http.rb",
      "lib/sham_rack/registry.rb",
+     "lib/sham_rack/version.rb",
      "sham_rack.gemspec",
      "spec/sham_rack_spec.rb",
      "spec/spec_helper.rb"
   ]
-  s.has_rdoc = true
   s.homepage = %q{http://github.com/mdub/sham_rack}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{shamrack}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Net::HTTP-to-Rack plumbing}
   s.test_files = [
     "spec/sham_rack_spec.rb",
@@ -48,3 +52,4 @@ Gem::Specification.new do |s|
   else
   end
 end
+

data/spec/sham_rack_spec.rb

@@ -238,6 +238,17 @@ describe ShamRack do
 
     end
 
+    it "supports POST using Net::HTTP" do
+
+      Net::HTTP.start("env.xyz") do |http|
+        http.post("/resource", "q=rack")
+      end
+
+      env["REQUEST_METHOD"].should == "POST"
+      env["rack.input"].read.should == "q=rack"
+
+    end
+
     it "supports PUT" do
 
       RestClient.put("http://env.xyz/thing1", "stuff", :content_type => "text/plain")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sham_rack
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors: 
 - Mike Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-05 00:00:00 +10:00
+date: 2009-11-27 00:00:00 +11:00
 default_executable: 
 dependencies: []
 
@@ -26,11 +26,13 @@ files:
 - CHANGES.markdown
 - README.markdown
 - Rakefile
-- VERSION.yml
+- benchmark/benchmark.rb
+- benchmark/hello_app.rb
 - lib/sham_rack.rb
 - lib/sham_rack/core_ext/net/http.rb
 - lib/sham_rack/http.rb
 - lib/sham_rack/registry.rb
+- lib/sham_rack/version.rb
 - sham_rack.gemspec
 - spec/sham_rack_spec.rb
 - spec/spec_helper.rb
@@ -58,7 +60,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: shamrack
-rubygems_version: 1.3.2
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Net::HTTP-to-Rack plumbing

data/VERSION.yml

@@ -1,4 +0,0 @@
---- 
-:major: 1
-:minor: 1
-:patch: 2