manveru-innate 2009.04.18 → 2009.05

data/CHANGELOG

@@ -1,3 +1,233 @@
+[9486b35 | Wed May 06 15:37:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * VERSION=xxx rake release:xxx
+
+[14feedf | Wed May 06 15:33:48 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Bring rakefile up to date
+
+[2252c28 | Wed May 06 15:20:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Last minute changes to tasks
+
+[ddc4560 | Wed May 06 15:14:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some ycov tasks, not all that tested yet
+
+[146e349 | Wed May 06 12:56:27 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * raise a more meaningful error when trying to assign to a non-existent option
+
+[21bbd9b | Tue May 05 06:08:06 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove some (c)
+
+[8fd62a3 | Tue May 05 04:48:32 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make Session compatible with the Rack spec, prepare to make it a middleware
+
+[a73a54e | Tue May 05 04:37:25 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Tell people that using YAML/Marshal cache is a bad idea in some cases
+
+[fff4e2a | Tue May 05 04:30:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Some docs fixes
+
+[d90138c | Mon May 04 11:19:35 UTC 2009] Ryan Grove <ryan@wonko.com>
+
+  * Add a read_cache option (off by default) to control caching of template files on read
+
+[aaa9b96 | Sun May 03 04:04:18 UTC 2009] Ryan Grove <ryan@wonko.com>
+
+  * When the view cache is enabled and Innate is in :live mode, cache view files after the first read to prevent unnecessary filesystem reads in the future.
+
+[06c224f | Mon May 04 16:49:15 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix update_mapping_shared, it would try to walk files and was buggy
+
+[e3ad651 | Mon May 04 03:28:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * remove specs for state
+
+[f69716d | Sun May 03 17:37:06 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Implement caching of traits
+
+[0434785 | Sat May 02 15:56:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove useless token from Etanni
+
+[d0356c6 | Sat May 02 06:05:42 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use clearer syntax for the option in view
+
+[2c3c1ca | Sat May 02 05:40:54 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Elaborate what +filename+ means
+
+[12d3666 | Sat May 02 05:40:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Only emit warning when the action is really invalid
+
+[5cb9b41 | Sat May 02 05:37:25 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Put the require of find into innate.rb
+
+[89d5858 | Sat May 02 14:24:30 UTC 2009] Andreas Karlsson <andreas@proxel.se>
+
+  * Simplify copy_variables by not using eval.
+
+    Copying to an instance instead of a binding simplifies
+    the code while also giving a minor performance enhancement
+    as a bonus.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[d1fe1f4 | Sat May 02 14:38:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * copy thread variables in Innate::defer
+
+[83d0a93 | Sat May 02 13:59:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Innate::STATE
+
+[f9ff691 | Fri May 01 20:04:20 UTC 2009] Andreas Karlsson <andreas@proxel.se>
+
+  * Move require due to profiling results.
+
+    When profiling with ruby-prof it was reveiled to me that a
+    major part of the time was spent inside require. Benchmarking
+    with a simple hello world application revealed it to be about
+    25 percent faster without this require.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[4155ea9 | Fri May 01 15:51:53 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Only warn if we encounter an invalid action in render_custom, try to render still
+
+[b4a9e70 | Fri May 01 15:46:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Be compatible with rack-test
+
+[3db47bc | Fri May 01 15:46:38 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Be compatible with 1.8
+
+[b3fb7be | Fri May 01 14:07:10 UTC 2009] Pistos <gitsomegrace.5.pistos@geoshell.com>
+
+  * In render helper: render_template -> render_file .  Changed relevant specs, too.
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[f3491f7 | Thu Apr 30 04:59:16 UTC 2009] Tadahiko Uehara <kikofx@gmail.com>
+
+  * Skip template/view/layout lookup if the given path doesn't exist.
+
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[e4b5388 | Fri May 01 08:30:31 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * We don't want to call Innate::setup_dependencies for rendering...
+
+[7c90ec0 | Fri May 01 07:22:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Default layout mapping to '/'
+
+[64517b3 | Fri May 01 07:20:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add some example invocations to the Helper::Render methods
+
+[d531f58 | Fri May 01 07:19:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding Helper::Render#render_template due to popular demand
+
+[59229dc | Fri May 01 06:18:39 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Speed up and simplify Etanni a little bit more
+
+[d8c3ca5 | Thu Apr 30 09:07:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add option to switch caching of compiled templates
+
+[21c4dfd | Thu Apr 30 08:19:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make Etanni a little bit more compact
+
+[43f6d76 | Thu Apr 30 08:19:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * First cut of template compilation, it's dumb, but it should speed things up a little
+
+[cca6d4d | Wed Apr 29 14:34:45 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve the ColorFormatter, output background as well
+
+[abda94c | Wed Apr 29 11:04:43 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Only add :trigger to options if there is one
+
+[559e711 | Wed Apr 29 07:51:58 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Spec cookie setting before redirect. Closes #1
+
+[9c85a49 | Tue Apr 28 13:05:33 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make the template lookup work without globs, hopefully that works on GAE now
+
+[a0b1f4a | Tue Apr 28 12:41:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make helper lookup work without glob
+
+[49ed57b | Tue Apr 28 12:41:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Tell people that routing static files doesn't work
+
+[ff310ab | Thu Apr 23 15:30:05 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Avoid issues with symbol comparision on 1.8
+
+[fce62b9 | Sun Apr 26 16:30:44 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Support setting multiple AOP hooks at once in before/after/wrap
+
+[ffd8edd | Sat Apr 25 14:59:47 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Give innate a rubyforge project
+
+[cf62a9c | Sat Apr 25 14:59:20 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04
+
+[0ec2012 | Thu Apr 23 06:21:17 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow deletion of mapped apps in DynaMap
+
+[cbedd9c | Thu Apr 23 05:04:04 UTC 2009] Ryan Grove <ryan@wonko.com>
+
+  * Add path and full_path to Innate::Action
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[b9a0d4b | Mon Apr 20 05:12:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make the u and h aliases for the CGI helper module_functions too
+
+[b68aad4 | Mon Apr 20 05:12:10 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Allow further modification of the Action in the render_* methods via block
+
+[dca3531 | Sun Apr 19 23:38:06 UTC 2009] Ryan Grove <ryan@wonko.com>
+
+  * Preserve response headers when redirecting. Closes #1
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[d465ca3 | Sat Apr 18 02:46:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04.18
+
 [987c5d7 | Sat Apr 18 02:44:26 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Update the release tasks

data/MANIFEST

@@ -57,8 +57,6 @@ 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
@@ -111,9 +109,8 @@ 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/authors.rake
 tasks/bacon.rake
 tasks/changelog.rake
 tasks/gem.rake
@@ -125,3 +122,4 @@ tasks/rcov.rake
 tasks/release.rake
 tasks/reversion.rake
 tasks/setup.rake
+tasks/ycov.rake

data/Rakefile

@@ -7,6 +7,7 @@ require 'date'
 PROJECT_SPECS = FileList['spec/{innate,example}/**/*.rb'].exclude('common.rb')
 PROJECT_MODULE = 'Innate'
 PROJECT_README = 'README.md'
+PROJECT_VERSION = ENV['VERSION'] || Date.today.strftime('%Y.%m.%d')
 
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'innate'
@@ -16,12 +17,15 @@ GEMSPEC = Gem::Specification.new{|s|
   s.email        = 'm.fellinger@gmail.com'
   s.homepage     = 'http://github.com/manveru/innate'
   s.platform     = Gem::Platform::RUBY
-  s.version      = (ENV['PROJECT_VERSION'] || Date.today.strftime("%Y.%m.%d"))
+  s.version      = PROJECT_VERSION
   s.files        = `git ls-files`.split("\n").sort
   s.has_rdoc     = true
   s.require_path = 'lib'
+  s.rubyforge_project = "innate"
 
-  # s.add_runtime_dependency('rack', '>= 0.9.1') # lies!
+  s.add_dependency('rack', '~> 1.0.0')
+
+  # rip those out if they cause you trouble
   # s.add_development_dependency('bacon', '>= 1.0')
   # s.add_development_dependency('json', '~> 1.1.3')
   # s.add_development_dependency('rack-test', '>= 0.1.0')

data/example/app/whywiki_erb/start.rb

@@ -35,7 +35,7 @@ class Wiki
   private
 
   def sync
-    Innate::STATE.sync{ DB.transaction{ yield }}
+    Innate.sync{ DB.transaction{ yield }}
   end
 end
 

data/innate.gemspec

@@ -2,17 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.04.18"
+  s.version = "2009.05"
 
   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-18}
+  s.date = %q{2009-05-07}
   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.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.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/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/traited.rb", "tasks/authors.rake", "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", "tasks/ycov.rake"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
+  s.rubyforge_project = %q{innate}
   s.rubygems_version = %q{1.3.2}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
@@ -21,8 +22,11 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<rack>, ["~> 1.0.0"])
     else
+      s.add_dependency(%q<rack>, ["~> 1.0.0"])
     end
   else
+    s.add_dependency(%q<rack>, ["~> 1.0.0"])
   end
 end

data/lib/innate.rb

@@ -13,14 +13,15 @@ module Innate
   end
 
   # stdlib
-  require 'pp'
-  require 'set'
-  require 'pathname'
   require 'digest/sha1'
   require 'digest/sha2'
+  require 'find'
   require 'ipaddr'
-  require 'socket'
   require 'logger'
+  require 'pathname'
+  require 'pp'
+  require 'set'
+  require 'socket'
   require 'uri'
 
   # 3rd party

data/lib/innate/action.rb

@@ -1,6 +1,6 @@
 module Innate
   ACTION_MEMBERS = [ :node, :instance, :method, :params, :method_value, :view,
-    :view_value, :layout, :wish, :options, :variables, :engine ]
+    :view_value, :layout, :wish, :options, :variables, :engine, :path ]
 
   class Action < Struct.new(*ACTION_MEMBERS)
     # Create a new Action instance.
@@ -64,31 +64,16 @@ module Innate
       from_action
     end
 
-    COPY_VARIABLES = '
-      STATE[:action_variables].each do |iv, value|
-        instance_variable_set("@#{iv}", value)
-      end'.strip.freeze
-
-    # Copy Action#variables as instance variables into the given binding.
-    #
-    # This relies on Innate::STATE, so should be thread-safe and doesn't depend
-    # on Innate::Current::actions order.
-    # So we avoid nasty business with Objectspace#_id2ref which may not work on
-    # all ruby implementations and seems to cause other problems as well.
+    # Copy Action#variables as instance variables into the given object.
+    # Defaults to copying the variables to self.
     #
-    # @param [Binding #eval] binding
+    # @param [Object #instance_variable_set] object
     # @return [NilClass] there is no indication of failure or success
-    # @see View::ERB::render
+    # @see Action#render
     # @author manveru
-    def copy_variables(binding = self.binding)
-      return unless variables.any?
-
-      STATE.sync do
-        STATE[:action_variables] = self.variables
-
-        eval(COPY_VARIABLES, binding)
-
-        STATE[:action_variables] = nil
+    def copy_variables(object)
+      self.variables.each do |iv, value|
+        object.instance_variable_set("@#{iv}", value)
       end
     end
 
@@ -97,9 +82,9 @@ module Innate
       self.variables[:content] ||= nil
 
       instance.wrap_action_call(self) do
-        copy_variables # this might need another position after all
+        copy_variables(self.instance) # this might need another position
         self.method_value = instance.__send__(method, *params) if method
-        self.view_value = ::File.read(view) if view
+        self.view_value = View.read(view) if view
 
         body, content_type = wrap_in_layout{
           engine.call(self, view_value || method_value || '') }
@@ -113,6 +98,7 @@ module Innate
 
       action = dup
       action.view, action.method = layout_view_or_method(*layout)
+      action.params = []
       action.layout = nil
       action.view_value = nil
       action.sync_variables(self)
@@ -137,6 +123,12 @@ module Innate
       File.basename((method || view).to_s).split('.').first
     end
 
+    # Path to this action, including params, with the mapping of the current
+    # controller prepended.
+    def full_path
+      File.join(node.mapping, path)
+    end
+
     def valid?
       node.needs_method? ? (method && view) : (method || view)
     end

data/lib/innate/cache.rb

@@ -65,7 +65,7 @@ module Innate
 
     options.dsl do
       o "Assign a cache to each of these names on Innate::Cache::setup",
-        :names, [:session]
+        :names, [:session, :view]
 
       default "If no option for the cache name exists, fall back to this",
         Innate::Cache::Memory

data/lib/innate/cache/drb.rb

@@ -9,8 +9,7 @@ module Innate
     # example below is using a normal Hash, but it is recommended to use a
     # thread-safe alternative like SyncHash.
     #
-    # Example for DRb server:
-    #
+    # @usage example for DRb server
     #   require 'drb'
     #
     #   URI = "druby://127.0.0.1:9069"
@@ -21,12 +20,13 @@ module Innate
     #   DRb.start_service(URI, CACHE)
     #   DRb.thread.join
     #
-    # Usage for all caches:
+    # Please note that on some Ruby implementations, access to Hash is not
+    # atomic and you might need to lock around access to avoid race conditions.
     #
+    # @usage for all caches
     #   Innate.options.cache.default = Innate::Cache::DRb
     #
-    # Usage for sessions only:
-    #
+    # @usage for sessions only
     #   Innate.options.cache.session = Innate::Cache::DRb
     class DRb
       include Cache::API