zorglub 0.1.0 → 0.1.1

data/lib/zorglub/node.rb

@@ -1,334 +1,334 @@
-# -*- coding: UTF-8 -*-
-
 require 'fileutils'
 
 module Zorglub
+  class Node
+    UNDEFINED = -1
 
-    class Node
-
-        UNDEFINED=-1
-
-        # class level engine, layout, static, layout_base_path, view_base_path configuration
+    # class level engine, layout, static, layout_base_path, view_base_path configuration
 
-        class << self
+    class << self
+      attr_reader :static, :cache_lifetime
 
-            attr_reader :static, :cache_lifetime
+      def engine!(engine)
+        @engine = engine
+      end
 
-            def engine! engine
-                @engine = engine
-            end
+      def engine
+        @engine = @app.opt(:engine) if @engine == UNDEFINED && @app
+        @engine
+      end
 
-            def engine
-                @engine = @app.opt(:engine) if @engine==UNDEFINED and @app
-                @engine
-            end
+      def no_layout!
+        layout! nil
+      end
 
-            def no_layout!
-                layout! nil
-            end
+      def layout!(layout)
+        @layout = layout
+      end
 
-            def layout! layout
-                @layout = layout
-            end
+      def layout
+        @layout = @app.opt(:layout) if @layout == UNDEFINED && @app
+        @layout
+      end
 
-            def layout
-                @layout = @app.opt(:layout) if @layout==UNDEFINED and @app
-                @layout
-            end
+      def static!(val, lifetime = 0)
+        @static = [true, false].include?(val) ? val : false
+        @cache_lifetime = lifetime
+      end
 
-            def static! val, lifetime=0
-                @static = ( (val==true or val==false) ? val : false )
-                @cache_lifetime = lifetime
-            end
+      def layout_base_path!(path)
+        @layout_base_path = path
+      end
 
-            def layout_base_path! path
-                @layout_base_path = path
-            end
+      def layout_base_path
+        @layout_base_path ||= @app.layout_base_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! 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 view_base_path
+        @view_base_path ||= @app.view_base_path
+      end
+    end
 
-        def engine! engine
-            @engine = engine
-        end
+    # instance level engine, layout, view, static configuration
 
-        def no_layout!
-            layout! nil
-        end
+    def engine!(engine)
+      @engine = engine
+    end
 
-        def layout! layout
-            @layout = layout
-        end
+    def no_layout!
+      layout! nil
+    end
 
-        def layout
-            return nil if @layout.nil?
-            File.join(self.class.layout_base_path, @layout) + ext
-        end
+    def layout!(layout)
+      @layout = layout
+    end
 
-        def no_view!
-            view! nil
-        end
+    def layout
+      return nil if @layout.nil?
 
-        def view! view
-            @view = view
-        end
+      File.join(self.class.layout_base_path, @layout) + ext
+    end
 
-        def view
-            return nil if @view.nil?
-            File.join(self.class.view_base_path, @view) + ext
-        end
+    def no_view!
+      view! nil
+    end
 
-        def static! val, lifetime=0
-            @static = ( (val==true or val==false) ? val : false )
-            @cache_lifetime = lifetime
-        end
+    def view!(view)
+      @view = view
+    end
 
-        def static
-            return nil if not @static or @view.nil?
-            File.join(app.static_base_path, @view) + ext
-        end
+    def view
+      return nil if @view.nil?
 
-        def ext! ext
-            @ext = ( (ext.nil? or ext.empty?) ? nil : (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.' + ext) )
-        end
+      File.join(self.class.view_base_path, @view) + ext
+    end
 
-        def ext
-            @ext || ''
-        end
+    def static!(val, lifetime = 0)
+      @static = [true, false].include?(val) ? val : false
+      @cache_lifetime = lifetime
+    end
 
-        def mime! mime
-            @mime = mime
-        end
+    def static
+      return nil if !@static || @view.nil?
 
-        # class level basic node functions
+      File.join(app.static_base_path, @view) + ext
+    end
 
-        class << self
+    def ext!(ext)
+      @ext = if ext.nil? || ext.empty?
+               nil
+             elsif ext[0] == '.'
+               ext.length == 1 ? nil : ext
+             else
+               ".#{ext}"
+             end
+    end
 
-            attr_accessor :app
-            def map app, location
-                @app = app
-                @app.map location, self
-            end
+    def ext
+      @ext || ''
+    end
 
-            def r *args
-                @r ||= @app.to self
-                (args.empty? ? @r : File.join( @r, args.map { |x| x.to_s } ) )
-            end
+    def mime!(mime)
+      @mime = mime
+    end
 
-        end
+    # class level basic node functions
 
-        # instance level basic node functions
+    class << self
+      attr_accessor :app
 
-        def app
-            self.class.app
-        end
+      def map(app, location)
+        @app = app
+        @app.map location, self
+      end
 
-        def map
-            self.class.r
-        end
+      def r *args
+        @r ||= @app.to self
+        args.empty? ? @r : File.join(@r, args.map(&:to_s))
+      end
+    end
 
-        def r *args
-            File.join map, (args.empty? ? meth : args.map { |x| x.to_s } )
-        end
+    # instance level basic node functions
 
-        def html
-            [ :map, :r, :args, :engine, :layout, :view ].inject('') { |s,sym| s+="<p>#{sym} => #{self.send sym}</p>"; s }
-        end
+    def app
+      self.class.app
+    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 map
+      self.class.r
+    end
 
-        def redirect_body target
-            "You are being redirected, please follow this link to: <a href='#{target}'>#{target}</a>!"
-        end
+    def r *args
+      File.join map, (args.empty? ? meth : args.map(&:to_s))
+    end
 
-        # class level inherited values are key=>array, copied at inheritance
-        # so they can be extanded at class level
-        # values are copied from class into instance at object creation
-        # so that can be extanded without modifying class level values
-        # typical usage are css or js inclusions
+    def html
+      %i[map r args engine layout view].inject('') { |s, sym| s + "<p>#{sym} => #{send sym}</p>" }
+    end
 
-        @cli_vals = { }
+    def redirect(target, options = {}, &block)
+      status = options[:status] || 302
+      body   = options[:body] || redirect_body(target)
+      header = response.headers.merge('Location' => target.to_s)
+      throw :stop_realize, Rack::Response.new(body, status, header, &block)
+    end
 
-        class << self
+    def redirect_body(target)
+      "You are being redirected, please follow this link to: <a href='#{target}'>#{target}</a>!"
+    end
 
-            attr_reader :cli_vals
+    # class level inherited values are key=>array, copied at inheritance
+    # so they can be extanded at class level
+    # values are copied from class into instance at object creation
+    # so that can be extanded without modifying class level values
+    # typical usage are css or js inclusions
 
-            def cli_val sym, *args
-                vals = @cli_vals[sym] ||= []
-                unless args.empty?
-                    vals.concat args
-                    vals.uniq!
-                end
-                vals
-            end
+    @cli_vals = {}
 
-        end
+    class << self
+      attr_reader :cli_vals
 
-        def cli_val sym, *args
-            vals = @cli_vals[sym] ||= []
-            unless args.empty?
-                vals.concat args
-                vals.uniq!
-            end
-            vals
+      def cli_val(sym, *args)
+        vals = @cli_vals[sym] ||= []
+        unless args.empty?
+          vals.concat args
+          vals.uniq!
         end
+        vals
+      end
+    end
 
-        # before_all and after_all hooks
-
-        @cli_vals[:before_all] = []
-        @cli_vals[:after_all] = []
-        class << self
-
-            def call_before_hooks obj
-                @cli_vals[:before_all].each do |blk| blk.call obj end
-            end
-
-            def before_all meth=nil, &blk
-                @cli_vals[:before_all]<< ( meth.nil? ? blk : meth )
-                @cli_vals[:before_all].uniq!
-            end
-
-            def call_after_hooks obj
-                @cli_vals[:after_all].each do |blk| blk.call obj end
-            end
+    def cli_val(sym, *args)
+      vals = @cli_vals[sym] ||= []
+      unless args.empty?
+        vals.concat args
+        vals.uniq!
+      end
+      vals
+    end
 
-            def after_all meth=nil, &blk
-                @cli_vals[:after_all]<< ( meth.nil? ? blk : meth )
-                @cli_vals[:after_all].uniq!
-            end
+    # before_all and after_all hooks
 
-        end
+    @cli_vals[:before_all] = []
+    @cli_vals[:after_all] = []
+    class << self
+      def call_before_hooks(obj)
+        @cli_vals[:before_all].each { |blk| blk.call obj }
+      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 :@cli_vals, {}
-                @cli_vals.each do |s,v| sub.cli_val s, *v end
-            end
-
-            def call env
-                meth, *args =  env['PATH_INFO'].sub(/^\/+/,'').split(/\//)
-                meth ||= 'index'
-                $stderr << "=> #{meth}(#{args.join ','})\n" if app.opt :debug
-                node = self.new env, meth, args
-                return error_404 node, meth if not node.respond_to? meth
-                node.realize!
-            end
-
-            def partial env, meth, *args
-                node = self.new env, meth.to_s, args, true
-                return error_404 node, meth if not node.respond_to? meth
-                node.feed! env[:no_hooks]
-                node.content
-            end
-
-            def error_404 node, meth
-                $stderr << " !! #{node.class.name}::#{meth} not found\n" if app.opt :debug
-                resp = node.response
-                resp.status = 404
-                resp['Content-Type'] = 'text/plain'
-                resp.write "%s mapped at %p can't respond to : %p" % [ node.class.name, node.map, node.meth ]
-                resp
-            end
+      def before_all(meth = nil, &blk)
+        @cli_vals[:before_all] << (meth.nil? ? blk : meth)
+        @cli_vals[:before_all].uniq!
+      end
 
-        end
+      def call_after_hooks(obj)
+        @cli_vals[:after_all].each { |blk| blk.call obj }
+      end
 
-        attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args
-
-        def initialize env, meth, args, partial=false
-            @meth = meth
-            @args = args
-            @partial = partial
-            @request = Rack::Request.new env
-            @response = Rack::Response.new
-            @cli_vals ={}
-            @debug = app.opt :debug
-            @engine = self.class.engine
-            @layout = ( partial ? nil : self.class.layout )
-            @view = r(meth)
-            @static = self.class.static
-            @cache_lifetime = self.class.cache_lifetime
-            self.class.cli_vals.each do |s,v| cli_val s, *v end
-        end
+      def after_all(meth = nil, &blk)
+        @cli_vals[:after_all] << (meth.nil? ? blk : meth)
+        @cli_vals[:after_all].uniq!
+      end
+    end
 
-        def realize!
-            catch(:stop_realize) {
-                feed!
-                response.write @content
-                response.header['Content-Type'] ||= ( @mime || 'text/html' )
-                response.finish
-                response
-            }
-        end
+    # rack entry point, page computation methods
+
+    class << self
+      def inherited(sub)
+        super
+        sub.engine!(engine || (self == Zorglub::Node ? UNDEFINED : nil))
+        sub.layout!(layout || (self == Zorglub::Node ? UNDEFINED : nil))
+        sub.instance_variable_set :@cli_vals, {}
+        @cli_vals.each { |s, v| sub.cli_val s, *v }
+      end
+
+      def call(env)
+        meth, *args =  env['PATH_INFO'].sub(%r{^/+}, '').split(%r{/})
+        meth ||= 'index'
+        $stderr << "=> #{meth}(#{args.join ','})\n" if app.opt :debug
+        node = new(env, meth, args)
+        return error404 node, meth unless node.respond_to? meth
+
+        node.realize!
+      end
+
+      def partial(env, meth, *args)
+        node = new env, meth.to_s, args, true
+        return error404 node, meth unless node.respond_to? meth
+
+        node.feed! env[:no_hooks]
+        node.content
+      end
+
+      def error404(node, meth)
+        $stderr << " !! #{node.class.name}::#{meth} not found\n" if app.opt :debug
+        resp = node.response
+        resp.status = 404
+        resp['Content-Type'] = 'text/plain'
+        resp.write "%<node.class.name>s mapped at %<node.map>p can't respond to : %<node.meth>p"
+        resp
+      end
+    end
 
-        def feed! no_hooks=false
-            @state = :pre_cb
-            self.class.call_before_hooks self unless no_hooks
-            @state = :meth
-            @content = self.send @meth, *@args
-            static_path = static
-            if static_path.nil?
-                compile_page!
-            else
-                static_page! static_path
-            end
-            @state = :post_cb
-            self.class.call_after_hooks self unless no_hooks
-            @state = :finished
-            return @content, @mime
-        end
+    attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args
+
+    def initialize(env, meth, args, partial = false)
+      @meth = meth
+      @args = args
+      @partial = partial
+      @request = Rack::Request.new env
+      @response = Rack::Response.new
+      @cli_vals = {}
+      @debug = app.opt :debug
+      @engine = self.class.engine
+      @layout = (partial ? nil : self.class.layout)
+      @view = r(meth)
+      @static = self.class.static
+      @cache_lifetime = self.class.cache_lifetime
+      self.class.cli_vals.each { |s, v| cli_val s, *v }
+    end
 
-        def static_page! path
-            if File.exists?(path) and  ( @cache_lifetime.nil? or @cache_lifetime==0 or ( (Time.now-File.stat(path).mtime) < @cache_lifetime ) )
-                $stderr << " * use cache file : #{path}\n" if @debug
-                content = File.open(path, 'r') {|f| f.read }
-                @content = content.sub /^@mime:(.*)\n/,''
-                @mime = $1
-            else
-                compile_page!
-                FileUtils.mkdir_p File.dirname(path)
-                File.open(path, 'w') {|f| f.write("@mime:"+@mime+"\n"); f.write(@content); }
-                $stderr << " * cache file created : #{path}\n" if @debug
-            end
-        end
+    def realize!
+      catch(:stop_realize) do
+        feed!
+        response.write @content
+        response.headers['Content-Type'] ||= @mime || 'text/html'
+        response.finish
+        response
+      end
+    end
 
-        def compile_page!
-            e, @ext = app.engine_proc_ext @engine, @ext
-            v, l = view, layout
-            if @debug
-                $stderr << " * "+(e ? 'use engine' : 'no engine ')+" : "+(e ? e.to_s : '')+"\n"
-                $stderr << " * "+((l and File.exists?(l)) ? 'use layout' : 'no layout ')+" : "+(l ? l : '')+"\n"
-                $stderr << " * "+((v and File.exists?(v)) ? 'use view  ' : 'no view   ')+" : "+(v ? v : '')+"\n"
-            end
-            @state = ( @partial ? :partial : :view )
-            @content, mime = e.call v, self if e and v and File.exists? v
-            @mime ||= mime
-            @state = :layout
-            @content, mime = e.call l, self if e and l and File.exists? l
-            @mime = mime if @mime.nil? and not mime.nil?
-        end
+    def feed!(no_hooks = false)
+      @state = :pre_cb
+      self.class.call_before_hooks self unless no_hooks
+      @state = :meth
+      @content = send @meth, *@args
+      static_path = static
+      if static_path.nil?
+        compile_page!
+      else
+        static_page! static_path
+      end
+      @state = :post_cb
+      self.class.call_after_hooks self unless no_hooks
+      @state = :finished
+      [@content, @mime]
+    end
 
+    def static_page!(path)
+      if File.exist?(path) && (@cache_lifetime.nil? || @cache_lifetime.zero? ||
+          (Time.now - File.stat(path).mtime) < @cache_lifetime)
+        $stderr << " * use cache file : #{path}\n" if @debug
+        content = File.read(path)
+        @content = content.sub(/^@mime:(.*)\n/, '')
+        @mime = ::Regexp.last_match(1)
+      else
+        compile_page!
+        FileUtils.mkdir_p File.dirname(path)
+        File.open(path, 'w') { |f| f.write("@mime:#{@mime}\n#{@content}") }
+        $stderr << " * cache file created : #{path}\n" if @debug
+      end
     end
 
+    def compile_page!
+      e, @ext = app.engine_proc_ext @engine, @ext
+      v = view
+      l = layout
+      if @debug
+        $stderr << " * #{e ? 'use engine' : 'no engine '} : #{e ? e.to_s : ''}\n"
+        $stderr << " * #{l && File.exist?(l) ? 'use layout' : 'no layout '} : #{l || ''}\n"
+        $stderr << " * #{v && File.exist?(v) ? 'use view  ' : 'no view   '} : #{v || ''}\n"
+      end
+      @state = @partial ? :partial : :view
+      @content, mime = e.call(v, self) if e && v && File.exist?(v)
+      @mime ||= mime
+      @state = :layout
+      @content, mime = e.call(l, self) if e && l && File.exist?(l)
+      @mime = mime if @mime.nil? && !mime.nil?
+    end
+  end
 end

data/lib/zorglub/rack_session.rb

@@ -1,9 +1,7 @@
-# -*- coding: UTF-8 -*-
-
 module Zorglub
-    class Node
-        def session
-            @request.session
-        end
+  class Node
+    def session
+      @request.session
     end
+  end
 end