innate 2009.04 → 2009.04.12

data/CHANGELOG

@@ -1,165 +1,3 @@
-[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
-
-[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.xhtml
+example/app/todo/layout/default.erb
 example/app/todo/spec/todo.rb
 example/app/todo/start.rb
-example/app/todo/view/index.xhtml
+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
@@ -30,6 +30,8 @@ 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
@@ -66,10 +68,8 @@ 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,4 +124,3 @@ 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 of ruby core or stdlib.
+* No patching[4] 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,6 +77,7 @@ 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
 
@@ -448,6 +449,13 @@ 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,7 +4,9 @@ require 'rake/gempackagetask'
 require 'time'
 require 'date'
 
-PROJECT_SPECS = FileList['spec/{innate,example}/**/*.rb'].exclude('common.rb')
+specs =  Dir['spec/{innate,example}/**/*.rb']
+specs -= Dir['spec/innate/cache/common.rb']
+PROJECT_SPECS = specs
 PROJECT_MODULE = 'Innate'
 PROJECT_README = 'README.md'
 
@@ -20,7 +22,6 @@ GEMSPEC = Gem::Specification.new{|s|
   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_development_dependency('bacon', '>= 1.0')

data/innate.gemspec

@@ -2,24 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.04"
+  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-26}
+  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.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.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"]
-  s.rubyforge_project = %q{innate}
-  s.rubygems_version = %q{1.3.2}
+  s.rubygems_version = %q{1.3.1}
   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 = 3
+    s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
     else

data/lib/innate.rb

@@ -3,7 +3,11 @@
 #
 # Name-space of Innate, just about everything goes in here.
 #
-# The only exception is Logger::ColorFormatter.
+# Exceptions are:
+#
+# * Logger::ColorFormatter
+# * In 1.8, we define ::BasicObject
+# * In 1.9, we define ::String#each
 #
 module Innate
   ROOT = File.expand_path(File.dirname(__FILE__))
@@ -26,6 +30,10 @@ module Innate
   # 3rd party
   require 'rack'
 
+  # innate's ruby core patches
+  require 'innate/core_compatibility/string'
+  require 'innate/core_compatibility/basic_object'
+
   # innate core
   require 'innate/version'
   require 'innate/traited'

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, :path ]
+  ACTION_MEMBERS = [ :node, :method, :params, :view, :layout, :instance, :exts,
+    :wish, :options, :variables, :value, :view_value, :engine ]
 
   class Action < Struct.new(*ACTION_MEMBERS)
     # Create a new Action instance.
@@ -32,7 +32,10 @@ module Innate
     # @api stable
     # @author manveru
     def call
-      Current.actions ? wrap_in_current{ render } : render
+      Current.actions << self
+      render
+    ensure
+      Current.actions.delete(self)
     end
 
     # @return [Binding] binding of the instance for this Action
@@ -98,11 +101,11 @@ module Innate
 
       instance.wrap_action_call(self) do
         copy_variables # this might need another position after all
-        self.method_value = instance.__send__(method, *params) if method
-        self.view_value = ::File.read(view) if view
+        self.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 || method_value || '') }
+          engine.call(self, view_value || value || '') }
         options[:content_type] ||= content_type if content_type
         body
       end
@@ -125,26 +128,13 @@ 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
 
-    # 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)
+      method || view
     end
   end
 end

data/lib/innate/core_compatibility/basic_object.rb

@@ -0,0 +1,10 @@
+# We define BasicObject for compatibility with 1.9 if it isn't there yet.
+class BasicObject
+  # Remove all but these methods
+  # NOTE: __id__ is not there in 1.9, but would give a warning in 1.8
+  KEEP = %w[== equal? ! != instance_eval instance_exec __send__ __id__]
+
+  (instance_methods - KEEP).each do |im|
+    undef_method(im)
+  end
+end unless defined?(BasicObject)

data/lib/innate/core_compatibility/string.rb

@@ -0,0 +1,3 @@
+class String # Dirty hack, but Rack needs it?
+  alias each each_line unless 'String'.respond_to?(:each)
+end

data/lib/innate/dynamap.rb

@@ -18,11 +18,6 @@ module Innate
       remap(@originals.merge(location.to_s => object))
     end
 
-    def delete(location)
-      @originals.delete(location)
-      remap(@originals)
-    end
-
     def at(location)
       @originals[location]
     end

data/lib/innate/helper.rb

@@ -152,10 +152,10 @@ module Innate
     # helper :foo_bar # => FooBar
     # helper :foo # => Foo
     def get(name)
-      module_name = /^#{name.to_s.dup.delete('_')}$/i
+      name = name.to_s.split('_').map{|e| e.capitalize}.join
 
       options.namespaces.each do |namespace|
-        found = namespace.constants.grep(module_name).first
+        found = namespace.constants.grep(/^#{name}$/i).first
         return namespace.const_get(found) if found
       end
 

data/lib/innate/helper/cgi.rb

@@ -46,9 +46,6 @@ module Innate
         Rack::Utils.escape_html(input.to_s).gsub(/#([{@$]@?)/, '#\1')
       end
       alias h html_and_code_escape
-
-      # aliases are ignored by module_function...
-      module_function :u, :h
     end
   end
 end

data/lib/innate/helper/link.rb

@@ -28,12 +28,12 @@ module Innate
         hashes, names = args.partition{|arg| arg.respond_to?(:merge!) }
         hashes.each{|to_merge| hash.merge!(to_merge) }
 
-        escape = Rack::Utils.method(:escape)
         location = route_location(self)
-        front = Array[location, name, *names.map{|n| escape[n]}].join('/').squeeze('/')
+        front = Array[location, name, *names].join('/').squeeze('/')
 
         return URI(front) if hash.empty?
 
+        escape = Rack::Utils.method(:escape)
         query = hash.map{|k, v| "#{escape[k]}=#{escape[v]}" }.join(';')
         URI("#{front}?#{query}")
       end

data/lib/innate/helper/redirect.rb

@@ -57,7 +57,7 @@ module Innate
       end
 
       def raw_redirect(target, options = {}, &block)
-        header = response.header.merge('Location' => target.to_s)
+        header = {'Location' => target.to_s}
         status = options[:status] || 302
         body   = options[:body] || redirect_body(target)
 

data/lib/innate/helper/render.rb

@@ -38,21 +38,17 @@ module Innate
       end
 
       # Renders an action without any layout.
-      # You can further tweak the action to be rendered by passing a block.
-      #
       # @api external
       # @see render_custom
       # @author manveru
       def render_partial(action_name, variables = {})
         render_custom(action_name, variables) do |action|
           action.layout = nil
-          yield(action) if block_given?
         end
       end
 
       # Renders an action view, doesn't execute any methods and won't wrap it
       # into a layout.
-      # You can further tweak the action to be rendered by passing a block.
       #
       # @api external
       # @see render_custom
@@ -61,14 +57,11 @@ module Innate
         render_custom(action_name, variables) do |action|
           action.layout = nil
           action.method = nil
-          yield(action) if block_given?
         end
       end
 
       def render_custom(action_name, variables = {})
-        unless action = resolve(action_name.to_s)
-          raise(ArgumentError, "No Action %p on #{self}" % action_name)
-        end
+        action = resolve(action_name.to_s)
 
         action.sync_variables(self.action)
         action.instance = action.node.new

data/lib/innate/helper/send_file.rb

@@ -3,20 +3,12 @@ module Innate
     module SendFile
       # Not optimally performing but convenient way to send files by their
       # filename.
-      #
-      # I think we should remove this from the default helpers and move it into
-      # Ramaze, the functionality is almost never used, the naming is ambigous,
-      # and it doesn't use the send_file capabilities of frontend servers.
-      #
-      # So for now, I'll mark it for deprecation
-      def send_file(filename, content_type = nil, content_disposition = nil)
+      def send_file(filename, content_type = nil)
         content_type ||= Rack::Mime.mime_type(::File.extname(filename))
-        content_disposition ||= File.basename(filename)
 
         response.body = ::File.readlines(filename, 'rb')
         response['Content-Length'] = ::File.size(filename).to_s
         response['Content-Type'] = content_type
-        response['Content-Disposition'] = content_disposition
         response.status = 200
 
         throw(:respond, response)

data/lib/innate/node.rb

@@ -364,7 +364,7 @@ module Innate
     def resolve(path)
       name, wish, engine = find_provide(path)
       node = (respond_to?(:ancestors) && respond_to?(:new)) ? self : self.class
-      action = Action.create(:node => node, :wish => wish, :engine => engine, :path => path)
+      action = Action.create(:node => node, :wish => wish, :engine => engine)
 
       if content_type = node.ancestral_trait["#{wish}_content_type"]
         action.options = {:content_type => content_type}

data/lib/innate/response.rb

@@ -1,4 +1,9 @@
 module Innate
+
+  # In order to reset the body contents we also need to reset the length set by
+  # Response#write - until I can submit a patch to Rack and the next release we
+  # just do this.
+
   class Response < Rack::Response
     include Optioned
 
@@ -7,6 +12,8 @@ module Innate
         :headers, {'Content-Type' => 'text/html'}
     end
 
+    attr_accessor :length
+
     def reset
       self.status = 200
       self.header.delete('Content-Type')

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.04"
+  VERSION = "2009.04.08"
 end

data/spec/innate/helper/link.rb

@@ -56,14 +56,6 @@ 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/tasks/release.rake

@@ -1,51 +1,12 @@
-namespace :release do
-  task :all => [:release_github, :release_rubyforge]
+desc 'publish to github'
+task :release => [:reversion, :gemspec] do
+  name, version = GEMSPEC.name, GEMSPEC.version
 
-  desc 'Display instructions to release on github'
-  task :github => [:reversion, :gemspec] do
-    name, version = GEMSPEC.name, GEMSPEC.version
+  sh("git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb")
 
-    puts <<INSTRUCTIONS
-First add the relevant files:
-
-git add MANIFEST CHANGELOG #{name}.gemspec lib/#{name}/version.rb
-
-Then commit them, tag the commit, and push:
-
-git commit -m 'Version #{version}'
-git tag -a -m '#{version}' '#{version}'
-git push
-
-INSTRUCTIONS
-
-  end
-
-  # TODO: Not tested
-  desc 'Display instructions to release on rubyforge'
-  task :rubyforge => [:reversion, :gemspec, :package] do
-    name, version = GEMSPEC.name, GEMSPEC.version
-
-    puts <<INSTRUCTIONS
-To publish to rubyforge do following:
-
-rubyforge login
-rubyforge add_release #{name} '#{version}' pkg/#{name}-#{version}.gem
-
-After you have done these steps, see:
-
-rake release:rubyforge_archives
-
-INSTRUCTIONS
-  end
-
-  desc 'Display instructions to add archives after release:rubyforge'
-  task :rubyforge_archives do
-    puts "Adding archives for distro packagers is:", ""
-
-    Dir["pkg/#{name}-#{version}.{gz,zip}"].each do |file|
-      puts "rubyforge add_file #{name} #{name} '#{version}' '#{file}'"
-    end
-
-    puts
-  end
+  puts "I added the relevant files, you can now run:", ''
+  puts "git commit -m 'Version #{version}'"
+  puts "git tag -a -m '#{version}' '#{version}'"
+  puts "git push"
+  puts
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
-  version: "2009.04"
+  version: 2009.04.12
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-26 00:00:00 +09:00
+date: 2009-04-12 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -54,6 +54,8 @@ files:
 - 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
@@ -151,8 +153,6 @@ files:
 - tasks/setup.rake
 has_rdoc: true
 homepage: http://github.com/manveru/innate
-licenses: []
-
 post_install_message: 
 rdoc_options: []
 
@@ -172,10 +172,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: innate
-rubygems_version: 1.3.2
+rubyforge_project: 
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Powerful web-framework wrapper for Rack.
 test_files: []