mock_server 0.1.4 → 0.1.5

data/lib/mock_server/playback.rb

@@ -1,4 +1,6 @@
 require 'mock_server/utils'
+require 'erb'
+require 'hashie'
 
 module MockServer
   class Playback
@@ -18,6 +20,10 @@ module MockServer
                                    lazy_match @options[:routes], env["PATH_INFO"]
 
       @request = Rack::Request.new(env)
+
+      $mock_server_options[:requests_stack] ||= []
+      $mock_server_options[:requests_stack] << @request.path
+
       @data = load_data
 
       record = match_request
@@ -57,7 +63,15 @@ module MockServer
 
         matchers.detect { |matcher|
           if matcher[:matcher]
-            matcher[:matcher].call(request, recorded_request) rescue false
+            result = true
+            begin
+              matcher[:matcher].call(request, recorded_request)
+            rescue => matcher_err
+              store_matcher_exception(matcher_err)
+              result = false
+            ensure
+              result
+            end
           else
             true
           end
@@ -65,6 +79,11 @@ module MockServer
       }
     end
 
+    def store_matcher_exception(exception)
+      $mock_server_options[:matcher_exceptions] ||= []
+      $mock_server_options[:matcher_exceptions] << exception
+    end
+
     def load_data
       FileUtils.mkdir_p(@options[:path]) unless File.exists? @options[:path]
 
@@ -82,4 +101,4 @@ module MockServer
     end
 
   end
-end
+end

data/lib/mock_server/record.rb

@@ -22,19 +22,19 @@ module MockServer
       @request = Rack::Request.new(env)
       @data = load_data
 
-      @app.call(env).tap do |response|
-        record_response(response)
+      @app.call(env).tap do |status, header, response|
+        record_response(status, header, response)
         response
       end
     end
   
     private
     
-    def record_response(response)
+    def record_response(status, header, response)
       request = hashified_request
       @data.reject! { |record| record[:request] == request }
 
-      @data << { :request => request, :response => hashify_response(response) }
+      @data << { :request => request, :response => hashify_response(status, header, response) }
       save_data(@data)
     end
 

data/lib/mock_server/spec/helpers.rb

@@ -118,6 +118,13 @@ module MockServer
       end
 
       # Errors / Success stack
+      def mock_server_requests_stack
+        $mock_server_options[:requests_stack] || []
+      end
+
+      def mock_server_requests_stack_clear!
+        $mock_server_options[:requests_stack] = []
+      end
 
       def mock_server_errors_stack
         $mock_server_options[:errors_stack] || []
@@ -136,6 +143,7 @@ module MockServer
       end
 
       def mock_server_response_stack_clear!
+        mock_server_requests_stack_clear!
         mock_server_success_stack_clear!
         mock_server_errors_stack_clear!
       end
@@ -148,7 +156,15 @@ module MockServer
         mock_server_disable_all_routes!
       end
 
+      def mock_server_reraise_matcher_exceptions
+        $mock_server_options[:matcher_exceptions] ||= []
+        $mock_server_options[:matcher_exceptions].each do |exception|
+          raise exception
+        end
+      end
+
       protected
+
       # Configuration
       def mock_server_config_set(key, value)
         $mock_server_options ||= {}
@@ -173,4 +189,4 @@ module MockServer
 
     end
   end
-end
+end

data/lib/mock_server/utils.rb

@@ -1,3 +1,6 @@
+require 'yaml'
+require 'json'
+
 module MockServer
   module Utils
 
@@ -22,27 +25,37 @@ module MockServer
     end
 
     def hashified_request
-      body = JSON.parse(@request.body.to_a.join) rescue ''
+      #rewind to ensure we read from the start
+      @request.body.rewind
+
+      #read body
+      body = @request.body.read
+
+      #rewind in case upstream expects it rewound
+      @request.body.rewind
+
+      json = JSON.parse(body) rescue body
+
       {
         :method  => @request.request_method,
         :path    => @request.path,
         :query   => @request.query_string,
-        :body    => body
+        :body    => json
       }
     end
   
-    def hashify_response(response)
-      status  = response[0]
-      headers = response[1]
-      body    = response[2].body rescue ''
-
+    def hashify_response(status, header, response)
       {
         :method  => @request.request_method,
         :path    => @request.path,
         :status  => status,
-        :headers => headers,
-        :body    => body
+        :headers => header,
+        :body    => if response.respond_to? :body
+          response.body
+        else
+          response.join
+        end
       }
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mock_server
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-10 00:00:00.000000000 Z
+date: 2011-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70269520247400 !ruby/object:Gem::Requirement
+  requirement: &70339623889120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269520247400
+  version_requirements: *70339623889120
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70269520245200 !ruby/object:Gem::Requirement
+  requirement: &70339623902520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70269520245200
+  version_requirements: *70339623902520
 description: 
 email: unixcharles@gmail.com
 executables: []