ramaze 2009.06.12 → 2009.07

data/spec/contrib/addressable_route.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../spec/helper', __FILE__)
 require 'ramaze/contrib/addressable_route'
 
 class SpecAddressableRoute < Ramaze::Controller
@@ -12,11 +12,9 @@ end
 describe 'addressable routing' do
   behaves_like :rack_test
 
-  RAR = Ramaze::AddressableRoute
-  RAR.map('/customer/{customer_id}/order/{order_id}', '/order/show')
-
   Ramaze.middleware! :spec do |m|
-    m.use RAR
+    m.use(Ramaze::AddressableRoute,
+          '/customer/{customer_id}/order/{order_id}' => '/order/show')
     m.run Ramaze::AppMap
   end
 

data/spec/contrib/rest.rb

@@ -1,4 +1,4 @@
-require 'spec/helper'
+require File.expand_path('../../../spec/helper', __FILE__)
 require 'ramaze/contrib/rest'
 
 class Posts < Ramaze::Controller

data/spec/examples/caching.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'examples/helpers/cache'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/helpers/cache', __FILE__)
 
 describe 'Caching' do
   behaves_like :rack_test

data/spec/examples/css.rb

@@ -1,6 +1,6 @@
-require 'spec/helper'
+require File.expand_path('../../../spec/helper', __FILE__)
 spec_require 'haml'
-require 'examples/misc/css'
+require File.expand_path('../../../examples/misc/css', __FILE__)
 
 describe 'CSSController' do
   behaves_like :rack_test

data/spec/examples/element.rb

@@ -1,6 +1,6 @@
-require 'spec/helper'
+require File.expand_path('../../../spec/helper', __FILE__)
 spec_require 'nagoro'
-require 'examples/basic/element'
+require File.expand_path('../../../examples/basic/element', __FILE__)
 
 describe 'Element' do
   behaves_like :rack_test

data/spec/examples/hello.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'examples/basic/hello'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/basic/hello', __FILE__)
 
 describe 'Hello' do
   behaves_like :rack_test

data/spec/examples/helpers/httpdigest.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'examples/helpers/httpdigest'
+require File.expand_path('../../../../spec/helper', __FILE__)
+require File.expand_path('../../../../examples/helpers/httpdigest', __FILE__)
 
 # Not sure if we should change the behaviour of digest_authorize, it keeps
 # challenging the authorization even after a logout, which will log us in right

data/spec/examples/linking.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'examples/basic/linking'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/basic/linking', __FILE__)
 
 describe 'Linking' do
   behaves_like :rack_test

data/spec/examples/simple.rb

@@ -1,5 +1,5 @@
-require 'spec/helper'
-require 'examples/basic/simple'
+require File.expand_path('../../../spec/helper', __FILE__)
+require File.expand_path('../../../examples/basic/simple', __FILE__)
 
 describe 'Simple' do
   behaves_like :rack_test

data/spec/examples/templates/template_erubis.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'erubis'
-require 'examples/templates/template_erubis'
+require File.expand_path('../../../../examples/templates/template_erubis', __FILE__)
 
 describe 'Template Erubis' do
   behaves_like :template_spec

data/spec/examples/templates/template_ezamar.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'ezamar'
-require 'examples/templates/template_ezamar'
+require File.expand_path('../../../../examples/templates/template_ezamar', __FILE__)
 
 describe 'Template Ezamar' do
   behaves_like :template_spec

data/spec/examples/templates/template_haml.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'haml'
-require 'examples/templates/template_haml'
+require File.expand_path('../../../../examples/templates/template_haml', __FILE__)
 
 describe 'Template Haml' do
   behaves_like :template_spec

data/spec/examples/templates/template_liquid.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'liquid'
-require 'examples/templates/template_liquid'
+require File.expand_path('../../../../examples/templates/template_liquid', __FILE__)
 
 describe 'Template Liquid' do
   behaves_like :template_spec

data/spec/examples/templates/template_markaby.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 # spec_require 'markaby'
-# require 'examples/templates/template_markaby'
+# require File.expand_path('../../../../examples/templates/template_erubis', __FILE__)
 
 describe 'Template Markaby' do
   # behaves_like :template_spec

data/spec/examples/templates/template_nagoro.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'nagoro'
-require 'examples/templates/template_nagoro'
+require File.expand_path('../../../../examples/templates/template_nagoro', __FILE__)
 
 describe 'Template Nagoro' do
   behaves_like :template_spec

data/spec/examples/templates/template_redcloth.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'redcloth'
-spec_require 'examples/templates/template_redcloth'
+require File.expand_path('../../../../examples/templates/template_redcloth', __FILE__)
 
 describe 'Template RedCloth' do
   behaves_like :template_spec

data/spec/examples/templates/template_remarkably.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'remarkably/engines/html'
-require 'examples/templates/template_remarkably'
+require File.expand_path('../../../../examples/templates/template_remarkably', __FILE__)
 
 describe 'Template Remarkably' do
   behaves_like :template_spec

data/spec/examples/templates/template_tenjin.rb

@@ -1,8 +1,11 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require 'ramaze/spec/helper/template_examples'
 
 spec_require 'tenjin'
-require 'examples/templates/template_tenjin'
+require File.expand_path('../../../../examples/templates/template_tenjin', __FILE__)
 
 describe 'Template Tenjin' do
   behaves_like :template_spec

data/spec/ramaze/action/render.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecAction < Ramaze::Controller
   map '/'

data/spec/ramaze/app.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../spec/helper', __FILE__)
 
 class SpecAppMain < Ramaze::Controller
   map '/', :core

data/spec/ramaze/app/location.rb

@@ -0,0 +1,43 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
+
+module SpecBlog
+  class Controller < Ramaze::Controller
+    map nil, :blog
+    app.location = '/'
+  end
+
+  class Posts < Controller
+    map '/posts'
+
+    def index
+      'The Blog Posts'
+    end
+  end
+end
+
+module SpecWiki
+  class Controller < Ramaze::Controller
+    map nil, :wiki
+    app.location = '/wiki'
+  end
+
+  class Pages < Controller
+    map '/pages'
+
+    def index
+      'The Wiki Page'
+    end
+  end
+end
+
+describe Ramaze::App do
+  behaves_like :rack_test
+
+  it "Doesn't set location for app automatically" do
+    get('/wiki/pages').body.should == 'The Wiki Page'
+    get('/posts').body.should == 'The Blog Posts'
+  end
+end

data/spec/ramaze/bin/ramaze.rb

@@ -1,8 +1,13 @@
-require "spec/helper"
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 require "ramaze/tool/bin"
+
 require "pathname"
+
 module Ramaze
-  BINPATH = Pathname.new(Ramaze::ROOT).join("..", "bin", "ramaze").expand_path
+  BINPATH = Pathname(Ramaze::ROOT).join("../bin/ramaze").expand_path
 end
 
 USAGE = <<TXT

data/spec/ramaze/cache/localmemcache.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'localmemcache'
 
 describe Ramaze::Cache::LocalMemCache do

data/spec/ramaze/cache/lru.rb

@@ -0,0 +1,48 @@
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
+
+describe Ramaze::Cache::LRU do
+  Ramaze.options.cache.names = [:one, :two]
+  Ramaze.options.cache.default = Ramaze::Cache::LRU
+  Ramaze.setup_dependencies
+
+  cache = Ramaze::Cache.one
+  hello = 'Hello, World!'
+
+  should 'store without ttl' do
+    cache.store(:hello, hello).should == hello
+  end
+
+  should 'fetch' do
+    cache.fetch(:hello).should == hello
+  end
+
+  should 'delete' do
+    cache.delete(:hello)
+    cache.fetch(:hello).should == nil
+  end
+
+  should 'delete two key/value pairs at once' do
+    cache.store(:hello, hello).should == hello
+    cache.store(:ramaze, 'ramaze').should == 'ramaze'
+    cache.delete(:hello, :ramaze)
+    cache.fetch(:hello).should == nil
+    cache.fetch(:innate).should == nil
+  end
+
+  should 'store with ttl' do
+    cache.store(:hello, @hello, :ttl => 0.2)
+    cache.fetch(:hello).should == @hello
+    sleep 0.3
+    cache.fetch(:hello).should == nil
+  end
+
+  should 'clear' do
+    cache.store(:hello, @hello)
+    cache.fetch(:hello).should == @hello
+    cache.clear
+    cache.fetch(:hello).should == nil
+  end
+end

data/spec/ramaze/cache/memcache.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 spec_precondition 'memcached is running' do
   require 'memcache'

data/spec/ramaze/cache/sequel.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 spec_require 'sequel'
 
 DB = Sequel.sqlite

data/spec/ramaze/controller/actionless_templates.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 Ramaze::App.options.merge!(:layouts => 'view')
 

data/spec/ramaze/controller/lonely_mapping.rb

@@ -1,5 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
 
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecHello < Ramaze::Controller
   def index

data/spec/ramaze/controller/mapping.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 describe 'Controller::generate_mapping' do
   def gen(klass)

data/spec/ramaze/controller/provide_inheritance.rb

@@ -1,4 +1,7 @@
-require 'spec/helper'
+#          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
+# All files in this distribution are subject to the terms of the Ruby license.
+
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecControllerInheritedMain < Ramaze::Controller
   Ramaze.node('/')

data/spec/ramaze/controller/resolve.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class MainController < Ramaze::Controller
   map '/'

data/spec/ramaze/controller/subclass.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class BaseController < Ramaze::Controller
   alias_view :foo, :bar

data/spec/ramaze/controller/template_resolving.rb

@@ -1,7 +1,7 @@
 #          Copyright (c) 2009 Michael Fellinger m.fellinger@gmail.com
 # All files in this distribution are subject to the terms of the Ruby license.
 
-require 'spec/helper'
+require File.expand_path('../../../../spec/helper', __FILE__)
 
 class SpecViewAlias < Ramaze::Controller
   map '/'