manveru-innate 2009.03.24 → 2009.04

data/lib/innate.rb

@@ -3,11 +3,7 @@
 #
 # Name-space of Innate, just about everything goes in here.
 #
-# Exceptions are:
-#
-# * Logger::ColorFormatter
-# * In 1.8, we define ::BasicObject
-# * In 1.9, we define ::String#each
+# The only exception is Logger::ColorFormatter.
 #
 module Innate
   ROOT = File.expand_path(File.dirname(__FILE__))
@@ -30,10 +26,6 @@ module Innate
   # 3rd party
   require 'rack'
 
-  # innates ruby core patches
-  require 'innate/core_compatibility/string'
-  require 'innate/core_compatibility/basic_object'
-
   # innate core
   require 'innate/version'
   require 'innate/traited'
@@ -97,7 +89,7 @@ module Innate
     #   Port for the server
     # @option param :started [boolean] (false)
     #   Indicate that calls Innate::start will be ignored
-    # @option param :handler [Symbol]  (:webrick)
+    # @option param :adapter [Symbol]  (:webrick)
     #   Web server to run on
     # @option param :setup   [Array]   ([Innate::Cache, Innate::Node])
     #   Will send ::setup to each element during Innate::start
@@ -113,14 +105,14 @@ module Innate
       root = given_options.delete(:root)
       file = given_options.delete(:file)
 
-      if found_root = go_figure_root(:root => root, :file => file)
-        $0 = found_root
-        Innate.options.roots = [found_root]
-      end
+      found_root = go_figure_root(caller, :root => root, :file => file)
+      Innate.options.roots = [found_root] if found_root
 
+      # Convert some top-level option keys to the internal ones that we use.
       PROXY_OPTIONS.each{|k,v| given_options[v] = given_options.delete(k) }
       given_options.delete_if{|k,v| v.nil? }
 
+      # Merge the user's given options into our existing set, which contains defaults.
       options.merge!(given_options)
 
       setup_dependencies
@@ -179,47 +171,27 @@ module Innate
       options[:middleware_compiler]::COMPILED[mode].compile!
     end
 
-    # Innate can be started by:
+    # @example Innate can be started by:
     #
     #   Innate.start :file => __FILE__
-    #   Innate.start :root => '/path/to/here'
+    #   Innate.start :root => File.dirname(__FILE__)
     #
-    # In case these options are not passed we will try to figure out a file named
-    # `start.rb` in the backtrace and use the directory it resides in.
+    # Either setting will surpress the warning that might show up on startup
+    # and tells you it couldn't find an explicit root.
     #
-    # TODO: better documentation and nice defaults, don't want to rely on a
-    #       filename, bad mojo.
-    def go_figure_root(options, backtrace = caller)
-      if o_file = options[:file]
-        return File.dirname(o_file)
-      elsif root = options[:root]
-        return root
-      end
-
-      pwd = Dir.pwd
-
-      return pwd if File.file?(File.join(pwd, 'start.rb'))
-
-      caller_lines(backtrace) do |file, line, method|
-        dir, file = File.split(File.expand_path(file))
-        return dir if file == "start.rb"
-      end
-
-      Log.warn("Couldn't find your application root, see Innate#go_figure_root")
-
-      return nil
-    end
-
-    # yields +file+, +line+, +method+
-    def caller_lines(backtrace)
-      backtrace.each do |line|
-        if line =~ /^(.*?):(\d+):in `(.*)'$/
-          file, line, method = $1, $2.to_i, $3
-        elsif line =~ /^(.*?):(\d+)$/
-          file, line, method = $1, $2.to_i, nil
-        end
-
-        yield(File.expand_path(file), line, method) if file and File.file?(file)
+    # In case these options are not passed we will try to figure out a file named
+    # `start.rb` in the process' working directory and assume it's a valid point.
+    def go_figure_root(backtrace, options)
+      if root = options[:root]
+        root
+      elsif file = options[:file]
+        File.dirname(file)
+      elsif File.file?('start.rb')
+        Dir.pwd
+      else
+        root = File.dirname(backtrace[0][/^(.*?):\d+/, 1])
+        Log.warn "No explicit root folder found, assuming it is #{root}"
+        root
       end
     end
   end
@@ -283,13 +255,15 @@ module Innate
   # @see Rack::MiddlewareCompiler
   middleware :dev do |m|
     m.apps(Rack::Lint, Rack::CommonLogger, Rack::ShowExceptions,
-           Rack::ShowStatus, Rack::ConditionalGet, Rack::Head, Rack::Reloader)
+           Rack::ShowStatus, Rack::ConditionalGet, Rack::ContentLength,
+           Rack::Head)
+    m.use(Rack::Reloader, 2)
     m.innate
   end
 
   middleware :live do |m|
     m.apps(Rack::CommonLogger, Rack::ShowStatus, Rack::ConditionalGet,
-           Rack::Head)
+           Rack::ContentLength, Rack::Head)
     m.innate
   end
 end

data/spec/example/app/retro_games.rb

@@ -0,0 +1,30 @@
+require 'spec/helper'
+require 'example/app/retro_games'
+
+describe 'Retro-games app' do
+  behaves_like :mock
+
+  it 'lists the first game' do
+    get '/'
+    last_response.should =~ /1 => Pacman/
+  end
+
+  it 'has a form to add another game' do
+    get '/'
+    last_response.should =~ /<form/
+  end
+
+  it 'allows you to add another game' do
+    post '/create', :name => 'Street Fighter II'
+    follow_redirect!
+    last_response.should =~ /0 =&gt; Street Fighter II/
+  end
+
+  it 'allows you to vote for a game' do
+    get '/vote/Street+Fighter+II'
+    follow_redirect!
+    last_response.should =~ /1 =&gt; Street Fighter II/
+  end
+
+  FileUtils.rm_f('games.yaml')
+end

data/spec/example/provides.rb

@@ -0,0 +1,16 @@
+require 'spec/helper'
+require 'example/provides'
+
+describe 'examples/provide' do
+  behaves_like :mock
+
+  it 'provides YAML representation' do
+    get '/list.yaml'
+    last_response.body.should == ARTICLES.to_yaml
+    last_response['Content-Type'].should == 'text/yaml'
+
+    get '/list'
+    last_response.body.should == ''
+    last_response['Content-Type'].should == 'text/html'
+  end
+end

data/spec/example/session.rb

@@ -2,27 +2,21 @@ require 'spec/helper'
 require 'example/session'
 
 describe 'example/session' do
-  behaves_like :session
+  behaves_like :mock
 
   it 'starts at 0' do
-    session do |mock|
-      mock.get('/').should =~ /Value is: 0/
-    end
+    get('/').body.should =~ /Value is: 0/
   end
 
   it 'increments the counter' do
-    session do |mock|
-      mock.get('/increment').should =~ /Value is: 1/
-      mock.get('/increment').should =~ /Value is: 2/
-      mock.get('/increment').should =~ /Value is: 3/
-    end
+    get('/increment').body.should =~ /Value is: 1/
+    get('/increment').body.should =~ /Value is: 2/
+    get('/increment').body.should =~ /Value is: 3/
   end
 
   it 'decrements the counter' do
-    session do |mock|
-      mock.get('/decrement').should =~ /Value is: -1/
-      mock.get('/decrement').should =~ /Value is: -2/
-      mock.get('/decrement').should =~ /Value is: -3/
-    end
+    get('/decrement').body.should =~ /Value is: 2/
+    get('/decrement').body.should =~ /Value is: 1/
+    get('/decrement').body.should =~ /Value is: 0/
   end
 end

data/spec/innate/action/layout/file_layout.xhtml

@@ -0,0 +1 @@
+<p>#{ @content }</p>

data/spec/innate/action/layout.rb

@@ -13,7 +13,7 @@ class SpecActionLayoutMethod < SpecActionLayout
   layout('method_layout')
 
   def method_layout
-    "<pre><%= @content %></pre>"
+    '<pre>#{ @content }</pre>'
   end
 
   def index

data/spec/innate/helper/aspect.rb

@@ -38,25 +38,25 @@ end
 describe Innate::Helper::Aspect do
   behaves_like :mock
 
-  should 'execute before aspect' do
+  it 'executes before aspect' do
     $aspect_spec_before = 0
     get('/with_before').body.should == '42'
     $aspect_spec_before.should == 42
   end
 
-  should 'execute after asepct' do
+  it 'executes after asepct' do
     $aspect_spec_after = 0
     get('/with_after').body.should == '2'
     $aspect_spec_after.should == 42
   end
 
-  should 'execute wrap aspects' do
+  it 'executes wrap aspects' do
     $aspect_spec_wrap = 0
     get('/with_wrap').body.should == '22'
     $aspect_spec_wrap == 42
   end
 
-  should 'before_all and after_all' do
+  it 'calls before_all and after_all' do
     $aspect_spec_before_all = $aspect_spec_after_all = 0
     get('/all/before_first').body.should == '42'
     $aspect_spec_before_all.should == 42
@@ -66,10 +66,10 @@ describe Innate::Helper::Aspect do
     $aspect_spec_after_all.should == 80
   end
 
-  should 'instance variables in blocks available to view/method' do
+  it 'makes instance variables in blocks available to view/method' do
     get('/with_instance_var').body.should == 'Hello World'
     get('/all/with_instance_var_first').body.should == 'Hello World'
     get('/all/with_instance_var_second').body.should == 'Hello to the World'
-    get('/without_method/aspect_hello').body.should == "Hello World!\n"
+    get('/without_method/aspect_hello').body.should == "Hello World!"
   end
 end

data/spec/innate/helper/flash.rb

@@ -57,81 +57,62 @@ class SpecFlashSub < SpecFlash
 end
 
 describe Innate::Helper::Flash do
-  behaves_like :session
+  behaves_like :mock
 
   should 'set and forget flash twice' do
-    session do |mock|
-      mock.get('/welcome').body.should == 'Welcome manveru'
-      mock.get('/bye').body.should == 'Bye manveru'
-      mock.get('/bye').body.should == 'Bye '
+    get('/welcome').body.should == 'Welcome manveru'
+    get('/bye').body.should == 'Bye manveru'
+    get('/bye').body.should == 'Bye'
 
-      mock.get('/welcome').body.should == 'Welcome manveru'
-      mock.get('/bye').body.should == 'Bye manveru'
-      mock.get('/bye').body.should == 'Bye '
-    end
+    get('/welcome').body.should == 'Welcome manveru'
+    get('/bye').body.should == 'Bye manveru'
+    get('/bye').body.should == 'Bye'
   end
 
   should 'work over multiple nodes' do
-    session do |mock|
-      mock.get('/welcome').body.should == 'Welcome manveru'
-      mock.get('/sub/bye').body.should == 'Bye manveru'
-      mock.get('/sub/bye').body.should == 'Bye '
+    get('/welcome').body.should == 'Welcome manveru'
+    get('/sub/bye').body.should == 'Bye manveru'
+    get('/sub/bye').body.should == 'Bye'
 
-      mock.get('/sub/welcome').body.should == 'Welcome manveru'
-      mock.get('/bye').body.should == 'Bye manveru'
-      mock.get('/bye').body.should == 'Bye '
-    end
+    get('/sub/welcome').body.should == 'Welcome manveru'
+    get('/bye').body.should == 'Bye manveru'
+    get('/bye').body.should == 'Bye'
   end
 
   should 'check if flash is empty' do
-    session do |mock|
-      mock.get('/welcome').body.should == 'Welcome manveru'
-      mock.get('/check_empty').body.should == 'false'
-      mock.get('/check_empty').body.should == 'true'
-    end
+    get('/welcome').body.should == 'Welcome manveru'
+    get('/check_empty').body.should == 'false'
+    get('/check_empty').body.should == 'true'
   end
 
   should 'set and delete key within one request' do
-    session do |mock|
-      mock.get('/set_delete_key').body.should == ''
-    end
+    get('/set_delete_key').body.should == ''
   end
 
   should 'set and delete key over two request' do
-    session do |mock|
-      mock.get('/welcome').body.should == 'Welcome manveru'
-      mock.get('/delete_key').body.should == 'Bye '
-    end
+    get('/welcome').body.should == 'Welcome manveru'
+    get('/delete_key').body.should == 'Bye'
   end
 
   should 'merge with hash' do
-    session do |mock|
-      mock.get('/merge').body.should == {:name => 'feagliir'}.inspect
-      mock.get('/bye').body.should == 'Bye '
-    end
+    get('/merge').body.should == {:name => 'feagliir'}.inspect
+    get('/bye').body.should == 'Bye'
   end
 
   should 'merge! with hash' do
-    session do |mock|
-      mock.get('/merge!').body.should == {:name => 'feagliir'}.inspect
-      mock.get('/bye').body.should == 'Bye feagliir'
-    end
+    get('/merge!').body.should == {:name => 'feagliir'}.inspect
+    get('/bye').body.should == 'Bye feagliir'
   end
 
   should 'inspect combined' do
-    session do |mock|
-      mock.get('/welcome')
-      mock.get('/inspect').body.
-        should == {:name => 'manveru', :yes => :yeah}.inspect
-    end
+    get('/welcome')
+    get('/inspect').body.should == {:name => 'manveru', :yes => :yeah}.inspect
   end
 
   should 'iterate over combined' do
-    session do |mock|
-      mock.get('/welcome')
+    get('/welcome')
 
-      hash = {:yes => :yeah, :name => 'manveru'}
-      Hash[*eval(mock.get('/iterate').body).flatten].should == hash
-    end
+    hash = {:yes => :yeah, :name => 'manveru'}
+    Hash[*eval(get('/iterate').body).flatten].should == hash
   end
 end

data/spec/innate/helper/link.rb

@@ -56,6 +56,14 @@ describe Innate::Helper::Link do
       Two.route(:foo, :bar).should == URI('/two/foo/bar')
     end
 
+    should 'respond with URI for node with path /foo/bar+baz' do
+      One.route('/foo/bar+baz').should == URI('/foo/bar+baz')
+      One.route(:foo, 'bar baz').should == URI('/foo/bar+baz')
+
+      Two.route('/foo/bar+baz').should == URI('/two/foo/bar+baz')
+      Two.route(:foo, 'bar baz').should == URI('/two/foo/bar+baz')
+    end
+
     should 'respond with URI for node with GET params' do
       One.route('/', :a => :b).should == URI('/?a=b')
 

data/spec/innate/helper/redirect.rb

@@ -20,7 +20,7 @@ class SpecRedirectHelper
   end
 
   def redirect_referer_action
-    redirect_referer
+    redirect_referer(r(:noop))
   end
 
   def no_actual_redirect
@@ -69,77 +69,92 @@ describe Innate::Helper::Redirect do
   end
 
   should 'redirect' do
-    got = get("#@uri/redirection")
-    got.status.should == 302
-    got.headers['Location'].should == "#@uri/index"
-    got.headers['Content-Type'].should == "text/html"
+    get("#@uri/redirection")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == "#@uri/index"
+    last_response.headers['Content-Type'].should == "text/html"
   end
 
   should 'redirect twice' do
-    got = get("#@uri/double_redirection")
-    got.status.should == 302
-    got.headers['Location'].should == "#@uri/redirection"
-    got.headers['Content-Type'].should == "text/html"
+    get("#@uri/double_redirection")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == "#@uri/redirection"
+    last_response.headers['Content-Type'].should == "text/html"
   end
 
   should 'redirect to referer' do
-    got = get("#@uri/redirect_referer_action", 'HTTP_REFERER' => '/noop')
-    got.status.should == 302
-    got.headers['Location'].should == "#@uri/noop"
-    got.headers['Content-Type'].should == "text/html"
-    got = get("#@uri/redirect_referer_action", 'HTTP_REFERER' => "#@uri/redirect_referer_action")
-    got.status.should == 302
-    got.headers['Location'].should == "#@uri/"
-    got.headers['Content-Type'].should == "text/html"
+    header 'HTTP_REFERER', '/index'
+    get("#@uri/redirect_referer_action")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == "#@uri/index"
+    last_response.headers['Content-Type'].should == "text/html"
+  end
+
+  should 'redirect to fallback if referrer is identical' do
+    header 'HTTP_REFERER', "#@uri/redirect_referer_action"
+    get("#@uri/redirect_referer_action")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == "#@uri/noop"
+    last_response.headers['Content-Type'].should == "text/html"
   end
 
   should 'use #r' do
-    got = get("#@uri/redirect_method")
-    got.status.should == 302
-    got.headers['Location'].should == "#@uri/noop"
-    got.headers['Content-Type'].should == "text/html"
+    get("#@uri/redirect_method")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == "#@uri/noop"
+    last_response.headers['Content-Type'].should == "text/html"
   end
 
   should 'work with absolute uris' do
-    got = get("#@uri/absolute_redirect")
-    got.status.should == 302
-    got.headers['Location'].should == "#@uri/noop"
-    got.headers['Content-Type'].should == "text/html"
+    get("#@uri/absolute_redirect")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == "#@uri/noop"
+    last_response.headers['Content-Type'].should == "text/html"
   end
 
   should 'support #respond' do
-    got = get("#@uri/loop")
-    got.status.should == 200
-    got.body.should == 'no loop'
+    get("#@uri/loop")
+
+    last_response.status.should == 200
+    last_response.body.should == 'no loop'
   end
 
   should 'support #respond with status' do
-    got = get("#@uri/respond_with_status")
-    got.status.should == 404
-    got.body.should == 'not found'
+    get("#@uri/respond_with_status")
+
+    last_response.status.should == 404
+    last_response.body.should == 'not found'
   end
 
   should 'support #respond!' do
-    got = get("#@uri/destructive_respond")
-    got.status.should == 200
-    got.body.should == 'destructive'
+    get("#@uri/destructive_respond")
+
+    last_response.status.should == 200
+    last_response.body.should == 'destructive'
   end
 
   should 'redirect without modifying the target' do
-    got = get("#@uri/redirect_unmodified")
-    got.status.should == 302
-    got.headers['Location'].should == '/noop'
+    get("#@uri/redirect_unmodified")
+
+    last_response.status.should == 302
+    last_response.headers['Location'].should == '/noop'
   end
 
   should 'catch redirection' do
-    got = get("#@uri/no_actual_redirect")
-    got.status.should == 200
-    got.body.should == 'no actual redirect'
+    get("#@uri/no_actual_redirect")
+    last_response.status.should == 200
+    last_response.body.should == 'no actual redirect'
   end
 
   should 'catch double redirect' do
-    got = get("#@uri/no_actual_double_redirect")
-    got.status.should == 200
-    got.body.should == 'no actual double redirect'
+    get("#@uri/no_actual_double_redirect")
+    last_response.status.should == 200
+    last_response.body.should == 'no actual double redirect'
   end
 end