Capcode 0.8.6 → 0.8.7

data/lib/capcode/render/haml.rb

@@ -2,15 +2,16 @@ require "haml"
 
 module Capcode
   module Helpers
-    @@__HAML_PATH__ = nil
     # Set the path to Haml files. If this path is not set, Capcode will search in the static path.
-    def self.haml_path=( p ) #:nodoc:
-      @@__HAML_PATH__ = p
+    # This method is deprecated and will be removed in version 1.0
+    def self.haml_path=( p )
+      warn "Capcode::Helpers.haml_path is deprecated and will be removed in version 1.0, please use `set :haml'"
+      Capcode.set :haml, p
     end
     
     def render_haml( f, opts ) #:nodoc:
-      if @@__HAML_PATH__.nil?
-        @@__HAML_PATH__ = "." + (Capcode.static.nil? == false)?Capcode.static():''
+      if @haml_path.nil?
+        @haml_path = Capcode.get( :haml ) || Capcode.static()
       end
       
       f = f.to_s
@@ -19,28 +20,36 @@ module Capcode
       end
       
       if /Windows/.match( ENV['OS'] )
-        unless( /.:\\/.match( @@__HAML_PATH__[0] ) )
-          @@__HAML_PATH__ = File.expand_path( File.join(".", @@__HAML_PATH__) )
+        unless( /.:\\/.match( @haml_path[0] ) )
+          @haml_path = File.expand_path( File.join(".", @haml_path) )
         end
       else
-        unless( @@__HAML_PATH__[0].chr == "/" )
-          @@__HAML_PATH__ = File.expand_path( File.join(".", @@__HAML_PATH__) )
+        unless( @haml_path[0].chr == "/" )
+          @haml_path = File.expand_path( File.join(".", @haml_path) )
         end
       end
-       
+      
+      # Get Layout file
       layout = opts.delete(:layout)||:layout
-      layout_file = File.join( @@__HAML_PATH__, layout.to_s+".haml" )
+      layout_file = File.join( @haml_path, layout.to_s+".haml" )
       
+      # Get HAML File
       f = f + ".haml" if File.extname( f ) != ".haml"
-      file = File.join( @@__HAML_PATH__, f )
-
-      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) 
-        }
+      file = File.join( @haml_path, f )
+      
+      # Render
+      if( File.exist?( file ) )
+        if( File.exist?( layout_file ) )
+          Haml::Engine.new( open( layout_file ).read ).to_html(self) { |*args| 
+            #@@__ARGS__ = args
+            Capcode::Helpers.args = args
+            Haml::Engine.new( open( file ).read ).render(self) 
+          }
+        else
+          Haml::Engine.new( open( file ).read ).to_html( self )
+        end
       else
-        Haml::Engine.new( open( file ).read ).to_html( self )
+        raise Capcode::RenderError, "Error rendering `haml', #{file} does not exist !"
       end
     end
   end

data/lib/capcode/render/markaby.rb

@@ -15,7 +15,8 @@ module Capcode
       __mab = Mab.new({}, self) { 
         if self.respond_to?(layout)
           self.send(layout.to_s) { |*args| 
-            @@__ARGS__ = args
+            #@@__ARGS__ = args
+            Capcode::Helpers.args = args
             self.send(f) 
           }
         else

data/lib/capcode/render/sass.rb

@@ -2,16 +2,16 @@ require "sass"
 
 module Capcode
   module Helpers
-    @@__SASS_PATH__ = "."
-    
     # Set the path to Sass files. If this path is not set, Capcode will search in the static path.
-    def self.sass_path=( p ) #:nodoc:
-      @@__SASS_PATH__ = p
+    # This method is deprecated and will be removed in version 1.0
+    def self.sass_path=( p )
+      warn "Capcode::Helpers.sass_path is deprecated and will be removed in version 1.0, please use `set :sass'"
+      Capcode.set :sass, p
     end
     
     def render_sass( f, _ ) #:nodoc:
-      if @@__SASS_PATH__.nil?
-        @@__SASS_PATH__ = "." + (Capcode.static.nil? == false)?Capcode.static():''
+      if @sass_path.nil?
+        @sass_path = Capcode.get( :sass ) || Capcode.static() 
       end
       
       f = f.to_s
@@ -20,19 +20,25 @@ module Capcode
       end
       
       if /Windows/.match( ENV['OS'] )
-        unless( /.:\\/.match( @@__SASS_PATH__[0] ) )
-          @@__SASS_PATH__ = File.expand_path( File.join(".", @@__SASS_PATH__) )
+        unless( /.:\\/.match( @sass_path[0] ) )
+          @sass_path = File.expand_path( File.join(".", @sass_path) )
         end
       else
-        unless( @@__SASS_PATH__[0].chr == "/" )
-          @@__SASS_PATH__ = File.expand_path( File.join(".", @@__SASS_PATH__) )
+        unless( @sass_path[0].chr == "/" )
+          @sass_path = File.expand_path( File.join(".", @sass_path) )
         end
       end
-       
+      
+      # Get File
       f = f + ".sass" if File.extname( f ) != ".sass"
-      file = File.join( @@__SASS_PATH__, f )
+      file = File.join( @sass_path, f )
 
-      Sass::Engine.new( open( file ).read ).to_css
+      # Render
+      if( File.exist?( file ) )
+        Sass::Engine.new( open( file ).read ).to_css
+      else
+        raise Capcode::RenderError, "Error rendering `sass', #{file} does not exist !"
+      end
     end
   end
 end

data/lib/capcode/render/text.rb

@@ -1,6 +1,6 @@
 module Capcode
   module Helpers
-    def render_text( f, _ ) #:nodoc:
+    def render_text( f, opts ) #:nodoc:
       f
     end
   end

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.8.6"
+  CAPCOD_VERION="0.8.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.8.6
+  version: 0.8.7
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-09 00:00:00 +02:00
+date: 2009-10-21 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,6 +43,7 @@ extra_rdoc_files:
 - AUTHORS
 - COPYING
 - lib/capcode.rb
+- lib/capcode/configuration.rb
 - lib/capcode/base/db.rb
 - lib/capcode/render/erb.rb
 - lib/capcode/render/haml.rb
@@ -70,6 +71,7 @@ files:
 - doc/rdoc/files/AUTHORS.html
 - doc/rdoc/files/COPYING.html
 - doc/rdoc/files/lib/capcode/base/db_rb.html
+- doc/rdoc/files/lib/capcode/configuration_rb.html
 - doc/rdoc/files/lib/capcode/helpers/auth_rb.html
 - doc/rdoc/files/lib/capcode/render/erb_rb.html
 - doc/rdoc/files/lib/capcode/render/haml_rb.html
@@ -90,6 +92,7 @@ files:
 - lib/capcode/base/couchdb.rb
 - lib/capcode/base/db.rb
 - lib/capcode/base/dm.rb
+- lib/capcode/configuration.rb
 - lib/capcode/core_ext.rb
 - lib/capcode/helpers/auth.rb
 - lib/capcode/render/erb.rb
@@ -124,11 +127,13 @@ files:
 - examples/my_blog.db
 - examples/render-erb.rb
 - examples/render-haml_sass.rb
+- examples/render-image.rb
 - examples/render-json.rb
 - examples/render-markaby.rb
 - examples/render-static.rb
 - examples/render-static.ru
 - examples/render-text.rb
+- examples/render-use.rb
 - examples/render-webdav.rb
 - examples/render-xml.rb
 - examples/rest-run.rb
@@ -137,6 +142,7 @@ files:
 - examples/rss.rb
 - examples/sample.rb
 - examples/session.rb
+- examples/static/coderay.css
 - examples/static/index.html
 - examples/test/index.html
 - examples/upload.rb