dcrec1-rspec-vraptor 0.4 → 0.5

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
  
 GEM = "rspec-vraptor"
-GEM_VERSION = "0.4"
+GEM_VERSION = "0.5"
 SUMMARY = "RSpec for VRaptor Sexy URLs"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"

data/lib/environment.rb

@@ -14,15 +14,20 @@ import java.util.HashSet
 import java.util.Locale
 
 def req(x)
-  require File.dirname(__FILE__) + "/spec/vraptor/mocked_#{x}"
+  require File.dirname(__FILE__) + "/spec/vraptor/#{x}"
 end
 
-req 'config'
-req 'http_session'
-req 'http_request'
-req 'http_response'
-req 'request_dispatcher'
-req 'servlet_context'
+def req_mocked(x)
+  req "mocked_#{x}"
+end
+
+req 'matchers'
+req_mocked 'config'
+req_mocked 'http_session'
+req_mocked 'http_request'
+req_mocked 'http_response'
+req_mocked 'request_dispatcher'
+req_mocked 'servlet_context'
 
 Spec::Runner.configure do |config|
   config.include(VRaptorMatchers)

data/lib/spec/vraptor/matchers.rb

@@ -0,0 +1,43 @@
+module VRaptorMatchers
+  class RedirectTo
+    def initialize(path)
+      @path = path
+    end
+    
+    def matches?(target)
+      @target = target
+      @target.destination.eql? @path
+    end
+    
+    def failure_message
+      "expected response to redirect to #{@target.destination}, is redirecting to #{@path}"
+    end
+  end
+  
+  def redirect_to(expected)
+    RedirectTo.new(expected)
+  end
+  
+  class Render
+    def initialize(target)
+      @target = "/#{target}"
+    end
+    
+    def matches?(request)
+      @dispatcher = request.dispatcher
+      @dispatcher.target.eql? @target
+    end
+    
+    def failure_message
+      "expected response to redirect to #{@dispatcher.target}, is redirecting to #{@target}"
+    end
+  end
+  
+  def redirect_to(expected)
+    RedirectTo.new(expected)
+  end
+  
+  def render(expected)
+    Render.new(expected)
+  end
+end

data/lib/spec/vraptor/mocked_http_request.rb

@@ -2,14 +2,15 @@ class MockedHttpRequest
   include HttpServletRequest
   attr_accessor :dispatcher, :session, :request_uri, :parameter_map, :headers, :attributes, :locale
   
-  def initialize(dispatcher, session, uri, map, injection, headers, locale)
+  def initialize(session, uri, map, injection, headers, locale)
     @locale = locale
     @attributes = injection
     @headers = {'Host' => '72.14.205.100'}.merge! headers
-    @dispatcher, @session, @request_uri, @parameter_map = MockedRequestDispatcher.new, session, uri, map
+    @session, @request_uri, @parameter_map = session, uri, map
   end
   
   def get_request_dispatcher(x)
+    @dispatcher = MockedRequestDispatcher.new(x)
     @dispatcher
   end
   

data/lib/spec/vraptor/mocked_http_response.rb

@@ -1,6 +1,6 @@
 class MockedHttpResponse
   include HttpServletResponse
-  attr_accessor :status, :error
+  attr_accessor :status, :error, :target
   
   def initialize
     @status = 200
@@ -15,32 +15,11 @@ class MockedHttpResponse
   end
   
   def send_redirect(path)
-    @redirect = path
+    @target = path
   end
   
   def destination
-    @redirect
+    @target
   end
   
 end
-
-module VRaptorMatchers
-  class RedirectTo
-    def initialize(path)
-      @path = path
-    end
-    
-    def matches?(target)
-      @target = target
-      @target.destination.eql? @path
-    end
-    
-    def failure_message
-      "expected response to redirect to #{@target.destination}, is redirecting to #{@path}"
-    end
-  end
-  
-  def redirect_to(expected)
-    RedirectTo.new(expected)
-  end
-end

data/lib/spec/vraptor/mocked_request_dispatcher.rb

@@ -1,6 +1,13 @@
 class MockedRequestDispatcher
   include RequestDispatcher
   
+  attr_reader :request, :target
+  
+  def initialize(target)
+    @target = target
+  end
+  
   def forward(request, response)
+    @request = request
   end
 end

data/lib/spec/vraptor.rb

@@ -4,9 +4,8 @@ def get(x, map = {}) #params_request = {}, params_session = {}, injection = {},
   init
   params = {:request => {}, :session => {}, :inject => {}, :headers => {}}.merge map
   @response = MockedHttpResponse.new
-  dispatcher = MockedRequestDispatcher.new
   @session = MockedHttpSession.new($context, params[:session], @session_id)
-  @request = MockedHttpRequest.new(dispatcher, @session, x, Rhyme.translate(params[:request]), params[:inject], params[:headers], Locale.new('en', 'US'))
+  @request = MockedHttpRequest.new(@session, x, Rhyme.translate(params[:request]), params[:inject], params[:headers], Locale.new('en', 'US'))
 
   $filter.do_filter(@request, @response, $chain)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dcrec1-rspec-vraptor
 version: !ruby/object:Gem::Version 
-  version: "0.4"
+  version: "0.5"
 platform: ruby
 authors: 
 - Diego Carrion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-30 00:00:00 -08:00
+date: 2009-02-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -29,6 +29,7 @@ files:
 - lib/spec/vraptor/mocked_request_dispatcher.rb
 - lib/spec/vraptor/mocked_servlet_context.rb
 - lib/spec/vraptor/mocked_http_request.rb
+- lib/spec/vraptor/matchers.rb
 - lib/environment.rb
 - README.textile
 - Rakefile