alfa 0.0.5.pre → 0.0.6.pre

data/lib/alfa/wrapper.rb

@@ -0,0 +1,155 @@
+require 'alfa/support'
+require 'alfa/exceptions'
+
+module Alfa
+  module WrapperMethods
+    def _instance_variables_hash
+      Hash[instance_variables.map { |name| [name.to_sym, instance_variable_get(name)] } ]
+    end
+
+    def _clear_instance_variables
+      instance_variables.each {|name| remove_instance_variable(name)}
+    end
+
+    def href(*o)
+      kwargs = _extract_href_params(*o)
+      @application.routes.href(kwargs)
+    end
+
+    alias :href_to :href
+
+    def _extract_href_params(*o)
+      args, kwargs = Support.args_kwargs(*o)
+      kwargs.merge!(_string_to_aca(args.first.to_s)) if args.any?
+      kwargs = {:app=>@app_sym}.merge kwargs
+      kwargs = {:controller=>@c_sym}.merge kwargs if kwargs[:action]
+      kwargs[:action] = :index if kwargs[:controller] && !kwargs[:action]
+      kwargs
+    end
+
+    # Convert string to App-Controller-Action hash
+    # 'app*controller#action'
+    def _string_to_aca(str)
+      res = {}
+      s1 = str.split('@')
+      raise Exceptions::E004.new("E004: Bad href argument #{str}: it should contain at most one @ symbol") if s1.length > 2
+      res[:app] = s1.last.to_sym if s1.length > 1
+      s2 = s1.first.split('#', -1)
+      raise Exceptions::E004.new("E004: Bad href argument #{str}: it should contain at most one # symbol") if s2.length > 2
+      if s2.length > 0
+        res[:action] = s2.last.to_sym unless s2.last.empty?
+        if s2.length > 1
+          res[:controller] = s2.first.to_sym unless s2.first.empty?
+        end
+      end
+      res
+    end
+
+
+    def session
+      @request.session
+    end
+
+    # Return current user
+    def user
+      @user ||= (
+        if @request.session[:user_id] && (u = ::User.first(id: @request.session[:user_id]))
+          Alfa::User.new(u)
+        else
+          GuestUser
+        end
+      )
+    end
+
+
+    def grant?(grant)
+      user.grant?(grant)
+    end
+
+
+    [300, 301, 302, 303].each do |code|
+      define_method ("redirect_#{code}".to_sym) do |url|
+        @application.redirect(url, code)
+      end
+    end
+
+    alias :redirect :redirect_302
+
+
+    def try_login(login, password)
+      u = @application.config[:db][:main][:instance][:users].first(login: login)
+      raise "No such login: #{login}" unless u
+      if u[:passhash] == Digest::MD5.hexdigest("#{u[:salt]}#{password}")
+        # success
+        session[:user_id] = u[:id]
+        return true
+      else
+        # fail
+        session[:user_id] = nil
+        raise 'login fail'
+        return false
+      end
+    end
+
+
+    def try_register(login, password)
+      @application.try_register(login, password)
+    end
+
+
+    def try_logout
+      session[:user_id] = nil
+      @user = GuestUser
+    end
+
+    # Store flash message to session
+    def flash(message)
+
+    end
+
+
+    def breadcrumb_match?(controller: nil, action: nil)
+      (controller ? (@route[:options][:controller] ? @route[:options][:controller] == controller : @params[:controller] == controller) : true) &&
+      (action ? (@route[:options][:action] ? @route[:options][:action] == action : @params[:action] == action) : true)
+    end
+
+
+    def csrf_token
+      session[:csrf_token] ||= SecureRandom.base64(12)
+    end
+
+    def check_csrf_token
+      obtained_token = @request.post? ? @request.POST['csrf_token'] : @request.GET['csrf_token']
+      raise Alfa::Exceptions::Route403, 'CSRF token fail' unless obtained_token == csrf_token
+      true
+    end
+  end
+
+
+  # Wrapper class for snippets and actions
+  class Wrapper
+    include Alfa::WrapperMethods
+
+    attr_reader :application, :request, :app_sym, :c_sym, :resourcer, :params
+
+    def initialize(application: nil, request: nil, app_sym: nil, c_sym: nil, resourcer: nil, params: nil, route: nil, caller: nil)
+      if caller
+        @application = caller.application
+        @request = caller.request
+        @app_sym = caller.app_sym
+        @c_sym = caller.c_sym
+        @resourcer = caller.resourcer
+        @params = caller.params
+        @route = caller.route
+      else
+        @application = application
+        @request = request
+        @app_sym = app_sym
+        @c_sym = c_sym
+        @resourcer = resourcer
+        @params = params
+        @route = route
+      end
+    end
+  end
+end

data/lib/alfa.rb

@@ -1,8 +1,6 @@
-
 require 'alfa/support'
 require 'alfa/exceptions'
 require 'alfa/web_application'
 require 'alfa/cli_application'
 require 'alfa/controller'
 require 'alfa/database'
-require 'alfa/models'

data/lib/rack/file_alfa.rb

@@ -3,8 +3,9 @@ require 'rack/file'
 module Rack
   class FileAlfa < File
     #Deny .htaccess files
-    def call(env)
+    def _call(env)
       return fail(404, 'Not found') if env['PATH_INFO'].split(SEPS).last == '.htaccess'
+      @headers['Expires'] = (Time.now + 2592000).httpdate
       super
     end
   end

data/lib/sequel/extensions/igrep.rb

@@ -0,0 +1,19 @@
+module Sequel
+  class Dataset
+    QUERY_METHODS << :igrep
+
+    def igrep(columns, patterns, opts=OPTS)
+      self.grep(columns, patterns, opts.merge({:case_insensitive=>true}))
+    end
+  end
+
+  Dataset.register_extension :igrep
+
+  class Model
+    DATASET_METHODS << :igrep
+
+    module ClassMethods
+      Plugins.def_dataset_methods(self, [:igrep])
+    end
+  end
+end

data/lib/sequel/extensions/with_pks.rb

@@ -0,0 +1,15 @@
+module Sequel
+  class Dataset
+    def self.with_pks(keys)
+      where(primary_key => keys)
+    end
+  end
+
+  Dataset.register_extension :with_pks
+
+  class Model
+    def self.with_pks(keys)
+      where(primary_key => keys)
+    end
+  end
+end

data/lib/template-inheritance/alfa_helpers.rb

@@ -1,25 +1,27 @@
 # Monkeypatch functionalfix for gem TemplateInheritance v0.3.1
 module TemplateInheritance
-  class Template
-    attr_writer :resources
-    def resources
-      @resources ||= {styles: [], scripts:[], added_scripts: []}
-    end
-
-    def instantiate_supertemplate
-      supertemplate = self.class.new(self.supertemplate, self.scope)
-      supertemplate.blocks = self.blocks
-      supertemplate.resources = self.resources
-      supertemplate
-    end
-  end
+  # class Template
+  #   attr_writer :resources
+  #   def resources
+  #
+  #   end
+  #
+  #   def instantiate_supertemplate
+  #     supertemplate = self.class.new(self.supertemplate, self.scope)
+  #     supertemplate.blocks = self.blocks
+  #     supertemplate.resources = self.resources
+  #     supertemplate
+  #   end
+  # end
 
 
   class RenderScope
-    attr_reader :controller
+    attr_reader :controller, :wrapper
 
-    def initialize(controller = nil)
+    def initialize(controller = nil, wrapper = nil, resourcer = nil)
       @controller = controller
+      @wrapper = wrapper
+      @resourcer = resourcer
     end
   end
 
@@ -38,13 +40,13 @@ module TemplateInheritance
         when :alfa_classic, 'alfa_classic'
 
         else
-          self.template.resources[:styles] << src
+          @resourcer[:styles] << src
       end
     end
 
     def styles
-      self.template.resources[:styles].uniq.map{|s|
-        if s.match(/^\/~assets\/(.*)/)
+      @resourcer.styles.uniq.map{|s|
+        if s.match(/\A\/~assets\/(.*)/)
           f = File.join(File.expand_path('../../../assets/', __FILE__), $1)
         else
           f = File.join(Alfa::WebApplication.config[:document_root], s)
@@ -60,33 +62,112 @@ module TemplateInheritance
 
     def require_script(src, type: 'text/javascript')
       raise ArgumentError, 'src required' if src.nil?
-      self.template.resources[:scripts] << src
+      case src
+        when :jquery, 'jquery'
+          @resourcer[:scripts] << {src: '/~assets/js/jquery/jquery-1.11.0.min.js', type: 'text/javascript'}
+        else
+          @resourcer[:scripts] << {src: src, type: type}
+      end
     end
 
     def add_script(type: 'text/javascript', &block)
-      self.template.resources[:scripts] << self.template.scope.capture(&block)
+      @resourcer[:scripts] << {code: self.template.scope.capture(&block), type: type}
     end
 
     def scripts
-      self.template.resources[:scripts].reverse.uniq.map{|s| "<script type='text/javascript' src='#{s}'></script>\n" }.join('')
+      @resourcer.scripts.uniq.map{|s|
+        if (s[:src])
+          if s[:src].match(/\A\/~assets\/(.*)/)
+            f = File.join(File.expand_path('../../../assets/', __FILE__), $1)
+          else
+            f = File.join(Alfa::WebApplication.config[:document_root], s[:src])
+          end
+          mtime = File.exist?(f) ? File.mtime(f).to_i : nil
+          "<script type='#{s[:type]}' src='#{s[:src]}?#{mtime}'></script>\n"
+        else
+          "<script type='#{s[:type]}'>\n#{s[:code].rstrip}\n</script>\n"
+        end
+      }.join('')
     end
 
     def href(*o)
-      @controller.href(*o)
+      @wrapper.href(*o)
+    end
+
+    # TODO: Fix casual white-spaces around returned tag string
+    def a(text, url, attributes = {})
+      active_class = 'active'
+      if url.is_a?(Array)
+        args, params = ::Alfa::Support.args_kwargs(*url)
+        url = args.first
+      else
+        params = {}
+      end
+      if url.is_a?(Symbol)
+        active_class = attributes[:active_class] if attributes.has_key?(:active_class)
+        zp = @wrapper._string_to_aca(url.to_s)
+        attributes[:class] = "#{attributes[:class]} #{active_class}".strip if breadcrumb_match?(controller: zp[:controller], action: zp[:action])
+        url = href(url.to_s, params)
+      end
+      attributes.delete(:active_class)
+      attributes[:href] = url
+      capture_haml do
+        haml_tag(:a, text, attributes)
+      end
     end
 
-    def a(text, url)
-      "<a href='#{url}'>#{Haml::Helpers.html_escape(text)}</a>"
+    def a_post(text, url, attributes = {})
+      if url.is_a?(Array)
+        args, params = ::Alfa::Support.args_kwargs(*url)
+        urlf = args.first
+      else
+        urlf = url
+        params = {}
+      end
+      url_str = urlf.is_a?(Symbol) ? href(urlf.to_s, params) : urlf.to_s
+      attributes[:onclick] = "{var form=document.createElement(\"form\"); form.setAttribute(\"method\", \"post\"); form.setAttribute(\"action\", \"#{url_str}\"); document.body.appendChild(form); form.submit(); return false;}"
+      a(text, url, attributes)
     end
 
     alias :link_to :a
 
+    # TODO: Fix casual white-spaces around returned tag string
+    def img(attributes = {})
+      capture_haml do
+        haml_tag(:img, attributes)
+      end
+    end
+
+    def application
+      @wrapper.application
+    end
+
     def controller
       @controller
     end
 
     def user
-      @controller.user
+      @wrapper.user
+    end
+
+    def grant?(*o)
+      user.grant?(*o)
+    end
+
+    def snippet(name)
+      @wrapper.application.snippet(name, @wrapper)
+    end
+
+    def breadcrumb_match?(controller: nil, action: nil)
+      @wrapper.breadcrumb_match?(controller: controller, action: action)
+    end
+
+    def csrf_token_tag
+      "<input type='hidden' name='csrf_token' value='#{@wrapper.csrf_token}'/>"
+    end
+
+    def csrf_token
+      @wrapper.csrf_token
     end
   end
 end

data/lib/tilt/alfa_patch.rb

@@ -18,7 +18,7 @@ end
 module TemplateInheritance
   class Template
     def template(options = {})
-      options = {:escape_html => true, :raw_interpolated_tags => [:a, :link_to]}.merge(options)
+      options = {:escape_html => true, :raw_interpolated_tags => [:a, :link_to, :a_post, :img, :csrf_token, :csrf_token_tag]}.merge(options)
       @template ||= Tilt.new(self.fullpath, nil, options)
     end
   end

data/test/data/test_router/1/apps/frontend/routes.rb

@@ -1,6 +1,7 @@
 Alfa::Router.draw do
   route '/', :controller => :main, :action => :index, :layout => :index
   route '/:action', :controller => :main, :layout => :internal
+  route '/:controller', action: :index, layout: :internal
   route '/:controller/:action', :layout => :internal
   route '/:controller/:action/:id', :layout => :internal
 end

data/test/data/test_router/2/apps/frontend/routes.rb

@@ -1,6 +1,7 @@
 Alfa::Router.draw do
   route '/' => 'main#index', :layout => :index
   route '/:action', :controller => :main, :layout => :internal
+  route '/:controller', action: :index, layout: :internal
   route '/:controller/:action', :layout => :internal
   route '/:controller/:action/:id', :layout => :internal
 end

data/test/data/test_web_application/apps/admin/controllers/second.rb

@@ -0,0 +1,5 @@
+class SecondController < Alfa::Controller
+  def index
+
+  end
+end

data/test/data/test_web_application/apps/admin/layouts/default.haml

@@ -0,0 +1 @@
+!= @body

data/test/data/test_web_application/apps/admin/layouts/default.tpl

@@ -0,0 +1 @@
+{{@body|raw}}

data/test/data/test_web_application/apps/admin/routes.rb

@@ -1,3 +1,4 @@
 Alfa::WebApplication.routes.draw do
+  route '/:controller', :action => :index
   route '/:action', :controller => :default
 end

data/test/data/test_web_application/apps/admin/templates/default/test_04.haml

@@ -0,0 +1 @@
+#{@str}

data/test/data/test_web_application/apps/admin/templates/default/test_04.tpl

@@ -0,0 +1 @@
+{{@str}}

data/test/data/test_web_application/apps/admin/templates/default/test_08.haml

@@ -0,0 +1,2 @@
+#{@path_info}
+#{@link}

data/test/data/test_web_application/apps/admin/templates/default/test_08a.haml

@@ -0,0 +1 @@
+!= controller.hash

data/test/data/test_web_application/apps/admin/templates/second/index.haml

@@ -0,0 +1 @@
+second#index@admin

data/test/data/test_web_application/apps/frontend/controllers/second.rb

@@ -0,0 +1,5 @@
+class SecondController < Alfa::Controller
+  def index
+
+  end
+end

data/test/data/test_web_application/apps/frontend/layouts/default.haml

@@ -0,0 +1 @@
+!= @body

data/test/data/test_web_application/apps/frontend/layouts/default.tpl

@@ -0,0 +1 @@
+{{@body|raw}}

data/test/data/test_web_application/apps/frontend/routes.rb

@@ -1,4 +1,5 @@
 Alfa::WebApplication.routes.draw do
   route '/' => 'default#index'
   route '/:action', :controller => :default
+  route '/:controller', :action => :index
 end

data/test/data/test_web_application/apps/frontend/templates/default/test_04.haml

@@ -0,0 +1 @@
+#{@str}

data/test/data/test_web_application/apps/frontend/templates/default/test_04.tpl

@@ -0,0 +1 @@
+{{@str}}

data/test/data/test_web_application/apps/frontend/templates/default/test_08.haml

@@ -0,0 +1,2 @@
+#{@path_info}
+#{@link}

data/test/data/test_web_application/apps/frontend/templates/default/test_08a.haml

@@ -0,0 +1 @@
+!= controller.hash

data/test/data/test_web_application/apps/frontend/templates/second/index.haml

@@ -0,0 +1 @@
+second#index@frontend

data/test/test_config.rb

@@ -19,8 +19,8 @@ class AlfaConfigTest < Test::Unit::TestCase
     assert_raise RuntimeError do
       config.store(:log, nil)
     end
-    assert_equal({:db=>{}, :log=>{}}, config)
+    assert_equal({:db=>{}, :log=>{}, :session=>{:key=>'session', :secret=>nil}}, config)
     config[:foo] = 1
-    assert_equal({:db=>{}, :log=>{}, :foo=>1}, config)
+    assert_equal({:db=>{}, :log=>{}, :session=>{:key=>'session', :secret=>nil}, :foo=>1}, config)
   end
 end

data/test/test_controller.rb

@@ -16,9 +16,9 @@ end
 EOL
     z = Z.new
     z.some_action
-    assert_equal({:@foo=>:bar}, z._instance_variables_hash)
+    assert_equal({:@foo=>:bar}, z._instance_variables_hash.except(:@route))
     z.other_action
-    assert_equal({:@foo=>:bar, :@fuu=>:baz}, z._instance_variables_hash)
+    assert_equal({:@foo=>:bar, :@fuu=>:baz}, z._instance_variables_hash.except(:@route))
   end
 
   # _string_to_aca
@@ -26,8 +26,11 @@ EOL
     c = Alfa::Controller.new
     assert_equal({:action=>:foo}, c._string_to_aca('foo'))
     assert_equal({:action=>:foo, :controller=>:default}, c._string_to_aca('default#foo'))
+    assert_equal({:controller=>:default}, c._string_to_aca('default#'))
+    assert_equal({:action=>:foo}, c._string_to_aca('#foo'))
     assert_equal({:app=>:admin, :controller=>:default, :action=>:foo}, c._string_to_aca('default#foo@admin'))
     assert_equal({:app=>:admin}, c._string_to_aca('@admin'))
+    assert_equal({:app=>:admin, :controller=>:default}, c._string_to_aca('default#@admin'))
     assert_raise Alfa::Exceptions::E004 do c._string_to_aca('default#foo@admi@n') end
     assert_raise Alfa::Exceptions::E004 do c._string_to_aca('de#fault#foo@admin') end
     assert_raise Alfa::Exceptions::E004 do c._string_to_aca('#default#f#oo@admin') end
@@ -40,11 +43,18 @@ EOL
     c.c_sym = :default
     assert_equal({:app=>:frontend, :controller=>:default, :action=>:foo}, c._extract_href_params(:action=>:foo))
     assert_equal({:app=>:frontend, :controller=>:default, :action=>:foo}, c._extract_href_params(:action=>:foo, :controller=>:default))
-    assert_equal({:app=>:frontend, :controller=>:default, :action=>:foo}, c._extract_href_params(:foo))
     assert_equal({:app=>:frontend, :controller=>:default, :action=>:foo}, c._extract_href_params('foo'))
+    assert_equal({:app=>:frontend, :controller=>:default, :action=>:foo}, c._extract_href_params(:foo))
     assert_equal({:app=>:frontend, :controller=>:admin, :action=>:foo}, c._extract_href_params('admin#foo'))
+    assert_equal({:app=>:frontend, :controller=>:admin, :action=>:foo}, c._extract_href_params(:'admin#foo'))
+    assert_equal({:app=>:frontend, :controller=>:admin, :action=>:index}, c._extract_href_params('admin#'))
+    assert_equal({:app=>:frontend, :controller=>:admin, :action=>:index}, c._extract_href_params(:'admin#'))
     assert_equal({:app=>:zoo, :controller=>:admin, :action=>:foo}, c._extract_href_params('admin#foo', :app=>:zoo))
+    assert_equal({:app=>:zoo, :controller=>:admin, :action=>:foo}, c._extract_href_params(:'admin#foo', :app=>:zoo))
     assert_equal({:app=>:zoo, :controller=>:admin, :action=>:foo}, c._extract_href_params('admin#foo@zoo'))
+    assert_equal({:app=>:zoo, :controller=>:admin, :action=>:foo}, c._extract_href_params(:'admin#foo@zoo'))
+    assert_equal({:app=>:zoo, :controller=>:admin, :action=>:index}, c._extract_href_params('admin#@zoo'))
+    assert_equal({:app=>:zoo, :controller=>:admin, :action=>:index}, c._extract_href_params(:'admin#@zoo'))
     assert_equal({:app=>:admin}, c._extract_href_params(:app=>:admin))
   end
 end

data/test/test_router.rb

@@ -15,6 +15,9 @@ class AlfaRouterTest < Test::Unit::TestCase
     assert_equal([true, {controller: :foo}], Alfa::Router.route_match?('/:controller/**', '/foo/bar/baz'))
     assert_equal([true, {path: 'js/jquery/jquery-latest.js', type: :asset}], Alfa::Router.route_match?('/~assets/:path**', '/~assets/js/jquery/jquery-latest.js'))
     assert_equal([true, {}], Alfa::Router.route_match?('/hello.html', '/hello.html'))
+    assert_equal([true, {action: :index}], Alfa::Router.route_match?('/foo/:action?', '/foo'))
+    assert_equal([true, {action: :index}], Alfa::Router.route_match?('/foo/:action?/', '/foo/'))
+    assert_equal([true, {action: :bar}], Alfa::Router.route_match?('/foo/:action?', '/foo/bar'))
 
     # string rules, negative cases
     assert_equal([false, {action: :foo}], Alfa::Router.route_match?('/:action', '/foo/'))
@@ -31,11 +34,11 @@ class AlfaRouterTest < Test::Unit::TestCase
     assert_equal([false, {}], Alfa::Router.route_match?('/hello.html', '/~assets/js/jquery/jquery-latest.js'))
 
     # regexp rules, positive cases
-    rule = Regexp.new('^/(?<controller>[^/]+)/(?<action>[^/]+)?$')
+    rule = Regexp.new('\A/(?<controller>[^/]+)/(?<action>[^/]+)?\z')
     assert_equal([true, {controller: 'default', action: 'index'}], Alfa::Router.route_match?(rule, '/default/index'))
 
     # regexp rules, negative cases
-    rule = Regexp.new('^/(?<controller>[^/]+)/(?<action>[^/]+)?$')
+    rule = Regexp.new('\A/(?<controller>[^/]+)/(?<action>[^/]+)?\z')
     assert_equal([false, {}], Alfa::Router.route_match?(rule, '/'))
   end
 
@@ -70,6 +73,7 @@ class AlfaRouterTest < Test::Unit::TestCase
         Alfa::Router.draw do
           route '/', :controller => :main, :action => :index, :layout => :index
           route '/:action', :controller => :main, :layout => :internal
+          route '/:controller', :action => :index, :layout => :internal
           route '/:controller/:action', :layout => :internal
           route '/:controller/:action/:id', :layout => :internal
         end
@@ -94,6 +98,7 @@ class AlfaRouterTest < Test::Unit::TestCase
              :routes=>[
                  {:rule=>"/", :options=>{:controller=>:main, :action=>:index, :layout=>:index}},
                  {:rule=>"/:action", :options=>{:controller=>:main, :layout=>:internal}},
+                 {:rule=>"/:controller", :options=>{:action=>:index, :layout=>:internal}},
                  {:rule=>"/:controller/:action", :options=>{:layout=>:internal}},
                  {:rule=>"/:controller/:action/:id", :options=>{:layout=>:internal}},
              ]},
@@ -111,7 +116,7 @@ class AlfaRouterTest < Test::Unit::TestCase
     assert_equal([{rule: '/', options: {app: :frontend, controller: :main, action: :index, layout: :index}}, {}], Alfa::Router.find_route('/'))
     assert_equal([{rule: '/:action', options: {app: :frontend, controller: :main, layout: :internal}}, {action: :foo}], Alfa::Router.find_route('/foo'))
     assert_equal([{rule: '/:controller/:action', options: {app: :frontend, layout: :internal}}, {controller: :foo, action: :bar}], Alfa::Router.find_route('/foo/bar'))
-    assert_equal([{rule: '/:controller/:action/:id', options: {app: :frontend, layout: :internal}}, {controller: :foo, action: :bar, id: :'8'}], Alfa::Router.find_route('/foo/bar/8'))
+    assert_equal([{rule: '/:controller/:action/:id', options: {app: :frontend, layout: :internal}}, {controller: :foo, action: :bar, id: '8'}], Alfa::Router.find_route('/foo/bar/8'))
     assert_equal([{rule: '/', options: {app: :admin, controller: :main, action: :index, layout: :admin}}, {}], Alfa::Router.find_route('/admin/'))
     assert_equal([{rule: '/:controller', options: {app: :admin, action: :index}}, {controller: :foo}], Alfa::Router.find_route('/admin/foo'))
     assert_raise Alfa::Exceptions::Route404 do
@@ -138,6 +143,7 @@ class AlfaRouterTest < Test::Unit::TestCase
              :routes=>[
                  {:rule=>"/", :options=>{:controller=>:main, :action=>:index, :layout=>:index}},
                  {:rule=>"/:action", :options=>{:controller=>:main, :layout=>:internal}},
+                 {:rule=>"/:controller", :options=>{:action=>:index, :layout=>:internal}},
                  {:rule=>"/:controller/:action", :options=>{:layout=>:internal}},
                  {:rule=>"/:controller/:action/:id", :options=>{:layout=>:internal}},
              ]},
@@ -155,7 +161,7 @@ class AlfaRouterTest < Test::Unit::TestCase
     assert_equal([{rule: '/', options: {app: :frontend, controller: :main, action: :index, layout: :index}}, {}], Alfa::Router.find_route('/'))
     assert_equal([{rule: '/:action', options: {app: :frontend, controller: :main, layout: :internal}}, {action: :foo}], Alfa::Router.find_route('/foo'))
     assert_equal([{rule: '/:controller/:action', options: {app: :frontend, layout: :internal}}, {controller: :foo, action: :bar}], Alfa::Router.find_route('/foo/bar'))
-    assert_equal([{rule: '/:controller/:action/:id', options: {app: :frontend, layout: :internal}}, {controller: :foo, action: :bar, id: :'8'}], Alfa::Router.find_route('/foo/bar/8'))
+    assert_equal([{rule: '/:controller/:action/:id', options: {app: :frontend, layout: :internal}}, {controller: :foo, action: :bar, id: '8'}], Alfa::Router.find_route('/foo/bar/8'))
     assert_equal([{rule: '/', options: {app: :backend, controller: :main, action: :index, layout: :index}}, {}], Alfa::Router.find_route('/admin/'))
     assert_equal([{rule: '/:controller', options: {app: :backend, action: :index}}, {controller: :foo}], Alfa::Router.find_route('/admin/foo'))
   end
@@ -176,10 +182,10 @@ class AlfaRouterTest < Test::Unit::TestCase
         [
             {:rule=>"/~assets/:path**", :options=>{:type=>:asset}},
             {:rule=>'/', :options=>{:controller=>:default, :action=>:index}},
-            {:rule=>'/zoo', :options=>{:controller=>:default, :action=>:zoo, :layout => :default}},
+            {:rule=>'/zoo', :options=>{:layout => :default, :controller=>:default, :action=>:zoo}},
             {:context=>{:app=>{:path=>'/admin/', :app=>:backend, :options=>{}}},
              :routes=>[
-                 {:rule=>'/', :options=>{:controller=>:kfk, :action=>:index, :layout=>:fantastic}}
+                 {:rule=>'/', :options=>{:layout=>:fantastic, :controller=>:kfk, :action=>:index}}
              ]},
         ],
         Alfa::Router.instance_variable_get(:@routes)
@@ -203,6 +209,7 @@ class AlfaRouterTest < Test::Unit::TestCase
              :routes=>[
                  {:rule=>"/", :options=>{:controller=>:main, :action=>:index, :layout=>:index}},
                  {:rule=>"/:action", :options=>{:controller=>:main, :layout=>:internal}},
+                 {:rule=>"/:controller", :options=>{:action=>:index, :layout=>:internal}},
                  {:rule=>"/:controller/:action", :options=>{:layout=>:internal}},
                  {:rule=>"/:controller/:action/:id", :options=>{:layout=>:internal}},
              ]},