zorglub 0.0.3 → 0.0.4

data/Changelog

@@ -11,7 +11,8 @@
 	* update test application and write specs
 
 2012-01-05 Jérémy Zurcher <jeremy@asynk.ch>
-	* haml engine
+	* haml, file engines
+	* view/layout extention overriding at methode level
 	* optional engine cache
 	* optional engine proc mime-type definition
 	* optional static page generation/cache

data/lib/zorglub/config.rb

@@ -50,19 +50,18 @@ module Zorglub
             #
             def register_engine name, ext, proc
                 return unless name
-                @engines[name]=[ ext, proc ]
+                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_ext engine
-                e = @engines[engine]
-                return '' if e.nil?
-                x=e[0]
-                ( x.nil? ? '' : '.'+x )
-            end
-            #
-            def engine_proc engine
-                e = @engines[engine]
-                ( e.nil? ? nil : e[1] )
+            def engine_proc_ext engine, ext
+                p,x = @engines[engine]
+                return [nil, ''] if p.nil?
+                [ p, (x.nil? ? ext : x ) ]
             end
             #
         end

data/lib/zorglub/engines/file.rb

@@ -0,0 +1,20 @@
+# -*- coding: UTF-8 -*-
+#
+require 'haml/util'
+require 'haml/engine'
+#
+module Zorglub
+    module Engines
+        module File
+            def self.proc path,obj
+                content = ::File.open(path,'r'){|f| f.read }
+                ext = path.sub /.*\.(.+)$/,'\1'
+                return content, "text/#{ext}"
+            end
+        end
+    end
+end
+#
+Zorglub::Config.register_engine :file, nil, Zorglub::Engines::File.method(:proc)
+#
+# EOF

data/lib/zorglub/node.rb

@@ -150,7 +150,8 @@ module Zorglub
         end
         #
         def compile!
-            v, l, e = view, layout, Config.engine_proc(@options[:engine])
+            e, @options[:ext] = Config.engine_proc_ext @options[:engine], @options[:ext]
+            v, l = view, layout
             state (@options[:layout].nil? ? :partial : :view)
             @content, mime = e.call v, self if e and File.exists? v
             @mime = mime unless mime.nil?
@@ -183,7 +184,7 @@ module Zorglub
         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])+ Config.engine_ext(@options[:engine])
+            File.join(Config.layout_base_path, @options[:layout])+ext
         end
         #
         def no_layout
@@ -193,13 +194,21 @@ module Zorglub
         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])+Config.engine_ext(@options[:engine])
+            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])+Config.engine_ext(@options[:engine])
+            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

data/lib/zorglub.rb

@@ -7,7 +7,7 @@ require './lib/zorglub/app'
 #
 module Zorglub
     #
-    VERSION = '0.0.3'
+    VERSION = '0.0.4'
     #
 end
 #

data/spec/data/view/node0/plain_file.txt

@@ -0,0 +1 @@
+plain file

data/spec/data/view/node0/xml_file.xml

@@ -0,0 +1 @@
+<xml>file</xml>

data/spec/node_spec.rb

@@ -152,16 +152,16 @@ describe Zorglub do
         end
         #
         it "static pages should be generated" do
-            r = Node0.my_call '/do_static'
+            r = Node6.my_call '/do_static'
             r.body[0].should == 'VAL 1'
             r.header['Content-type'].should == 'text/static'
-            r = Node0.my_call '/do_static'
+            r = Node6.my_call '/do_static'
             r.body[0].should == 'VAL 1'
             r.header['Content-type'].should == 'text/static'
-            r = Node0.my_call '/do_static'
+            r = Node6.my_call '/do_static'
             r.body[0].should == 'VAL 1'
             r.header['Content-type'].should == 'text/static'
-            r = Node0.my_call '/no_static'
+            r = Node6.my_call '/no_static'
             r.body[0].should == 'VAL 4'
             r.header['Content-type'].should == 'text/static'
         end
@@ -192,6 +192,13 @@ describe Zorglub do
             vars.should == ['js0','js1']
             vars[2].should be_nil
         end
+        #
+        it "ext definition and file engine should work" do
+            r = Node0.my_call '/xml_file'
+            r.body[0]='<xml>file</xml>'
+            r = Node0.my_call '/plain_file'
+            r.body[0]='plain text'
+        end
     end
     #
 end

data/spec/spec_helper.rb

@@ -11,6 +11,7 @@ end
 require 'yaml'
 #
 require 'zorglub'
+require 'zorglub/engines/file'
 #
 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'] }
@@ -45,10 +46,6 @@ class Temp < Zorglub::Node
 end
 #
 class Node0 < Zorglub::Node
-    @static_cpt=0
-    class << self
-        attr_accessor :static_cpt
-    end
     # default
     def index
         html
@@ -72,20 +69,15 @@ class Node0 < Zorglub::Node
     def do_redirect
         redirect r(:do_partial,1,2,3)
     end
-    attr_reader :value
-    def no_static
-        static false
-        engine 'static'
-        view r('do_render')
-        Node0.static_cpt+=1
-        @value = Node0.static_cpt
+    def xml_file
+        no_layout
+        engine :file
+        ext 'xml'
     end
-    def do_static
-        static true
-        engine 'static'
-        view r('do_render')
-        Node0.static_cpt+=1
-        @value = Node0.static_cpt
+    def plain_file
+        no_layout
+        engine :file
+        ext 'txt'
     end
 end
 #
@@ -144,12 +136,35 @@ class Node5 < Node4
     end
 end
 #
+class Node6 < Zorglub::Node
+    @static_cpt=0
+    class << self
+        attr_accessor :static_cpt
+    end
+    attr_reader :value
+    static true
+    def no_static
+        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')
+        Node6.static_cpt+=1
+        @value = Node6.static_cpt
+    end
+end
+#
 APP = Zorglub::App.new do
     map '/node0', Node0
     map '/node1', Node1
     map '/node3', Node3
     map '/node4', Node4
     map '/node5', Node5
+    map '/node6', Node6
 end
 class Node2
     map APP, '/node2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &23307900 !ruby/object:Gem::Requirement
+  requirement: &20000040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *23307900
+  version_requirements: *20000040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23323560 !ruby/object:Gem::Requirement
+  requirement: &19999520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *23323560
+  version_requirements: *19999520
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23322980 !ruby/object:Gem::Requirement
+  requirement: &19998860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *23322980
+  version_requirements: *19998860
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &23322340 !ruby/object:Gem::Requirement
+  requirement: &19998120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,13 +54,14 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *23322340
+  version_requirements: *19998120
 description: a nano web application framework based on rack[http://rack.rubyforge.org/]
 email: jeremy@asynk.ch
 executables: []
 extensions: []
 extra_rdoc_files:
 - README.rdoc
+- spec/data/view/node0/plain_file.txt
 files:
 - Changelog
 - MIT-LICENSE
@@ -69,6 +70,7 @@ files:
 - 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
@@ -78,6 +80,8 @@ files:
 - spec/data/layout/main.spec
 - spec/data/view/node0/do_partial
 - spec/data/view/node0/do_render
+- spec/data/view/node0/plain_file.txt
+- spec/data/view/node0/xml_file.xml
 - spec/node_spec.rb
 - spec/spec_helper.rb
 - tasks/ann.rake