zorglub 0.0.4 → 0.0.5

data/Changelog

@@ -16,4 +16,11 @@
 	* optional engine cache
 	* optional engine proc mime-type definition
 	* optional static page generation/cache
-	*
+
+2012-01-17 Jérémy Zurcher <jeremy@asynk.ch>
+	* Node code cleanup
+	* class and method level directives are now view!, layout!, no_layout!, ...
+	* add view_base_path! and layout_base_path!
+	* before_all and after_all are based on inherited_vars
+	* add Zorglub::Config.debug
+	* Zorglub::App swallows Zorglub::Config

data/Rakefile

@@ -1,6 +1,8 @@
 # -*- coding: UTF-8 -*-
 #
-require './lib/zorglub.rb'
+$LOAD_PATH << 'lib'
+#
+require 'zorglub'
 load './tasks/setup.rb'
 #
 # Project general information

data/lib/zorglub/app.rb

@@ -9,10 +9,33 @@ module Zorglub
         def initialize map={}, &block
             super
             @map = map
+            @engines_cache = { }
+            @options = {
+                :debug => false,
+                :root => '.',
+                :layout => 'default',
+                :view_dir => 'view',
+                :layout_dir => 'layout',
+                :static_dir => 'static',
+                :engine => nil,
+                :engines_cache_enabled => true,
+                :engines => { },
+                :haml_options => {
+                    :format => :html5,
+                    :ugly => false,
+                    :encoding => 'utf-8'
+                },
+                :session_options => {
+                    :session_on => false,
+                    :session_key => 'zorglub.sid',
+                    :session_secret => 'session-secret-secret',
+                    :session_sid_len => 64,
+                }
+            }
             instance_eval &block if block_given?
             remap @map
-            @engines_cache = { }
         end
+        #
         attr_reader :engines_cache
         #
         def map location, object
@@ -40,6 +63,47 @@ module Zorglub
             @map.dup
         end
         #
+        # OPTIONS @options
+        #
+        def opt sym
+            @options[sym]
+        end
+        #
+        def opt! sym, val
+            @options[sym] = val
+        end
+        #
+        def register_engine! name, ext, proc
+            return unless name
+            if ext.nil? or ext.empty?
+                x = nil
+            else
+                x = (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext)
+            end
+            @options[:engines][name]=[ proc, x ]
+        end
+        #
+        def engine_proc_ext engine, ext
+            p,x = @options[:engines][engine]
+            return [nil, ''] if p.nil?
+            [ p, ((ext.nil? or ext.empty?) ? x : ext ) ]
+        end
+        #
+        def view_base_path
+            p = @options[:view_path]
+            ( p.nil? ? File.join(@options[:root], @options[:view_dir]) : p )
+        end
+        #
+        def layout_base_path
+            p = @options[:layout_path]
+            ( p.nil? ? File.join(@options[:root], @options[:layout_dir]) : p )
+        end
+        #
+        def static_base_path
+            p = @options[:static_path]
+            ( p.nil? ? File.join(@options[:root], @options[:static_dir]) : p )
+        end
+        #
     end
     #
 end

data/lib/zorglub/engines/file.rb

@@ -15,6 +15,4 @@ module Zorglub
     end
 end
 #
-Zorglub::Config.register_engine :file, nil, Zorglub::Engines::File.method(:proc)
-#
 # EOF

data/lib/zorglub/engines/haml.rb

@@ -7,11 +7,11 @@ module Zorglub
     module Engines
         module Haml
             def self.proc path,obj
-                if Zorglub::Config.engines_cache_enabled
-                    key = path.sub Zorglub::Config.root,''
-                    haml = obj.app.engines_cache[key] ||= ::Haml::Engine.new( File.open(path,'r'){|f| f.read }, Zorglub::Config.haml_options )
+                if obj.app.opt(:engines_cache_enabled)
+                    key = path.sub obj.app.opt(:root),''
+                    haml = obj.app.engines_cache[key] ||= ::Haml::Engine.new( ::File.open(path,'r'){|f| f.read }, obj.app.opt(:haml_options) )
                 else
-                    haml = ::Haml::Engine.new( File.open(path,'r'){|f| f.read }, Zorglub::Config.haml_options )
+                    haml = ::Haml::Engine.new( ::File.open(path,'r'){|f| f.read }, obj.app.opt(:haml_options) )
                 end
                 html = haml.render(obj)
                 return html, 'text/html'
@@ -20,6 +20,4 @@ module Zorglub
     end
 end
 #
-Zorglub::Config.register_engine :haml, 'haml', Zorglub::Engines::Haml.method(:proc)
-#
 # EOF

data/lib/zorglub/node.rb

@@ -4,47 +4,109 @@ module Zorglub
     #
     class Node
         #
-        @hooks = {
-            :before_all => [],
-            :after_all => [],
-        }
+        UNDEFINED=-1
         #
-        @inherited_vars = { }
+        # class level engine, layout, static, layout_base_path, view_base_path configuration
         #
         class << self
             #
-            attr_reader :hooks, :inherited_vars
+            attr_reader :static
             #
-            def inherited sub
-                sub.layout layout
-                sub.engine engine
-                sub.instance_variable_set :@inherited_vars, {}
-                @inherited_vars.each do |s,v| sub.inherited_var s, *v end
+            def engine! engine
+                @engine = engine
             end
             #
-            def engine engine=nil
-                @engine = engine unless engine.nil? or engine.empty?
-                @engine ||= Config.engine
+            def engine
+                @engine = @app.opt(:engine) if @engine==UNDEFINED and @app
+                @engine
             end
             #
-            def layout layout=nil
-                @layout = layout unless layout.nil? or layout.empty?
-                @layout ||= Config.layout
+            def no_layout!
+                layout! nil
             end
             #
-            def static val=nil
-                @static = val if (val==true or val==false)
-                @static ||=false
+            def layout! layout
+                @layout = layout
             end
             #
-            def inherited_var sym, *args
-                var = @inherited_vars[sym] ||=[]
-                unless args.empty?
-                    var.concat args
-                    var.uniq!
-                end
-                var
+            def layout
+                @layout = @app.opt(:layout) if @layout==UNDEFINED and @app
+                @layout
             end
+            #
+            def static! val
+                @static = ( (val==true or val==false) ? val : false )
+            end
+            #
+            def layout_base_path! path
+                @layout_base_path = path
+            end
+            #
+            def layout_base_path
+                @layout_base_path ||= @app.layout_base_path
+            end
+            #
+            def view_base_path! path
+                @view_base_path = path
+            end
+            #
+            def view_base_path
+                @view_base_path ||= @app.view_base_path
+            end
+        end
+        #
+        # instance level engine, layout, view, static configuration
+        #
+        def engine! engine
+            @options[:engine] = engine
+        end
+        #
+        def engine
+            @options[:engine]
+        end
+        #
+        def no_layout!
+            layout! nil
+        end
+        #
+        def layout! layout
+            @options[:layout] = layout
+        end
+        #
+        def layout
+            return '' if @options[:layout].nil?
+            File.join(self.class.layout_base_path, @options[:layout])+ext
+        end
+        #
+        def view! view
+            @options[:view] = view
+        end
+        #
+        def view
+            return '' if @options[:view].nil?
+            File.join(self.class.view_base_path, @options[:view])+ext
+        end
+        #
+        def static! val
+            @options[:static] = ((val==true or val==false) ? val : false )
+        end
+        #
+        def static
+            return nil if not @options[:static] or @options[:view].nil?
+            File.join(app.static_base_path, @options[:view])+ext
+        end
+        #
+        def ext! ext
+            @options[:ext]= ( (ext.nil? or ext.empty?) ? nil : (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext) )
+        end
+        #
+        def ext
+            @options[:ext]||''
+        end
+        #
+        # class level basic node functions
+        #
+        class << self
             #
             attr_accessor :app
             def map app, location
@@ -57,40 +119,126 @@ module Zorglub
                 (args.empty? ? @r : File.join( @r, args.map { |x| x.to_s } ) )
             end
             #
-            def call env
-                meth, *args =  env['PATH_INFO'].sub(/^\//,'').split '/'
-                meth||= 'index'
-                node = self.new env, {:engine=>engine,:layout=>layout,:view=>r(meth),:method=>meth,:args=>args,:static=>static}
-                return error_404 node if not node.respond_to? meth
-                node.realize!
+        end
+        #
+        # instance level basic node functions
+        #
+        def app
+            self.class.app
+        end
+        #
+        def args
+            @options[:args]
+        end
+        #
+        def map
+            self.class.r
+        end
+        #
+        def r *args
+            File.join map, (args.empty? ? @options[:method] : args.map { |x| x.to_s } )
+        end
+        #
+        def html
+            [ :map, :r, :args, :engine, :layout, :view ].inject('') { |s,sym| s+="<p>#{sym} => #{self.send sym}</p>"; s }
+        end
+        #
+        def redirect target, options={}, &block
+            status = options[:status] || 302
+            body   = options[:body] || redirect_body(target)
+            header = response.header.merge('Location' => target.to_s)
+            throw :stop_realize, Rack::Response.new(body, status, header, &block)
+        end
+        #
+        def redirect_body target
+            "You are being redirected, please follow this link to: <a href='#{target}'>#{target}</a>!"
+        end
+        #
+        # inherited vars, they can be modified at class level only
+        #
+        @inherited_vars = { }
+        #
+        class << self
+            #
+            attr_reader :inherited_vars
+            #
+            def inherited_var sym, *args
+                var = @inherited_vars[sym] ||=[]
+                unless args.empty?
+                    var.concat args
+                    var.uniq!
+                end
+                var
             end
             #
-            def partial meth, *args
-                node = self.new nil, {:engine=>engine,:layout=>nil,:view=>r(meth),:method=>meth.to_s,:args=>args,:static=>static}
-                return error_404 node if not node.respond_to? meth
-                node.feed!
-                node.content
+        end
+        #
+        def inherited_var sym, *args
+            d = self.class.inherited_vars[sym].clone || []
+            unless args.empty?
+                d.concat args
+                d.uniq!
             end
+            d
+        end
+        #
+        # before_all and after_all hooks
+        #
+        @inherited_vars[:before_all] = []
+        @inherited_vars[:after_all] = []
+        class << self
+            #
+            attr_reader :hooks
             #
             def call_before_hooks obj
-                Node.hooks[:before_all].each do |blk| blk.call obj end
+                @inherited_vars[:before_all].each do |blk| blk.call obj end
             end
             #
             def before_all &blk
-                Node.hooks[:before_all]<< blk
-                Node.hooks[:before_all].uniq!
+                @inherited_vars[:before_all]<< blk
+                @inherited_vars[:before_all].uniq!
             end
             #
             def call_after_hooks obj
-                Node.hooks[:after_all].each do |blk| blk.call obj end
+                @inherited_vars[:after_all].each do |blk| blk.call obj end
             end
             #
             def after_all &blk
-                Node.hooks[:after_all]<< blk
-                Node.hooks[:after_all].uniq!
+                @inherited_vars[:after_all]<< blk
+                @inherited_vars[:after_all].uniq!
+            end
+            #
+        end
+        #
+        # rack entry point, page computation methods
+        #
+        class << self
+            #
+            def inherited sub
+                sub.engine! engine||(self==Zorglub::Node ? UNDEFINED : nil )
+                sub.layout! layout||(self==Zorglub::Node ? UNDEFINED : nil )
+                sub.instance_variable_set :@inherited_vars, {}
+                @inherited_vars.each do |s,v| sub.inherited_var s, *v end
+            end
+            #
+            def call env
+                meth, *args =  env['PATH_INFO'].sub(/^\//,'').split '/'
+                meth||= 'index'
+                puts "=> #{meth}(#{args.join ','})" if app.opt :debug
+                node = self.new env, {:engine=>engine,:layout=>layout,:view=>r(meth),:method=>meth,:args=>args,:static=>static}
+                return error_404 node if not node.respond_to? meth
+                node.realize!
+            end
+            #
+            def partial meth, *args
+                node = self.new nil, {:engine=>engine,:layout=>nil,:view=>r(meth),:method=>meth.to_s,:args=>args,:static=>static}
+                return error_404 node if not node.respond_to? meth
+                node.feed!
+                node.content
             end
             #
             def error_404 node
+                puts " !! method not found" if app.opt :debug
                 resp = node.response
                 resp.status = 404
                 resp['Content-Type'] = 'text/plain'
@@ -109,6 +257,11 @@ module Zorglub
             @response = Rack::Response.new
         end
         #
+        def state state=nil
+            @options[:state] = state unless state.nil?
+            @options[:state]
+        end
+        #
         def realize!
             catch(:stop_realize) {
                 feed!
@@ -121,37 +274,41 @@ module Zorglub
         #
         def feed!
             state :pre_cb
-            Node.call_before_hooks self
+            self.class.call_before_hooks self
             state :meth
             @content = self.send @options[:method], *@options[:args]
             static_path = static
             if static_path.nil?
-                compile!
+                compile_page!
             else
-                static! static_path
+                static_page! static_path
             end
             state :post_cb
-            Node.call_after_hooks self
+            self.class.call_after_hooks self
             state :finished
             return @content, @mime
         end
         #
-        def static! path
+        def static_page! path
             if not File.exists? path
-                compile!
-                Dir.mkdir Config.static_base_path
+                compile_page!
+                Dir.mkdir app.static_base_path
                 Dir.mkdir File.dirname path
-                File.open(path, 'w') {|f| f.write(@content); f.write("\n@mime:"+@mime) }
+                File.open(path, 'w') {|f| f.write("@mime:"+@mime+"\n"); f.write(@content); }
+                puts " * cache file created : #{path}" if app.opt :debug
             else
+                puts " * use cache file : #{path}" if app.opt :debug
                 content = File.open(path, 'r') {|f| f.read }
-                @content = content.sub /\n@mime:(.*)$/,''
+                @content = content.sub /^@mime:(.*)\n/,''
                 @mime = $1
             end
         end
         #
-        def compile!
-            e, @options[:ext] = Config.engine_proc_ext @options[:engine], @options[:ext]
-            v, l = view, layout
+        def compile_page!
+            e, @options[:ext] = app.engine_proc_ext @options[:engine], @options[:ext]
+            v, l, debug = view, layout, app.opt(:debug)
+            puts " * "+(File.exists?(l) ? 'use layout' : 'not found layout')+" : "+l if debug
+            puts " * "+(File.exists?(v) ? 'use view  ' : 'not found view  ')+" : "+v if debug
             state (@options[:layout].nil? ? :partial : :view)
             @content, mime = e.call v, self if e and File.exists? v
             @mime = mime unless mime.nil?
@@ -160,86 +317,6 @@ module Zorglub
             @mime = mime unless mime.nil?
         end
         #
-        def redirect target, options={}, &block
-            status = options[:status] || 302
-            body   = options[:body] || redirect_body(target)
-            header = response.header.merge('Location' => target.to_s)
-            throw :stop_realize, Rack::Response.new(body, status, header, &block)
-        end
-        #
-        def redirect_body target
-            "You are being redirected, please follow this link to: <a href='#{target}'>#{target}</a>!"
-        end
-        #
-        def state state=nil
-            @options[:state] = state unless state.nil?
-            @options[:state]
-        end
-        #
-        def engine engine=nil
-            @options[:engine] = engine unless engine.nil? or engine.empty?
-            @options[:engine]
-        end
-        #
-        def layout layout=nil
-            @options[:layout] = layout unless layout.nil? or layout.empty?
-            return '' if @options[:layout].nil?
-            File.join(Config.layout_base_path, @options[:layout])+ext
-        end
-        #
-        def no_layout
-            @options[:layout] = nil
-        end
-        #
-        def static val=nil
-            @options[:static] = val if (val==true or val==false)
-            return nil if not @options[:static] or @options[:view].nil?
-            File.join(Config.static_base_path, @options[:view])+ext
-        end
-        #
-        def view view=nil
-            @options[:view] = view unless view.nil? or view.empty?
-            return '' if @options[:view].nil?
-            File.join(Config.view_base_path, @options[:view])+ext
-        end
-        #
-        def ext ext=nil
-            if ext.nil? or ext.empty?
-                @options[:ext]||''
-            else
-                @options[:ext] = (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext)
-            end
-        end
-        #
-        def inherited_var sym, *args
-            d = self.class.inherited_vars[sym].clone || []
-            unless args.empty?
-                d.concat args
-                d.uniq!
-            end
-            d
-        end
-        #
-        def app
-            self.class.app
-        end
-        #
-        def args
-            @options[:args]
-        end
-        #
-        def map
-            self.class.r
-        end
-        #
-        def r *args
-            File.join map, (args.empty? ? @options[:method] : args.map { |x| x.to_s } )
-        end
-        #
-        def html
-            [ :map, :r, :args, :engine, :layout, :view ].inject('') { |s,sym| s+="<p>#{sym} => #{self.send sym}</p>"; s }
-        end
-        #
     end
     #
 end

data/lib/zorglub/session.rb

@@ -13,17 +13,18 @@ module Zorglub
         end
         #
         def session
-            @session ||= SessionHash.new @request, @response, Node.sessions
+            @session ||= SessionHash.new @request, @response, Node.sessions, app.opt(:session_options)
         end
     end
     #
     class SessionHash < Hash
         #
-        def initialize req, resp, sessions
+        def initialize req, resp, sessions, options
             @request = req
             @response = resp
             @sessions = sessions
             @sid = nil
+            @options = options
             super()
         end
         #
@@ -46,7 +47,7 @@ module Zorglub
         #
         def clear
             load_data!
-#            @response.delete_cookie Zorglub::Config.session_key
+#            @response.delete_cookie @options[:session_key]
 #            @sessions.delete @sid
 #            @sid = nil
             super
@@ -94,11 +95,11 @@ module Zorglub
         #
         def load_data!
             return if loaded?
-            if Config.session_on
-                sid = @request.cookies[Zorglub::Config.session_key]
+            if @options[:session_on]
+                sid = @request.cookies[@options[:session_key]]
                 if sid.nil?
                     sid = generate_sid!
-                    @response.set_cookie Zorglub::Config.session_key, sid
+                    @response.set_cookie @options[:session_key], sid
                 end
                 replace @sessions[sid] ||={}
                 @sessions[sid] = self
@@ -125,7 +126,7 @@ module Zorglub
             # SecureRandom is available since Ruby 1.8.7.
             # For Ruby versions earlier than that, you can require the uuidtools gem,
             # which has a drop-in replacement for SecureRandom.
-            def sid_algorithm; SecureRandom.hex(Zorglub::Config.session_sid_len); end
+            def sid_algorithm; SecureRandom.hex(@options[:session_sid_len]); end
         rescue LoadError
             require 'openssl'
             # Using OpenSSL::Random for generation, this is comparable in performance
@@ -133,7 +134,7 @@ module Zorglub
             # have the same behaviour as the SecureRandom::hex method of the
             # uuidtools gem.
             def sid_algorithm
-                OpenSSL::Random.random_bytes(Zorglub::Config.session_sid_len / 2).unpack('H*')[0]
+                OpenSSL::Random.random_bytes(@options[:session_sid_len] / 2).unpack('H*')[0]
             end
         rescue LoadError
             # Digest::SHA2::hexdigest produces a string of length 64, although

data/lib/zorglub.rb

@@ -1,13 +1,12 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require './lib/zorglub/config'
-require './lib/zorglub/node'
-require './lib/zorglub/app'
+require 'zorglub/node'
+require 'zorglub/app'
 #
 module Zorglub
     #
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'
     #
 end
 #

data/spec/data/view/node0/engines.haml

@@ -0,0 +1 @@
+%h1="Hello world"

data/spec/node_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 #
 def clean_static_path
-    static_base_path = Zorglub::Config.static_base_path
+    static_base_path = Node0.app.static_base_path
     Dir.glob( File.join(static_base_path,'**','*') ).each do |f| File.unlink f if File.file? f end
     Dir.glob( File.join(static_base_path,'*') ).each do |d| Dir.rmdir d end
     Dir.rmdir static_base_path if File.directory? static_base_path
@@ -22,12 +22,11 @@ describe Zorglub do
         end
         #
         it "engine should return default Node's engine" do
-            Node0.engine.should == Zorglub::Config.engine
-            Node0.engine.should == Zorglub::Config[:engine]
+            Node0.engine.should == Node0.app.opt(:engine)
         end
         #
         it "layout should return default Node's layout" do
-            Node0.layout.should == Zorglub::Config.layout
+            Node0.layout.should == Node0.app.opt(:layout)
         end
         #
         it "engine should return class defined Node's engine" do
@@ -85,8 +84,8 @@ describe Zorglub do
             r = Node0.my_call '/index'
             r.status.should == 200
             h = YAML.load r.body[0]
-            ly = File.join Zorglub::Config.root, Zorglub::Config.layout_dir, Node0.layout
-            vu = File.join Zorglub::Config.root, Zorglub::Config.view_dir, Node0.r, 'index'
+            ly = File.join Node0.app.layout_base_path, Node0.layout
+            vu = File.join Node0.app.view_base_path, Node0.r, 'index'
             h[:path].should == ly
             h[:layout].should == ly
             h[:view].should == vu
@@ -96,8 +95,8 @@ describe Zorglub do
             r = Node1.my_call '/index'
             r.status.should == 200
             h = YAML.load r.body[0]
-            ly = File.join Zorglub::Config.root, Zorglub::Config.layout_dir, 'main.spec'
-            vu = File.join Zorglub::Config.root, Zorglub::Config.view_dir, Node1.r, 'index.spec'
+            ly = File.join Node1.app.layout_base_path, 'main.spec'
+            vu = File.join Node1.app.view_base_path, Node1.r, 'index.spec'
             h[:path].should == ly
             h[:layout].should == ly
             h[:view].should == vu
@@ -127,6 +126,30 @@ describe Zorglub do
             Node3.after.should == 3
         end
         #
+        it "inherited before_all hook should work" do
+            Node3.before = 0
+            Node3.after = 0
+            Node3.before.should == 0
+            Node8.my_call '/index'
+            Node3.before.should == 1
+            Node8.my_call '/index'
+            Node3.before.should == 2
+            Node8.my_call '/index'
+            Node3.before.should == 3
+        end
+        #
+        it "inherited after_all hook should work" do
+            Node3.before = 0
+            Node3.after = 0
+            Node3.after.should == 0
+            Node8.my_call '/index'
+            Node3.after.should == 1
+            Node8.my_call '/index'
+            Node3.after.should == 2
+            Node8.my_call '/index'
+            Node3.after.should == 3
+        end
+        #
         it "should find view and layout and render them" do
             r = Node0.my_call '/do_render'
             r.status.should == 200
@@ -172,6 +195,10 @@ describe Zorglub do
             r.header['location'].should == Node0.r(:do_partial,1,2,3)
         end
         #
+        it "no_layout! should be inherited" do
+            Node5.layout.should be_nil
+        end
+        #
         it "inherited_vars should be inherited and extended" do
             r = Node5.my_call '/index'
             vars = YAML.load r.body[0]
@@ -195,10 +222,28 @@ describe Zorglub do
         #
         it "ext definition and file engine should work" do
             r = Node0.my_call '/xml_file'
-            r.body[0]='<xml>file</xml>'
+            r.body[0].should  == "<xml>file<\/xml>\n"
             r = Node0.my_call '/plain_file'
-            r.body[0]='plain text'
+            r.body[0].should == "plain file\n"
         end
+        #
+        it "haml engine should work" do
+            r = Node0.my_call '/engines/haml'
+            r.body[0].should == "<h1>Hello world</h1>\n"
+        end
+        #
+        it "view_base_path! should work" do
+            r = Node7.my_call '/view_path'
+            h = YAML.load r.body[0]
+            h[:view].should == File.join(Node7.app.opt(:root), 'alt','do_render')
+        end
+        #
+        it "layout_base_path! should work" do
+            r = Node7.my_call '/view_path'
+            h = YAML.load r.body[0]
+            h[:layout].should == File.join(Node7.app.opt(:root), 'alt','layout','default')
+        end
+        #
     end
     #
 end

data/spec/spec_helper.rb

@@ -12,6 +12,7 @@ require 'yaml'
 #
 require 'zorglub'
 require 'zorglub/engines/file'
+require 'zorglub/engines/haml'
 #
 HASH_PROC = Proc.new { |path,obj| {:path=>path,:layout=>obj.layout,:view=>obj.view,:args=>obj.args,:map=>obj.map}.to_yaml }
 STATIC_PROC = Proc.new { |path,obj| ["VAL #{obj.value}",'text/static'] }
@@ -27,14 +28,7 @@ RENDER_PROC = Proc.new { |path,obj|
         raise Exception.new
     end
 }
-Zorglub::Config.register_engine 'default', nil, HASH_PROC
-Zorglub::Config.register_engine 'engine-1', 'spec', HASH_PROC
-Zorglub::Config.register_engine 'engine-2', 'spec', HASH_PROC
-Zorglub::Config.register_engine 'real', nil, RENDER_PROC
-Zorglub::Config.register_engine 'static', nil, STATIC_PROC
-#
-Zorglub::Config[:engine] = 'default'
-Zorglub::Config.root = File.join Dir.pwd, 'spec', 'data'
+APP_ROOT = File.join Dir.pwd, 'spec', 'data'
 #
 class Zorglub::Node
     def self.my_call uri
@@ -51,42 +45,49 @@ class Node0 < Zorglub::Node
         html
     end
     def hello
-        no_layout
+        no_layout!
         'world'
     end
     def with_2args a1, a2
     end
     def do_render
-        engine 'real'
+        engine! 'real'
     end
     def do_partial a1, a2
-        engine 'real'
+        engine! 'real'
     end
     def other_view
-        engine 'real'
-        view r('do_partial')
+        engine! 'real'
+        view! r('do_partial')
     end
     def do_redirect
         redirect r(:do_partial,1,2,3)
     end
     def xml_file
-        no_layout
-        engine :file
-        ext 'xml'
+        no_layout!
+        engine! :file
+        ext! 'xml'
     end
     def plain_file
-        no_layout
-        engine :file
-        ext 'txt'
+        no_layout!
+        engine! :file
+        ext! 'txt'
+    end
+    def engines name
+        no_layout!
+        case name
+        when 'haml'
+            engine! :haml
+        end
     end
 end
 #
 class Node1 < Zorglub::Node
-    layout 'layout-1'
-    engine 'engine-1'
+    layout! 'layout-1'
+    engine! 'engine-1'
     def index
-        layout 'main'
-        engine 'engine-2'
+        layout! 'main'
+        engine! 'engine-2'
     end
 end
 #
@@ -106,21 +107,23 @@ class Node3 < Zorglub::Node
     after_all do |node|
         Node3.after +=1
     end
-    layout 'layout-2'
-    engine 'engine-2'
+    layout! 'layout-2'
+    engine! 'engine-2'
     def index
-        (self.class.before-self.class.after).should == 1
+        (Node3.before-Node3.after).should == 1
     end
 end
 #
+class Node8 < Node3
+end
+#
 class Node4 < Zorglub::Node
+    no_layout!
     inherited_var :js,'js0','js1'
     def index
-        no_layout
         inherited_var(:js).to_yaml
     end
     def more
-        no_layout
         inherited_var(:js,'js2').to_yaml
     end
 end
@@ -128,8 +131,8 @@ end
 class Node5 < Node4
     inherited_var :js, 'js3'
     inherited_var :css, 'css0', 'css1'
+    # no_layout! inherited from Node4
     def index
-        no_layout
         js = inherited_var(:js,'jsx')
         css = inherited_var(:css, 'css0', 'css1','css2')
         js.concat(css).to_yaml
@@ -142,30 +145,50 @@ class Node6 < Zorglub::Node
         attr_accessor :static_cpt
     end
     attr_reader :value
-    static true
+    static! true
     def no_static
-        static false
-        engine 'static'
-        view Node0.r('do_render')
+        static! false
+        engine! 'static'
+        view! Node0.r('do_render')
         Node6.static_cpt+=1
         @value = Node6.static_cpt
     end
     def do_static
-        engine 'static'
-        view Node0.r('do_render')
+        engine! 'static'
+        view! Node0.r('do_render')
         Node6.static_cpt+=1
         @value = Node6.static_cpt
     end
 end
 #
+class Node7 < Zorglub::Node
+    layout_base_path! File.join APP_ROOT, 'alt','layout'
+    view_base_path! File.join APP_ROOT, 'alt'
+    def view_path
+        view! 'do_render'
+    end
+end
+#
 APP = Zorglub::App.new do
+    register_engine! :file, nil, Zorglub::Engines::File.method(:proc)
+    register_engine! :haml, 'haml', Zorglub::Engines::Haml.method(:proc)
+    register_engine! 'default', nil, HASH_PROC
+    register_engine! 'engine-1', 'spec', HASH_PROC
+    register_engine! 'engine-2', 'spec', HASH_PROC
+    register_engine! 'real', nil, RENDER_PROC
+    register_engine! 'static', nil, STATIC_PROC
+    opt! :root, APP_ROOT
+    opt! :engine, 'default'
     map '/node0', Node0
     map '/node1', Node1
     map '/node3', Node3
     map '/node4', Node4
     map '/node5', Node5
     map '/node6', Node6
+    map '/node7', Node7
+    map '/node8', Node8
 end
+#
 class Node2
     map APP, '/node2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-05 00:00:00.000000000 Z
+date: 2012-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &20000040 !ruby/object:Gem::Requirement
+  requirement: &23057180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *20000040
+  version_requirements: *23057180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19999520 !ruby/object:Gem::Requirement
+  requirement: &23056680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *19999520
+  version_requirements: *23056680
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19998860 !ruby/object:Gem::Requirement
+  requirement: &23055880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *19998860
+  version_requirements: *23055880
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &19998120 !ruby/object:Gem::Requirement
+  requirement: &23055180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *19998120
+  version_requirements: *23055180
 description: a nano web application framework based on rack[http://rack.rubyforge.org/]
 email: jeremy@asynk.ch
 executables: []
@@ -69,17 +69,19 @@ files:
 - Rakefile
 - lib/zorglub.rb
 - lib/zorglub/app.rb
-- lib/zorglub/config.rb
 - lib/zorglub/engines/file.rb
 - lib/zorglub/engines/haml.rb
 - lib/zorglub/node.rb
 - lib/zorglub/rack_session.rb
 - lib/zorglub/session.rb
 - spec/app_spec.rb
+- spec/data/alt/do_render
+- spec/data/alt/layout/default
 - spec/data/layout/default
 - spec/data/layout/main.spec
 - spec/data/view/node0/do_partial
 - spec/data/view/node0/do_render
+- spec/data/view/node0/engines.haml
 - spec/data/view/node0/plain_file.txt
 - spec/data/view/node0/xml_file.xml
 - spec/node_spec.rb

data/lib/zorglub/config.rb

@@ -1,81 +0,0 @@
-# -*- coding: UTF-8 -*-
-#
-module Zorglub
-    #
-    class Config
-        @options = {
-            :root => '.',
-            :engine => nil,
-            :layout => 'default',
-            :view_dir => 'view',
-            :layout_dir => 'layout',
-            :static_dir => 'static',
-            :session_on => false,
-            :session_key => 'zorglub.sid',
-            :session_secret => 'session-secret-secret',
-            :session_sid_len => 64,
-            :engines_cache_enabled => true,
-            :haml_options => {
-                :format => :html5,
-                :ugly => false,
-                :encoding => 'utf-8'
-            }
-        #
-        }
-        @engines = { }
-        class << self
-            #
-            def [] k
-                @options[k]
-            end
-            #
-            def []= k, v
-                @options[k]=v
-            end
-            #
-            def view_base_path
-                p = @options[:view_path]
-                ( p.nil? ? File.join(@options[:root], @options[:view_dir]) : p )
-            end
-            #
-            def layout_base_path
-                p = @options[:layout_path]
-                ( p.nil? ? File.join(@options[:root], @options[:layout_dir]) : p )
-            end
-            #
-            def static_base_path
-                p = @options[:static_path]
-                ( p.nil? ? File.join(@options[:root], @options[:static_dir]) : p )
-            end
-            #
-            def register_engine name, ext, proc
-                return unless name
-                if ext.nil? or ext.empty?
-                    x = nil
-                else
-                    x = (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext)
-                end
-                @engines[name]=[ proc, x ]
-            end
-            #
-            def engine_proc_ext engine, ext
-                p,x = @engines[engine]
-                return [nil, ''] if p.nil?
-                [ p, (x.nil? ? ext : x ) ]
-            end
-            #
-        end
-        #
-        def self.method_missing m, *args, &block
-            if m=~/(.*)=$/
-                @options[$1.to_sym]=args[0]
-            else
-                @options[m.to_sym]
-            end
-        end
-        #
-    end
-    #
-end
-#
-# EOF