sham_rack 1.3.3 → 1.3.4

data/CHANGES.markdown

@@ -1,3 +1,8 @@
+## 1-May-2012 [mdub@dogbiscuit.org]
+
+* Validate arguments to `ShamRack#mount`.
+* Update for compatibility with patron-0.4.x.
+
 ## 18-Oct-2010 [mdub@dogbiscuit.org]
 
 * Add support for Patron.

data/README.markdown

@@ -29,7 +29,7 @@ Using it
     require 'sham_rack'
 
     ShamRack.at("www.greetings.com") do |env|
-      ["200 OK", { "Content-type" => "text/plain" }, "Hello, world!"]
+      ["200 OK", { "Content-type" => "text/plain" }, ["Hello, world!"]]
     end
       
     require 'open-uri'

data/lib/sham_rack.rb

@@ -1,9 +1,11 @@
+require "sham_rack/net_http"
+require "sham_rack/registry"
+require "sham_rack/version"
+
 # ShamRack allows access to Rack applications using Net::Http, but without network traffic.
 #
 # For more detail, see http://github.com/mdub/sham_rack
 #
-module ShamRack; end
-
-require "sham_rack/net_http"
-require "sham_rack/registry"
-require "sham_rack/version"
+module ShamRack
+  extend ShamRack::Registry
+end

data/lib/sham_rack/net_http.rb

@@ -1,10 +1,11 @@
 require "net/http"
+require "rack"
 require "sham_rack/registry"
 
-class << Net::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)
@@ -20,14 +21,14 @@ end
 
 module ShamRack
   module NetHttp
-    
+
     module Extensions
 
       attr_accessor :rack_app
 
       def start
         if block_given?
-          yield self 
+          yield self
         else
           self
         end
@@ -47,14 +48,14 @@ module ShamRack
         rack_env.merge!(header_env(request))
         rack_env.merge!(server_env)
       end
-      
+
       def server_env
         {
-          "SERVER_NAME" => @address, 
+          "SERVER_NAME" => @address,
           "SERVER_PORT" => @port.to_s
         }
       end
-      
+
       def header_env(request)
         env = {}
         request.each_header do |header, content|

data/lib/sham_rack/patron.rb

@@ -34,13 +34,7 @@ module Patron
 
     def patron_response(rack_response)
       status, headers, body = rack_response
-      status_code = Rack::Utils::HTTP_STATUS_CODES[status.to_i]
-      res = Patron::Response.new
-      res.instance_variable_set(:@status, status)
-      res.instance_variable_set(:@status_line, "HTTP/1.1 #{status} #{status_code}")
-      res.instance_variable_set(:@body, assemble_body(body))
-      res.instance_variable_set(:@headers, headers)
-      res
+      Patron::Response.new("", status.to_i, 0, assemble_headers(status, headers), assemble_body(body))
     end
 
     def header_env(patron_request)
@@ -53,6 +47,15 @@ module Patron
       env
     end
 
+    def assemble_headers(status, headers)
+      status_code = Rack::Utils::HTTP_STATUS_CODES[status.to_i]
+      content = "HTTP/1.1 #{status} #{status_code}\r\n"
+      headers.each do |k, v|
+        content << "#{k}: #{v}\r\n"
+      end
+      content
+    end
+
     def assemble_body(body)
       content = ""
       body.each { |fragment| content << fragment }
@@ -61,4 +64,4 @@ module Patron
 
   end
 
-end
+end

data/lib/sham_rack/registry.rb

@@ -1,12 +1,21 @@
 module ShamRack
 
   module Registry
-  
+
+    ADDRESS_PATTERN = /^[a-z0-9-]+(\.[a-z0-9-]+)*$/i
+
     def mount(rack_app, address, port = nil)
-      port ||= Net::HTTP.default_port
+      unless address =~ ADDRESS_PATTERN
+        raise ArgumentError, "invalid address"
+      end
+      if port.nil?
+        port = Net::HTTP.default_port
+      else
+        port = Integer(port)
+      end
       registry[[address, port]] = rack_app
     end
-    
+
     def unmount_all
       registry.clear
     end
@@ -18,24 +27,22 @@ module ShamRack
         Registrar.new(address, port)
       end
     end
-    
+
     def application_for(address, port = nil)
       port ||= Net::HTTP.default_port
       registry[[address, port]]
     end
 
     private
-    
+
     def registry
       @registry ||= {}
     end
-    
+
   end
-    
-  extend Registry
 
   class Registrar
-    
+
     def initialize(address, port = nil)
       @address = address
       @port = port
@@ -46,7 +53,7 @@ module ShamRack
       app = Rack::Builder.new(&block).to_app
       ShamRack.mount(app, @address, @port)
     end
-    
+
     def sinatra(&block)
       require "sinatra/base"
       sinatra_app = Class.new(Sinatra::Base)
@@ -58,7 +65,7 @@ module ShamRack
       require "sham_rack/stub_web_service"
       ShamRack.mount(StubWebService.new, @address, @port)
     end
-    
+
   end
 
 end

data/lib/sham_rack/version.rb

@@ -1,3 +1,3 @@
 module ShamRack
-  VERSION = "1.3.3"
+  VERSION = "1.3.4"
 end

data/spec/sham_rack_spec.rb

@@ -56,6 +56,20 @@ describe ShamRack do
 
   end
 
+  describe ".mount" do
+
+    context "with a URL" do
+
+      it "raises an ArgumentError" do
+        lambda do
+          ShamRack.mount(GreetingApp.new, "http://www.greetings.com")
+        end.should raise_error(ArgumentError, "invalid address")
+      end
+
+    end
+
+  end
+
   describe ".at" do
 
     describe "with a block" do
@@ -100,7 +114,7 @@ describe ShamRack do
           end
         end
       end
-      
+
       it "mounts associated block as a Sinatra app" do
         open("http://sinatra.xyz/hello/stranger").read.should == "Hello, stranger"
       end
@@ -108,11 +122,11 @@ describe ShamRack do
       it "returns the app" do
         @return_value.should respond_to(:call)
       end
-      
+
     end
 
     describe "#stub" do
-      
+
       before do
         @return_value = ShamRack.at("stubbed.xyz").stub
       end
@@ -120,28 +134,28 @@ describe ShamRack do
       it "mounts a StubWebService" do
         ShamRack.application_for("stubbed.xyz").should be_kind_of(ShamRack::StubWebService)
       end
-      
+
       it "returns the StubWebService" do
         @return_value.should == ShamRack.application_for("stubbed.xyz")
       end
-      
+
     end
-    
+
   end
 
   describe "response" do
-    
+
     before(:each) do
       ShamRack.at("www.greetings.com") do
         [
-          "201 Created", 
+          "201 Created",
           { "Content-Type" => "text/plain", "X-Foo" => "bar" },
           ["BODY"]
         ]
       end
       @response = Net::HTTP.get_response(URI.parse("http://www.greetings.com/"))
     end
-    
+
     it "has status returned by app" do
       @response.code.should == "201"
     end
@@ -149,17 +163,17 @@ describe ShamRack do
     it "has body returned by app" do
       @response.body.should == "BODY"
     end
-    
+
     it "has Content-Type returned by app" do
       @response.content_type.should == "text/plain"
     end
-    
+
     it "has other headers returned by app" do
       @response["x-foo"].should =="bar"
     end
-    
+
   end
-  
+
   describe "Rack environment" do
 
     before(:each) do
@@ -232,8 +246,8 @@ describe ShamRack do
       patron = Patron::Session.new
       response = patron.post("http://env.xyz/resource", "<xml/>", "Content-Type" => "application/xml")
 
-      response.status.should == "200 OK"
-      
+      response.status.should == 200
+
       env["REQUEST_METHOD"].should == "POST"
       env["rack.input"].read.should == "<xml/>"
       env["CONTENT_TYPE"].should == "application/xml"

metadata

@@ -1,46 +1,39 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sham_rack
-version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: false
-  segments: 
-  - 1
-  - 3
-  - 3
-  version: 1.3.3
+version: !ruby/object:Gem::Version
+  version: 1.3.4
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Mike Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-12-22 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-05-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-description: ShamRack plumbs Net::HTTP directly into Rack, for quick and easy HTTP testing.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: ShamRack plumbs Net::HTTP directly into Rack, for quick and easy HTTP
+  testing.
 email: mdub@dogbiscuit.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/sham_rack/net_http.rb
 - lib/sham_rack/patron.rb
 - lib/sham_rack/registry.rb
@@ -56,41 +49,37 @@ files:
 - Rakefile
 - benchmark/benchmark.rb
 - benchmark/hello_app.rb
-has_rdoc: true
 homepage: http://github.com/mdub/sham_rack
 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -1856658297304903275
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -1856658297304903275
 requirements: []
-
 rubyforge_project: shamrack
-rubygems_version: 1.3.7
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Net::HTTP-to-Rack plumbing
-test_files: 
+test_files:
 - spec/sham_rack/stub_web_service_spec.rb
 - spec/sham_rack_spec.rb
 - spec/spec_helper.rb