Capcode 0.8.1 → 0.8.2

data/doc/rdoc/classes/Capcode/Helpers.html

@@ -310,6 +310,28 @@ If you want to use a specific layout, you can specify it with option
 </pre>
   </div>
 </div>
+<h4 class="ruled">Public Instance method: 
+<strong><a name="M000014">static()</a></strong> <a href="#M000014"><img src="../../permalink.gif" border="0" title="Permalink to Public Instance method: static" /></a></h4>
+
+<p>
+Return information about the <a href="Helpers.html#M000014">static</a>
+directory
+</p>
+
+<div class="sourcecode">
+  <p class="source-link">[ <a href="javascript:toggleSource('M000014_source')" id="l_M000014_source">show source</a> ]</p>
+  <div id="M000014_source" class="dyn-source">
+<pre>
+     <span class="ruby-comment cmt"># File lib/capcode.rb, line 149</span>
+149:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">static</span>
+150:       { 
+151:         <span class="ruby-identifier">:uri</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">Capcode</span>.<span class="ruby-identifier">static</span>,
+152:         <span class="ruby-identifier">:path</span> =<span class="ruby-operator">&gt;</span> <span class="ruby-constant">File</span>.<span class="ruby-identifier">expand_path</span>( <span class="ruby-constant">File</span>.<span class="ruby-identifier">join</span>(<span class="ruby-value str">&quot;.&quot;</span>, <span class="ruby-constant">Capcode</span>.<span class="ruby-identifier">static</span> ) )
+153:       }
+154:     <span class="ruby-keyword kw">end</span>
+</pre>
+  </div>
+</div>
 
 </div>
 </div>

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Wed, 08 Jul 2009 02:03:05 +0200
+Fri, 17 Jul 2009 18:23:07 +0200

data/doc/rdoc/files/README.html

@@ -81,7 +81,7 @@ end</strong>
     <div id="README" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">README / Wed Jul 08 02:02:45 +0200 2009</div>
+  <div class="path">README / Fri Jul 17 18:22:38 +0200 2009</div>
 </div>
 
 <h1><a href="../classes/Capcode.html">Capcode</a></h1>
@@ -98,6 +98,25 @@ Copyright (C) 2009 Gregoire Lejeune
 <a href="../classes/Capcode.html">Capcode</a> is a web microframework
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.8.2</h3>
+<ul>
+<li>Add XML renderer (see rss example)
+
+</li>
+<li>Major bug corrections
+
+</li>
+<li>Add Helpers.static
+
+</li>
+<li>New example : upload.rb
+
+</li>
+<li>The database&#8217; configuration file is no more relative to the root
+directory but to the main file
+
+</li>
+</ul>
 <h3>0.8.1</h3>
 <ul>
 <li>Sorry for 0.8.0 !!
@@ -196,7 +215,7 @@ href="../classes/Capcode.html#M000008">Capcode.run</a>. This option allow
 you to specify the working directory
 
 </li>
-<li>Of &#8217;/&#8217; route is not defined but /index.html exist, display
+<li>If &#8217;/&#8217; route is not defined but /index.html exist, display
 index
 
 </li>

data/doc/rdoc/files/lib/capcode_rb.html

@@ -81,7 +81,7 @@ end</strong>
     <div id="lib/capcode.rb" class="page_shade">
 <div class="page">
 <div class="header">
-  <div class="path">lib/capcode.rb / Wed Jul 08 02:02:06 +0200 2009</div>
+  <div class="path">lib/capcode.rb / Fri Jul 17 12:19:44 +0200 2009</div>
 </div>
 
 <pre>

data/examples/rss.rb

@@ -0,0 +1,48 @@
+$:.unshift( "../lib" )
+require 'rubygems'
+require 'capcode'
+require 'capcode/render/xml'
+
+## !! THIS IS JUSTE FOR THIS EXAMPLE !!
+class Hash
+  def method_missing( id, *a )
+    self[id.id2name.to_sym]
+  end
+end
+
+module Capcode
+  class RSS < Route "/rss"
+    def get
+      @posts = [
+        { :title => "Welcome", :body => "This is a RSS example for Capcode!", :iid => 1, :created_at => Time.now() },
+        { :title => "Just For Fun", :body => "See more examples on the Capcode Website...", :iid => 2, :created_at => Time.now() },
+      ]
+      render :xml => :rss_view
+    end
+  end
+end
+
+module Capcode::Views
+  def rss_view
+    xml? :version => '1.0'
+    rss :version => "2.0" do
+      channel do
+        title "Capcode News"
+        description "Capcode Framework."
+        link "http://example.com/"
+        
+        @posts.each do |post|
+          item do
+            title post.title
+            link "http://example.com/posts/#{post.iid}"
+            description post.body
+            pubDate Time.parse(post.created_at.to_s).rfc822()
+            guid "http://example.com/posts/#{post.iid}"
+          end
+        end
+      end
+    end
+  end
+end
+
+Capcode.run()

data/examples/upload.rb

@@ -0,0 +1,39 @@
+require 'rubygems'
+require 'capcode'
+require 'capcode/render/markaby'
+require 'capcode/render/static'
+require 'fileutils'
+
+module Capcode
+  class Index < Route '/'
+    def get
+      render :markaby => :index
+    end
+    
+    def post
+      FileUtils.cp( 
+        params["upfile"][:tempfile].path, 
+        File.join( static[:path], params["upfile"][:filename] )
+      )
+      render :static => params["upfile"][:filename]
+    end
+  end
+end
+
+module Capcode::Views
+  def index
+    html do
+      body do
+        h1 "Upload..."
+        form :method => "POST", :enctype => 'multipart/form-data' do
+          input :type => "file", :name => "upfile"; br
+          input :type => "submit", :value => "Upload"
+        end
+      end
+    end
+  end
+end
+
+FileUtils.mkdir_p 'data'
+
+Capcode.run( :static => "data" )

data/lib/capcode.rb

@@ -144,6 +144,14 @@ module Capcode
         yield
       end
     end
+    
+    # Return information about the static directory
+    def static
+      { 
+        :uri => Capcode.static,
+        :path => File.expand_path( File.join(".", Capcode.static ) )
+      }
+    end
   end
   
   include Rack
@@ -356,7 +364,7 @@ module Capcode
         :session => args[:session]||{},
         :pid => args[:pid]||"#{$0}.pid",
         :daemonize => args[:daemonize]||false,
-        :db_config => args[:db_config]||"database.yml",
+        :db_config => File.expand_path(args[:db_config]||"database.yml"),
         :static => args[:static]||nil,
         :root => args[:root]||File.expand_path(File.dirname($0)),
         
@@ -442,7 +450,7 @@ module Capcode
         end
         
         # Set Static directory
-        @@__STATIC_DIR = File.expand_path(File.join("/", conf[:static])) unless conf[:static].nil?
+        @@__STATIC_DIR = (conf[:static][0].chr == "/")?conf[:static]:"/"+conf[:static] unless conf[:static].nil?
         
         # Initialize Rack App
         puts "** Map routes." if __VERBOSE

data/lib/capcode/render/erb.rb

@@ -12,6 +12,10 @@ module Capcode
     end
     
     def render_erb( f, opts ) #:nodoc:
+      if @@__ERB_PATH__.nil?
+        @@__ERB_PATH__ = "." + (Capcode.static.nil? == false)?Capcode.static:''
+      end
+      
       f = f.to_s
       if f.include? '..'
         return [403, {}, '403 - Invalid path']

data/lib/capcode/render/haml.rb

@@ -2,12 +2,16 @@ require "haml"
 
 module Capcode
   module Helpers
-    @@__HAML_PATH__ = "."
+    @@__HAML_PATH__ = nil
     def self.haml_path=( p )
       @@__HAML_PATH__ = p
     end
     
     def render_haml( f, opts ) #:nodoc:
+      if @@__HAML_PATH__.nil?
+        @@__HAML_PATH__ = "." + (Capcode.static.nil? == false)?Capcode.static:''
+      end
+      
       f = f.to_s
       if f.include? '..'
         return [403, {}, '403 - Invalid path']

data/lib/capcode/render/sass.rb

@@ -8,6 +8,10 @@ module Capcode
     end
     
     def render_sass( f, _ ) #:nodoc:
+      if @@__SASS_PATH__.nil?
+        @@__SASS_PATH__ = "." + (Capcode.static.nil? == false)?Capcode.static:''
+      end
+      
       f = f.to_s
       if f.include? '..'
         return [403, {}, '403 - Invalid path']

data/lib/capcode/render/static.rb

@@ -1,8 +1,8 @@
 module Capcode
   module Helpers
     def render_static( f, _ )
-      if Capcode.static.nil?
-        return [404, {}, ""]
+      if Capcode.static.nil? or f.include? '..'
+        return [403, {}, '403 - Invalid path']
       end
       redirect File.join( Capcode.static, f )
     end

data/lib/capcode/render/xml.rb

@@ -0,0 +1,121 @@
+# To use the XML renderer, you first need to require 'capcode/render/xml'
+
+class XML #:nodoc:
+  class TagError < ArgumentError #:nodoc:
+  end
+  
+  class DSL #:nodoc:
+    def initialize( helper, &block )
+      @__x_d_level = 0
+      @__x_d_helper = helper
+      @__x_d_helper.instance_variables.each do |ivar|
+        self.instance_variable_set(ivar, @__x_d_helper.instance_variable_get(ivar))
+      end
+      @__x_d_builder = ""
+      instance_eval(&block) if block
+    end
+
+    def __
+      " "*@__x_d_level
+    end
+
+    def _(x)
+      @__x_d_builder << __ << x << "\n"
+    end
+    
+    def tag!(sym, *args, &block)
+      tag = {
+        :bra => "<",
+        :ket => " />",
+        :name => sym.id2name,
+        :close => block_given?(),
+        :attrs => "",
+        :value => ""
+      }
+              
+      args.each do |a|
+        if a.class == Hash
+          a.each do |k, v|
+            tag[:attrs] << " #{k.to_s}='#{v}'"
+          end
+        elsif a.class == String
+          tag[:close] = true
+          tag[:value] << a << "\n"
+        end
+      end
+      
+      if tag[:name].match( /\?$/ )
+        tag[:name].gsub!( /\?$/, "" )
+        tag[:bra] = "<?"
+        tag[:ket] = "?>"
+        
+        if tag[:close] == true
+          raise XML::TagError, "Malformated traitment tag!"
+        end
+      end
+
+      @__x_d_builder << __ << tag[:bra] << "#{tag[:name]}#{tag[:attrs]}"
+      if tag[:close]
+        @__x_d_builder << ">\n"
+      else
+        @__x_d_builder << tag[:ket] << "\n"
+      end
+      
+      @__x_d_level += 2
+      
+      @__x_d_builder << __ << tag[:value] if tag[:value].size > 0
+      instance_eval(&block) if block
+      
+      @__x_d_level -= 2
+      
+      if tag[:close]
+        @__x_d_builder << __ << "</#{tag[:name]}>\n"
+      end
+    end
+    
+    def cdata( x = "", &block )
+      @__x_d_builder << __ << "<![CDATA["
+      if x.match( /\n/ ) or block
+        @__x_d_level += 2
+        @__x_d_builder << "\n" << __ << x << "\n" if x.size > 0
+        instance_eval(&block) if block
+        @__x_d_level -= 2
+        @__x_d_builder << __ 
+      else
+        @__x_d_builder << x if x.size > 0
+      end
+      @__x_d_builder << "]]>\n"
+    end
+    
+    def to_s
+      @__x_d_builder
+    end
+    
+    def method_missing(sym, *args, &block)
+      if @__x_d_helper.respond_to?(sym, true)
+        @__x_d_helper.send(sym, *args, &block)
+      elsif instance_variables.include?(ivar = "@__x_d_#{sym}")
+        instance_variable_get(ivar)
+      elsif !@__x_d_helper.nil? && @__x_d_helper.instance_variables.include?(ivar)
+        @__x_d_helper.instance_variable_get(ivar)
+      else
+        tag!(sym, *args, &block)
+      end
+    end
+  end
+end
+
+module Capcode
+  class XML::DSL #:nodoc:
+    include Views
+  end
+  
+  module Helpers
+    def render_xml( f, _ ) #:nodoc:
+      r = XML::DSL.new( self ) do
+        self.send(f.to_s)
+      end
+      r.to_s
+    end
+  end
+end

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.8.1"
+  CAPCOD_VERION="0.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-07-08 00:00:00 +02:00
+date: 2009-07-17 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,6 +107,7 @@ files:
 - lib/capcode/render/sass.rb
 - lib/capcode/render/static.rb
 - lib/capcode/render/text.rb
+- lib/capcode/render/xml.rb
 - lib/capcode/version.rb
 - lib/capcode.rb
 - examples/blog-couchdb.rb
@@ -122,10 +123,12 @@ files:
 - examples/haml/layout.haml
 - examples/haml/m_hello.haml
 - examples/my_blog.db
+- examples/rss.rb
 - examples/sample.rb
 - examples/session.rb
 - examples/static/index.html
 - examples/test/index.html
+- examples/upload.rb
 has_rdoc: true
 homepage: http://algorithmique.net
 licenses: []
@@ -134,9 +137,14 @@ post_install_message: |+
   
   If you want to use Markaby renderer, you must install Markaby.
   If you want to use HAML renderer, you must install haml.
+  If you want to use SASS renderer, you must install sass.
+  If you want to use JSON renderer, you must install json
   
   If For more information about Capcode, see 
-    http://capcode.rubyforge.org"
+    http://capcode.rubyforge.org
+  
+  You can also read the Capcode book (fr) at
+    http://algorithmique.net/capcode
   
 rdoc_options: 
 - --quiet