manveru-innate 2009.04.08 → 2009.04.18

data/CHANGELOG

@@ -1,3 +1,129 @@
+[987c5d7 | Sat Apr 18 02:44:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update the release tasks
+
+[f927c9d | Fri Apr 17 11:51:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add Content-Disposition support to send_file
+
+[888318c | Fri Apr 17 10:43:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Better English in render_custom error
+
+[15078e6 | Wed Apr 15 16:49:04 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add comment about planned deprecation of SendFile helper's default status
+
+[4b487aa | Wed Apr 15 16:48:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove the length from Response, Rack provides that
+
+[1634391 | Wed Apr 15 11:02:11 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't camel-case the helper module name, simply remove underscores, we do case-insensitive lookup anyway
+
+[f97e8d7 | Wed Apr 15 10:58:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove core_extensions, we don't need String#each or BasicObject anymore
+
+[0b33546 | Wed Apr 15 09:16:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Action may be invalid if the node requires a method and view
+
+[39dd843 | Wed Apr 15 09:15:30 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Escape non-hash arguments to Helper::Link#route (ryan grove)
+
+[22ee4df | Wed Apr 15 07:25:02 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Raise if the Render helper cannot obtain an Action
+
+[e229299 | Mon Apr 13 12:48:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow Action#call even if we are outside Current#wrap
+
+[b6e9558 | Mon Apr 13 04:37:42 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Action#exts member and use better terms
+
+[46d2a5e | Sun Apr 12 05:03:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * FileBased caches have access to @filename now
+
+[f84f18f | Sun Apr 12 05:03:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Set a PROJECT_README for some rake tasks
+
+[8920482 | Sun Apr 12 05:03:21 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improvment and spec for provide example
+
+[a892dea | Sun Apr 12 05:02:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Minor improvment and spec for retro games example
+
+[b3aeb97 | Fri Apr 10 12:30:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow overriding of middleware mode for specs
+
+[7d65255 | Fri Apr 10 12:07:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Compact code
+
+[cde9366 | Fri Apr 10 10:51:03 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Simplify specs and make them pass using rack-test
+
+[f4c9572 | Fri Apr 10 10:50:34 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't forget to specify an app for rack-test
+
+[41b1955 | Fri Apr 10 10:17:42 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove spec for render_template
+
+[a3b73ca | Fri Apr 10 10:17:27 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add `rake setup` task to comply to convention. I will put up the corresponding gems ASAP
+
+[c648bf7 | Fri Apr 10 10:16:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Switch to using rack-test for our specs, needs rack-test from the master branch head
+
+[5c08e25 | Thu Apr 09 17:52:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use ContentLength middleware
+
+[0dc50d4 | Thu Apr 09 16:10:51 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix template caching... was using html instead of the wish the glob was for
+
+[622bbe3 | Thu Apr 09 16:01:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix example apps
+
+[6e9e843 | Tue Apr 07 09:56:56 UTC 2009] Sam Carr <samcarr@gmail.com>
+
+  * Minor tidy-ups to fix comments, add missing requires, add comments etc.
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[8f9af98 | Tue Apr 07 18:42:35 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Set default interval for reloader to 2 seconds
+
+[9f7e749 | Tue Apr 07 18:42:14 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Never assign $0, bad mojo
+
+[281501e | Tue Apr 07 17:53:08 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't assign a directory to $0
+
+[8a2ddc7 | Tue Apr 07 17:16:37 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04.08
+
 [89ab244 | Tue Apr 07 16:17:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * bring the retro_games example up to date

data/MANIFEST

@@ -4,10 +4,10 @@ MANIFEST
 README.md
 Rakefile
 example/app/retro_games.rb
-example/app/todo/layout/default.erb
+example/app/todo/layout/default.xhtml
 example/app/todo/spec/todo.rb
 example/app/todo/start.rb
-example/app/todo/view/index.erb
+example/app/todo/view/index.xhtml
 example/app/whywiki_erb/layout/wiki.html.erb
 example/app/whywiki_erb/spec/wiki.rb
 example/app/whywiki_erb/start.rb
@@ -30,8 +30,6 @@ lib/innate/cache/file_based.rb
 lib/innate/cache/marshal.rb
 lib/innate/cache/memory.rb
 lib/innate/cache/yaml.rb
-lib/innate/core_compatibility/basic_object.rb
-lib/innate/core_compatibility/string.rb
 lib/innate/current.rb
 lib/innate/dynamap.rb
 lib/innate/helper.rb
@@ -68,8 +66,10 @@ lib/innate/view.rb
 lib/innate/view/erb.rb
 lib/innate/view/etanni.rb
 lib/innate/view/none.rb
+spec/example/app/retro_games.rb
 spec/example/hello.rb
 spec/example/link.rb
+spec/example/provides.rb
 spec/example/session.rb
 spec/helper.rb
 spec/innate/action/layout.rb
@@ -124,3 +124,4 @@ tasks/manifest.rake
 tasks/rcov.rake
 tasks/release.rake
 tasks/reversion.rake
+tasks/setup.rake

data/README.md

@@ -67,7 +67,7 @@ encourages everybody to build on top of it whatever they want.
 * No clutter in your application directory structure, scales from a single file
   upwards
 * Seamless integration with Rack middleware
-* No patching[4] of ruby core or stdlib.
+* No patching of ruby core or stdlib.
 * Direct access to the current Request, Response, and Session from anywhere via
   Trinity
 * Works out of the box with ERB the templating engine.
@@ -77,7 +77,6 @@ encourages everybody to build on top of it whatever they want.
 [1]: What you may think of as Controller.
 [2]: This includes: Ruby 1.8, Ruby 1.9.1, JRuby, Rubinius
 [3]: Fiber is available on 1.9 only at this point.
-[4]: However, we add String#each if it isn't there to be compatible with Rack.
 
 ## Usage
 
@@ -449,13 +448,6 @@ authorization, etc.
 
 Innate abandons the snippets, keeping your core clean.
 
-Two things that we need are (currently) String#each, because Rack relies on it,
-and BasicObject as superclass for the Option class. They are only applied on
-demand.
-
-These are in the directory called core_extensions, to make it very, very clear
-what we are doing and how we are doing it.
-
 Ramaze has still a lot of these snippets and will continue to, although I will
 constantly strive to reduce them slowly.
 

data/Rakefile

@@ -4,10 +4,9 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-specs =  Dir['spec/{innate,example}/**/*.rb']
-specs -= Dir['spec/innate/cache/common.rb']
-PROJECT_SPECS = specs
+PROJECT_SPECS = FileList['spec/{innate,example}/**/*.rb'].exclude('common.rb')
 PROJECT_MODULE = 'Innate'
+PROJECT_README = 'README.md'
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'innate'
@@ -22,9 +21,10 @@ GEMSPEC = Gem::Specification.new{|s|
   s.has_rdoc     = true
   s.require_path = 'lib'
 
-#   s.add_runtime_dependency('rack', '>= 0.9.1') # lies!
-#   s.add_development_dependency('bacon', '>= 1.0')
-#   s.add_development_dependency('json', '~> 1.1.3')
+  # s.add_runtime_dependency('rack', '>= 0.9.1') # lies!
+  # s.add_development_dependency('bacon', '>= 1.0')
+  # s.add_development_dependency('json', '~> 1.1.3')
+  # s.add_development_dependency('rack-test', '>= 0.1.0')
 }
 
 Dir['tasks/*.rake'].each{|f| import(f) }

data/example/app/retro_games.rb

@@ -32,7 +32,8 @@ class Games
 
   TEMPLATE = <<-'T'.strip
 <?xml version='1.0' encoding='utf-8' ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html>
   <head>
     <title>Top Retro Games</title>
@@ -47,14 +48,13 @@ class Games
       <?r STORE.each do |name, votes| ?>
         <li>
           #{ a("Vote", r(:vote, u(name))) }
-          #{ "%5d => %s" % [votes, name] }
+          #{ h "%5d => %s" % [votes, name] }
         </li>
       <?r end ?>
     </ol>
   </body>
 </html>
   T
-
 end
 
 Innate.start

data/example/app/whywiki_erb/start.rb

@@ -7,7 +7,7 @@ DB = YAML::Store.new('wiki.yaml') unless defined?(DB)
 class Wiki
   Innate.node '/'
   layout 'wiki'
-  engine :ERB
+  provide :html, :engine => :ERB
 
   def index(page = 'Home')
     @page = page
@@ -39,4 +39,4 @@ class Wiki
   end
 end
 
-Innate.start :adapter => :mongrel
+Innate.start

data/example/provides.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'innate'
+require 'yaml'
 
 ARTICLES = {
   'hello' => {
@@ -13,15 +14,17 @@ class BlogArticles
   Innate.node('/')
 
   # provide a content representation for requests to /<action>.yaml
+  # If you request `/list.yaml`, you will get the `ARTICLES object serialized
+  # to YAML.
   provide(:yaml, :type => 'text/yaml'){|action, value| value.to_yaml }
 
-  # the return value of this method is the `value` in the provide above
-  # Since ruby has implicit returns, `ARTICLES` will be the return value.
-  #
-  # If you request `/list.yaml` you will get the `ARTICLES` object serialized
-  # to YAML.
+  # Since there will always be an `html` representation (the default), you have
+  # to take care of it. If you simply want to return an empty page, use following.
+  provide(:html){|action, value| '' }
+
+  # The return value of this method is the `value` in the provides above.
   def list
-    @articles = ARTICLES
+    return ARTICLES
   end
 end
 

data/innate.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.04.08"
+  s.version = "2009.04.18"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-04-08}
+  s.date = %q{2009-04-18}
   s.description = %q{Simple, straight-forward base for web-frameworks.}
   s.email = %q{m.fellinger@gmail.com}
-  s.files = ["CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.erb", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.erb", "example/app/whywiki_erb/layout/wiki.html.erb", "example/app/whywiki_erb/spec/wiki.rb", "example/app/whywiki_erb/start.rb", "example/app/whywiki_erb/view/edit.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/core_compatibility/basic_object.rb", "lib/innate/core_compatibility/string.rb", "lib/innate/current.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/helper/send_file.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/state/fiber.rb", "lib/innate/state/thread.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/send_file.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/state/fiber.rb", "spec/innate/state/thread.rb", "spec/innate/traited.rb", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/grancher.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake"]
+  s.files = ["CHANGELOG", "COPYING", "MANIFEST", "README.md", "Rakefile", "example/app/retro_games.rb", "example/app/todo/layout/default.xhtml", "example/app/todo/spec/todo.rb", "example/app/todo/start.rb", "example/app/todo/view/index.xhtml", "example/app/whywiki_erb/layout/wiki.html.erb", "example/app/whywiki_erb/spec/wiki.rb", "example/app/whywiki_erb/start.rb", "example/app/whywiki_erb/view/edit.erb", "example/app/whywiki_erb/view/index.erb", "example/custom_middleware.rb", "example/hello.rb", "example/howto_spec.rb", "example/link.rb", "example/provides.rb", "example/session.rb", "innate.gemspec", "lib/innate.rb", "lib/innate/action.rb", "lib/innate/adapter.rb", "lib/innate/cache.rb", "lib/innate/cache/api.rb", "lib/innate/cache/drb.rb", "lib/innate/cache/file_based.rb", "lib/innate/cache/marshal.rb", "lib/innate/cache/memory.rb", "lib/innate/cache/yaml.rb", "lib/innate/current.rb", "lib/innate/dynamap.rb", "lib/innate/helper.rb", "lib/innate/helper/aspect.rb", "lib/innate/helper/cgi.rb", "lib/innate/helper/flash.rb", "lib/innate/helper/link.rb", "lib/innate/helper/redirect.rb", "lib/innate/helper/render.rb", "lib/innate/helper/send_file.rb", "lib/innate/log.rb", "lib/innate/log/color_formatter.rb", "lib/innate/log/hub.rb", "lib/innate/middleware_compiler.rb", "lib/innate/mock.rb", "lib/innate/node.rb", "lib/innate/options.rb", "lib/innate/options/dsl.rb", "lib/innate/options/stub.rb", "lib/innate/request.rb", "lib/innate/response.rb", "lib/innate/route.rb", "lib/innate/session.rb", "lib/innate/session/flash.rb", "lib/innate/spec.rb", "lib/innate/state.rb", "lib/innate/state/accessor.rb", "lib/innate/state/fiber.rb", "lib/innate/state/thread.rb", "lib/innate/traited.rb", "lib/innate/trinity.rb", "lib/innate/version.rb", "lib/innate/view.rb", "lib/innate/view/erb.rb", "lib/innate/view/etanni.rb", "lib/innate/view/none.rb", "spec/example/app/retro_games.rb", "spec/example/hello.rb", "spec/example/link.rb", "spec/example/provides.rb", "spec/example/session.rb", "spec/helper.rb", "spec/innate/action/layout.rb", "spec/innate/action/layout/file_layout.xhtml", "spec/innate/cache/common.rb", "spec/innate/cache/marshal.rb", "spec/innate/cache/memory.rb", "spec/innate/cache/yaml.rb", "spec/innate/dynamap.rb", "spec/innate/helper.rb", "spec/innate/helper/aspect.rb", "spec/innate/helper/cgi.rb", "spec/innate/helper/flash.rb", "spec/innate/helper/link.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/render.rb", "spec/innate/helper/send_file.rb", "spec/innate/helper/view/aspect_hello.xhtml", "spec/innate/helper/view/locals.xhtml", "spec/innate/helper/view/loop.xhtml", "spec/innate/helper/view/num.xhtml", "spec/innate/helper/view/partial.xhtml", "spec/innate/helper/view/recursive.xhtml", "spec/innate/mock.rb", "spec/innate/node/mapping.rb", "spec/innate/node/node.rb", "spec/innate/node/resolve.rb", "spec/innate/node/view/another_layout/another_layout.xhtml", "spec/innate/node/view/bar.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/with_layout.xhtml", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.xhtml", "spec/innate/provides/list.txt.xhtml", "spec/innate/request.rb", "spec/innate/route.rb", "spec/innate/session.rb", "spec/innate/state/fiber.rb", "spec/innate/state/thread.rb", "spec/innate/traited.rb", "tasks/bacon.rake", "tasks/changelog.rake", "tasks/gem.rake", "tasks/gem_installer.rake", "tasks/grancher.rake", "tasks/install_dependencies.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
+  s.rubygems_version = %q{1.3.2}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
+    s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

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(caller, :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
@@ -185,10 +177,10 @@ module Innate
     #   Innate.start :root => File.dirname(__FILE__)
     #
     # Either setting will surpress the warning that might show up on startup
-    # and tells you it coldn't find an explicit root.
+    # and tells you it couldn't find an explicit root.
     #
     # In case these options are not passed we will try to figure out a file named
-    # `start.rb` in the processes working directory and assumes it's a valid point.
+    # `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
@@ -263,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/lib/innate/action.rb

@@ -1,6 +1,6 @@
 module Innate
-  ACTION_MEMBERS = [ :node, :method, :params, :view, :layout, :instance, :exts,
-    :wish, :options, :variables, :value, :view_value, :engine ]
+  ACTION_MEMBERS = [ :node, :instance, :method, :params, :method_value, :view,
+    :view_value, :layout, :wish, :options, :variables, :engine ]
 
   class Action < Struct.new(*ACTION_MEMBERS)
     # Create a new Action instance.
@@ -32,10 +32,7 @@ module Innate
     # @api stable
     # @author manveru
     def call
-      Current.actions << self
-      render
-    ensure
-      Current.actions.delete(self)
+      Current.actions ? wrap_in_current{ render } : render
     end
 
     # @return [Binding] binding of the instance for this Action
@@ -101,11 +98,11 @@ module Innate
 
       instance.wrap_action_call(self) do
         copy_variables # this might need another position after all
-        self.value = instance.__send__(method, *params) if method
-        self.view_value = File.read(view) if view
+        self.method_value = instance.__send__(method, *params) if method
+        self.view_value = ::File.read(view) if view
 
         body, content_type = wrap_in_layout{
-          engine.call(self, view_value || value || '') }
+          engine.call(self, view_value || method_value || '') }
         options[:content_type] ||= content_type if content_type
         body
       end
@@ -128,13 +125,20 @@ module Innate
       [:layout, :view].include?(name) ? [arg, nil] : [nil, arg]
     end
 
+    def wrap_in_current
+      Current.actions << self
+      yield
+    ensure
+      Current.actions.delete(self)
+    end
+
     # Try to figure out a sane name for current action.
     def name
       File.basename((method || view).to_s).split('.').first
     end
 
     def valid?
-      method || view
+      node.needs_method? ? (method && view) : (method || view)
     end
   end
 end