sham_rack 1.3.1 → 1.3.2

data/CHANGES.markdown

@@ -1,3 +1,7 @@
+## 02-Sep-2010 [mdub@dogbiscuit.org]
+
+* Fixes to support Ruby-1.9.x.
+
 ## 08-Jul-2010 [jyurek@thoughtbot.com]
 
 * Add support for Mechanize.

data/lib/sham_rack.rb

@@ -4,6 +4,6 @@
 #
 module ShamRack; end
 
-require "sham_rack/core_ext/net/http"
+require "sham_rack/net_http"
 require "sham_rack/registry"
 require "sham_rack/version"

data/lib/sham_rack/{http.rb → net_http.rb}

@@ -1,7 +1,26 @@
-module ShamRack
+require "net/http"
+require "sham_rack/registry"
+
+class << Net::HTTP  
+
+  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
+      http_object.extend(ShamRack::NetHttp::Extensions)
+      http_object.rack_app = rack_app
+    end
+    http_object
+  end
 
-  module HTTP
+end
 
+module ShamRack
+  module NetHttp
+    
     module Extensions
 
       attr_accessor :rack_app
@@ -49,8 +68,10 @@ module ShamRack
       def io_env(request, body)
         raise(ArgumentError, "both request.body and body argument were provided") if (request.body && body)
         body ||= request.body || ""
+        body = body.to_s
+        body = body.encode("ASCII-8BIT") if body.respond_to?(:encode)
         { 
-          "rack.input" => StringIO.new(body.to_s),
+          "rack.input" => StringIO.new(body),
           "rack.errors" => $stderr
         }
       end
@@ -83,7 +104,7 @@ module ShamRack
         headers.each do |k,v|
           response.add_field(k, v)
         end
-        response.extend ShamRack::ResponseExtensions
+        response.extend ShamRack::NetHttp::ResponseExtensions
         return response
       end
 
@@ -95,14 +116,14 @@ module ShamRack
 
     end
 
-  end
+    module ResponseExtensions
 
-  module ResponseExtensions
+      def read_body(dest = nil)
+        yield @body if block_given?
+        dest << @body if dest
+        return @body
+      end
 
-    def read_body(dest = nil)
-      yield @body if block_given?
-      dest << @body if dest
-      return @body
     end
 
   end

data/lib/sham_rack/stub_web_service.rb

@@ -32,7 +32,7 @@ module ShamRack
         unless request.query_string.to_s.empty?
           request_path += "?" + request.query_string
         end
-        [status, {"Content-Type" => content_type}, content] if request_path == path
+        [status, {"Content-Type" => content_type}, [content]] if request_path == path
       end
     end
 
@@ -43,7 +43,7 @@ module ShamRack
     protected
 
     def default_response
-      [404, {"Content-Type" => "text/plain"}, "Not found"]
+      [404, {"Content-Type" => "text/plain"}, ["Not found"]]
     end
 
   end

data/lib/sham_rack/version.rb

@@ -1,3 +1,3 @@
 module ShamRack
-  VERSION = "1.3.1".freeze
+  VERSION = "1.3.2"
 end

data/spec/sham_rack/stub_web_service_spec.rb

@@ -43,11 +43,11 @@ describe ShamRack::StubWebService do
     before(:each) do
       
       @app.handle do |request|
-        [200, {}, "response from first handler"] if request.get?
+        [200, {}, ["response from first handler"]] if request.get?
       end
 
       @app.handle do |request|
-        [200, {}, "response from second handler"] if request.path_info == "/stuff"
+        [200, {}, ["response from second handler"]] if request.path_info == "/stuff"
       end
       
     end

data/spec/sham_rack_spec.rb

@@ -107,7 +107,7 @@ describe ShamRack do
         [
           "201 Created", 
           { "Content-Type" => "text/plain", "X-Foo" => "bar" },
-          "BODY"
+          ["BODY"]
         ]
       end
       @response = Net::HTTP.get_response(URI.parse("http://www.test.xyz/"))
@@ -138,7 +138,7 @@ describe ShamRack do
       it "mounts associated block as an app" do
 
         ShamRack.at("simple.xyz") do |env|
-          ["200 OK", { "Content-type" => "text/plain" }, "Easy, huh?"]
+          ["200 OK", { "Content-type" => "text/plain" }, ["Easy, huh?"]]
         end
 
         open("http://simple.xyz").read.should == "Easy, huh?"

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sham_rack
 version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Mike Williams
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-12 00:00:00 +10:00
+date: 2010-09-02 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -27,14 +28,19 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- lib/sham_rack/core_ext/net/http.rb
-- lib/sham_rack/http.rb
+- lib/sham_rack/net_http.rb
 - lib/sham_rack/registry.rb
 - lib/sham_rack/stub_web_service.rb
 - lib/sham_rack/version.rb
 - lib/sham_rack.rb
 - README.markdown
 - CHANGES.markdown
+- spec/sham_rack/stub_web_service_spec.rb
+- spec/sham_rack_spec.rb
+- spec/spec_helper.rb
+- Rakefile
+- benchmark/benchmark.rb
+- benchmark/hello_app.rb
 has_rdoc: true
 homepage: http://github.com/mdub/sham_rack
 licenses: []
@@ -45,23 +51,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: shamrack
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Net::HTTP-to-Rack plumbing

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

@@ -1,20 +0,0 @@
-require "net/http"
-require "sham_rack/registry"
-require "sham_rack/http"
-
-class << Net::HTTP  
-
-  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
-      http_object.extend(ShamRack::HTTP::Extensions)
-      http_object.rack_app = rack_app
-    end
-    http_object
-  end
-
-end