http_spec 0.1.0 → 0.2.0

data/lib/http_spec/clients/faraday.rb

@@ -9,10 +9,17 @@ module HTTPSpec
       end
 
       def dispatch(request)
-        @conn.send(request.method, request.path) do |req|
-          req.headers = request.headers || {}
+        response = @conn.send(request.method, request.path) do |req|
+          req.headers = request.headers
           req.body = request.body
         end
+        from_faraday response
+      end
+
+      private
+
+      def from_faraday(response)
+        HTTPSpec::Response.new(response.status, response.body, response.headers)
       end
     end
   end

data/lib/http_spec/clients/rack.rb

@@ -11,13 +11,16 @@ module HTTPSpec
       def dispatch(request)
         opts = headers_to_env(request.headers)
         opts[:input] = request.body
-        @session.request(request.method, request.path, opts)
+        from_rack @session.request(request.method, request.path, opts)
       end
 
       private
 
+      def from_rack(response)
+        HTTPSpec::Response.new(response.status, response.body, response.headers)
+      end
+
       def headers_to_env(headers)
-        return {} unless headers
         headers.inject({}) do |env, (k, v)|
           k = k.tr("-", "_").upcase
           k = "HTTP_#{k}" unless %w{CONTENT_TYPE CONTENT_LENGTH}.include?(k)

data/lib/http_spec/clients/raddocs_proxy.rb

@@ -122,9 +122,10 @@ module HTTPSpec
 
         def add_request(request, response)
           requests.push(
-            "request_headers" => request.headers || {},
+            "request_headers" => request.headers,
             "request_method" => request.method.upcase,
             "request_path" => request.path,
+            "request_query_parameters" => {},
             "request_body" => request.body,
             "response_status" => response.status,
             "response_headers" => response.headers,

data/lib/http_spec/clients/vcr_proxy.rb

@@ -0,0 +1,61 @@
+require "http_spec/types"
+require "digest/sha1"
+
+module HTTPSpec
+  module Clients
+    class VCRProxy
+      def initialize(inner, cassette, dir = "recordings")
+        @inner = inner
+        @recording = Recording.new(cassette, dir)
+      end
+
+      def dispatch(request)
+        if @recording.new?
+          response = @inner.dispatch(request)
+          @recording.record(request, response)
+          response
+        else
+          @recording.play(request)
+        end
+      end
+
+      class Recording
+        def initialize(cassette, dir)
+          filename = Digest::SHA1.hexdigest(cassette)
+          @filepath = File.join(dir, filename)
+        end
+
+        def new?
+          @new ||= !File.exists?(@filepath)
+        end
+
+        def record(request, response)
+          cache << [request, response]
+          File.open(@filepath, "w+") do |file|
+            Marshal.dump(@cache, file)
+          end
+        end
+
+        def play(request)
+          next_request, next_response = cache.shift
+          if next_request == request
+            next_response
+          else
+            raise "Request does not match recording."
+          end
+        end
+
+        def cache
+          @cache ||=
+            if File.exists?(@filepath)
+              File.open(@filepath, "r+") do |file|
+                Marshal.load(file)
+              end
+            else
+              []
+            end
+        end
+      end
+    end
+  end
+end

data/lib/http_spec/clients/webmachine.rb

@@ -20,7 +20,7 @@ module HTTPSpec
         ::Webmachine::Request.new(
           request.method.to_s.upcase,
           URI.parse(request.path),
-          request.headers || {},
+          request.headers,
           request.body
         )
       end

data/lib/http_spec/dsl/methods.rb

@@ -6,7 +6,7 @@ module HTTPSpec
     module Methods
       def self.define_actions(*methods)
         methods.each do |method|
-          define_method(method) do |path, body=nil, headers=nil|
+          define_method(method) do |path, body="", headers={}|
             request = Request.new(method, path, body, headers)
             HTTPSpec.dispatch(request)
           end

data/lib/http_spec/dsl/resource.rb

@@ -14,7 +14,7 @@ module HTTPSpec
           methods.each do |method|
             define_method(method) do |route, metadata = {}, &block|
               description = "#{method.to_s.upcase} #{route}"
-              metadata[:request] = Request.new(method, route)
+              metadata[:request] = Request.new(method, route, "", {})
               context(description, metadata, &block)
             end
           end
@@ -36,11 +36,7 @@ module HTTPSpec
       end
 
       def do_request(options = {})
-        request = example.metadata[:request].dup
-        request.body = options.delete(:body)
-        request.headers = default_headers(options.delete(:headers))
-        build_path(request, options)
-        @last_response = HTTPSpec.dispatch(request)
+        @last_response = HTTPSpec.dispatch(build_request(options))
       end
 
       def status
@@ -58,8 +54,17 @@ module HTTPSpec
 
       private
 
+      def build_request(options)
+        request = example.metadata[:request]
+        path = build_path(request, options)
+        body = options.fetch(:body, "")
+        headers = example.metadata[:default_headers]
+        headers.merge!(options.fetch(:headers, {}))
+        Request.new(request.method, path, body, headers)
+      end
+
       def build_path(request, options)
-        request.path.gsub!(/:(\w+)/) do |match|
+        request.path.gsub(/:(\w+)/) do |match|
           if options.key?($1.to_sym)
             options[$1.to_sym]
           elsif respond_to?($1)
@@ -69,13 +74,6 @@ module HTTPSpec
           end
         end
       end
-
-      def default_headers(headers)
-        default_headers = example.metadata[:default_headers]
-        return default_headers if headers.nil?
-        return headers if default_headers.nil?
-        default_headers.merge(headers)
-      end
     end
   end
 end

data/lib/http_spec/types.rb

@@ -1,9 +1,6 @@
-module HTTPSpec
-  Request = Struct.new(:method, :path, :body, :headers) do
-    def dup
-      Request.new(method, path.dup, body, headers)
-    end
-  end
+require "values"
 
-  Response = Struct.new(:status, :body, :headers)
+module HTTPSpec
+  Request = Value.new(:method, :path, :body, :headers)
+  Response = Value.new(:status, :body, :headers)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_spec
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: values
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,6 +123,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +229,7 @@ files:
 - lib/http_spec/clients/fdoc_proxy.rb
 - lib/http_spec/clients/rack.rb
 - lib/http_spec/clients/raddocs_proxy.rb
+- lib/http_spec/clients/vcr_proxy.rb
 - lib/http_spec/clients/webmachine.rb
 - lib/http_spec/dsl/methods.rb
 - lib/http_spec/dsl/parameters.rb