manveru-innate 2009.04.01 → 2009.04.08

data/CHANGELOG

@@ -1,3 +1,107 @@
+[89ab244 | Tue Apr 07 16:17:07 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * bring the retro_games example up to date
+
+[c1b6939 | Tue Apr 07 14:30:14 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix typo in howto_spec example
+
+[c1f7bb8 | Tue Apr 07 12:24:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve Helper::CGI, don't accept more than one argument per method
+
+[c01a0ce | Tue Apr 07 02:07:28 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Warn if action is invalid
+
+[d749887 | Tue Apr 07 02:07:01 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Helper::Render#render_template
+
+[fba39b5 | Mon Apr 06 03:26:29 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove specs for Helper::Partial
+
+[98bc6f7 | Mon Apr 06 03:25:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Add more specs and refine Helper::Render
+
+[616b5aa | Mon Apr 06 03:03:21 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Provide direct access to Helper::Render methods through extension
+
+[696f85d | Mon Apr 06 02:58:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make Helper::Render#render_template work and add specs
+
+[b0fcf13 | Sun Apr 05 23:51:09 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Adding Helper::Render, this should be able to cover all our rendering needs
+
+[ea02bbe | Sun Apr 05 23:49:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove Helper::Partial, to be replaced by Helper::Render
+
+[52c9943 | Sun Apr 05 23:47:01 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * just fix some annoying things
+
+[cd45648 | Sun Apr 05 23:46:17 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Refactor Helper to use HelpersHelper.options
+
+[4a1b7f6 | Sun Apr 05 14:25:43 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * remove some more methods from Request, they depend on a method in ramaze
+
+[6e0b421 | Sun Apr 05 09:22:19 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make multipart building a bit more compact
+
+[2f17bf6 | Sun Apr 05 14:23:45 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Make some variables more 'communicative', as reek puts it
+
+[348e179 | Sat Apr 04 06:37:50 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Caching for template locations finally working, this should reduce the disk IO through globbing considerably, even if it is still updating the locations for every request
+
+[8555277 | Sat Apr 04 06:27:54 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Better bacon task
+
+[110243b | Fri Apr 03 12:08:41 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Experimental templating path caching
+
+[258d7c9 | Fri Apr 03 13:01:12 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use Etanni engine for specs and most examples
+
+[2bf8941 | Fri Apr 03 12:59:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Comment out gemspec dependencies until rack is released
+
+[57078ac | Fri Apr 03 12:58:24 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Remove the extra newlines introduced with Etanni
+
+[51b4797 | Fri Apr 03 12:58:03 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Relax views by using #to_s instead of #to_str
+
+[d8475d3 | Fri Apr 03 09:48:49 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't carry over view_value into layout actions
+
+[8e2788f | Thu Apr 02 03:50:52 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix view and layout mapping if there are multiple view_mappings
+
+[8e93e87 | Tue Mar 31 16:35:56 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.04.01
+
 [1a7242b | Tue Mar 31 16:32:40 UTC 2009] Michael Fellinger <m.fellinger@gmail.com>
 
   * Optional is called Optioned now, watch out

data/MANIFEST

@@ -11,8 +11,8 @@ 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.html.erb
-example/app/whywiki_erb/view/index.html.erb
+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
@@ -39,8 +39,8 @@ lib/innate/helper/aspect.rb
 lib/innate/helper/cgi.rb
 lib/innate/helper/flash.rb
 lib/innate/helper/link.rb
-lib/innate/helper/partial.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
@@ -73,7 +73,7 @@ spec/example/link.rb
 spec/example/session.rb
 spec/helper.rb
 spec/innate/action/layout.rb
-spec/innate/action/layout/file_layout.erb
+spec/innate/action/layout/file_layout.xhtml
 spec/innate/cache/common.rb
 spec/innate/cache/marshal.rb
 spec/innate/cache/memory.rb
@@ -84,30 +84,30 @@ spec/innate/helper/aspect.rb
 spec/innate/helper/cgi.rb
 spec/innate/helper/flash.rb
 spec/innate/helper/link.rb
-spec/innate/helper/partial.rb
 spec/innate/helper/redirect.rb
+spec/innate/helper/render.rb
 spec/innate/helper/send_file.rb
-spec/innate/helper/view/aspect_hello.erb
-spec/innate/helper/view/locals.erb
-spec/innate/helper/view/loop.erb
-spec/innate/helper/view/num.erb
-spec/innate/helper/view/partial.erb
-spec/innate/helper/view/recursive.erb
+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.erb
-spec/innate/node/view/bar.erb
-spec/innate/node/view/foo.html.erb
-spec/innate/node/view/only_view.erb
-spec/innate/node/view/with_layout.erb
+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.erb
-spec/innate/provides/list.txt.erb
+spec/innate/provides/list.html.xhtml
+spec/innate/provides/list.txt.xhtml
 spec/innate/request.rb
 spec/innate/route.rb
 spec/innate/session.rb

data/Rakefile

@@ -22,9 +22,9 @@ 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')
 }
 
 Dir['tasks/*.rake'].each{|f| import(f) }

data/example/app/retro_games.rb

@@ -25,7 +25,7 @@ class Games
   end
 
   def vote(name)
-    STORE[url_decode(name)] += 1
+    STORE[name] += 1
 
     redirect_referrer
   end
@@ -39,17 +39,17 @@ class Games
   </head>
   <body>
     <h1>Vote on your favorite Retro Game</h1>
-    <form action="<%= r :create %>" method="post">
+    <form action="#{ r(:create) }" method="post">
       <input type="text" name="name" />
       <input type="submit" value="Add" />
     </form>
     <ol>
-      <% STORE.each do |name, votes| %>
+      <?r STORE.each do |name, votes| ?>
         <li>
-          <%= Games.a("Vote", "/vote/#{u name}") %>
-          <%= "%5d => %s" % [votes, name] %>
+          #{ a("Vote", r(:vote, u(name))) }
+          #{ "%5d => %s" % [votes, name] }
         </li>
-      <% end %>
+      <?r end ?>
     </ol>
   </body>
 </html>

data/example/app/todo/layout/default.erb

@@ -6,6 +6,6 @@
   </head>
   <body>
     <h1>Organize your life and learn Innate</h1>
-    <%= @content %>
+    #{ @content }
   </body>
 </html>

data/example/app/todo/view/index.erb

@@ -1,4 +1,4 @@
-<form method="post" action="<%= r :create %>">
+<form method="post" action="#{ r :create }">
   <fieldset>
     <legend>Create new task</legend>
 
@@ -10,30 +10,30 @@
 </form>
 
 <table>
-  <% @list.each do |title, done| %>
+  <?r @list.each do |title, done| ?>
     <tr>
-      <form method="post" action="<%= r :update %>">
-        <input type="hidden" name="id" value="<%= h title %>" />
+      <form method="post" action="#{ r :update }">
+        <input type="hidden" name="id" value="#{ h title }" />
         <td>
-          <input type="text" name="title" value="<%= h title %>" />
+          <input type="text" name="title" value="#{ h title }" />
         </td>
         <td>
-          <% if done %>
+          <?r if done ?>
             <input type="checkbox" name="done" checked="checked" />
-          <% else %>
+          <?r else ?>
             <input type="checkbox" name="done" />
-          <% end %>
+          <?r end ?>
         </td>
         <td>
           <input type="submit" value="Update" />
         </td>
       </form>
-      <form method="post" action="<%= r :delete %>">
-        <input type="hidden" name="id" value="<%= h title %>" />
+      <form method="post" action="#{ r :delete }">
+        <input type="hidden" name="id" value="#{ h title }" />
         <td>
           <input type="submit" value="Delete" />
         </td>
       </form>
     </tr>
-  <% end %>
+  <?r end ?>
 </table>

data/example/app/whywiki_erb/start.rb

@@ -7,6 +7,7 @@ DB = YAML::Store.new('wiki.yaml') unless defined?(DB)
 class Wiki
   Innate.node '/'
   layout 'wiki'
+  engine :ERB
 
   def index(page = 'Home')
     @page = page

data/example/howto_spec.rb

@@ -26,7 +26,7 @@ describe 'An example spec' do
     got['Content-Type'].should == 'text/html'
   end
 
-  should 'respond to /' do
+  should 'respond to /foo' do
     got = get('/foo')
     got.status.should == 200
     got.body.should == "I should be at /foo"

data/example/session.rb

@@ -11,9 +11,9 @@ class Hello
   <body>
     <h1>Session example</h1>
     <p>
-      Value is: <%= session[:value] %><br />
-      <%= a :increment %><br />
-      <%= a :decrement %>
+      Value is: #{ session[:value] }<br />
+      #{ a :increment }<br />
+      #{ a :decrement }
     </p>
   </body>
 </html>

data/innate.gemspec

@@ -2,14 +2,14 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.04.01"
+  s.version = "2009.04.08"
 
   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-01}
+  s.date = %q{2009-04-08}
   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.html.erb", "example/app/whywiki_erb/view/index.html.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/partial.rb", "lib/innate/helper/redirect.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.erb", "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/partial.rb", "spec/innate/helper/redirect.rb", "spec/innate/helper/send_file.rb", "spec/innate/helper/view/aspect_hello.erb", "spec/innate/helper/view/locals.erb", "spec/innate/helper/view/loop.erb", "spec/innate/helper/view/num.erb", "spec/innate/helper/view/partial.erb", "spec/innate/helper/view/recursive.erb", "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.erb", "spec/innate/node/view/bar.erb", "spec/innate/node/view/foo.html.erb", "spec/innate/node/view/only_view.erb", "spec/innate/node/view/with_layout.erb", "spec/innate/node/wrap_action_call.rb", "spec/innate/options.rb", "spec/innate/parameter.rb", "spec/innate/provides.rb", "spec/innate/provides/list.html.erb", "spec/innate/provides/list.txt.erb", "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.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.has_rdoc = true
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
@@ -21,17 +21,8 @@ Gem::Specification.new do |s|
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rack>, [">= 0.9.1"])
-      s.add_development_dependency(%q<bacon>, [">= 1.0"])
-      s.add_development_dependency(%q<json>, ["~> 1.1.3"])
     else
-      s.add_dependency(%q<rack>, [">= 0.9.1"])
-      s.add_dependency(%q<bacon>, [">= 1.0"])
-      s.add_dependency(%q<json>, ["~> 1.1.3"])
     end
   else
-    s.add_dependency(%q<rack>, [">= 0.9.1"])
-    s.add_dependency(%q<bacon>, [">= 1.0"])
-    s.add_dependency(%q<json>, ["~> 1.1.3"])
   end
 end

data/lib/innate/action.rb

@@ -100,7 +100,7 @@ module Innate
       self.variables[:content] ||= nil
 
       instance.wrap_action_call(self) do
-        copy_variables # this might another position after all
+        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
 
@@ -117,6 +117,7 @@ module Innate
       action = dup
       action.view, action.method = layout_view_or_method(*layout)
       action.layout = nil
+      action.view_value = nil
       action.sync_variables(self)
       body, content_type = yield
       action.variables[:content] = body

data/lib/innate/helper.rb

@@ -11,6 +11,7 @@ module Innate
     def self.included(into)
       into.extend(HelperAccess)
       into.__send__(:include, Trinity)
+      into.helper(*HelpersHelper.options[:default])
     end
   end
 
@@ -63,34 +64,27 @@ module Innate
   #
   #   p Innate::HelpersHelper.each(:cgi, :link, :aspect)
   module HelpersHelper
-    EXTS = %w[rb so bundle]
+    include Optioned
 
-    # By default, lib/innate/ is added to the PATH, you may add your
-    # application root here so innate will look in your own helper/ directory.
-    PATH = []
+    options.dsl do
+      o "Paths that will be searched for helper files",
+        :paths, [Dir.pwd, File.dirname(__FILE__)]
 
-    # The namespaces that may container helper modules.
-    # Lookup is done from left to right.
-    POOL = []
+      o "Namespaces that will be searched for helper modules",
+        :namespaces, [Helper]
 
-    # all of the following are singleton methods
+      o "Filename extensions considered for helper files",
+        :exts, %w[rb so bundle]
 
-    module_function
-
-    def add_pool(pool)
-      POOL.unshift(pool)
-      POOL.uniq!
+      o "Default helpers, added on inclusion of the Helper module",
+        :default, [:aspect, :cgi, :flash, :link, :render, :redirect, :send_file]
     end
 
-    add_pool(Helper)
+    EXTS = %w[rb so bundle]
 
-    def add_path(path)
-      PATH.unshift(File.expand_path(path))
-      PATH.uniq!
-    end
+    # all of the following are singleton methods
 
-    add_path(File.dirname(__FILE__))
-    add_path('')
+    module_function
 
     # Yield all the modules we can find for the given names of helpers, try to
     # require them if not available.
@@ -160,7 +154,7 @@ module Innate
     def get(name)
       name = name.to_s.split('_').map{|e| e.capitalize}.join
 
-      POOL.each do |namespace|
+      options.namespaces.each do |namespace|
         found = namespace.constants.grep(/^#{name}$/i).first
         return namespace.const_get(found) if found
       end
@@ -181,12 +175,9 @@ module Innate
     # Return a nice list of filenames in correct locations with correct
     # filename-extensions.
     def glob(name = '*')
-      "{#{paths.join(',')}}/helper/#{name}.{#{EXTS.join(',')}}"
-    end
-
-    # In case you want to do something better.
-    def paths
-      PATH
+      exts, paths = options.exts, options.paths
+      paths.uniq!
+      "{#{paths.join(',')}}/helper/#{name}.{#{exts.join(',')}}"
     end
   end
 end