http_vanilli 0.0.3 → 0.0.4

data/lib/http_vanilli/basic_mapper.rb

@@ -32,8 +32,8 @@ module HttpVanilli
     ## Mapping API
 
     # Take the info from the innards of Net::HTTP and build a request.
-    def build_request(kind,http,request,&block)
-      HttpVanilli::Request.build(kind,http,request,&block)
+    def build_request(kind, http, request, index, &block)
+      HttpVanilli::Request.build(kind, http, request, index, &block)
     end
 
     # Should we map the request?

data/lib/http_vanilli/net_http/override.rb

@@ -39,12 +39,22 @@ module Net  #:nodoc: all
   end
 
   class HTTP
+    # add some class methods
     class << self
       def socket_type_with_http_vanilli
         HttpVanilli::NetHttp::StubSocket
       end
       alias_method :socket_type_without_http_vanilli, :socket_type
       alias_method :socket_type, :socket_type_with_http_vanilli
+
+      def last_request_index
+        @last_request_index ||= -1
+      end
+
+      def next_request_index
+        @last_request_index ||= -1
+        @last_request_index += 1
+      end
     end
 
     def request_with_http_vanilli(request, body = nil, &block)
@@ -53,7 +63,7 @@ module Net  #:nodoc: all
       request.set_body_internal body
 
       # Wrap Net::HTTPRequest & associated info in a HttpVanilli::Request
-      vanilli_request = mapper.build_request(:net_http, self, request, &block)
+      vanilli_request = mapper.build_request(:net_http, self, request, self.class.next_request_index, &block)
 
       # The mapper can map the request. Do it.
       if mapper.map_request?(vanilli_request)

data/lib/http_vanilli/net_http/request.rb

@@ -3,11 +3,12 @@ require 'http_vanilli/request'
 module HttpVanilli
   module NetHttp
     class Request < HttpVanilli::Request
-      attr_reader :block, :uri, :method, :original_request
+      attr_reader :block, :uri, :method, :original_request, :index
 
-      def initialize(http,request,&block)
+      def initialize(http,request,index,&block)
         @http             = http
         @original_request = request
+        @index            = index
         @block            = block
 
         protocol = http.use_ssl? ? "https" : "http"

data/lib/http_vanilli/responders/rack.rb

@@ -45,7 +45,8 @@ module HttpVanilli
                      "rack.multiprocess" => false,
                      "rack.run_once"     => false,
 
-                     "rack.url_scheme" => request.uri.scheme
+                     "rack.url_scheme" => request.uri.scheme,
+                     "http_vanilli.request_index" => request.index
                    })
 
         app.call(env)
@@ -53,7 +54,14 @@ module HttpVanilli
 
       def app
         inner_app = lambda {|l| [BadStatus,{'Content-Type' => 'text/plain'},['']]}
-        @app_class.new(inner_app,*@args,&@block)
+
+        if Proc === @app_class
+          lambda {|env|
+            @app_class.call(env) || inner_app.call(env)
+          }
+        else
+          @app_class.new(inner_app,*@args,&@block)
+        end
       end
     end
   end

data/lib/http_vanilli/version.rb

@@ -1,3 +1,3 @@
 module HttpVanilli
-  Version = '0.0.3'
+  Version = '0.0.4'
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_vanilli
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 23
+  prerelease: 
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Lachie Cox
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-02 00:00:00 +10:00
+date: 2011-04-19 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: exemplor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -33,9 +36,11 @@ dependencies:
   name: addressable
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 2
         - 2
@@ -56,19 +61,16 @@ files:
 - lib/angry_web/matcher.rb
 - lib/http_vanilli/abstract_responder.rb
 - lib/http_vanilli/basic_mapper.rb
-- lib/http_vanilli/basic_mapping.rb
 - lib/http_vanilli/net_http/override.rb
 - lib/http_vanilli/net_http/request.rb
 - lib/http_vanilli/net_http/response.rb
 - lib/http_vanilli/net_http/stubs.rb
 - lib/http_vanilli/net_http/util.rb
-- lib/http_vanilli/other_mapper.rb
 - lib/http_vanilli/request.rb
 - lib/http_vanilli/responders/block.rb
 - lib/http_vanilli/responders/rack.rb
 - lib/http_vanilli/responders.rb
 - lib/http_vanilli/response.rb
-- lib/http_vanilli/test_adapters/rspec.rb
 - lib/http_vanilli/util.rb
 - lib/http_vanilli/version.rb
 - lib/http_vanilli.rb
@@ -82,16 +84,20 @@ 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: 23
       segments: 
       - 1
       - 3
@@ -100,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: http_vanilli
-rubygems_version: 1.3.6
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Flexible web connection mocking lib.

data/lib/http_vanilli/basic_mapping.rb

@@ -1,22 +0,0 @@
-require 'addressable/uri'
-
-module Unused 
-  class BasicMapping
-    include HttpVanilli::NetHttp::YieldResponse
-    
-    def initialize(method,url,&block)
-      @method = method
-      @url    = Addressable::URI.heuristic_parse(url)
-      @block  = block
-    end
-
-    def match?(request)
-      (request.host == @url.host)
-    end
-
-    def rack_response
-      @block[request]
-    end
-
-  end
-end

data/lib/http_vanilli/other_mapper.rb

@@ -1,54 +0,0 @@
-require 'ostruct'
-require 'pp'
-
-module HttpVanilli
-  class OtherMapper
-    def customise_request(&block)
-      @customise_request = block
-    end
-
-    # Take the info from the innards of Net::HTTP and build a request.
-    def build_request(kind,http,request,body,&block)
-      req = OpenStruct.new
-      req.block = block
-
-      pp http
-      pp request.to_hash
-
-      protocol = http.use_ssl? ? "https" : "http"
-
-      path = request.path
-      path = Addressable::URI.parse(request.path).request_uri if request.path =~ /^http/
-
-      req.uri = Addressable::URI.parse( "#{protocol}://#{http.address}:#{http.port}#{path}" )
-      req.method = request.method.downcase.to_sym
-
-      if @customise_request
-        @customise_request[req]
-      end
-
-      req
-    end
-
-    # Should we map the request?
-    def map_request?(request)
-      true
-    end
-
-    # Map the request
-    def map_request(request)
-      response = HttpVanilli::NetHttp::Response.new(200,'cool')
-      response.body = "boddy"
-
-      nhrsp = response.to_net_http
-      request.block[nhrsp] if request.block
-
-      nhrsp
-    end
-
-    # The request wasn't matched and normal net connection was disallowed.
-    def unmapped_request(request)
-      raise "unmatched_request :("
-    end
-  end
-end

data/lib/http_vanilli/test_adapters/rspec.rb

@@ -1,9 +0,0 @@
-require 'http_vanilli'
-
-module HttpVanilli
-  module RSpec
-    def stub_web(method, url, &block)
-      HttpVanilli.mapper.add_mapping(method,url,&block)
-    end
-  end
-end