ramaze 0.2.1 → 0.3.0

data/spec/ramaze/template.rb

@@ -31,9 +31,7 @@ class TCTemplateController < Ramaze::Controller
 end
 
 describe "testing ramaze template" do
-  before :all do
-    ramaze
-  end
+  ramaze
 
   def getpage page
     content = Ramaze::Controller.handle(page)
@@ -45,7 +43,7 @@ describe "testing ramaze template" do
 
     @action.should == "index"
     @params.should == []
-    @file.should be_nil
+    @file.should == nil
   end
 
   it "Maps the index" do
@@ -53,7 +51,7 @@ describe "testing ramaze template" do
 
     @action.should == "index"
     @params.should == []
-    @file.should be_nil
+    @file.should == nil
   end
 
   it "Parses parameters" do
@@ -61,7 +59,7 @@ describe "testing ramaze template" do
 
     @action.should == "index"
     @params.should == %w{one two three}
-    @file.should be_nil
+    @file.should == nil
   end
 
   it "Knows about other methods" do
@@ -69,7 +67,7 @@ describe "testing ramaze template" do
 
     @action.should == "some_other_method"
     @params.should == []
-    @file.should be_nil
+    @file.should == nil
   end
 
   it "Uses external template files" do

data/spec/ramaze/template/amrita2.rb

@@ -3,12 +3,14 @@
 
 require 'spec/helper'
 
-testcase_requires 'amrita2'
+spec_require 'amrita2'
 
 class TCTemplateAmritaController < Ramaze::Controller
   template_root __DIR__/:amrita2
   engine :Amrita2
 
+  private
+
   def title
     "hello world"
   end
@@ -19,6 +21,7 @@ class TCTemplateAmritaController < Ramaze::Controller
 end
 
 describe "Simply calling" do
+  behaves_like 'http'
   ramaze(:mapping => {'/' => TCTemplateAmritaController})
 
   it "should respond to /data" do

data/spec/ramaze/template/erubis.rb

@@ -3,7 +3,7 @@
 
 require 'spec/helper'
 
-testcase_requires 'erubis'
+spec_require 'erubis'
 
 class TCTemplateErubisController < Ramaze::Controller
   template_root __DIR__/:erubis
@@ -24,6 +24,7 @@ class TCTemplateErubisController < Ramaze::Controller
 end
 
 describe "Erubis" do
+  behaves_like 'http'
   ramaze(:mapping => {'/' => TCTemplateErubisController})
 
   it "index" do

data/spec/ramaze/template/ezamar.rb

@@ -32,9 +32,8 @@ end
 
 
 describe "Ezamar" do
-  before(:all) do
-    ramaze
-  end
+  behaves_like 'http'
+  ramaze
 
   it "hello world" do
     get('/World').body.should == 'Hello, World!'

data/spec/ramaze/template/ezamar/other__index.xhtml

@@ -0,0 +1 @@
+This is the index of /other

data/spec/ramaze/template/haml.rb

@@ -3,7 +3,7 @@
 
 require 'spec/helper'
 
-testcase_requires 'ramaze/template/haml'
+spec_require 'ramaze/template/haml'
 
 class TCTemplateHamlController < Ramaze::Controller
   map :/
@@ -31,6 +31,7 @@ class TCTemplateHamlLocalsController < Ramaze::Controller
 end
 
 describe "Haml templates" do
+  behaves_like 'http'
   ramaze(:compile => true)
 
   it "should render" do

data/spec/ramaze/template/liquid.rb

@@ -3,7 +3,7 @@
 
 require 'spec/helper'
 
-testcase_requires 'liquid'
+spec_require 'liquid'
 
 module ProductsFilter
   def price(integer)
@@ -25,6 +25,7 @@ end
 
 
 class TCTemplateLiquidController < Ramaze::Controller
+  map '/'
   template_root 'spec/ramaze/template/liquid/'
   engine :Liquid
   trait :liquid_options => { :filters => ProductsFilter }
@@ -48,7 +49,8 @@ class TCTemplateLiquidController < Ramaze::Controller
 end
 
 describe "Liquid" do
-  ramaze(:mapping => {'/' => TCTemplateLiquidController})
+  behaves_like 'http'
+  ramaze
 
   it "index" do
     get('/').body.strip.should == "hi tobi"

data/spec/ramaze/template/markaby.rb

@@ -3,9 +3,10 @@
 
 require 'spec/helper'
 
-testcase_requires 'markaby'
+spec_require 'markaby'
 
 class TCTemplateMarkabyController < Ramaze::Controller
+  map '/'
   template_root 'spec/ramaze/template/markaby/'
   engine :Markaby
 
@@ -34,7 +35,8 @@ class TCTemplateMarkabyController < Ramaze::Controller
 end
 
 describe "Markaby" do
-  ramaze(:mapping => {'/' => TCTemplateMarkabyController})
+  behaves_like 'http'
+  ramaze
 
   it "index" do
     get('/').body.should == '<h1>Markaby Index</h1>'

data/spec/ramaze/template/nagoro.rb

@@ -2,7 +2,7 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'spec/helper'
-testcase_requires 'nagoro'
+spec_require 'nagoro'
 
 class TCTemplateNagoroController < Ramaze::Controller
   map :/
@@ -33,9 +33,8 @@ end
 
 
 describe "Nagoro" do
-  before(:all) do
-    ramaze
-  end
+  behaves_like 'http'
+  ramaze
 
   it "hello world" do
     get('/World').body.should == 'Hello, World!'

data/spec/ramaze/template/remarkably.rb

@@ -2,9 +2,10 @@
 # All files in this distribution are subject to the terms of the Ruby license.
 
 require 'spec/helper'
-testcase_requires 'remarkably/engines/html'
+spec_require 'remarkably/engines/html'
 
 class TCTemplateRemarkablyController < Ramaze::Controller
+  map '/'
   template_root 'spec/ramaze/template/remarkably/'
   engine :Remarkably
 
@@ -31,7 +32,8 @@ class TCTemplateRemarkablyController < Ramaze::Controller
 end
 
 describe "Remarkably" do
-  ramaze(:mapping => {'/' => TCTemplateRemarkablyController})
+  behaves_like 'http'
+  ramaze
 
   def retrieve(*url)
     Ramaze::Controller.handle(*url)

data/spec/ramaze/template/sass.rb

@@ -3,7 +3,7 @@
 
 require 'spec/helper'
 
-testcase_requires 'sass/engine'
+spec_require 'sass/engine'
 
 class TCTemplateSassController < Ramaze::Controller
   map '/'
@@ -40,6 +40,7 @@ body
 end
 
 describe "Sass templates" do
+  behaves_like 'http'
   ramaze(:compile => true)
 
   it "should render inline" do
@@ -63,6 +64,6 @@ describe "Sass templates" do
   end
 
   it "should use sass options" do
-    get('/options/test').body.should_not =~ /^ +/
+    get('/options/test').body.should.not =~ /^ +/
   end
 end

data/spec/ramaze/template/xslt.rb

@@ -3,15 +3,13 @@
 
 require 'spec/helper'
 
-testcase_requires 'xml/libxml'
-testcase_requires 'xml/xslt'
-testcase_requires 'ramaze/gestalt'
-testcase_requires 'rexml/document'
+spec_require 'xml/libxml', 'xml/xslt', 'ramaze/gestalt', 'rexml/document'
 
 class TCTemplateXSLTController < Ramaze::Controller
   template_root 'spec/ramaze/template/xslt/'
   engine :XSLT
   trait :xslt_options => { :fun_xmlns => 'urn:test' }
+  map '/'
 
   def index
     gestalt {
@@ -66,11 +64,11 @@ class TCTemplateXSLTController < Ramaze::Controller
   def gestalt &block
     Ramaze::Gestalt.new(&block).to_s
   end
-
 end
 
 describe "XSLT" do
-  ramaze(:mapping => {'/' => TCTemplateXSLTController})
+  behaves_like 'http'
+  ramaze
 
   it "index" do
     get('/').body.should == "hi tobi"
@@ -90,4 +88,3 @@ describe "XSLT" do
     get('/concat_words').body.should == 'oneonetwoonetwothree'
   end
 end
-

data/spec/ramaze/trinity/request.rb

@@ -12,8 +12,9 @@ describe 'Ramaze::Request' do
 
   it 'should show local_net?' do
     request.local_net?('192.168.0.1').to_s.should == '192.168.0.0'
-    request.local_net?('252.168.0.1').should be_nil
-    request('REMOTE_ADDR' => '211.3.129.47, 66.249.85.131').local_net?.should be_nil
-    request('REMOTE_ADDR' => '211.3.129.47').local_net?.should be_nil
+    request.local_net?('252.168.0.1').should == nil
+    request.local_net?('unknown').should == nil
+    request('REMOTE_ADDR' => '211.3.129.47, 66.249.85.131').local_net?.should == nil
+    request('REMOTE_ADDR' => '211.3.129.47').local_net?.should == nil
   end
 end

data/spec/ramaze/trinity/session.rb

@@ -12,12 +12,14 @@ class TrinitySessionController < Ramaze::Controller
 end
 
 describe "Session" do
-  before(:all){
-    Ramaze::Global.sessions = false
-    ramaze
-  }
+  behaves_like 'http'
+  ramaze :sessions => false
 
   it 'should work without sessions' do
+    class Ramaze::Session
+      remove_const :IP_COUNT_LIMIT
+      const_set(:IP_COUNT_LIMIT, 2)
+    end
     (Ramaze::Session::IP_COUNT_LIMIT + 2).times do
       r = get('/')
       r.body.should == "nothing"

data/spec/snippets/array/put_within.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require 'lib/ramaze/spec/helper/snippets'
 
 describe 'Array#put_within' do
   it 'should put a given object at a well-described position' do
@@ -11,7 +11,8 @@ describe 'Array#put_within' do
     array = [:foo, :bar, :baz]
     lambda{
       array.put_within(:foobar, :after => :foo, :before => :baz)
-    }.should raise_error(ArgumentError, "Too many elements within constrain")
+    }.should.raise(ArgumentError).
+      message.should == "Too many elements within constrain"
   end
 end
 

data/spec/snippets/divide.rb

@@ -1,8 +1,6 @@
-require 'spec/helper'
+require 'lib/ramaze/spec/helper/snippets'
 
 describe 'String#/ and Symbol#/' do
-
-  # check if this is ok in win32
   it 'should join two strings' do
     ('a' / 'b').should == 'a/b'
   end
@@ -18,5 +16,4 @@ describe 'String#/ and Symbol#/' do
   it 'should be usable in concatenation' do
     ('a' / :b / :c).should == 'a/b/c'
   end
-
 end

data/spec/snippets/kernel/__dir__.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require 'lib/ramaze/spec/helper/snippets'
 
 describe '__DIR__' do
   # this is hardly exhaustive, but better than nothing

data/spec/snippets/kernel/acquire.rb

@@ -0,0 +1,71 @@
+require 'lib/ramaze/spec/helper/snippets'
+require 'fileutils'
+
+describe 'acquire' do
+  def require(name)
+    @required << name
+  end
+
+  before do
+    dir = 'tmp_dir_for_acquire'
+    FileUtils.mkdir_p(dir + '/sub')
+
+    %w[ foo.rb bar.rb baz.so baz.yml sub/baz.rb ].
+      each do |path|
+      FileUtils.touch("#{dir}/#{path}")
+    end
+
+    @required = []
+  end
+
+  it 'should not load a single file' do
+    acquire 'tmp_dir_for_acquire/foo'
+    @required.should == []
+  end
+
+  it 'should load dir' do
+    acquire 'tmp_dir_for_acquire/sub/*'
+    @required.should == %w[
+      tmp_dir_for_acquire/sub/baz.rb]
+  end
+
+  it 'should be aliased to acquire' do
+    acquire 'tmp_dir_for_acquire/sub/*'
+    @required.should.not.be.empty
+  end
+
+  it 'should load {so,rb}, not others' do
+    acquire 'tmp_dir_for_acquire/*'
+    @required.sort.should == %w[
+      tmp_dir_for_acquire/bar.rb
+      tmp_dir_for_acquire/baz.so
+      tmp_dir_for_acquire/foo.rb]
+  end
+
+  it 'should use globbing' do
+    acquire 'tmp_dir_for_acquire/ba*'
+    @required.sort.should == %w[
+      tmp_dir_for_acquire/bar.rb
+      tmp_dir_for_acquire/baz.so]
+  end
+
+  it 'should use recursive globbing' do
+    acquire 'tmp_dir_for_acquire/**/*'
+    @required.sort.should == %w[
+      tmp_dir_for_acquire/bar.rb
+      tmp_dir_for_acquire/baz.so
+      tmp_dir_for_acquire/foo.rb
+      tmp_dir_for_acquire/sub/baz.rb]
+  end
+
+  it 'should accept multiple arguments' do
+    acquire 'tmp_dir_for_acquire/*', 'tmp_dir_for_acquire/sub/*'
+    @required.sort.should == %w[
+      tmp_dir_for_acquire/bar.rb
+      tmp_dir_for_acquire/baz.so
+      tmp_dir_for_acquire/foo.rb
+      tmp_dir_for_acquire/sub/baz.rb]
+  end
+
+  FileUtils.rm_rf('tmp_dir_for_acquire')
+end

data/spec/snippets/kernel/constant.rb

@@ -1,8 +1,6 @@
-require 'spec/helper'
+require 'lib/ramaze/spec/helper/snippets'
 
 describe 'constant' do
-
-
   it 'should load from string' do
     constant('Fixnum').should == Fixnum
   end
@@ -12,16 +10,14 @@ describe 'constant' do
   end
 
   it 'should handle hierarchy' do
-    constant('Ramaze::Inform').should == Ramaze::Inform
+    constant('Math::PI').should == Math::PI
   end
 
   it 'should be callable with explicit self' do
-    Ramaze.constant('Inform').should == Ramaze::Inform
+    Math.constant('PI').should == Math::PI
   end
 
   it 'should be callable with explicit self' do
-    Ramaze.constant('::Ramaze').should == Ramaze
+    Math.constant('::Math').should == Math
   end
-
 end
-