ramaze 2012.12.08b → 2023.01.06

data/spec/ramaze/dispatcher/directory.rb

@@ -3,7 +3,7 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-spec_require 'hpricot'
+spec_require 'nokogiri'
 
 Ramaze.middleware(:spec) do
   run Rack::ETag.new(
@@ -36,37 +36,47 @@ describe 'Directory listing' do
     get('path').body
   end
 
-  def check(url, title, list)
+  def check(url, title, list, ignore_order = false)
     got = get(url)
-    got.status.should == 200
+
+    got.status.should          == 200
     got['Content-Type'].should == 'text/html; charset=utf-8'
 
-    doc = Hpricot(got.body)
+    doc = Nokogiri::HTML(got.body)
+
     doc.at(:title).inner_text.should == title
 
-    (doc/'td.name/a').map{|a| [a[:href], a.inner_text] }.should == list
+    urls = doc.css('td.name a').map do |a|
+      ["/#{a[:href]}".squeeze('/'), a.inner_text]
+    end
+    if ignore_order
+      urls.flatten.sort.should == list.flatten.sort
+    else
+      urls.should == list
+    end
   end
 
   should 'dry serve root directory' do
-   files = [
-     ["../", "Parent Directory"],
-     ["/favicon.ico", "favicon.ico"],
-     ["/file+name.txt", "file name.txt"],
-     ["/test/", "test/"],
-     ["/test_download.css", "test_download.css"]
-   ]
+    files = [
+      # ["/../", "Parent Directory"],
+      ["/favicon.ico", "favicon.ico"],
+      ["/test/", "test/"],
+      ["/test_download.css", "test_download.css"],
+      ["/file%20name.txt", "file name.txt"]
+    ]
 
     check '/', '/', files
   end
 
   should 'serve hierarchies' do
     files = [
-      ["../", "Parent Directory"],
+      ["/test/../", "Parent Directory"],
       ["/test/deep/", "deep/"],
       ["/test/five.txt", "five.txt"],
       ["/test/six.txt", "six.txt"]
     ]
-    check '/test', '/test', files
+
+    check '/test', '/test', files, true
   end
 
   FileUtils.rm_rf(__DIR__('public/test'))

data/spec/ramaze/dispatcher/file.rb

@@ -3,11 +3,6 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-# This spec more or less tries to ensure that we integrate with rack and
-# rack-contrib in regards to static file serving.
-
-spec_require 'rack/contrib'
-
 Ramaze.middleware(:spec) do
   use Rack::ConditionalGet
   use Rack::ETag

data/spec/ramaze/error.rb

@@ -2,8 +2,7 @@
 # All files in this distribution are subject to the terms of the MIT license.
 
 require File.expand_path('../../../spec/helper', __FILE__)
-require 'rexml/document'
-require 'rexml/xpath'
+require 'nokogiri'
 
 class SpecError < Ramaze::Controller
   map '/'
@@ -40,15 +39,14 @@ describe 'Error handling' do
   Ramaze.options.mode = :dev
 
   it 'uses Rack::ShowException to display errors' do
-    got = get('/raises')
-    [got.status, got['Content-Type']].should == [500, 'text/html']
-
-    # we use this xpath notation because otherwise rexml is really slow...
-    doc = REXML::Document.new(got.body)
-    REXML::XPath.first(doc, "/html/body/div[1]/h1").text.
-      should == "NameError at /raises"
-    REXML::XPath.first(doc, "/html/body/div[4]/p/code").text.
-      should == "Rack::ShowExceptions"
+    got = get('/raises', {}, {'HTTP_ACCEPT' => 'text/html'})
+    got.status.should == 500
+    got['Content-Type'].should == 'text/html'
+
+    doc = Nokogiri::HTML(got.body)
+    doc.at("#summary").text.should.match(/NameError at \/raises/)
+    doc.at("#explanation").text.strip.should ==
+      "You're seeing this error because you use Rack::ShowExceptions."
   end
 
   it 'uses original action_missing when no action was found' do
@@ -78,11 +76,9 @@ describe 'Error handling' do
     got = get('/empty')
     [got.status, got['Content-Type']].should == [404, 'text/html']
 
-    # we use this xpath notation because otherwise rexml is really slow...
-    doc = REXML::Document.new(got.body)
-    REXML::XPath.first(doc, "/html/body/div[1]/h1").text.strip.
-      should == "Not Found"
-    REXML::XPath.first(doc, "/html/body/div[3]/p/code").text.
-      should == "Rack::ShowStatus"
+    doc = Nokogiri::HTML(got.body)
+    doc.at("#info").text.strip.should == "Not Found"
+    doc.at("#explanation").text.strip.should ==
+      "You're seeing this error because you use Rack::ShowStatus."
   end
 end

data/spec/ramaze/helper/paginate.rb

@@ -2,7 +2,8 @@
 # All files in this distribution are subject to the terms of the MIT license.
 
 require File.expand_path('../../../../spec/helper', __FILE__)
-spec_require 'hpricot'
+
+spec_require 'nokogiri'
 
 class SpecHelperPaginateArray < Ramaze::Controller
   map '/array'
@@ -31,6 +32,13 @@ class SpecHelperPaginateArray < Ramaze::Controller
     pager.each{|item| out << item }
     out.inspect
   end
+
+  def preserve_params
+    request.params['single'] = 'zero'
+    request.params['multiple'] = %w[ one two three ]
+    pager = paginate(ALPHA)
+    pager.navigation
+  end
 end
 
 describe Ramaze::Helper::Paginate do
@@ -38,8 +46,9 @@ describe Ramaze::Helper::Paginate do
     behaves_like :rack_test
 
     it 'shows navigation for page 1' do
-      doc = Hpricot(get("/array/navigation").body)
-      (doc/:a).map{|a| [a.inner_text, a[:href]] }.
+      doc = Nokogiri::HTML(get("/array/navigation").body)
+
+      doc.css('a').map{|a| [a.inner_text, a[:href]] }.
         should == [
           ['1', '/array/navigation?pager=1'],
           ['2', '/array/navigation?pager=2'],
@@ -49,8 +58,9 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'shows navigation for page 2' do
-      doc = Hpricot(get("/array/navigation?pager=2").body)
-      (doc/:a).map{|a| [a.inner_text, a[:href]] }.
+      doc = Nokogiri::HTML(get("/array/navigation?pager=2").body)
+
+      doc.css('a').map{|a| [a.inner_text, a[:href]] }.
         should == [
           ['<<', '/array/navigation?pager=1'],
           ['<', '/array/navigation?pager=1'],
@@ -62,8 +72,8 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'shows navigation for page 3' do
-      doc = Hpricot(get("/array/navigation?pager=3").body)
-      (doc/:a).map{|a| [a.inner_text, a[:href]] }.
+      doc = Nokogiri::HTML(get("/array/navigation?pager=3").body)
+      doc.css('a').map{|a| [a.inner_text, a[:href]] }.
         should == [
           ['<<', '/array/navigation?pager=1'],
           ['<', '/array/navigation?pager=2'],
@@ -78,7 +88,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets default css elements on page 1' do
-      doc = Hpricot(get('/array/navigation').body)
+      doc = Nokogiri::HTML(get('/array/navigation').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the first page, the first two
       # elements are spans, then a's
@@ -109,7 +119,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets default css elements on page 2' do
-      doc = Hpricot(get('/array/navigation?pager=2').body)
+      doc = Nokogiri::HTML(get('/array/navigation?pager=2').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the second page, none are disabled
       # Note that this is only valid for the second page since
@@ -140,7 +150,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets default css elements on page 3' do
-      doc = Hpricot(get('/array/navigation?pager=3').body)
+      doc = Nokogiri::HTML(get('/array/navigation?pager=3').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the last page, last and next will be disabled
       # Note that this is only valid for the third page
@@ -173,7 +183,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets our custom css elements for page 1' do
-      doc = Hpricot(get('/array/custom_navigation').body)
+      doc = Nokogiri::HTML(get('/array/custom_navigation').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the first page, the first two
       # elements are spans, then a's
@@ -209,7 +219,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets our custom css elements on page 2' do
-      doc = Hpricot(get('/array/custom_navigation?pager=2').body)
+      doc = Nokogiri::HTML(get('/array/custom_navigation?pager=2').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the second page, none are disabled
       # Note that this is only valid for the second page since
@@ -240,7 +250,7 @@ describe Ramaze::Helper::Paginate do
     end
 
     it 'sets our custom css elements on page 3' do
-      doc = Hpricot(get('/array/custom_navigation?pager=3').body)
+      doc = Nokogiri::HTML(get('/array/custom_navigation?pager=3').body)
       # Paginator outputs spans for disabled elements
       # Since we're on the last page, last and next will be disabled
       # Note that this is only valid for the third page
@@ -272,5 +282,23 @@ describe Ramaze::Helper::Paginate do
 
     end
 
+    it 'preserves single value params' do
+      doc = Nokogiri::HTML(get("/array/preserve_params").body)
+      params = doc.search("//a").first[:href].split('?').last.split('&')
+      params.should.include 'single=zero'
+      params.should.not.include 'single[]'.escape(:cgi) + '=zero'
+    end
+
+    it 'preserves multi value params' do
+      doc = Nokogiri::HTML(get("/array/preserve_params").body)
+      params = doc.search("//a").first[:href].split('?').last.split('&')
+      params.should.not.include 'multiple=one'
+      params.should.not.include 'multiple=two'
+      params.should.not.include 'multiple=three'
+      params.should.include 'multiple[]'.escape(:cgi) + '=one'
+      params.should.include 'multiple[]'.escape(:cgi) + '=two'
+      params.should.include 'multiple[]'.escape(:cgi) + '=three'
+    end
+
   end
 end

data/spec/ramaze/log/syslog.rb

@@ -4,9 +4,9 @@
 
 require File.expand_path('../../../../spec/helper', __FILE__)
 
-spec_precondition 'Syslog should be supported' do
+spec_precondition 'Process.fork should be supported' do
   if RUBY_DESCRIPTION.include?('jruby')
-    should.flunk 'Forking/Syslog is not supported'
+    should.flunk 'These tests use Process.fork which does not work on jruby'
   end
 end
 
@@ -14,70 +14,82 @@ require 'ramaze/log/syslog'
 
 describe 'Syslog' do
 
-	# close the syslog, if it was open for some reason before we
-	# start a test.
-	before do
-		if ( Syslog.opened? )
-			::Syslog.close
-		end
-	end
+  # close the syslog, if it was open for some reason before we
+  # start a test.
+  before do
+    Syslog.close if Syslog.opened?
+  end
+
+  it 'should default initialize correctly' do
+    syslog = Ramaze::Logger::Syslog.new
+    ::Syslog.opened?.should == true
+    ::Syslog.ident.should   == $0
+    ::Syslog.options.should == ( ::Syslog::LOG_PID | ::Syslog::LOG_CONS )
+    ::Syslog.facility.should == ::Syslog::LOG_USER
+  end
+
+  it 'should handle non default initialization' do
+    syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
+                                                   ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT,
+                                                   ::Syslog::LOG_DAEMON )
+    ::Syslog.opened?.should == true
+    ::Syslog.ident.should   == 'ramaze_syslog_test'
+    ::Syslog.options.should == ( ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT )
+    ::Syslog.facility.should == ::Syslog::LOG_DAEMON
+  end
+
+  # We test the actual logging using a trick found in te test code of the
+  # syslog module.  We create a pipe, fork a child, reroute the childs
+  # stderr to the pipe. Then we open the logging using LOG_PERROR, so all
+  # log messages are written to stderror.  In the parent we read the messages
+  # from the pipe and compare them to what we expected.
+  def test_log_msg( type, priority, msg )
+    logpipe = IO::pipe
+    child = fork {
+      logpipe[0].close
+      STDERR.reopen(logpipe[1])
+      syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
+                                                    ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR,
+                              ::Syslog::LOG_USER )
+      syslog.send priority, msg
+      Process.exit!( 0 )
+    }
+    logpipe[1].close
+    Process.waitpid(child)
+    label = case priority
+            # when 'debug', 'info', 'error'
+            #   priority
+            when :dev
+              'debug'
+            when :warn
+              'warning'
+            else
+              priority.to_s
+            end
+    logpipe[0].gets.slice(/ramaze.*/).should == "ramaze_syslog_test[#{child}] <#{label.capitalize}>: #{msg}"
+  end
 
-	it 'should default initialize correctly' do
-		syslog = Ramaze::Logger::Syslog.new
-		::Syslog.opened?.should == true
-		::Syslog.ident.should   == $0
-		::Syslog.options.should == ( ::Syslog::LOG_PID | ::Syslog::LOG_CONS )
-		::Syslog.facility.should == ::Syslog::LOG_USER
-	end
+  it 'should handle debug' do
+    test_log_msg :direct, :debug, "Hello Debug World"
+  end
 
-	it 'should handle non default initialization' do
-		syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
-		                                               ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT,
-		                                               ::Syslog::LOG_DAEMON )
-		::Syslog.opened?.should == true
-		::Syslog.ident.should   == 'ramaze_syslog_test'
-		::Syslog.options.should == ( ::Syslog::LOG_NDELAY | ::Syslog::LOG_NOWAIT )
-		::Syslog.facility.should == ::Syslog::LOG_DAEMON
-	end
+  it 'should handle dev' do
+    test_log_msg :direct, :dev, "Hello Dev World"
+  end
 
-    # We test the actual logging using a trick found in te test code of the
-    # syslog module.  We create a pipe, fork a child, reroute the childs
-    # stderr to the pipe. Then we open the logging using LOG_PERROR, so all
-    # log messages are written to stderror.  In the parent we read the messages
-    # from the pipe and compare them to what we expected.
-	def test_log_msg( type, priority, msg )
-		logpipe = IO::pipe
-		child = fork {
-			logpipe[0].close
-			STDERR.reopen(logpipe[1])
-			syslog = Ramaze::Logger::Syslog.new( 'ramaze_syslog_test',
-			                                              ::Syslog::LOG_PID | ::Syslog::LOG_NDELAY | ::Syslog::LOG_PERROR,
-														  ::Syslog::LOG_USER )
-			syslog.send priority, msg
-			Process.exit!( 0 )
-		}
-		logpipe[1].close
-		Process.waitpid(child)
+  it 'should handle info' do
+    test_log_msg :direct, :info, 'Hello Info World!'
+  end
 
-		logpipe[0].gets.should == "ramaze_syslog_test[#{child}]: #{msg}\n"
-	end
+  it 'should handle warn' do
+    test_log_msg :direct, :warn, 'Hello Warn World!'
+  end
 
-	it 'should handle debug' do
-		test_log_msg :direct, :debug, "Hello Debug World"
-	end
-	it 'should handle dev' do
-		test_log_msg :direct, :dev, "Hello Dev World"
-	end
-	it 'should handle info' do
-		test_log_msg :direct, :info, 'Hello Info World!'
-	end
-	it 'should handle warn' do
-		test_log_msg :direct, :warn, 'Hello Warn World!'
-	end
-	it 'should handle error' do
-		test_log_msg :direct, :error, 'Hello Error World!'
-	end
-	it 'should escape % sequences' do
-		test_log_msg :direct, :info, "Hello Cruel |évil| 戈 REAL %s World"
-	end
+  it 'should handle error' do
+    test_log_msg :direct, :error, 'Hello Error World!'
+  end
+
+  it 'should escape % sequences' do
+    test_log_msg :direct, :info, "Hello Cruel |évil| 戈 REAL %s World"
+  end
 end

data/spec/ramaze/session/redis.rb

@@ -2,8 +2,8 @@ require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'redis'
 
 spec_precondition 'Redis is running' do
-  cache           = Redis.new
-  cache['active'] = true
+  cache = Redis.new
+  "OK" == cache.set('testkey', 'testval')
 end
 
 class SpecSession < Ramaze::Controller

data/spec/ramaze/session/sequel.rb

@@ -1,4 +1,6 @@
 require File.expand_path('../../../../spec/helper', __FILE__)
+
+spec_require 'sqlite3'
 spec_require 'sequel'
 
 class SpecSession < Ramaze::Controller

data/spec/ramaze/view/haml.rb

@@ -72,7 +72,7 @@ describe Ramaze::View::Haml do
   <li>
     <a href='/external'>External template</a>
   </li>
-</ul>"
+</ul>".gsub(/\n\s+/, "\n")
   end
 
   should 'render external template' do
@@ -87,7 +87,7 @@ describe Ramaze::View::Haml do
   <body>
     <h1>Haml Template</h1>
   </body>
-</html>"
+</html>".gsub(/\n\s+/, "\n")
   end
 
   should 'render external template with instance variables' do
@@ -97,7 +97,7 @@ describe Ramaze::View::Haml do
     got.body.strip.should ==
 "<div>
   3
-</div>"
+</div>".gsub(/\n\s+/, "\n")
   end
 
   should 'render the wrapped view twice even with caching' do

data/spec/ramaze/view/slim.rb

@@ -39,7 +39,7 @@ describe 'Ramaze::View::Slim' do
   end
 
   should 'render an external template with variables' do
-    got = get('/external')
+    got = get('/external_vars')
 
     got.status.should          == 200
     got['Content-Type'].should == 'text/html'