manveru-innate 2009.02.25 → 2009.03.24

data/lib/innate/view.rb

@@ -8,8 +8,9 @@ module Innate
 
     module_function
 
-    def render(ext, action, string)
-      get(ext).render(action, string)
+    def exts_of(engine)
+      name = engine.to_s
+      ENGINE.reject{|k,v| v != name }.keys
     end
 
     # Try to obtain given engine by its registered name.
@@ -22,7 +23,7 @@ module Innate
       elsif klass = ENGINE[eoe]
         TEMP[eoe] = obtain(klass)
       else
-        TEMP[eoe] = const_get(eoe.capitalize)
+        TEMP[eoe] = obtain(eoe, View)
       end
     end
 
@@ -30,11 +31,10 @@ module Innate
     # class will cause race conditions and one call may return the wrong class
     # on the first request (before TEMP is set).
     # No mutex is used in Fiber environment, see Innate::State and subclasses.
-    def obtain(klass)
+    def obtain(klass, root = Object)
       STATE.sync do
-        obj = Object
-        klass.split('::').each{|e| obj = obj.const_get(e) }
-        obj
+        klass.scan(/\w+/){|part| root = root.const_get(part) }
+        root
       end
     end
 
@@ -47,23 +47,16 @@ module Innate
     def register(klass, *exts)
       exts.each do |ext|
         ext = ext.to_s
-        if k = ENGINE[ext]
-          Log.warn "#{ext} is assigned to #{k} already"
-        else
-          ENGINE[ext] = klass
-        end
+        k = ENGINE[ext]
+        Log.warn("overwriting %p which is set to %p already" % [ext, k]) if k
+        ENGINE[ext] = klass
       end
     end
 
-    # Combine Kernel#autoload and Innate::View::register
+    autoload :None, 'innate/view/none'
+    autoload :ERB, 'innate/view/erb'
 
-    def auto_register(name, *exts)
-      autoload(name, "innate/view/#{name}".downcase)
-      register("#{self}::#{name}", *exts)
-    end
-
-    auto_register :None, :css
-    auto_register :None, :html, :htm
-    auto_register :ERB,  :erb
+    register 'Innate::View::None', :css, :html, :htm
+    register 'Innate::View::ERB', :erb
   end
 end

data/lib/innate.rb

@@ -21,6 +21,7 @@ module Innate
   require 'set'
   require 'pathname'
   require 'digest/sha1'
+  require 'digest/sha2'
   require 'ipaddr'
   require 'socket'
   require 'logger'
@@ -29,19 +30,25 @@ module Innate
   # 3rd party
   require 'rack'
 
-  # innate core patches
+  # innates ruby core patches
   require 'innate/core_compatibility/string'
   require 'innate/core_compatibility/basic_object'
 
   # innate core
   require 'innate/version'
   require 'innate/traited'
+  require 'innate/trinity'
+  require 'innate/middleware_compiler'
+  require 'innate/options/dsl'
+  require 'innate/options/stub'
+  require 'innate/dynamap'
+
+  # innate full
   require 'innate/cache'
   require 'innate/node'
   require 'innate/options'
   require 'innate/log'
   require 'innate/state'
-  require 'innate/trinity'
   require 'innate/current'
   require 'innate/mock'
   require 'innate/adapter'
@@ -50,18 +57,15 @@ module Innate
   require 'innate/view'
   require 'innate/session'
   require 'innate/session/flash'
-  require 'innate/dynamap'
   require 'innate/route'
 
-  # innate lib/rack
-  require 'rack/reloader'
-  require 'rack/middleware_compiler'
-
   extend Trinity
 
   # Contains all the module functions for Innate, we keep them in a module so
   # Ramaze can simply use them as well.
   module SingletonMethods
+    PROXY_OPTIONS = { :port => 'adapter.port', :host => 'adapter.host',
+                      :adapter => 'adapter.handler' }
     # The method that starts the whole business.
     #
     # Call Innate.start after you defined your application.
@@ -73,7 +77,7 @@ module Innate
     # We do return if options.started is true, which indicates that all you
     # wanted to do is setup the environment and update options.
     #
-    # @usage
+    # @example usage
     #
     #   # passing options
     #   Innate.start :adapter => :mongrel, :mode => :live
@@ -93,7 +97,7 @@ module Innate
     #   Port for the server
     # @option param :started [boolean] (false)
     #   Indicate that calls Innate::start will be ignored
-    # @option param :adapter [Symbol]  (:webrick)
+    # @option param :handler [Symbol]  (:webrick)
     #   Web server to run on
     # @option param :setup   [Array]   ([Innate::Cache, Innate::Node])
     #   Will send ::setup to each element during Innate::start
@@ -105,10 +109,19 @@ 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(param = {}, &block)
-      options[:app][:root] = go_figure_root(param, caller)
-      param.reject!{|k, v| [:root, :file].include?(k) }
-      options.merge!(param)
+    def start(given_options = {}, &block)
+      root = given_options.delete(:root)
+      file = given_options.delete(:file)
+
+      if found_root = go_figure_root(:root => root, :file => file)
+        $0 = found_root
+        Innate.options.roots = [found_root]
+      end
+
+      PROXY_OPTIONS.each{|k,v| given_options[v] = given_options.delete(k) }
+      given_options.delete_if{|k,v| v.nil? }
+
+      options.merge!(given_options)
 
       setup_dependencies
       middleware!(options.mode, &block) if block_given?
@@ -116,24 +129,30 @@ module Innate
       return if options.started
       options.started = true
 
-      trap(options[:trap]){ stop(10) } if options[:trap]
+      signal = options.trap
+      trap(signal){ stop(10) } if signal
 
-      start!(options)
+      start!
     end
 
-    def start!(options = Innate.options)
-      Adapter.start(middleware(options.mode), options)
+    def start!(mode = options[:mode])
+      Adapter.start(middleware(mode))
     end
 
     def stop(wait = 3)
       Log.info("Shutdown within #{wait} seconds")
+      Timeout.timeout(wait){ teardown_dependencies }
       Timeout.timeout(wait){ exit }
     ensure
       exit!
     end
 
     def setup_dependencies
-      options[:setup].each{|obj| obj.setup }
+      options[:setup].each{|obj| obj.setup if obj.respond_to?(:setup) }
+    end
+
+    def teardown_dependencies
+      options[:setup].each{|obj| obj.teardown if obj.respond_to?(:teardown) }
     end
 
     # Treat Innate like a rack application, pass the rack +env+ and optionally
@@ -144,20 +163,20 @@ module Innate
     # @default mode options.mode
     # @return [Array] with [body, header, status]
     # @author manveru
-    def call(env, mode = options.mode)
+    def call(env, mode = options[:mode])
       middleware(mode).call(env)
     end
 
-    def middleware(mode, &block)
-      Rack::MiddlewareCompiler.build(mode, &block)
+    def middleware(mode = options[:mode], &block)
+      options[:middleware_compiler].build(mode, &block)
     end
 
-    def middleware!(mode, &block)
-      Rack::MiddlewareCompiler.build!(mode, &block)
+    def middleware!(mode = options[:mode], &block)
+      options[:middleware_compiler].build!(mode, &block)
     end
 
-    def middleware_recompile(mode = options.mode)
-      Rack::MiddlewareCompiler::COMPILED[mode].compile!
+    def middleware_recompile(mode = options[:mode])
+      options[:middleware_compiler]::COMPILED[mode].compile!
     end
 
     # Innate can be started by:
@@ -170,7 +189,7 @@ module Innate
     #
     # TODO: better documentation and nice defaults, don't want to rely on a
     #       filename, bad mojo.
-    def go_figure_root(options, backtrace)
+    def go_figure_root(options, backtrace = caller)
       if o_file = options[:file]
         return File.dirname(o_file)
       elsif root = options[:root]
@@ -263,14 +282,14 @@ module Innate
   #
   # @see Rack::MiddlewareCompiler
   middleware :dev do |m|
-    m.use(Rack::Lint, Rack::CommonLogger, Rack::ShowExceptions,
-          Rack::ShowStatus, Rack::ConditionalGet, Rack::Head, Rack::Reloader)
+    m.apps(Rack::Lint, Rack::CommonLogger, Rack::ShowExceptions,
+           Rack::ShowStatus, Rack::ConditionalGet, Rack::Head, Rack::Reloader)
     m.innate
   end
 
   middleware :live do |m|
-    m.use(Rack::CommonLogger, Rack::ShowStatus, Rack::ConditionalGet,
-          Rack::Head)
+    m.apps(Rack::CommonLogger, Rack::ShowStatus, Rack::ConditionalGet,
+           Rack::Head)
     m.innate
   end
 end

data/spec/helper.rb

@@ -1,2 +1,10 @@
+if caller_line = caller.grep(%r!spec/innate/!).first
+  caller_file = caller_line.split(':', 2).first
+  caller_root = File.dirname(caller_file)
+  $0 = caller_file
+end
+
 require File.expand_path(File.join(File.dirname(__FILE__), '../lib/innate'))
 require 'innate/spec'
+
+Innate.options.roots = [caller_root] if caller_root

data/spec/innate/action/layout.rb

@@ -3,9 +3,12 @@
 
 require 'spec/helper'
 
-Innate.options.app.root = File.dirname(__FILE__)
+class SpecActionLayout
+  include Innate::Node
+  map_layouts '/'
+end
 
-class SpecActionLayoutMethod
+class SpecActionLayoutMethod < SpecActionLayout
   Innate.node('/from_method', self)
   layout('method_layout')
 
@@ -22,7 +25,7 @@ class SpecActionLayoutMethod
   end
 end
 
-class SpecActionLayoutFile
+class SpecActionLayoutFile < SpecActionLayout
   Innate.node('/from_file', self)
   layout('file_layout')
 
@@ -31,7 +34,7 @@ class SpecActionLayoutFile
   end
 end
 
-class SpecActionLayoutSpecific
+class SpecActionLayoutSpecific < SpecActionLayout
   Innate.node('/specific', self)
   layout('file_layout'){|name, wish| name == 'index' }
 
@@ -44,7 +47,7 @@ class SpecActionLayoutSpecific
   end
 end
 
-class SpecActionLayoutDeny
+class SpecActionLayoutDeny < SpecActionLayout
   Innate.node('/deny', self)
   layout('file_layout'){|name, wish| name != 'without' }
 
@@ -57,7 +60,7 @@ class SpecActionLayoutDeny
   end
 end
 
-class SpecActionLayoutMulti
+class SpecActionLayoutMulti < SpecActionLayout
   Innate.node('/multi', self)
   layout('file_layout'){|name, wish| name =~ /index|second/ }
 

data/spec/innate/cache/common.rb

@@ -1,8 +1,8 @@
 require 'spec/helper'
 
-Innate.options.cache.names = [:one, :two]
-Innate.options.cache.one = $common_cache_class
-Innate.options.cache.two = $common_cache_class
+Innate::Cache.options.names = [:one, :two]
+Innate::Cache.options.one = $common_cache_class
+Innate::Cache.options.two = $common_cache_class
 Innate.setup_dependencies
 
 describe $common_cache_class do

data/spec/innate/helper/aspect.rb

@@ -1,9 +1,7 @@
 require 'spec/helper'
-Innate.options.app.root = File.dirname(__FILE__)
-Innate.options.app.view = ''
 
 class AspectSpec
-  Innate.node('/', self).provide(:html => :none)
+  Innate.node('/', self).provide(:html, :None)
 
   before(:with_before){ $aspect_spec_before += 40 }
   def with_before; $aspect_spec_before += 2; end
@@ -19,7 +17,7 @@ class AspectSpec
 end
 
 class AspectAllSpec
-  Innate.node('/all', self).provide(:html => :none)
+  Innate.node('/all', self).provide(:html, :None)
 
   before_all{ $aspect_spec_before_all += 40; @foo = 'Hello'; @bar = 'World' }
   after_all{  $aspect_spec_after_all += 40 }
@@ -33,7 +31,7 @@ class AspecNoMethodSpec
   Innate.node('/without_method', self)
   include Innate::Node
   map '/without_method'
-  view_root 'view'
+  map_views '/'
   before_all{ @foo = 'Hello'; @bar = 'World'}
 end
 

data/spec/innate/helper/flash.rb

@@ -23,7 +23,7 @@ class SpecFlash
   def set_delete_key
     flash[:name] = 'manveru'
     flash.delete(:name)
-    flash[:name]
+    flash[:name].to_s
   end
 
   def delete_key

data/spec/innate/helper/link.rb

@@ -3,11 +3,29 @@ require 'spec/helper'
 class One
   include Innate::Node
   map '/'
+
+  def auto_route
+    UsingRouteSelf.new.route.to_s
+  end
 end
 
 class Two
   include Innate::Node
   map '/two'
+
+  def auto_route
+    UsingRouteSelf.new.route.to_s
+  end
+end
+
+class UsingRouteSelf
+  include Innate::Helper::Link
+
+  attr_reader :route
+
+  def initialize
+    @route = route_self(:elsewhere)
+  end
 end
 
 describe Innate::Helper::Link do
@@ -56,9 +74,9 @@ describe Innate::Helper::Link do
     end
 
     should 'prefix the links as defined in the options' do
-      Innate.options.app.prefix = '/bar'
+      Innate.options.prefix = '/bar'
       One.route('/foo').should == URI('/bar/foo')
-      Innate.options.app.prefix = '/'
+      Innate.options.prefix = '/'
     end
   end
 
@@ -85,4 +103,29 @@ describe Innate::Helper::Link do
         should == '<a href="/foo">&lt;blink&gt; &amp; &lt;a&gt;</a>'
     end
   end
+
+  describe 'combining #anchor and #route' do
+    should 'not escape twice' do
+      One.anchor('foo', One.route(:index, :bar => 'a/b/c')).
+        should == '<a href="/index?bar=a%2Fb%2Fc">foo</a>'
+    end
+
+    should 'handle complete uris gracefully' do
+      One.anchor('foo', 'http://example.com/?foo=bar&baz=qux').
+        should == '<a href="http://example.com/?foo=bar&amp;baz=qux">foo</a>'
+    end
+
+    should 'be able to route from one node to another' do
+      Two.anchor('foo', One.route(:index)).should == '<a href="/index">foo</a>'
+      One.anchor('foo', Two.route(:index)).should == '<a href="/two/index">foo</a>'
+    end
+  end
+
+  describe '#route_self' do
+    behaves_like :mock
+    should 'provide a route to the node of the currently active action' do
+      get('/auto_route').body.should == '/elsewhere'
+      get('/two/auto_route').body.should == '/two/elsewhere'
+    end
+  end
 end

data/spec/innate/helper/partial.rb

@@ -1,8 +1,8 @@
 require 'spec/helper'
 
-Innate.options.app.root = File.dirname(__FILE__)
 class SpecHelperPartial
   Innate.node '/'
+  map_views '/'
 
   def index
     '<html><head><title><%= render_partial("/title") %></title></head></html>'
@@ -20,26 +20,38 @@ class SpecHelperPartial
     "Message: #{request[:msg]}"
   end
 
+  def without_ext
+    render_template('partial')
+  end
+
+  def with_real_ext
+    render_template('partial.erb')
+  end
+
+  def with_needed_ext
+    render_template('partial.html')
+  end
+
   def composed
     @here = 'there'
-    'From Action | ' << render_template("partial.erb")
+    'From Action | ' << render_template("partial")
   end
 
   def recursive
     @n = 1
   end
 
-  def without_ext
-    render_template('partial')
+  def with_variable
+    here = 'there'
+    render_template("partial", :here => here)
   end
 end
 
 class SpecHelperPartialWithLayout < SpecHelperPartial
   Innate.node '/with_layout'
   layout('layout')
-  view_root '/'
 
-  def layout 
+  def layout
     '<h1>with layout</h1><%= @content %>'
   end
 end
@@ -59,6 +71,18 @@ describe Innate::Helper::Partial do
     get('/composed').body.strip.should == "From Action | From Partial there"
   end
 
+  should 'not require file extension' do
+    get('/without_ext').body.should == "From Partial \n"
+  end
+
+  it "the real extension will just be stripped" do
+    got = get('/with_real_ext').body.should == "From Partial \n"
+  end
+
+  it "works with the content representation instead" do
+    get('/with_needed_ext').body.should == "From Partial \n"
+  end
+
   should 'render_template in a loop' do
     get('/loop').body.gsub(/\s/,'').should == '12345'
   end
@@ -67,11 +91,11 @@ describe Innate::Helper::Partial do
     get('/recursive').body.gsub(/\s/,'').should == '{1{2{3{44}4}3}2}'
   end
 
-  should 'not require file extension' do
-    get('/without_ext').body.should == "From Partial \n"
-  end
-
   should 'render template with layout' do
     get('/with_layout/without_ext').body.should == "<h1>with layout</h1>From Partial \n"
   end
+
+  it 'makes passed variables available in the template as instance variables' do
+    get('/with_variable').body.should == "From Partial there\n"
+  end
 end

data/spec/innate/helper/view/loop.erb

@@ -1,4 +1,4 @@
 <% (1..5).each do |n| %>
   <% @n = n %>
-  <%= render_template('num.erb') %>
+  <%= render_template('num') %>
 <% end %>

data/spec/innate/helper/view/recursive.erb

@@ -2,7 +2,7 @@
   <%= @n %>
   <% if @n < 4 %>
     <% @n += 1 %>
-    <%= render_template('recursive.xhtml') %>
+    <%= render_template('recursive') %>
   <% end %>
   <%= @n %>
 }

data/spec/innate/node/mapping.rb

@@ -0,0 +1,37 @@
+require 'spec/helper'
+
+describe 'Node::generate_mapping' do
+  def gen(const)
+    Innate::Node.generate_mapping(const)
+  end
+
+  should 'transform class names into snake_case locations' do
+    gen(     'O').should == '/o'
+    gen(    'Oo').should == '/oo'
+    gen(   'Ooo').should == '/ooo'
+    gen(  'OooO').should == '/oooo'
+    gen( 'OooOo').should == '/ooo_oo'
+    gen('OooOoo').should == '/ooo_ooo'
+    gen('OOOooo').should == '/oooooo'
+    gen('OooOOO').should == '/oooooo'
+    gen('OoOoOo').should == '/oo_oo_oo'
+  end
+
+  should 'transform namespaces into leading parts of the location' do
+    gen('O::O').should == '/o/o'
+    gen('O::O::O').should == '/o/o/o'
+    gen('O::O::O::O').should == '/o/o/o/o'
+  end
+
+  should 'transform leading parts just like standalone part' do
+    gen(     'O::O').should == '/o/o'
+    gen(    'Oo::O').should == '/oo/o'
+    gen(   'Ooo::O').should == '/ooo/o'
+    gen(  'OooO::O').should == '/oooo/o'
+    gen( 'OooOo::O').should == '/ooo_oo/o'
+    gen('OooOoo::O').should == '/ooo_ooo/o'
+    gen('OOOooo::O').should == '/oooooo/o'
+    gen('OooOOO::O').should == '/oooooo/o'
+    gen('OoOoOo::O').should == '/oo_oo_oo/o'
+  end
+end