innate 2009.07 → 2009.10

data/AUTHORS

@@ -1,10 +1,14 @@
 Following persons have contributed to innate.
 (Sorted by number of submitted patches, then alphabetically)
 
-   722 Michael Fellinger <m.fellinger@gmail.com>
+   739 Michael Fellinger <m.fellinger@gmail.com>
     31 Tadahiko Uehara <kikofx@gmail.com>
      8 Pistos <gitsomegrace.5.pistos@geoshell.com>
      5 Ryan Grove <ryan@wonko.com>
      2 Andreas Karlsson <andreas@proxel.se>
+     2 Antti Tuomi <antti.tuomi@tkk.fi>
      2 TJ Vanderpoel <bougy.man@gmail.com>
+     1 Arnaud Meuret <arnaud@meuret.name>
+     1 Jérémy Zurcher <jeremy@asynk.ch>
+     1 ravage <ravage@fragmentized.net>
      1 Sam Carr <samcarr@gmail.com>

data/CHANGELOG

@@ -1,3 +1,103 @@
+[1b0702f | 2009-10-02 13:24:16 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Version 2009.10
+
+[88451a1 | 2009-10-02 13:23:53 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve the release tasks, add one for gemcutter
+
+[c37df32 | 2009-10-01 11:16:02 UTC] Arnaud Meuret <arnaud@meuret.name>
+
+  * Fix: specifying a layout from a method and a filter block was broken
+
+[18668be | 2009-09-29 14:13:13 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Update dependencies
+
+[672bbaa | 2009-09-22 15:15:44 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use Rack::Utils::build_query, this changes query separator from ; to &
+
+[0d4d2d1 | 2009-09-22 15:04:05 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Improve code readability a bit
+
+[44d02ed | 2009-09-21 17:02:09 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Use Mutex instead of Thread::critical
+
+[1b80af6 | 2009-09-21 17:00:42 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix ruby/jruby dependency mixup
+
+[783f554 | 2009-09-21 16:32:07 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix startup issue regarding jruby-rack
+
+[a908b32 | 2009-09-15 07:15:48 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix typo
+
+[79df3a5 | 2009-08-27 08:21:05 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Don't call aspects in layout
+
+[b69e9dd | 2009-08-27 03:55:08 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Fix Options#pretty_print spec
+
+[6b8c32d | 2009-08-27 03:36:53 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * dev dependencies for jruby
+
+[0bb6ea5 | 2009-08-26 16:59:01 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Forgot to require digest/md5
+
+[2bc0566 | 2009-08-19 08:27:37 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Cache is not a module
+
+[c74c2b8 | 2009-08-17 05:37:02 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * fix doc typo
+
+[9650f8c | 2009-07-28 06:49:20 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Some more specs for double underscore
+
+[822560a | 2009-07-28 06:43:32 UTC] Michael Fellinger <m.fellinger@gmail.com>
+
+  * Expand specs for double underscore
+
+[b865335 | 2009-05-21 13:27:38 UTC] Antti Tuomi <antti.tuomi@tkk.fi>
+
+  * Aspect spec uses inline layout instead a file-based.
+
+    Also prefixed DerivedWithLayout with the helper name.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[62d8853 | 2009-05-21 13:16:57 UTC] Antti Tuomi <antti.tuomi@tkk.fi>
+
+  * Aspect spec checks the functionality when using layouts.
+
+    This spec fails at the moment.
+    
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[e4735cb | 2009-05-27 14:57:48 UTC] ravage <ravage@fragmentized.net>
+
+  * Resolve fake depth
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
+[10d7ef3 | 2009-07-21 16:11:57 UTC] Jérémy Zurcher <jeremy@asynk.ch>
+
+  * fix default option handling overriding in options/dsl
+
+    Signed-off-by: Michael Fellinger <m.fellinger@gmail.com>
+
 [03274f3 | 2009-07-19 03:02:21 UTC] Michael Fellinger <m.fellinger@gmail.com>
 
   * Version 2009.07

data/MANIFEST

@@ -100,8 +100,12 @@ 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/cat2/cat22.xhtml
+spec/innate/node/view/cat3/cat33.xhtml
 spec/innate/node/view/foo.html.xhtml
 spec/innate/node/view/only_view.xhtml
+spec/innate/node/view/sub/baz.xhtml
+spec/innate/node/view/sub/foo/baz.xhtml
 spec/innate/node/view/with_layout.xhtml
 spec/innate/node/wrap_action_call.rb
 spec/innate/options.rb

data/Rakefile

@@ -15,10 +15,15 @@ DEPENDENCIES = {
 
 DEVELOPMENT_DEPENDENCIES = {
   'bacon'     => {:version => '>= 1.1.0'},
-  'json'      => {:version => '~> 1.1.7'},
-  'rack-test' => {:version => '>= 0.4.0', :lib => 'rack/test'}
+  'rack-test' => {:version => '>= 0.5.0', :lib => 'rack/test'}
 }
 
+if defined?(RUBY_PLATFORM) && RUBY_PLATFORM =~ /jruby/
+  DEVELOPMENT_DEPENDENCIES['json-jruby'] = {:version => '~> 1.1.7'}
+else
+  DEVELOPMENT_DEPENDENCIES['json'] = {:version => '~> 1.1.9'}
+end
+
 GEMSPEC = Gem::Specification.new{|s|
   s.name         = 'innate'
   s.author       = "Michael 'manveru' Fellinger"

data/innate.gemspec

@@ -2,18 +2,18 @@
 
 Gem::Specification.new do |s|
   s.name = %q{innate}
-  s.version = "2009.07"
+  s.version = "2009.10"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael 'manveru' Fellinger"]
-  s.date = %q{2009-07-25}
+  s.date = %q{2009-10-02}
   s.description = %q{Simple, straight-forward base for web-frameworks.}
   s.email = %q{m.fellinger@gmail.com}
-  s.files = ["AUTHORS", "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/spec/bacon.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/modes.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_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
+  s.files = ["AUTHORS", "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/spec/bacon.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/modes.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/cat2/cat22.xhtml", "spec/innate/node/view/cat3/cat33.xhtml", "spec/innate/node/view/foo.html.xhtml", "spec/innate/node/view/only_view.xhtml", "spec/innate/node/view/sub/baz.xhtml", "spec/innate/node/view/sub/foo/baz.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_setup.rake", "tasks/grancher.rake", "tasks/manifest.rake", "tasks/rcov.rake", "tasks/release.rake", "tasks/reversion.rake", "tasks/setup.rake", "tasks/ycov.rake"]
   s.homepage = %q{http://github.com/manveru/innate}
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{innate}
-  s.rubygems_version = %q{1.3.4}
+  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Powerful web-framework wrapper for Rack.}
 
   if s.respond_to? :specification_version then
@@ -23,18 +23,18 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<rack>, ["~> 1.0.0"])
       s.add_development_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_development_dependency(%q<json>, ["~> 1.1.7"])
-      s.add_development_dependency(%q<rack-test>, [">= 0.4.0"])
+      s.add_development_dependency(%q<rack-test>, [">= 0.5.0"])
+      s.add_development_dependency(%q<json>, ["~> 1.1.9"])
     else
       s.add_dependency(%q<rack>, ["~> 1.0.0"])
       s.add_dependency(%q<bacon>, [">= 1.1.0"])
-      s.add_dependency(%q<json>, ["~> 1.1.7"])
-      s.add_dependency(%q<rack-test>, [">= 0.4.0"])
+      s.add_dependency(%q<rack-test>, [">= 0.5.0"])
+      s.add_dependency(%q<json>, ["~> 1.1.9"])
     end
   else
     s.add_dependency(%q<rack>, ["~> 1.0.0"])
     s.add_dependency(%q<bacon>, [">= 1.1.0"])
-    s.add_dependency(%q<json>, ["~> 1.1.7"])
-    s.add_dependency(%q<rack-test>, [">= 0.4.0"])
+    s.add_dependency(%q<rack-test>, [">= 0.5.0"])
+    s.add_dependency(%q<json>, ["~> 1.1.9"])
   end
 end

data/lib/innate.rb

@@ -13,6 +13,7 @@ module Innate
   end
 
   # stdlib
+  require 'digest/md5'
   require 'digest/sha1'
   require 'digest/sha2'
   require 'find'
@@ -22,6 +23,7 @@ module Innate
   require 'pp'
   require 'set'
   require 'socket'
+  require 'thread'
   require 'uri'
 
   # 3rd party
@@ -102,27 +104,27 @@ module Innate
     #   Keep state in Thread or Fiber, fall back to Thread if Fiber not available
     # @option param :mode    [Symbol]  (:dev)
     #   Indicates which default middleware to use, (:dev|:live)
-    def start(given_options = {}, &block)
-      root = given_options.delete(:root)
-      file = given_options.delete(:file)
+    def start(options = {}, &block)
+      root, file = options.delete(:root), options.delete(:file)
+      innate_options = Innate.options
 
       found_root = go_figure_root(caller, :root => root, :file => file)
-      Innate.options.roots = [*found_root] if found_root
+      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? }
+      PROXY_OPTIONS.each{|given, proxy| options[proxy] = options[given] }
+      options.delete_if{|key, value| PROXY_OPTIONS[key] || value.nil? }
 
       # Merge the user's given options into our existing set, which contains defaults.
-      options.merge!(given_options)
+      innate_options.merge!(options)
 
       setup_dependencies
-      middleware!(options.mode, &block) if block_given?
+      middleware!(innate_options.mode, &block) if block_given?
 
-      return if options.started
-      options.started = true
+      return if innate_options.started
+      innate_options.started = true
 
-      signal = options.trap
+      signal = innate_options.trap
       trap(signal){ stop(10) } if signal
 
       start!

data/lib/innate/action.rb

@@ -55,10 +55,9 @@ module Innate
     def sync_variables(from_action)
       instance = from_action.instance
 
-      instance.instance_variables.each{|iv|
-        iv_value = instance.instance_variable_get(iv)
-        iv_name = iv.to_s[1..-1]
-        self.variables[iv_name.to_sym] = iv_value
+      instance.instance_variables.each{|variable|
+        name = variable.to_s[1..-1].to_sym
+        self.variables[name] = instance.instance_variable_get(variable)
       }
 
       from_action
@@ -71,18 +70,18 @@ module Innate
     # @return [NilClass] there is no indication of failure or success
     # @see Action#render
     # @author manveru
-    def copy_variables(object)
+    def copy_variables(object = instance)
       self.variables.each do |iv, value|
         object.instance_variable_set("@#{iv}", value)
       end
     end
 
     def render
-      self.instance = node.new
+      self.instance = instance = node.new
       self.variables[:content] ||= nil
 
       instance.wrap_action_call(self) do
-        copy_variables(self.instance) # this might need another position
+        copy_variables
         self.method_value = instance.__send__(method, *params) if method
         self.view_value = View.read(view) if view
 
@@ -94,18 +93,22 @@ module Innate
     end
 
     def wrap_in_layout
-      return yield unless layout
-
-      action = dup
-      action.view, action.method = layout_view_or_method(*layout)
-      action.params = []
-      action.layout = nil
-      action.view_value = nil
-      action.sync_variables(self)
+      layout ? dup.render_in_layout(&Proc.new) : yield
+    end
+
+    def render_in_layout
+      self.view, self.method = layout_view_or_method(*layout)
+      self.options[:is_layout] = true
+      self.params = []
+      self.layout = self.view_value = nil
+      self.sync_variables(self)
+
       body, content_type = yield
-      action.sync_variables(self)
-      action.variables[:content] = body
-      return action.call, content_type
+
+      self.sync_variables(self)
+      self.variables[:content] = body
+
+      return call, content_type
     end
 
     def layout_view_or_method(name, arg)

data/lib/innate/adapter.rb

@@ -1,4 +1,9 @@
-Rack::Handler.register('ebb', 'Rack::Handler::Ebb')
+# Rack doesn't ship with ebb handler, but it doesn't get picked up under some
+# circumstances, so we do that here.
+# Jruby Rack doesn't have the Handler::register method, so we have to check.
+if Rack::Handler.respond_to?(:register)
+  Rack::Handler.register('ebb', 'Rack::Handler::Ebb')
+end
 
 module Innate
 

data/lib/innate/cache/api.rb

@@ -66,7 +66,7 @@ module Innate
             value[:value]
           end
         else
-          [key, *keys].map{|k| cache_delete(k) }
+          [key, *keys].map{|element| cache_delete(element) }
         end
       end
 

data/lib/innate/cache/drb.rb

@@ -1,7 +1,7 @@
 require 'drb'
 
 module Innate
-  module Cache
+  class Cache
 
     # Cache utilizing a DRb server.
     #

data/lib/innate/helper/aspect.rb

@@ -79,6 +79,7 @@ module Innate
       # @see Action#render
       # @author manveru
       def wrap_action_call(action, &block)
+        return yield if action.options[:is_layout]
         wrap = SortedSet.new
         action.node.ancestral_trait_values(:wrap).each{|sset| wrap.merge(sset) }
         head, *tail = wrap.map{|k,v| v }

data/lib/innate/helper/link.rb

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

data/lib/innate/helper/redirect.rb

@@ -5,7 +5,7 @@ module Innate
         response.write body
         response.status = status
         header['Content-Type'] ||= 'text/html'
-        header.each{|k,v| response[k] = v }
+        header.each{|key, value| response[key] = value }
 
         throw(:respond, response)
       end

data/lib/innate/middleware_compiler.rb

@@ -19,8 +19,8 @@ module Innate
       yield(self) if block_given?
     end
 
-    def use(app, *args, &block)
-      @middlewares << [app, args, block]
+    def use(middleware, *args, &block)
+      @middlewares << [middleware, args, block]
     end
 
     def apps(*middlewares)
@@ -41,7 +41,7 @@ module Innate
 
       joined = roots.map{|root| publics.map{|public| ::File.join(root, public)}}
 
-      apps = joined.flatten.map{|pr| Rack::File.new(pr) }
+      apps = joined.flatten.map{|public_root| Rack::File.new(public_root) }
       apps << Current.new(Route.new(app), Rewrite.new(app))
 
       cascade(*apps)
@@ -57,8 +57,9 @@ module Innate
     end
 
     def compile!
-      @compiled = @middlewares.reverse.inject(@app){|s, (app, args, block)|
-        app.new(s, *args, &block) }
+      @compiled = @middlewares.reverse.
+        inject(@app){|app, (middleware, args, block)|
+          middleware.new(app, *args, &block) }
       self
     end
   end

data/lib/innate/node.rb

@@ -138,7 +138,7 @@ module Innate
     # @author manveru
     def map(location)
       trait :skip_node_map => true
-      Innate.map(location, self) if location
+      Innate.map(location, self)
     end
 
     # Specify which way contents are provided and processed.
@@ -226,7 +226,7 @@ module Innate
     end
 
     def provides
-      ancestral_trait.reject{|k,v| k !~ /_handler$/ }
+      ancestral_trait.reject{|key, value| key !~ /_handler$/ }
     end
 
     # This makes the Node a valid application for Rack.
@@ -339,6 +339,7 @@ module Innate
     # @see Innate::Response Node#try_resolve
     # @author manveru
     def action_missing(path)
+      response = Current.response
       response.status = 404
       response['Content-Type'] = 'text/plain'
       response.write("No action found at: %p" % path)
@@ -513,7 +514,7 @@ module Innate
     # @example
     #
     #   Hi.update_method_arities
-    #   # => {'index' => 0, 'foo' => -1, 'bar => 2}
+    #   # => {'index' => 0, 'foo' => -1, 'bar' => 2}
     #
     # @api internal
     # @see Node#resolve
@@ -522,7 +523,7 @@ module Innate
       @method_arities = {}
 
       exposed = ancestors & Helper::EXPOSE.to_a
-      higher = ancestors.select{|a| a < Innate::Node }
+      higher = ancestors.select{|ancestor| ancestor < Innate::Node }
 
       (higher + exposed).reverse_each do |ancestor|
         ancestor.public_instance_methods(false).each do |im|
@@ -661,13 +662,13 @@ module Innate
     #   of multitudes of obscure options and methods like deny_layout we simply
     #   take a block and use the returned value as the name for the layout. No
     #   layout will be used if the block returns nil.
-    def layout(name = nil, &block)
-      if name and block
+    def layout(layout_name = nil, &block)
+      if layout_name and block
         # default name, but still check with block
-        trait(:layout => lambda{|n, w| name if block.call(n, w) })
-      elsif name
+        trait(:layout => lambda{|name, wish| layout_name.to_s if block.call(name, wish) })
+      elsif layout_name
         # name of a method or template
-        trait(:layout => name.to_s)
+        trait(:layout => layout_name.to_s)
       elsif block
         # call block every request with name and wish, returned value is name
         # of layout template or method
@@ -1021,7 +1022,7 @@ module Innate
     def node_from_backtrace(backtrace)
       filename, lineno = backtrace[0].split(':', 2)
       regexp = /^\s*class\s+(\S+)/
-      File.readlines(filename)[0..lineno.to_i].reverse.find{|l| l =~ regexp }
+      File.readlines(filename)[0..lineno.to_i].reverse.find{|ln| ln =~ regexp }
       const_get($1)
     end
   end

data/lib/innate/options.rb

@@ -32,6 +32,6 @@ module Innate
     o "Prefix used to create relative links",
       :prefix, '/'
 
-    trigger(:mode){|v| Innate.middleware_recompile(v) }
+    trigger(:mode){|value| Innate.middleware_recompile(value) }
   end
 end

data/lib/innate/options/dsl.rb

@@ -132,7 +132,9 @@ module Innate
     #
     # TODO: allow arbitrary assignments
     def []=(key, value)
-      if ns = @hash[key.to_sym]
+      ks = key.to_sym
+      if @hash.has_key? ks
+        ns = @hash[ks]
         ns[:value] = value
         ns[:trigger].call(value) if ns[:trigger].respond_to?(:call)
       elsif existing = get(key)

data/lib/innate/request.rb

@@ -124,7 +124,7 @@ module Innate
 
     ipv4 = %w[ 127.0.0.1/32 192.168.0.0/16 172.16.0.0/12 10.0.0.0/8 169.254.0.0/16 ]
     ipv6 = %w[ fc00::/7 fe80::/10 fec0::/10 ::1 ]
-    LOCAL = (ipv4 + ipv6).map{|a| IPAddr.new(a)} unless defined?(LOCAL)
+    LOCAL = (ipv4 + ipv6).map{|range| IPAddr.new(range)} unless defined?(LOCAL)
 
     # Request is from a local network?
     # Checks both IPv4 and IPv6

data/lib/innate/route.rb

@@ -51,7 +51,7 @@ module Innate
     end
 
     def self.[]=(key, value)
-      self::ROUTES.delete_if{|k,v| k == key }
+      self::ROUTES.delete_if{|route_key, route_value| route_key == key }
       self::ROUTES << [key, value]
     end
 

data/lib/innate/session.rb

@@ -39,8 +39,8 @@ module Innate
       o "Length of generated Session ID (only applies when using SecureRandom)",
         :sid_length, 64
 
-      trigger(:expires){|v|
-        self.ttl = v - Time.now.to_i
+      trigger(:expires){|value|
+        self.ttl = value - Time.now.to_i
         Log.warn("Innate::Session.options.expires is deprecated, use #ttl instead")
       }
     end

data/lib/innate/spec/bacon.rb

@@ -8,7 +8,7 @@ Bacon.summary_on_exit
 
 module Innate
   # minimal middleware, no exception handling
-  middleware(:spec){|m| m.innate }
+  middleware(:spec){|mw| mw.innate }
 
   # skip starting adapter
   options.started = true

data/lib/innate/state.rb

@@ -1,6 +1,8 @@
 require 'thread'
 
 module Innate
+  SEMAPHORE = Mutex.new
+
   module SingletonMethods
     # Use this method to achieve thread-safety for sensitive operations.
     #
@@ -9,9 +11,8 @@ module Innate
     # execution of this method.
     #
     # @param [Proc] block the things you want to execute
-    # @see State::Thread#sync State::Fiber#sync
     def sync(&block)
-      Thread.exclusive(&block)
+      SEMAPHORE.synchronize(&block)
     end
 
     def defer

data/lib/innate/version.rb

@@ -1,3 +1,3 @@
 module Innate
-  VERSION = "2009.07"
+  VERSION = "2009.10"
 end

data/lib/innate/view.rb

@@ -30,7 +30,7 @@ module Innate
 
     def exts_of(engine)
       name = engine.to_s
-      ENGINE.reject{|k,v| v != name }.keys
+      ENGINE.reject{|ext, klass| klass != name }.keys
     end
 
     # Try to obtain given engine by its registered name.
@@ -49,10 +49,10 @@ module Innate
     # on the first request (before TEMP is set).
     # No mutex is used in Fiber environment, see Innate::State and subclasses.
     def obtain(klass, root = Object)
-      Thread.exclusive{
+      Innate.sync do
         klass.to_s.scan(/\w+/){|part| root = root.const_get(part) }
         return root
-      }
+      end
     end
 
     # Reads the specified view template from the filesystem. When the read_cache

data/lib/innate/view/erb.rb

@@ -4,7 +4,7 @@ module Innate
   module View
     module ERB
       def self.call(action, string)
-        erb = View.compile(string){|s| ::ERB.new(s, nil, '%<>') }
+        erb = View.compile(string){|str| ::ERB.new(str, nil, '%<>') }
         erb.filename = (action.view || action.method).to_s
         html = erb.result(action.binding)
         return html, 'text/html'

data/lib/innate/view/etanni.rb

@@ -2,7 +2,7 @@ module Innate
   module View
     module Etanni
       def self.call(action, string)
-        etanni = View.compile(string){|s| Innate::Etanni.new(s) }
+        etanni = View.compile(string){|str| Innate::Etanni.new(str) }
         html = etanni.result(action.binding, (action.view || action.method))
         return html, 'text/html'
       end

data/spec/innate/dynamap.rb

@@ -7,7 +7,7 @@ describe Innate::DynaMap do
     lambda{ Innate::DynaMap.call({}) }.should.raise(RuntimeError)
   end
 
-  should 'not raise if nothing is mapped' do
+  should 'not raise if something is mapped' do
     Innate.map('/', &@app)
     Innate::DynaMap.call('SCRIPT_NAME' => '/').should == [200, {}, ['pass']]
   end

data/spec/innate/helper.rb

@@ -54,7 +54,7 @@ describe Innate::Helper::Link do
     FNL.r(:index, :foo => :bar).should == URI('/foo/index?foo=bar')
 
     uri = FNL.r(:index, :a => :b, :x => :y)
-    uri.query.split(';').sort.should == %w[a=b x=y]
+    uri.query.split('&').sort.should == %w[a=b x=y]
   end
 
   should 'construct link from ::a' do

data/spec/innate/helper/aspect.rb

@@ -27,6 +27,16 @@ class AspectAllSpec
   def with_instance_var_second; "#{@foo} to the #{@bar}"; end
 end
 
+class AspectDerivedWithLayout < AspectAllSpec
+  map '/derived'
+  provide(:html, :None)
+  layout :page
+
+  def page
+    "Content: #{@content}"
+  end
+end
+
 class AspecNoMethodSpec
   Innate.node('/without_method', self)
   include Innate::Node
@@ -58,9 +68,11 @@ describe Innate::Helper::Aspect do
 
   it 'calls before_all and after_all' do
     $aspect_spec_before_all = $aspect_spec_after_all = 0
+
     get('/all/before_first').body.should == '42'
     $aspect_spec_before_all.should == 42
     $aspect_spec_after_all.should == 40
+
     get('/all/before_second').body.should == '84'
     $aspect_spec_before_all.should == 84
     $aspect_spec_after_all.should == 80
@@ -72,4 +84,16 @@ describe Innate::Helper::Aspect do
     get('/all/with_instance_var_second').body.should == 'Hello to the World'
     get('/without_method/aspect_hello').body.should == "Hello World!"
   end
+
+  it 'calls before_all and after_all in the superclass' do
+    $aspect_spec_before_all = $aspect_spec_after_all = 0
+
+    get('/derived/before_first').body.should == 'Content: 42'
+    $aspect_spec_before_all.should == 42
+    $aspect_spec_after_all.should == 40
+
+    get('/derived/before_second').body.should == 'Content: 84'
+    $aspect_spec_before_all.should == 84
+    $aspect_spec_after_all.should == 80
+  end
 end

data/spec/innate/node/node.rb

@@ -11,6 +11,18 @@ class SpecNode
   def two(arg1, arg2) end
   def more(*args) end
   def default(arg = nil) end
+
+  def cat1__cat11
+    'cat1: cat11'
+  end
+
+  def cat1__cat11__cat111
+    'cat1: cat11: cat111'
+  end
+
+  def cat3_cat33
+    'The wrong 33rd cat.'
+  end
 end
 
 class SpecNodeProvide
@@ -61,6 +73,25 @@ class SpecNodeWithLayoutMethod < SpecNodeProvide
   end
 end
 
+class SpecNodeWithLayoutMethodSymbol < SpecNodeProvide
+  map '/layout_method_symbol'
+  layout :layout_method
+
+  def layout_method
+    '<div class="content">#{@content}</div>'
+  end
+end
+
+class SpecNodeWithLayoutMethodSymbolAndBlock < SpecNodeProvide
+  map '/layout_method_symbol_block'
+  layout(:layout_method) { |wish,path| true }
+
+  def layout_method
+    '<div class="content">#{@content}</div>'
+  end
+end
+
+
 class SpecNodeIndex
   Innate.node('/spec_index')
 
@@ -80,48 +111,62 @@ describe 'Innate::Node' do
   behaves_like :rack_test
 
   should 'respond with 404 if no action was found' do
-    got = Innate::Mock.get('/does_not_exist')
+    got = get('/does_not_exist')
     got.status.should == 404
     got.body.should == 'No action found at: "/does_not_exist"'
     got['Content-Type'].should == 'text/plain'
   end
 
   should 'wrap with layout' do
-    got = Innate::Mock.get('/layout/bar')
+    got = get('/layout/bar')
     got.status.should == 200
     got.body.should == %(<div class="content">42</div>)
     got['Content-Type'].should == 'text/html'
   end
 
   should 'find layout with view_root' do
-    got = Innate::Mock.get('/another_layout/bar')
+    got = get('/another_layout/bar')
     got.status.should == 200
     got.body.should == %(<div class="content">\n  42\n</div>)
     got['Content-Type'].should == 'text/html'
   end
 
   should 'find layout from method' do
-    got = Innate::Mock.get('/layout_method/bar')
+    got = get('/layout_method/bar')
+    got.status.should == 200
+    got.body.should == %(<div class="content">42</div>)
+    got['Content-Type'].should == 'text/html'
+  end
+
+  should 'find layout from method specified as a symbol' do
+    got = get('/layout_method_symbol/bar')
+    got.status.should == 200
+    got.body.should == %(<div class="content">42</div>)
+    got['Content-Type'].should == 'text/html'
+  end
+
+  should 'find layout from method specified as a symbol and a filter block' do
+    got = get('/layout_method_symbol_block/bar')
     got.status.should == 200
     got.body.should == %(<div class="content">42</div>)
     got['Content-Type'].should == 'text/html'
   end
 
   should 'not get an action with wrong parameters' do
-    got = Innate::Mock.get('/spec_index/bar')
+    got = get('/spec_index/bar')
     got.status.should == 404
     got.body.should == 'No action found at: "/bar"'
   end
 
   should 'get an action view if there is no method' do
-    got = Innate::Mock.get('/provide_template/only_view')
+    got = get('/provide_template/only_view')
     got.status.should == 200
     got.body.strip.should == "Only template"
     got['Content-Type'].should == 'text/html'
   end
 
   should 'not get an action view with params if there is no method' do
-    got = Innate::Mock.get('/provide_template/only_view/param')
+    got = get('/provide_template/only_view/param')
     got.status.should == 404
     got.body.strip.should == 'No action found at: "/only_view/param"'
   end
@@ -132,4 +177,34 @@ describe 'Innate::Node' do
     got.body.strip.should == "<h1>Hello, World!</h1>"
     got['Content-Type'].should == 'text/html'
   end
+
+  it "does double underscore lookup for method only" do
+    got = get('/cat1/cat11')
+    got.body.should == 'cat1: cat11'
+  end
+
+  it "does double double underscore lookup for method only" do
+    got = get('/cat1/cat11/cat111')
+    got.body.should == 'cat1: cat11: cat111'
+  end
+
+  it "resolves double underscore for template only" do
+    got = get('/cat2/cat22')
+    got.body.should == 'The 22nd cat.'
+  end
+
+  it "resolves double underscore for template and method" do
+    got = get('/cat3/cat33')
+    got.body.should == 'The right 33rd cat.'
+  end
+
+  it 'resolves normal template in subnode ' do
+    got = get('/sub/baz')
+    got.body.should == 'This is baz, cheer up!'
+  end
+
+  it 'resolves nested template in subnode' do
+    got = get('/sub/foo/baz')
+    got.body.should == 'This is foo/baz, cheer up!'
+  end
 end

data/spec/innate/node/view/cat2/cat22.xhtml

@@ -0,0 +1 @@
+The 22nd cat.

data/spec/innate/node/view/cat3/cat33.xhtml

@@ -0,0 +1 @@
+The right 33rd cat.

data/spec/innate/node/view/sub/baz.xhtml

@@ -0,0 +1 @@
+This is baz, cheer up!

data/spec/innate/node/view/sub/foo/baz.xhtml

@@ -0,0 +1 @@
+This is foo/baz, cheer up!

data/spec/innate/options.rb

@@ -104,9 +104,7 @@ describe Options do
 
   should 'pretty_print' do
     require 'pp'
-    p = PP.new
-    @options.pretty_print(p)
-    lines = p.output.split(/\n/)
+    lines = @options.pretty_inspect.split(/\n/)
     lines.find_all{|l|
       /:doc/ === l &&
       /:value/ === l
@@ -120,4 +118,15 @@ describe Options do
     @options.port = 300
     set.should == 300
   end
+  should 'return default value' do
+    @options.default('my default', 'jeremy' )
+    @options.fake.should == 'jeremy'
+  end
+  should 'not change default value' do
+    @options.fake1.should == 'jeremy'
+    @options.fake2.should == 'jeremy'
+    @options.fake1 = 'zurcher'
+    @options.fake1.should == 'zurcher'
+    @options.fake2.should == 'jeremy'
+  end
 end

data/spec/innate/parameter.rb

@@ -115,15 +115,6 @@ describe "Simple Parameters" do
     handle('/one_default/my_default').should == "one_default (my_default)"
   end
 
-  it "double underscore lookup" do
-    handle('/cat1/cat11').should == 'cat1: cat11'
-  end
-
-  it "double double underscore lookup" do
-    handle('/cat1/cat11/cat111').should == 'cat1: cat11: cat111'
-  end
-
-
   it "jo/add should raise with 0 parameters" do
     lambda{ handle('/jo/add') }.
       should.raise(ArgumentError)

data/tasks/release.rake

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: innate
 version: !ruby/object:Gem::Version 
-  version: "2009.07"
+  version: "2009.10"
 platform: ruby
 authors: 
 - Michael 'manveru' Fellinger
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-25 00:00:00 +09:00
+date: 2009-10-02 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,24 +33,24 @@ dependencies:
         version: 1.1.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: rack-test
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.1.7
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: json
   type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: 1.1.9
     version: 
 description: Simple, straight-forward base for web-frameworks.
 email: m.fellinger@gmail.com
@@ -163,8 +163,12 @@ files:
 - spec/innate/node/resolve.rb
 - spec/innate/node/view/another_layout/another_layout.xhtml
 - spec/innate/node/view/bar.xhtml
+- spec/innate/node/view/cat2/cat22.xhtml
+- spec/innate/node/view/cat3/cat33.xhtml
 - spec/innate/node/view/foo.html.xhtml
 - spec/innate/node/view/only_view.xhtml
+- spec/innate/node/view/sub/baz.xhtml
+- spec/innate/node/view/sub/foo/baz.xhtml
 - spec/innate/node/view/with_layout.xhtml
 - spec/innate/node/wrap_action_call.rb
 - spec/innate/options.rb
@@ -212,7 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: innate
-rubygems_version: 1.3.4
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: Powerful web-framework wrapper for Rack.