Capcode 0.6.1 → 0.6.2

data/lib/capcode/render/erb.rb

@@ -7,7 +7,11 @@ module Capcode
       @@__ERB_PATH__ = p
     end
     
-    def render_erb( f ) #:nodoc:
+    def get_binding
+      binding
+    end
+    
+    def render_erb( f, opts ) #:nodoc:
       f = f.to_s
       if f.include? '..'
         return [403, {}, '403 - Invalid path']
@@ -22,10 +26,21 @@ module Capcode
           @@__ERB_PATH__ = File.expand_path( File.join(@@__ROOT_DIRECTORY, @@__ERB_PATH__) )
         end
       end
-      
+
+      layout = opts.delete(:layout)||:layout
+      layout_file = File.join( @@__ERB_PATH__, layout.to_s+".rhtml" )
+
       f = f + ".rhtml" if File.extname( f ) != ".rhtml"
       file = File.join( @@__ERB_PATH__, f )
-      ERB.new(open(file).read).result(binding)
+      
+      if( File.exist?( layout_file ) )
+        ERB.new(open(layout_file).read).result( get_binding { |*args| 
+          @@__ARGS__ = args
+          ERB.new(open(file).read).result(binding) 
+        } )
+      else
+        ERB.new(open(file).read).result(binding)
+      end
     end
   end
 end

data/lib/capcode/render/haml.rb

@@ -7,7 +7,7 @@ module Capcode
       @@__HAML_PATH__ = p
     end
     
-    def render_haml( f ) #:nodoc:
+    def render_haml( f, opts ) #:nodoc:
       f = f.to_s
       if f.include? '..'
         return [403, {}, '403 - Invalid path']
@@ -23,9 +23,20 @@ module Capcode
         end
       end
        
+      layout = opts.delete(:layout)||:layout
+      layout_file = File.join( @@__HAML_PATH__, layout.to_s+".haml" )
+      
       f = f + ".haml" if File.extname( f ) != ".haml"
       file = File.join( @@__HAML_PATH__, f )
-      Haml::Engine.new( open( file ).read ).to_html( self )
+
+      if( File.exist?( layout_file ) )
+        Haml::Engine.new( open( layout_file ).read ).to_html(self) { |*args| 
+          @@__ARGS__ = args
+          Haml::Engine.new( open( file ).read ).render(self) 
+        }
+      else
+        Haml::Engine.new( open( file ).read ).to_html( self )
+      end
     end
   end
 end

data/lib/capcode/render/json.rb

@@ -2,7 +2,7 @@ require 'json'
 
 module Capcode
   module Helpers
-    def render_json( f )
+    def render_json( f, opts )
       @response['Content-Type'] = 'application/json'
       f.to_json
     end

data/lib/capcode/render/markaby.rb

@@ -1,16 +1,23 @@
 require "markaby"
 
+Markaby::Builder.set(:indent, 2)
+
 module Capcode
   class Markaby::Builder
     include Views
   end
   
   module Helpers
-    def render_markaby( f ) #:nodoc:
+    def render_markaby( f, opts ) #:nodoc:
       f = f.to_s
+      layout = opts.delete(:layout)||:layout
+      
       mab = Markaby::Builder.new({}, self) { 
-        if self.respond_to?(:layout)
-          layout { self.send(f) }
+        if self.respond_to?(layout)
+          self.send(layout.to_s) { |*args| 
+            @@__ARGS__ = args
+            self.send(f) 
+          }
         else
           self.send(f) 
         end

data/lib/capcode/render/text.rb

@@ -0,0 +1,7 @@
+module Capcode
+  module Helpers
+    def render_text( f )
+      f
+    end
+  end
+end

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.6.1"
+  CAPCOD_VERION="0.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-15 00:00:00 +02:00
+date: 2009-06-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -69,13 +69,20 @@ files:
 - lib/capcode/render/haml.rb
 - lib/capcode/render/json.rb
 - lib/capcode/render/markaby.rb
+- lib/capcode/render/text.rb
 - lib/capcode/version.rb
 - lib/capcode.rb
 - examples/blog-couchdb.rb
 - examples/blog-couchdb.yml
 - examples/blog-dm.rb
 - examples/blog-dm.yml
+- examples/erb/cf.rhtml
+- examples/erb/cf_layout.rhtml
+- examples/erb/layout.rhtml
 - examples/erb/m_hello.rhtml
+- examples/haml/cf.haml
+- examples/haml/cf_layout.haml
+- examples/haml/layout.haml
 - examples/haml/m_hello.haml
 - examples/index.html
 - examples/my_blog.db