Capcode 0.4.0 → 0.5.0

data/lib/capcode.rb

@@ -14,15 +14,29 @@ module Capcode
   class RouteError < ArgumentError #:nodoc:
   end
   
+  class RenderError < ArgumentError
+  end
+  
   module Views; end
   
   # Helpers contains methods available in your controllers
   module Helpers
     # Render a view
-    def render( v )
-      self.send v.to_s
+    def render( h )
+      if h.class == Hash
+        t = (h.keys)[0]
+        v = h[t]
+        begin
+          self.send( "render_#{t.to_s}", v )
+        rescue => e
+          raise Capcode::RenderError, "Error rendering `#{t.to_s}' : #{e.message}", caller
+        end
+      else
+        return self.send(h.to_s)
+      end
     end
     
+    
     # Help you to return a JSON response
     #
     #   module Capcode
@@ -33,6 +47,7 @@ module Capcode
     #     end
     #   end
     def json( d )
+      warn( "json is deprecated, please use `render( :json => ... )'" )
       @response['Content-Type'] = 'application/json'
       d.to_json
     end

data/lib/capcode/render/erb.rb

@@ -0,0 +1,21 @@
+require 'erb'
+
+module Capcode
+  module Helpers
+    @@__ERB_PATH__ = File.expand_path( "." )
+    def self.erb_path=( p )
+      @@__ERB_PATH__ = File.expand_path( p )
+    end
+    
+    def render_erb( f )
+      f = f.to_s
+      if f.include? '..'
+        return [403, {}, '403 - Invalid path']
+      end
+          
+      f = f + ".rhtml" if File.extname( f ) != ".rhtml"
+      file = File.join( @@__ERB_PATH__, f )
+      ERB.new(open(file).read).result(binding)
+    end
+  end
+end

data/lib/capcode/render/haml.rb

@@ -0,0 +1,21 @@
+require "haml"
+
+module Capcode
+  module Helpers
+    @@__HAML_PATH__ = File.expand_path( "." )
+    def self.haml_path=( p )
+      @@__HAML_PATH__ = File.expand_path( p )
+    end
+    
+    def render_haml( f ) #:nodoc:
+      f = f.to_s
+      if f.include? '..'
+        return [403, {}, '403 - Invalid path']
+      end
+          
+      f = f + ".haml" if File.extname( f ) != ".haml"
+      file = File.join( @@__HAML_PATH__, f )
+      Haml::Engine.new( open( file ).read ).to_html( self )
+    end
+  end
+end

data/lib/capcode/render/json.rb

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

data/lib/capcode/render/markaby.rb

@@ -0,0 +1,15 @@
+require "markaby"
+
+module Capcode
+  class Markaby::Builder
+    include Views
+  end
+  
+  module Helpers
+    def render_markaby( f ) #:nodoc:
+      f = f.to_s
+      mab = Markaby::Builder.new({}, self) { self.send(f) }
+      mab.to_s  
+    end
+  end
+end

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.4.0"
+  CAPCOD_VERION="0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-30 00:00:00 +02:00
+date: 2009-05-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,12 +54,18 @@ files:
 - lib/capcode/base/couchdb.rb
 - lib/capcode/base/dm.rb
 - lib/capcode/core_ext.rb
+- lib/capcode/render/erb.rb
+- lib/capcode/render/haml.rb
+- lib/capcode/render/json.rb
+- lib/capcode/render/markaby.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/m_hello.rhtml
+- examples/haml/m_hello.haml
 - examples/index.html
 - examples/my_blog.db
 - examples/sample.rb
@@ -100,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: capcode
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Capcode is a web microframework