dcrec1-rspec-vraptor 0.9.5 → 0.9.6

data/README.textile

@@ -43,16 +43,6 @@ end</code></pre>
 
 h2. SPECING:
 
-Before running specs:
-
-If you are using linux
-<pre><code>export CLASSPATH=inc/servlet-api-2.5.jar:inc/vraptor-2.6.3.jar:inc/log4j-1.2.12.jar</code></pre>
-
-If you are using windows
-<pre><code>set CLASSPATH=inc\servlet-api-2.5.jar;inc\vraptor-2.6.3.jar;inc\log4j-1.2.12.jar</code></pre>
-
-Then to spec:
-
 <pre><code>jruby -S rake spec</code></pre>
 
 h2. LICENSE:

data/Rakefile

@@ -1,3 +1,6 @@
+$CLASSPATH << 'inc/log4j-1.2.12.jar'
+$CLASSPATH << 'inc/servlet-api-2.5.jar'
+
 require 'rubygems'
 require 'rubygems/specification'
 require 'rake'
@@ -5,8 +8,8 @@ require 'rake/gempackagetask'
 require 'spec/rake/spectask'
  
 GEM = "rspec-vraptor"
-GEM_VERSION = "0.9.5"
-SUMMARY = "RSpec for VRaptor Sexy URLs"
+GEM_VERSION = "0.9.6"
+SUMMARY = "RSpec for VRaptor Sexy/Nice URLs"
 AUTHOR = "Diego Carrion"
 EMAIL = "dc.rec1@gmail.com"
 HOMEPAGE = "http://www.diegocarrion.com"
@@ -26,10 +29,26 @@ spec = Gem::Specification.new do |s|
   s.rubyforge_project = GEM # GitHub bug, gem isn't being build when this miss
 end
 
-Spec::Rake::SpecTask.new do |t|
+Spec::Rake::SpecTask.new('spec') do |t|
   t.spec_files = FileList['spec/**/*_spec.rb']
   t.spec_opts = %w(--color)
 end
+
+task :set_sexy do
+  $CLASSPATH << 'inc/vraptor-2.6.3.jar'
+  $CLASSPATH << 'inc/picocontainer-1.3.jar' 
+end
+
+task :set_nice do
+  $CLASSPATH << 'inc/vraptor-2.6.0.jar' 
+  $CLASSPATH << 'inc/picocontainer-2.7.jar'
+end
+
+desc "Run specs for VRaptor Nice URLs"
+task :'spec:nice' => [:set_nice, :spec]
+
+desc "Run specs for VRaptor Sexy URLs"
+task :'spec:sexy' => [:set_sexy, :spec]
   
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.gem_spec = spec

data/lib/environment.rb

@@ -10,7 +10,16 @@ import javax.servlet.FilterConfig
 import javax.servlet.FilterChain
 import javax.servlet.ServletContext
 import javax.servlet.RequestDispatcher
-import org.vraptor.VRaptorFilter
+begin
+  import org.vraptor.VRaptorFilter
+rescue
+  $VRAPTOR_VERSION = "Nice"
+end
+begin
+  import org.vraptor.plugin.niceurls.NiceURLFilter
+rescue
+  $VRAPTOR_VERSION = "Sexy"
+end
 import java.util.HashSet
 import java.util.Locale
 
@@ -23,7 +32,7 @@ def req_mocked(x)
 end
 
 req 'matchers'
-req_mocked 'config'
+req_mocked 'filter_config'
 req_mocked 'http_session'
 req_mocked 'http_request'
 req_mocked 'http_response'

data/lib/spec/vraptor/mocked_http_request.rb

@@ -6,7 +6,7 @@ class MockedHttpRequest
     @locale = locale
     @attributes = injection
     @headers = {'Host' => '72.14.205.100'}.merge! headers
-    @context_path = "/sso"
+    @context_path = "/context"
     @session, @request_uri, @parameter_map = session, @context_path + uri, map
     @cookies = cookies
   end

data/lib/spec/vraptor/mocked_servlet_context.rb

@@ -4,11 +4,9 @@ class MockedServletContext
   
   def initialize
     @attributes = {}
-    @basic_path = java.io.File.new("").get_absolute_path
   end
   
   def get_init_parameter(x)
-    nil
   end
   
   def get_context(uri_path)
@@ -28,32 +26,21 @@ class MockedServletContext
   end
   
   def get_resource_paths(path)
-    if path.eql? "/WEB-INF/classes/"
-      path = "target/classes/"
-    else
-      path = path.sub("/WEB-INF/classes/", "")
-    end
-    root_folder = java.io.File.new(java.io.File.new(@basic_path), path)
-    paths = HashSet.new
-    root_folder.list.each do |file_name|
-      if java.io.File.new(root_folder, file_name).is_directory
-        file_name = file_name + '/'
-      end
-      name = path + file_name
-      if name.include? ".class"
-        name = name.sub("target", "/WEB-INF")
-      end
-      paths.add(name)
+    paths = HashSet.new  
+    path = @basic_path = ($CLASSPATH.select {|p| p.include? "classes"})[0].sub("file:", "") if path.eql? "/WEB-INF/classes/"
+    Dir[path + "*"].each do |path|
+      path = path + "/" unless path.include? "."
+      path = path.gsub(@basic_path, "/WEB-INF/classes/") if path.include? ".class"
+      paths.add path
     end
     paths
   end
+
+  def get_resource(x)
+  end
   
-  def get_real_path(x)
-    if !x.include? ".class"
-      java.io.File.new("").get_absolute_path + "/" + x
-    else
-      x
-    end
+  def get_real_path(path)
+    path
   end
   
   def set_attribute(x, y)

data/lib/spec/vraptor.rb

@@ -16,7 +16,7 @@ def init
     
     $config = MockedFilterConfig.new($context)
     
-    $filter = VRaptorFilter.new
+    $filter = ($VRAPTOR_VERSION.eql?("Sexy") ? VRaptorFilter : NiceURLFilter).new
     $filter.init($config)
     
     $chain = mock(FilterChain)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dcrec1-rspec-vraptor
 version: !ruby/object:Gem::Version 
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors: 
 - Diego Carrion

data/lib/spec/vraptor/mocked_config.rb

@@ -1,13 +0,0 @@
-class MockedFilterConfig
-  include FilterConfig
-  
-  attr_accessor :context
-  
-  def initialize(context)
-    @context = context
-  end
-  
-  def getServletContext
-    @context
-  end
-end