merb-core 0.9.10 → 0.9.11

data/lib/merb-core/test/helpers/mock_request_helper.rb

@@ -52,7 +52,7 @@ module Merb
             if value.blank?
               self.delete(key)
             else
-              self[key] = Merb::Request.unescape(value)
+              self[key] = Merb::Parse.unescape(value)
             end
           end
         end
@@ -210,7 +210,7 @@ module Merb
       # @api public    
       # @deprecated  
       def build_request(params = {}, env = {})
-        params             = Merb::Request.params_to_query_string(params)
+        params             = Merb::Parse.params_to_query_string(params)
 
         query_string = env[:query_string] || env['QUERY_STRING']
         env[:query_string] = query_string ? "#{query_string}&#{params}" : params

data/lib/merb-core/test/helpers/request_helper.rb

@@ -2,54 +2,48 @@ require "rack"
 
 module Merb
   module Test
-    module RequestHelper
-
-      def describe_request(rack)
-        "a #{rack.original_env[:method] || rack.original_env["REQUEST_METHOD"] || "GET"} to '#{rack.url}'"
-      end
-
-      def describe_input(input)
-        if input.respond_to?(:controller_name)
-          "#{input.controller_name}##{input.action_name}"
-        elsif input.respond_to?(:original_env)
-          describe_request(input)
-        else
-          input
-        end
-      end
-      
-      def status_code(input)
-        input.respond_to?(:status) ? input.status : input
-      end
+    module MakeRequest
 
       def request(uri, env = {})
-        uri = url(uri) if uri.is_a?(Symbol)    
+        uri = url(uri) if uri.is_a?(Symbol)
+        uri = URI(uri)
+        uri.scheme ||= "http"
+        uri.host   ||= "example.org"
 
         if (env[:method] == "POST" || env["REQUEST_METHOD"] == "POST")
           params = env.delete(:body_params) if env.key?(:body_params)
           params = env.delete(:params) if env.key?(:params) && !env.key?(:input)
-          
+
           unless env.key?(:input)
-            env[:input] = Merb::Request.params_to_query_string(params)
+            env[:input] = Merb::Parse.params_to_query_string(params)
             env["CONTENT_TYPE"] = "application/x-www-form-urlencoded"
           end
         end
 
         if env[:params]
-          uri << "?#{Merb::Request.params_to_query_string(env.delete(:params))}"
+          uri.query = [
+            uri.query, Merb::Parse.params_to_query_string(env.delete(:params))
+          ].compact.join("&")
         end
+        
+        ignore_cookies = env.has_key?(:jar) && env[:jar].nil?
 
-        if @__cookie__
-          env["HTTP_COOKIE"] = @__cookie__
+        unless ignore_cookies
+          # Setup a default cookie jar container
+          @__cookie_jar__ ||= Merb::Test::CookieJar.new
+          # Grab the cookie group name
+          jar = env.delete(:jar) || :default
+          # Set the cookie header with the cookies
+          env["HTTP_COOKIE"] = @__cookie_jar__.for(jar, uri)
         end
-
+        
         app = Merb::Rack::Application.new
-        rack = app.call(::Rack::MockRequest.env_for(uri, env))
+        rack = app.call(::Rack::MockRequest.env_for(uri.to_s, env))
 
         rack = Struct.new(:status, :headers, :body, :url, :original_env).
-          new(rack[0], rack[1], rack[2], uri, env)
-
-        @__cookie__ = rack.headers["Set-Cookie"] && rack.headers["Set-Cookie"].join
+          new(rack[0], rack[1], rack[2], uri.to_s, env)
+          
+        @__cookie_jar__.update(jar, uri, rack.headers["Set-Cookie"]) unless ignore_cookies
 
         Merb::Dispatcher.work_queue.size.times do
           Merb::Dispatcher.work_queue.pop.call
@@ -57,9 +51,31 @@ module Merb
 
         rack
       end
-      alias requesting request
-      alias response_for request
+    end
+    
+    module RequestHelper
+      include MakeRequest
+
+      def describe_request(rack)
+        "a #{rack.original_env[:method] || rack.original_env["REQUEST_METHOD"] || "GET"} to '#{rack.url}'"
+      end
+
+      def describe_input(input)
+        if input.respond_to?(:controller_name)
+          "#{input.controller_name}##{input.action_name}"
+        elsif input.respond_to?(:original_env)
+          describe_request(input)
+        else
+          input
+        end
+      end
+      
+      def status_code(input)
+        input.respond_to?(:status) ? input.status : input
+      end
       
+      def requesting(*args)   request(*args) end
+      def response_for(*args) request(*args) end
     end
   end
 end

data/lib/merb-core/test/matchers/request_matchers.rb

@@ -36,6 +36,26 @@ Spec::Matchers.create(:be_missing, :be_client_error) do
   end
 end
 
+Spec::Matchers.create(:have_body) do
+  matches do |rack, body|
+    @actual = if rack.respond_to?(:body)
+      rack.body.to_s
+    else
+      rack.to_s
+    end
+    
+    @actual == body
+  end
+  
+  negative_failure_message do |rack, body|
+    "Expected the response not to match:\n    #{body}\nActual response was:\n    #{@actual}" 
+  end
+  
+  failure_message do |rack, body|
+    "Expected the response to match:\n    #{body}\nActual response was:\n    #{@actual}" 
+  end
+end
+
 Spec::Matchers.create(:have_content_type) do
   matches do |rack, mime_symbol|
     content_type = rack.headers["Content-Type"].split("; ").first

data/lib/merb-core/test/matchers/route_matchers.rb

@@ -56,7 +56,7 @@ module Merb::Test::Rspec::RouteMatchers
     # ==== Returns
     # String:: The failure message.
     def failure_message
-      "expected the request to route to #{@expected_controller.camel_case}##{@expected_action}#{expected_parameters_message}, but was #{@target_controller.camel_case}##{@target_action}#{actual_parameters_message}"
+      "expected the request to route to #{@expected_controller.to_const_string}##{@expected_action}#{expected_parameters_message}, but was #{@target_controller.to_const_string}##{@target_action}#{actual_parameters_message}"
     end
 
     # ==== Returns

data/lib/merb-core/test/test_ext/rspec.rb

@@ -36,8 +36,12 @@ module Merb
       end
     end
 
+    module Matchers
+    end
+    
     class ExampleGroup < Spec::Example::ExampleGroup
 
+      include ::Merb::Test::Matchers
       include ::Merb::Test::ViewHelper
       include ::Merb::Test::RouteHelper
       include ::Merb::Test::ControllerHelper
@@ -76,7 +80,7 @@ module Spec
   
     def self.create(*names, &block)
       @guid ||= 0
-      mod = Module.new do
+      Merb::Test::Matchers.module_eval do
         klass = Class.new(MatcherDSL) do
           def initialize(expected_value)
             @expected_value = expected_value
@@ -91,7 +95,6 @@ module Spec
           end
         end
       end
-      Merb::Test::ExampleGroup.send(:include, mod)
     end
   
     class MatcherDSL

data/lib/merb-core/version.rb

@@ -1,3 +1,3 @@
 module Merb
-  VERSION = '0.9.10' unless defined?(Merb::VERSION)
+  VERSION = '0.9.11' unless defined?(Merb::VERSION)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merb-core
 version: !ruby/object:Gem::Version 
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-21 00:00:00 -07:00
+date: 2008-10-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -153,6 +153,7 @@ files:
 - lib/merb-core/dispatch/default_exception/views/index.html.erb
 - lib/merb-core/dispatch/dispatcher.rb
 - lib/merb-core/dispatch/request.rb
+- lib/merb-core/dispatch/request_parsers.rb
 - lib/merb-core/dispatch/router
 - lib/merb-core/dispatch/router/behavior.rb
 - lib/merb-core/dispatch/router/cached_proc.rb
@@ -192,7 +193,6 @@ files:
 - lib/merb-core/rack/middleware
 - lib/merb-core/rack/middleware/conditional_get.rb
 - lib/merb-core/rack/middleware/content_length.rb
-- lib/merb-core/rack/middleware/csrf.rb
 - lib/merb-core/rack/middleware/path_prefix.rb
 - lib/merb-core/rack/middleware/profiler.rb
 - lib/merb-core/rack/middleware/static.rb
@@ -210,6 +210,7 @@ files:
 - lib/merb-core/test
 - lib/merb-core/test/helpers
 - lib/merb-core/test/helpers/controller_helper.rb
+- lib/merb-core/test/helpers/cookie_jar.rb
 - lib/merb-core/test/helpers/mock_request_helper.rb
 - lib/merb-core/test/helpers/multipart_request_helper.rb
 - lib/merb-core/test/helpers/request_helper.rb

data/lib/merb-core/rack/middleware/csrf.rb

@@ -1,73 +0,0 @@
-require 'digest/md5'
-
-module Merb
-  module Rack
-
-    class Csrf < Merb::Rack::Middleware
-      HTML_TYPES = %w(text/html application/xhtml+xml)
-      POST_FORM_RE = Regexp.compile('(<form\W[^>]*\bmethod=(\'|"|)POST(\'|"|)\b[^>]*>)', Regexp::IGNORECASE)
-      ERROR_MSG = '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"><body><h1>403 Forbidden</h1><p>Cross Site Request Forgery detected. Request aborted.</p></body></html>'.freeze
-
-      def call(env)
-        status, header, body = @app.call(env)
-        body = body.to_s
-        if env[Merb::Const::REQUEST_METHOD] == Merb::Const::GET
-          body = process_response(body) if valid_content_type?(header[Merb::Const::CONTENT_TYPE])
-        elsif env[Merb::Const::REQUEST_METHOD] == Merb::Const::POST
-          status, body = process_request(env, status, body)
-        end
-
-        [status, header, body]
-      end
-
-      private
-      def process_request(env, status, body)
-        session_id = Merb::Config[:session_id_key]
-        csrf_token = _make_token(session_id)
-
-        request_csrf_token = env['csrf_authentication_token']
-
-        unless csrf_token == request_csrf_token
-          exception = Merb::ControllerExceptions::Forbidden.new(ERROR_MSG)
-          status = exception.status
-          body = exception.message
-
-          return [status, body]
-        end
-
-        return [status, body]
-      end
-
-      def process_response(body)
-        session_id = Merb::Config[:session_id_key]
-        csrf_token = _make_token(session_id)
-
-        if csrf_token
-          modified_body = ''
-          body.scan(POST_FORM_RE) do |match|
-            modified_body << add_csrf_field($~, csrf_token)
-          end
-
-          body = modified_body
-        end
-
-        body
-      end
-
-      def add_csrf_field(match, csrf_token)
-        modified_body = match.pre_match
-        modified_body << match.to_s
-        modified_body << "<div style='display: none;'><input type='hidden' id='csrf_authentication_token' name='csrf_authentication_token' value='#{csrf_token}' /></div>"
-        modified_body << match.post_match
-      end
-
-      def valid_content_type?(content_type)
-        HTML_TYPES.include?(content_type.split(';').first)
-      end
-
-      def _make_token(session_id)
-        Digest::MD5.hexdigest(Merb::Config[:session_secret_key] + session_id)
-      end
-    end
-  end
-end