zorglub 0.0.6 → 0.0.7

data/Changelog

@@ -1,12 +1,21 @@
+2013-02-01 Jérémy Zurcher <jeremy@asynk.ch>
+	* release 0.0.7
+	* zorglub.rb swallows version.rb
+	* before_all and after_all accept parameter or proc
+	* use instance variables instead of @options hash
+	* add optional cache_lifetime to static pages
+	* add firs parameter env to Node#partial
+	* allow by passing hooks in partials
+
 2013-01-08 Jérémy Zurcher <jeremy@asynk.ch>
-	* release 0.6
+	* release 0.0.6
 	* add sass engine
 	* use Bundler
 	* enable travis
 	* fix and rename inherited_vars in cli_vals
 
 2012-01-17 Jérémy Zurcher <jeremy@asynk.ch>
-	* release 0.5
+	* release 0.0.5
 	* Node code cleanup
 	* class and method level directives are now view!, layout!, no_layout!, ...
 	* add view_base_path! and layout_base_path!
@@ -15,7 +24,7 @@
 	* Zorglub::App swallows Zorglub::Config
 
 2012-01-05 Jérémy Zurcher <jeremy@asynk.ch>
-	* release 0.3 and 0.4
+	* release 0.0.3 and 0.0.4
 	* haml, file engines
 	* view/layout extention overriding at methode level
 	* optional engine cache
@@ -23,7 +32,7 @@
 	* optional static page generation/cache
 
 2012-01-04 Jérémy Zurcher <jeremy@asynk.ch>
-	* release 0.2
+	* release 0.0.2
 	* lots of code cleanup
 	* replace Helpers Module with Node#inherited_var Node@inherited_vars
 	* rewrite session so it is compatible with Rack SessionHash

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zorglub (0.0.5)
+    zorglub (0.0.7)
       rack
 
 GEM
@@ -9,7 +9,7 @@ GEM
   specs:
     diff-lcs (1.1.3)
     haml (3.1.7)
-    rack (1.4.2)
+    rack (1.5.1)
     rake (10.0.3)
     rspec (2.12.0)
       rspec-core (~> 2.12.0)
@@ -18,7 +18,7 @@ GEM
     rspec-core (2.12.2)
     rspec-expectations (2.12.1)
       diff-lcs (~> 1.1.3)
-    rspec-mocks (2.12.1)
+    rspec-mocks (2.12.2)
     sass (3.2.5)
 
 PLATFORMS

data/README.md

@@ -1,6 +1,8 @@
 # zorglub
     by Jérémy Zurcher
     http://asynk.ch
+[![Build Status](https://secure.travis-ci.org/jeremyz/zorglub.png)](http://travis-ci.org/jeremyz/zorglub)
+[![Gem Version](https://badge.fury.io/rb/zorglub.png)](http://badge.fury.io/rb/zorglub)
 
 ## DESCRIPTION:
 
@@ -17,10 +19,6 @@ a nano web application framework based on [rack](http://rack.rubyforge.org/)
 * class level inherited variables
 * session
 
-## STATUS:
-
-[![Build Status](https://secure.travis-ci.org/jeremyz/zorglub.png)](http://travis-ci.org/jeremyz/zorglub)
-
 ## SYNOPSIS:
 
 For a simple test application run:

data/example/sample.ru

@@ -89,7 +89,7 @@ class Node2 < Zorglub::Node
     end
     #
     def meth1 *args
-        more = Node2.partial :meth0, *args
+        more = Node2.partial response.env, :meth0, *args
         "<title>Node2:meth1</title><b>partial</b><br/>#{more}<br/><b>done</b><br/><a href=#{Node0.r}>back</a>"
     end
 end

data/lib/zorglub/node.rb

@@ -1,5 +1,7 @@
 # -*- coding: UTF-8 -*-
 #
+require 'fileutils'
+#
 module Zorglub
     #
     class Node
@@ -10,7 +12,7 @@ module Zorglub
         #
         class << self
             #
-            attr_reader :static
+            attr_reader :static, :cache_lifetime
             #
             def engine! engine
                 @engine = engine
@@ -34,8 +36,9 @@ module Zorglub
                 @layout
             end
             #
-            def static! val
+            def static! val, lifetime=0
                 @static = ( (val==true or val==false) ? val : false )
+                @cache_lifetime = lifetime
             end
             #
             def layout_base_path! path
@@ -58,11 +61,7 @@ module Zorglub
         # instance level engine, layout, view, static configuration
         #
         def engine! engine
-            @options[:engine] = engine
-        end
-        #
-        def engine
-            @options[:engine]
+            @engine = engine
         end
         #
         def no_layout!
@@ -70,38 +69,39 @@ module Zorglub
         end
         #
         def layout! layout
-            @options[:layout] = layout
+            @layout = layout
         end
         #
         def layout
-            return '' if @options[:layout].nil?
-            File.join(self.class.layout_base_path, @options[:layout])+ext
+            return nil if @layout.nil?
+            File.join(self.class.layout_base_path, @layout)+ext
         end
         #
         def view! view
-            @options[:view] = view
+            @view = view
         end
         #
         def view
-            return '' if @options[:view].nil?
-            File.join(self.class.view_base_path, @options[:view])+ext
+            return nil if @view.nil?
+            File.join(self.class.view_base_path, @view)+ext
         end
         #
-        def static! val
-            @options[:static] = ((val==true or val==false) ? val : false )
+        def static! val, lifetime=0
+            @static = ( (val==true or val==false) ? val : false )
+            @cache_lifetime = lifetime
         end
         #
         def static
-            return nil if not @options[:static] or @options[:view].nil?
-            File.join(app.static_base_path, @options[:view])+ext
+            return nil if not @static or @view.nil?
+            File.join(app.static_base_path, @view)+ext
         end
         #
         def ext! ext
-            @options[:ext]= ( (ext.nil? or ext.empty?) ? nil : (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext) )
+            @ext = ( (ext.nil? or ext.empty?) ? nil : (ext[0]=='.' ? (ext.length==1 ? nil : ext) : '.'+ext) )
         end
         #
         def ext
-            @options[:ext]||''
+            @ext || ''
         end
         #
         # class level basic node functions
@@ -127,16 +127,12 @@ module Zorglub
             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 } )
+            File.join map, (args.empty? ? meth : args.map { |x| x.to_s } )
         end
         #
         def html
@@ -167,7 +163,7 @@ module Zorglub
             attr_reader :cli_vals
             #
             def cli_val sym, *args
-                vals = @cli_vals[sym] ||=[]
+                vals = @cli_vals[sym] ||= []
                 unless args.empty?
                     vals.concat args
                     vals.uniq!
@@ -178,7 +174,7 @@ module Zorglub
         end
         #
         def cli_val sym, *args
-            vals = @cli_vals[sym] ||=[]
+            vals = @cli_vals[sym] ||= []
             unless args.empty?
                 vals.concat args
                 vals.uniq!
@@ -196,8 +192,8 @@ module Zorglub
                 @cli_vals[:before_all].each do |blk| blk.call obj end
             end
             #
-            def before_all &blk
-                @cli_vals[:before_all]<< blk
+            def before_all meth=nil, &blk
+                @cli_vals[:before_all]<< ( meth.nil? ? blk : meth )
                 @cli_vals[:before_all].uniq!
             end
             #
@@ -205,8 +201,8 @@ module Zorglub
                 @cli_vals[:after_all].each do |blk| blk.call obj end
             end
             #
-            def after_all &blk
-                @cli_vals[:after_all]<< blk
+            def after_all meth=nil, &blk
+                @cli_vals[:after_all]<< ( meth.nil? ? blk : meth )
                 @cli_vals[:after_all].uniq!
             end
             #
@@ -217,107 +213,111 @@ module Zorglub
         class << self
             #
             def inherited sub
-                sub.engine! engine||(self==Zorglub::Node ? UNDEFINED : nil )
-                sub.layout! layout||(self==Zorglub::Node ? UNDEFINED : nil )
+                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'
-                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}
+                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 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}
+            def partial env, meth, *args
+                node = self.new env, meth.to_s, args, true
                 return error_404 node if not node.respond_to? meth
-                node.feed!
+                node.feed! env[:no_hooks]
                 node.content
             end
             #
             def error_404 node
-                puts " !! method not found" if app.opt :debug
+                $stderr << " !! method 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.request.env['PATH_INFO'] ]
+                resp.write "%s mapped at %p can't respond to : %p" % [ node.class.name, node.map, node.meth ]
                 resp
             end
             #
         end
         #
-        attr_reader :options, :request, :response, :content, :mime
+        attr_reader :request, :response, :content, :mime, :state, :engine, :meth, :args
         #
-        def initialize env, options
-            @env = env
-            @options = options
+        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 state state=nil
-            @options[:state] = state unless state.nil?
-            @options[:state]
-        end
-        #
         def realize!
             catch(:stop_realize) {
                 feed!
                 response.write @content
-                response.header['Content-Type'] = @mime||'text/html'
+                response.header['Content-Type'] = ( @mime || 'text/html' )
                 response.finish
                 response
             }
         end
         #
-        def feed!
-            state :pre_cb
-            self.class.call_before_hooks self
-            state :meth
-            @content = self.send @options[:method], *@options[:args]
+        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
-            state :finished
+            @state = :post_cb
+            self.class.call_after_hooks self unless no_hooks
+            @state = :finished
             return @content, @mime
         end
         #
         def static_page! path
-            if not File.exists? path
-                compile_page!
-                Dir.mkdir app.static_base_path
-                Dir.mkdir File.dirname path
-                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
+            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 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
+            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 unless mime.nil?
-            state :layout
-            @content, mime = e.call l, self if e and File.exists? l
+            @state = :layout
+            @content, mime = e.call l, self if e and l and File.exists? l
             @mime = mime unless mime.nil?
         end
         #

data/lib/zorglub.rb

@@ -1,7 +1,10 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'version'
+module Zorglub
+    VERSION = '0.0.7'
+end
+#
 require 'zorglub/node'
 require 'zorglub/app'
 #

data/spec/node_spec.rb

@@ -167,11 +167,27 @@ describe Zorglub do
         end
         #
         it "partial should render correctly" do
-            Node0.partial(:do_partial, 1, 2).should == 'partial_content'
+            Node0.partial({},:do_partial, 1, 2).should == 'partial_content'
         end
         #
         it "method level view should work" do
-            Node0.partial(:other_view).should == 'partial_content'
+            Node0.partial({},:other_view).should == 'partial_content'
+        end
+        #
+        it "partial with hooks should be default" do
+            Node3.before = 0
+            Node3.after = 0
+            Node3.partial({},:do_partial,1,2).should == 'partial_content'
+            Node3.before.should == 1
+            Node3.after.should == 1
+        end
+        #
+        it "partial without hooks should work" do
+            Node3.before = 0
+            Node3.after = 0
+            Node3.partial({:no_hooks=>true},:do_partial,1,2).should == 'partial_content'
+            Node3.before.should == 0
+            Node3.after.should == 0
         end
         #
         it "static pages should be generated" do
@@ -187,6 +203,14 @@ describe Zorglub do
             r = Node6.my_call '/no_static'
             r.body[0].should == 'VAL 4'
             r.header['Content-type'].should == 'text/static'
+            r = Node6.my_call '/do_static'
+            r.body[0].should == 'VAL 1'
+            r.header['Content-type'].should == 'text/static'
+            Node6.static! true, 0.000001
+            sleep 0.0001
+            r = Node6.my_call '/do_static'
+            r.body[0].should == 'VAL 6'
+            r.header['Content-type'].should == 'text/static'
         end
         #
         it "redirect should work" do
@@ -261,6 +285,11 @@ describe Zorglub do
             h[:layout].should == File.join(Node7.app.opt(:root), 'alt','layout','default')
         end
         #
+        it "debug out should work" do
+            APP.opt! :debug, true
+            Node0.my_call '/hello'
+        end
+        #
     end
     #
 end

data/spec/spec_helper.rb

@@ -103,18 +103,23 @@ class Node3 < Zorglub::Node
     @after=0
     class << self
         attr_accessor :before, :after
+        def post obj
+            @after +=1
+        end
     end
     before_all do |node|
         Node3.before +=1
     end
-    after_all do |node|
-        Node3.after +=1
-    end
+    after_all Node3.method(:post)
     layout! 'layout-2'
     engine! 'engine-2'
     def index
         (Node3.before-Node3.after).should == 1
     end
+    def do_partial a1, a2
+        view! Node0.r('do_partial')
+        engine! 'real'
+    end
 end
 #
 class Node8 < Node3
@@ -151,7 +156,7 @@ class Node6 < Zorglub::Node
         attr_accessor :static_cpt
     end
     attr_reader :value
-    static! true
+    static! true, 5
     def no_static
         static! false
         engine! 'static'

data/zorglub.gemspec

@@ -2,7 +2,11 @@
 # -*- coding: UTF-8 -*-
 #
 $:.push File.expand_path("../lib", __FILE__)
-require 'version'
+#
+begin
+    require 'zorglub'
+rescue LoadError
+end
 #
 Gem::Specification.new do |s|
     s.name = "zorglub"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-08 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &7940480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7940480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7939860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7939860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7864280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7864280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &7862960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7862960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &7862020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7862020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: This is a very stripped down version of innate.
 email:
 - jeremy@asynk.ch
@@ -89,7 +114,6 @@ files:
 - example/view/url1/index.haml
 - example/view/url1/meth0.haml
 - example/view/url3/index.haml
-- lib/version.rb
 - lib/zorglub.rb
 - lib/zorglub/app.rb
 - lib/zorglub/engines/file.rb
@@ -132,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: a nano web application framework based on rack

data/lib/version.rb

@@ -1,10 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-module Zorglub
-    #
-    VERSION = '0.0.6'
-    #
-end
-#
-# EOF