innate 2009.04.12 → 2009.05

data/Rakefile

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

data/example/app/whywiki_erb/start.rb

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

data/innate.gemspec

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

data/lib/innate.rb

@@ -3,11 +3,7 @@
 #
 # Name-space of Innate, just about everything goes in here.
 #
-# Exceptions are:
-#
-# * Logger::ColorFormatter
-# * In 1.8, we define ::BasicObject
-# * In 1.9, we define ::String#each
+# The only exception is Logger::ColorFormatter.
 #
 module Innate
   ROOT = File.expand_path(File.dirname(__FILE__))
@@ -17,23 +13,20 @@ module Innate
   end
 
   # stdlib
-  require 'pp'
-  require 'set'
-  require 'pathname'
   require 'digest/sha1'
   require 'digest/sha2'
+  require 'find'
   require 'ipaddr'
-  require 'socket'
   require 'logger'
+  require 'pathname'
+  require 'pp'
+  require 'set'
+  require 'socket'
   require 'uri'
 
   # 3rd party
   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, :method, :params, :view, :layout, :instance, :exts,
-    :wish, :options, :variables, :value, :view_value, :engine ]
+  ACTION_MEMBERS = [ :node, :instance, :method, :params, :method_value, :view,
+    :view_value, :layout, :wish, :options, :variables, :engine, :path ]
 
   class Action < Struct.new(*ACTION_MEMBERS)
     # Create a new Action instance.
@@ -32,10 +32,7 @@ module Innate
     # @api stable
     # @author manveru
     def call
-      Current.actions << self
-      render
-    ensure
-      Current.actions.delete(self)
+      Current.actions ? wrap_in_current{ render } : render
     end
 
     # @return [Binding] binding of the instance for this Action
@@ -67,31 +64,16 @@ module Innate
       from_action
     end
 
-    COPY_VARIABLES = '
-      STATE[:action_variables].each do |iv, value|
-        instance_variable_set("@#{iv}", value)
-      end'.strip.freeze
-
-    # Copy Action#variables as instance variables into the given binding.
+    # Copy Action#variables as instance variables into the given object.
+    # Defaults to copying the variables to self.
     #
-    # This relies on Innate::STATE, so should be thread-safe and doesn't depend
-    # on Innate::Current::actions order.
-    # So we avoid nasty business with Objectspace#_id2ref which may not work on
-    # all ruby implementations and seems to cause other problems as well.
-    #
-    # @param [Binding #eval] binding
+    # @param [Object #instance_variable_set] object
     # @return [NilClass] there is no indication of failure or success
-    # @see View::ERB::render
+    # @see Action#render
     # @author manveru
-    def copy_variables(binding = self.binding)
-      return unless variables.any?
-
-      STATE.sync do
-        STATE[:action_variables] = self.variables
-
-        eval(COPY_VARIABLES, binding)
-
-        STATE[:action_variables] = nil
+    def copy_variables(object)
+      self.variables.each do |iv, value|
+        object.instance_variable_set("@#{iv}", value)
       end
     end
 
@@ -100,12 +82,12 @@ module Innate
       self.variables[:content] ||= nil
 
       instance.wrap_action_call(self) do
-        copy_variables # this might need another position after all
-        self.value = instance.__send__(method, *params) if method
-        self.view_value = File.read(view) if view
+        copy_variables(self.instance) # this might need another position
+        self.method_value = instance.__send__(method, *params) if method
+        self.view_value = View.read(view) if view
 
         body, content_type = wrap_in_layout{
-          engine.call(self, view_value || value || '') }
+          engine.call(self, view_value || method_value || '') }
         options[:content_type] ||= content_type if content_type
         body
       end
@@ -116,6 +98,7 @@ module Innate
 
       action = dup
       action.view, action.method = layout_view_or_method(*layout)
+      action.params = []
       action.layout = nil
       action.view_value = nil
       action.sync_variables(self)
@@ -128,13 +111,26 @@ 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?
-      method || view
+      node.needs_method? ? (method && view) : (method || view)
     end
   end
 end

data/lib/innate/cache.rb

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

data/lib/innate/cache/drb.rb

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

data/lib/innate/cache/file_based.rb

@@ -2,6 +2,9 @@ module Innate
   class Cache
 
     # Used by caches that serialize their contents to the filesystem.
+    # Right now we do not lock around write access to the file outside of the
+    # process, that means that all FileBased caches are not safe for use if you
+    # need more than one instance of your application.
     module FileBased
       attr_reader :filename
 

data/lib/innate/cache/marshal.rb

@@ -3,8 +3,11 @@ require 'pstore'
 module Innate
   class Cache
     # Keeps every cache in a separate file like this:
-    #
     # /tmp/innate-cache-marshal/delta-manveru-session.marshal
+    #
+    # The Marshal cache is not safe for use between multiple processes, it is
+    # also slow compared to other caches, so generally the use of it is
+    # discouraged.
     class Marshal
       include Cache::API
       include Cache::FileBased

data/lib/innate/cache/memory.rb

@@ -1,8 +1,7 @@
 module Innate
   class Cache
     # Memory cache is simply a Hash with the Cache::API, it's the reference
-    # implementation for every other cache.
-
+    # implementation for every other cache and the default cache.
     class Memory < Hash
       include Cache::API
 

data/lib/innate/cache/yaml.rb

@@ -3,8 +3,11 @@ require 'yaml/store'
 module Innate
   class Cache
     # Keeps every cache in a separate file like this:
-    #
     # /tmp/innate-cache-yaml/delta-manveru-session.yaml
+    #
+    # The YAML cache is not safe for use between multiple processes, it is also
+    # very slow compared to other caches, so generally the use of it is
+    # discouraged.
     class YAML
       include Cache::API
       include Cache::FileBased

data/lib/innate/current.rb

@@ -2,9 +2,9 @@ require 'innate/request'
 require 'innate/response'
 
 module Innate
-  # Uses STATE to scope request/response/session per Fiber/Thread so we can
-  # reach them from anywhere in the code without passing around the objects
-  # directly.
+  # We track the current request/response/session (Trinity) in Thread.current
+  # so we can reach them from anywhere in the code without passing around the
+  # objects directly.
   class Current
     extend Trinity
 
@@ -16,22 +16,20 @@ module Innate
       end
     end
 
-    # Wrap into STATE, run setup and call the app inside STATE.
-
+    # Run setup and call the app
     def call(env)
-      STATE.wrap do
-        setup(env)
-        @app.call(env)
-      end
+      setup(env)
+      @app.call(env)
     end
 
     # Setup new Request/Response/Session for this request/response cycle.
     # The parameters are here to allow Ramaze to inject its own classes.
     def setup(env, request = Request, response = Response, session = Session)
-      req = STATE[:request] = request.new(env)
-      res = STATE[:response] = response.new
-      STATE[:actions] = []
-      STATE[:session] = Session.new(req, res)
+      current = Thread.current
+      req = current[:request] = request.new(env)
+      res = current[:response] = response.new
+      current[:actions] = []
+      current[:session] = Session.new(req, res)
     end
   end
 end

data/lib/innate/dynamap.rb

@@ -18,6 +18,11 @@ 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)
-      name = name.to_s.split('_').map{|e| e.capitalize}.join
+      module_name = /^#{name.to_s.dup.delete('_')}$/i
 
       options.namespaces.each do |namespace|
-        found = namespace.constants.grep(/^#{name}$/i).first
+        found = namespace.constants.grep(module_name).first
         return namespace.const_get(found) if found
       end
 
@@ -165,19 +165,21 @@ module Innate
     # Figure out files that might have the helper we ask for and then require
     # the first we find, if any.
     def try_require(name)
-      if found = Dir[glob(name)].first
+      if found = find_helper(name.to_s)
         require(found) || true
       else
         raise(LoadError, "Helper #{name} not found")
       end
     end
 
-    # Return a nice list of filenames in correct locations with correct
-    # filename-extensions.
-    def glob(name = '*')
-      exts, paths = options.exts, options.paths
-      paths.uniq!
-      "{#{paths.join(',')}}/helper/#{name}.{#{exts.join(',')}}"
+    def find_helper(name)
+      options.paths.uniq.find do |path|
+        base = ::File.join(path, 'helper', name)
+        options.exts.find do |ext|
+          full = "#{base}.#{ext}"
+          return full if ::File.file?(full)
+        end
+      end
     end
   end
 end

data/lib/innate/helper/aspect.rb

@@ -94,28 +94,28 @@ module Innate
           AOP[self][:before_all] = block
         end
 
-        def before(name, &block)
-          AOP[self][:before][name] = block
+        def before(*names, &block)
+          names.each{|name| AOP[self][:before][name] = block }
         end
 
         def after_all(&block)
           AOP[self][:after_all] = block
         end
 
-        def after(name, &block)
-          AOP[self][:after][name] = block
+        def after(*names, &block)
+          names.each{|name| AOP[self][:after][name] = block }
         end
 
-        def wrap(name, &block)
-          before(name, &block)
-          after(name, &block)
+        def wrap(*names, &block)
+          before(*names, &block)
+          after(*names, &block)
         end
 
         def add_action_wrapper(order, method_name)
           if wrap = trait[:wrap]
-            wrap.merge(SortedSet[[order, method_name]])
+            wrap.merge(SortedSet[[order, method_name.to_s]])
           else
-            trait :wrap => SortedSet[[order, method_name]]
+            trait :wrap => SortedSet[[order, method_name.to_s]]
           end
         end
       end