Pistos-ramaze 2009.04.08 → 2009.06.12

data/spec/ramaze/bin/ramaze.rb

@@ -0,0 +1,96 @@
+#          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(Ramaze::ROOT).join("../bin/ramaze").expand_path
+end
+
+USAGE = <<TXT
+
+  Usage:
+	ramaze <start [PIDFILE]|stop [PIDFILE]|restart [PIDFILE]|status [PIDFILE]|create PROJECT|console> [ruby/rack options]
+
+	Commands:
+
+	  * All commands which take an optional PIDFILE (defaults to PROJECT.pid otherwise).
+	  * All commands which start a ramaze instance will default to webrick on port 7000
+	    unless you supply the rack options -p/--port PORT and/or * -s/--server SERVER.
+
+	 start   - Starts an instance of this application.
+
+	 stop    - Stops a running instance of this application.
+
+	 restart - Stops running instance of this application, then starts it back up.  Pidfile
+	           (if supplied) is used for both stop and start.
+
+	 status  - Gives status of a running ramaze instance
+
+	 create  - Creates a new prototype Ramaze application in a directory named PROJECT in
+	           the current directory.  ramaze create foo would make ./foo containing an
+	           application prototype. Rack options are ignored here.
+
+	 console - Starts an irb console with app.rb (and irb completion) loaded. This command
+	           ignores rack options, ARGV is passed on to IRB.
+
+
+	Ruby options:
+	  -e, --eval LINE          evaluate a LINE of code
+	  -d, --debug              set debugging flags (set $DEBUG to true)
+	  -w, --warn               turn warnings on for your script
+	  -I, --include PATH       specify $LOAD_PATH (may be used more than once)
+	  -r, --require LIBRARY    require the library, before executing your script
+
+	Rack options:
+	  -s, --server SERVER      serve using SERVER (webrick/mongrel)
+	  -o, --host HOST          listen on HOST (default: 0.0.0.0)
+	  -p, --port PORT          use PORT (default: 9292)
+	  -E, --env ENVIRONMENT    use ENVIRONMENT for defaults (default: development)
+	  -D, --daemonize          run daemonized in the background
+	  -P, --pid FILE           file to store PID (default: rack.pid)
+
+	Common options:
+	  -h, --help               Show this message
+	      --version            Show version
+TXT
+
+describe "bin/ramaze command" do
+  it "Can find the ramaze binary" do
+    Ramaze::BINPATH.file?.should == true
+  end
+
+  it "Shows command line help" do
+    output = `#{Ramaze::BINPATH} -h`
+    output.should == USAGE
+  end
+
+  it "Shows the correct version" do
+    output = %x{#{Ramaze::BINPATH} --version}
+    output.strip.should == Ramaze::VERSION
+  end
+
+  it "Can create a new tree from prototype" do
+    require "fileutils"
+    root = Pathname.new("/tmp/test_tree")
+    raise "#{root} already exists, please move it out of the way before running this test" if root.directory?
+    begin
+      output = %x{#{Ramaze::BINPATH} create #{root}}
+      root.directory?.should.be.true
+      root.join("config.ru").file?.should.be.true
+      root.join("start.rb").file?.should.be.true
+      root.join("controller").directory?.should.be.true
+      root.join("controller", "init.rb").file?.should.be.true
+      root.join("view").directory?.should.be.true
+      root.join("model").directory?.should.be.true
+      root.join("model", "init.rb").file?.should.be.true
+    ensure
+      FileUtils.rm_rf(root)
+    end
+  end
+
+end
+

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/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'
@@ -45,6 +45,12 @@ describe Ramaze::Cache::MemCache do
     cache.fetch(:hello).should == nil
   end
 
+  should 'amend the ttl if it is too high' do
+    ttl = Ramaze::Cache::MemCache::MAX_TTL + 1
+    cache.store(:hello, @hello, :ttl => ttl)
+    cache.fetch(:hello).should == @hello
+  end
+
   should 'clear' do
     cache.store(:hello, @hello)
     cache.fetch(:hello).should == @hello

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')
 
@@ -23,7 +23,7 @@ class SpecActionlessTemplatesLayout < Ramaze::Controller
 end
 
 describe "Testing Actionless Templates" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it "should not find template file for non existant method" do
     get('/list').status.should == 404

data/spec/ramaze/controller/lonely_mapping.rb

@@ -0,0 +1,18 @@
+#          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
+    'automatically mapped'
+  end
+end
+
+describe 'Lonely Controller automap' do
+  behaves_like :rack_test
+
+  it 'automatically creates an app and maps the controller into it' do
+    get('/').body.should == 'automatically mapped'
+  end
+end

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)
@@ -41,17 +44,3 @@ describe 'Controller::generate_mapping' do
     gen(Class.new.name).should == nil
   end
 end
-
-class SpecControllerMapping < Ramaze::Controller
-  def index
-    'automatically mapped'
-  end
-end
-
-describe 'Controller automap' do
-  behaves_like :mock
-
-  it 'automatically creates an app and maps the controller into it' do
-    get('/spec_controller_mapping').body.should == 'automatically mapped'
-  end
-end

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('/')
@@ -25,7 +28,7 @@ class SpecControllerInheritedYetAnother < SpecControllerInheritedAnother
 end
 
 describe 'Ramaze::Controller#self.inherited' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   should 'default renders nagoro' do
     get('/').body.should == "<p>Main is nagoro</p>"

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 '/'
@@ -13,7 +13,7 @@ class MainController < Ramaze::Controller
 end
 
 describe 'Controller resolving' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'should work with .' do
     get('/file.ext').body.should == 'file.ext'

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
@@ -14,7 +14,7 @@ class MainController < BaseController
 end
 
 describe 'Controller' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'allows sub-classing MainController' do
     get('/test').body.should == 'test'

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 '/'
@@ -44,7 +44,7 @@ class SpecViewAlias2 < SpecViewAlias
 end
 
 describe "Template aliasing" do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'serves normal template' do
     get('/greet/asdf').body.should == '<html>asdf : Message</html>'

data/spec/ramaze/dispatcher/directory.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__)
 
 spec_require 'hpricot'
 
@@ -10,7 +13,7 @@ module Ramaze
 end
 
 describe 'Directory listing' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   @hierarchy = %w[
     /test/deep/hierarchy/one.txt

data/spec/ramaze/dispatcher/file.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__)
 
 # This spec more or less tries to ensure that we integrate with rack and
 # rack-contrib in regards to static file serving.
@@ -9,61 +9,63 @@ require 'spec/helper'
 module Ramaze
   # minimal middleware, no exception handling
   middleware!(:spec){|m|
-    m.apps(Rack::ETag, Rack::ConditionalGet)
+    m.apps Rack::ConditionalGet, Rack::ETag
     m.innate
   }
 end
 
 describe 'Serving static files' do
-  behaves_like :mock
+  behaves_like :rack_test
 
-  Ramaze.map('/', lambda{|env| [200, {}, 'nothing']})
+  Ramaze.map('/', lambda{|env| [200, {}, ['nothing']]})
 
   it 'serves from public root' do
     css = File.read(__DIR__('public/test_download.css'))
-    got = get('/test_download.css')
-    got.body.should == css
-    got.status.should == 200
+    get '/test_download.css'
+    last_response.body.should == css
+    last_response.status.should == 200
   end
 
   it 'serves files with spaces' do
-    got = get('/file%20name.txt')
-    got.status.should == 200
-    got.body.should == 'hi'
+    get '/file%20name.txt'
+    last_response.status.should == 200
+    last_response.body.should == 'hi'
   end
 
-  it 'sends ETag for string bodies' do
-    got = get('/')
-    got['ETag'].size.should == 34
+  it 'sends Etag for string bodies' do
+    get '/'
+    last_response['Etag'].size.should > 1
   end
 
   it 'sends Last-Modified for file bodies' do
-    got = get('/test_download.css')
+    get '/test_download.css'
 
     mtime = File.mtime(__DIR__('public/test_download.css'))
 
-    got['Last-Modified'].should == mtime.httpdate
+    last_response['Last-Modified'].should == mtime.httpdate
   end
 
-  it 'respects ETag with HTTP_IF_NONE_MATCH' do
-    got = get('/')
+  it 'respects Etag with HTTP_IF_NONE_MATCH' do
+    get '/'
 
-    etag = got['ETag']
+    etag = last_response['Etag']
     etag.should.not.be.nil
 
-    got = get('/', 'HTTP_IF_NONE_MATCH' => etag)
-    got.status.should == 304
-    got.body.should == ''
+    header 'HTTP_IF_NONE_MATCH', etag
+    get '/'
+    last_response.status.should == 304
+    last_response.body.should == ''
   end
 
   it 'respects Last-Modified with HTTP_IF_MODIFIED_SINCE' do
-    got = get('/test_download.css')
+    get '/test_download.css'
 
-    mtime = got['Last-Modified']
+    mtime = last_response['Last-Modified']
     mtime.should.not.be.nil
 
-    got = get('/test_download.css', 'HTTP_IF_MODIFIED_SINCE' => mtime)
-    got.status.should == 304
-    got.body.should == ''
+    header 'HTTP_IF_MODIFIED_SINCE', mtime
+    get '/test_download.css'
+    last_response.status.should == 304
+    last_response.body.should == ''
   end
 end

data/spec/ramaze/error.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__)
 require 'rexml/document'
 require 'rexml/xpath'
 
@@ -35,7 +35,7 @@ class SpecErrorHandling < SpecError
 end
 
 describe 'Error handling' do
-  behaves_like :mock
+  behaves_like :rack_test
 
   Ramaze.options.mode = :dev
 
@@ -66,7 +66,7 @@ describe 'Error handling' do
   end
 
   it 'uses Rack::RouteExceptions when a route is set' do
-    Rack::RouteExceptions[NameError] = '/handle/name_error'
+    Rack::RouteExceptions.route(NameError, '/handle/name_error')
 
     got = get('/raises')
     [got.status, got['Content-Type']].should == [200, 'text/html']

data/spec/ramaze/files.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 SpecFilesCore < Ramaze::Controller
   map '/', :core
@@ -17,7 +20,7 @@ Ramaze::App[:other].options.publics = 'files/public_2'
 Ramaze.middleware!(:spec){|m| m.run(Ramaze::AppMap) }
 
 describe Ramaze::Files do
-  behaves_like :mock
+  behaves_like :rack_test
 
   it 'serves files for core app from public_1' do
     get('/plain.txt').body.should == "Just some text in a file\n"

data/spec/ramaze/gestalt.rb

@@ -1,6 +1,9 @@
 # * Encoding: UTF-8
+#
+#          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__)
 require 'ramaze/gestalt'
 
 describe "Gestalt" do
@@ -26,38 +29,38 @@ describe "Gestalt" do
 
   it "deep nested tags" do
     gestalt{ p do
-      div do
-        ol do
-          li
+        div do
+          ol do
+            li
+          end
         end
       end
-    end
     }.should == '<p><div><ol><li /></ol></div></p>'
   end
 
   it "deep nested tags with repetition" do
     gestalt{ p do
-      div do
-        ol do
-          li
-          li
-        end
-        ol do
-          li
-          li
+        div do
+          ol do
+            li
+            li
+          end
+          ol do
+            li
+            li
+          end
         end
       end
-    end
     }.should == '<p><div><ol><li /><li /></ol><ol><li /><li /></ol></div></p>'
   end
 
   it "deep nested tags with strings" do
     gestalt{
       p do
-      div do
-       'Hello, World'
+        div do
+          'Hello, World'
+        end
       end
-    end
     }.should == '<p><div>Hello, World</div></p>'
   end
 
@@ -109,6 +112,12 @@ describe "Gestalt" do
     }.should == '<a href="http://example.org/?a=one&amp;b=two">Click here</a>'
   end
 
+  it 'takes text and attributes' do
+    gestalt {
+      a('Click here', :href => "http://example.org/?a=one&b=two")
+    }.should == '<a href="http://example.org/?a=one&amp;b=two">Click here</a>'
+  end
+
   it 'should accept symbols as attributes' do
     input = gestalt{ input(:type => :text, :value => :one) }