Capcode 0.8.9 → 0.9.0

data/lib/capcode/configuration.rb

@@ -1,39 +1,74 @@
 module Capcode
   class << self
-    # Set global configuration options
-    #
-    # Options :
-    # * <tt>:port</tt> = Listen port (default: 3000)
-    # * <tt>:host</tt> = Listen host (default: 0.0.0.0)
-    # * <tt>:server</tt> = Server type (webrick, mongrel or thin)
-    # * <tt>:log</tt> = Output logfile (default: STDOUT)
-    # * <tt>:session</tt> = Session parameters. See Rack::Session for more informations
-    # * <tt>:pid</tt> = PID file (default: $0.pid)
-    # * <tt>:daemonize</tt> = Daemonize application (default: false)
-    # * <tt>:db_config</tt> = database configuration file (default: database.yml)
-    # * <tt>:static</tt> = Static directory (default: the working directory)
-    # * <tt>:root</tt> = Root directory (default: directory of the main.rb) -- This is also the working directory !
-    # * <tt>:verbose</tt> = run in verbose mode
-    # * <tt>:auth</tt> = HTTP Basic Authentication options 
-    #
-    # It can exist specifics options depending on a renderer, a helper, ...
-    # 
-    # Example : 
-    #
-    #   module Capcode
-    #     set :erb, "/path/to/erb/files"
-    #     ...
-    #   end
-    def set( key, value )
-      config[key] = value
-    end
-    
-    def get( key ) #:nodoc:
-      config[key] || nil
-    end
-    
-    def config
-      @configuration ||= {}
+    def set(key, value, opts = {}); Configuration.set(key, value, opts); end
+  end
+  
+  class Configuration
+    class << self
+      def configuration( args = {} ) #:nodoc:
+        @configuration = config.merge({
+          :port => args[:port]||Capcode::Configuration.get(:port)||3000, 
+          :host => args[:host]||Capcode::Configuration.get(:host)||"0.0.0.0",
+          :server => args[:server]||Capcode::Configuration.get(:server)||nil,
+          :log => args[:log]||Capcode::Configuration.get(:log)||$stdout,
+          :session => args[:session]||Capcode::Configuration.get(:session)||{},
+          :pid => args[:pid]||Capcode::Configuration.get(:pid)||"#{$0}.pid",
+          :daemonize => args[:daemonize]||Capcode::Configuration.get(:daemonize)||false,
+          :db_config => File.expand_path(args[:db_config]||Capcode::Configuration.get(:db_config)||"database.yml"),
+          :root => args[:root]||Capcode::Configuration.get(:root)||File.expand_path(File.dirname($0)),
+          :static => args[:static]||Capcode::Configuration.get(:static)||args[:root]||File.expand_path(File.dirname($0)),
+          :verbose => args[:verbose]||Capcode::Configuration.get(:verbose)||false,
+          :console => false
+        })
+      end
+      def config #:nodoc:
+        @configuration ||= {}
+      end
+      
+      # Set global configuration options
+      #
+      # Options :
+      # * <tt>:port</tt> = Listen port (default: 3000)
+      # * <tt>:host</tt> = Listen host (default: 0.0.0.0)
+      # * <tt>:server</tt> = Server type (webrick, mongrel or thin)
+      # * <tt>:log</tt> = Output logfile (default: STDOUT)
+      # * <tt>:session</tt> = Session parameters. See Rack::Session for more informations
+      # * <tt>:pid</tt> = PID file (default: $0.pid)
+      # * <tt>:daemonize</tt> = Daemonize application (default: false)
+      # * <tt>:db_config</tt> = database configuration file (default: database.yml)
+      # * <tt>:static</tt> = Static directory (default: the working directory)
+      # * <tt>:root</tt> = Root directory (default: directory of the main.rb) -- This is also the working directory !
+      # * <tt>:verbose</tt> = run in verbose mode
+      # * <tt>:auth</tt> = HTTP Basic Authentication options 
+      #
+      # It can exist specifics options depending on a renderer, a helper, ...
+      # 
+      # Example : 
+      #
+      #   module Capcode
+      #     set :erb, "/path/to/erb/files"
+      #     ...
+      #   end
+      def set( key, value, opts = {} )
+        if Hash === value
+          opts = value
+          value = nil
+        end
+        config[key] = value
+        options[key] = opts
+      end
+      
+      def get( key = nil )
+        if key.nil?
+          config
+        else
+          config[key] || nil
+        end
+      end
+      
+      def options
+        @options ||= {}
+      end
     end
   end
 end

data/lib/capcode/render/text.rb

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

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.8.9"
+  CAPCOD_VERION="0.9.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-21 00:00:00 +01:00
+date: 2010-01-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,30 +45,17 @@ extra_rdoc_files:
 - lib/capcode.rb
 - lib/capcode/configuration.rb
 - lib/capcode/base/db.rb
-- lib/capcode/render/binary.rb
-- lib/capcode/render/email.rb
-- lib/capcode/render/erb.rb
-- lib/capcode/render/haml.rb
-- lib/capcode/render/json.rb
-- lib/capcode/render/markaby.rb
-- lib/capcode/render/mustache.rb
-- lib/capcode/render/none.rb
-- lib/capcode/render/redirect.rb
-- lib/capcode/render/sass.rb
-- lib/capcode/render/static.rb
 - lib/capcode/render/text.rb
-- lib/capcode/render/webdav.rb
-- lib/capcode/render/xml.rb
 files: 
 - COPYING
 - README.rdoc
 - AUTHORS
 - setup.rb
 - doc/rdoc/classes/Capcode/Base.html
+- doc/rdoc/classes/Capcode/Configuration.html
 - doc/rdoc/classes/Capcode/Helpers/Authorization.html
 - doc/rdoc/classes/Capcode/Helpers.html
 - doc/rdoc/classes/Capcode/HTTPError.html
-- doc/rdoc/classes/Capcode/Mab.html
 - doc/rdoc/classes/Capcode/Resource.html
 - doc/rdoc/classes/Capcode/Views.html
 - doc/rdoc/classes/Capcode.html
@@ -78,20 +65,7 @@ files:
 - 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/binary_rb.html
-- doc/rdoc/files/lib/capcode/render/email_rb.html
-- doc/rdoc/files/lib/capcode/render/erb_rb.html
-- doc/rdoc/files/lib/capcode/render/haml_rb.html
-- doc/rdoc/files/lib/capcode/render/json_rb.html
-- doc/rdoc/files/lib/capcode/render/markaby_rb.html
-- doc/rdoc/files/lib/capcode/render/mustache_rb.html
-- doc/rdoc/files/lib/capcode/render/none_rb.html
-- doc/rdoc/files/lib/capcode/render/redirect_rb.html
-- doc/rdoc/files/lib/capcode/render/sass_rb.html
-- doc/rdoc/files/lib/capcode/render/static_rb.html
 - doc/rdoc/files/lib/capcode/render/text_rb.html
-- doc/rdoc/files/lib/capcode/render/webdav_rb.html
-- doc/rdoc/files/lib/capcode/render/xml_rb.html
 - doc/rdoc/files/lib/capcode_rb.html
 - doc/rdoc/files/README_rdoc.html
 - doc/rdoc/fr_class_index.html
@@ -99,47 +73,15 @@ files:
 - doc/rdoc/fr_method_index.html
 - doc/rdoc/index.html
 - doc/rdoc/rdoc-style.css
-- lib/capcode/base/ar.rb
-- lib/capcode/base/couchdb.rb
 - lib/capcode/base/db.rb
-- lib/capcode/base/dm.rb
-- lib/capcode/base/mongodb.rb
-- lib/capcode/base/sq.rb
 - lib/capcode/configuration.rb
 - lib/capcode/core_ext.rb
 - lib/capcode/helpers/auth.rb
-- lib/capcode/render/binary.rb
-- lib/capcode/render/email.rb
-- lib/capcode/render/erb.rb
-- lib/capcode/render/haml.rb
-- lib/capcode/render/json.rb
-- lib/capcode/render/markaby.rb
-- lib/capcode/render/mustache.rb
-- lib/capcode/render/none.rb
-- lib/capcode/render/redirect.rb
-- lib/capcode/render/sass.rb
-- lib/capcode/render/static.rb
 - lib/capcode/render/text.rb
-- lib/capcode/render/webdav.rb
-- lib/capcode/render/xml.rb
 - lib/capcode/version.rb
 - lib/capcode.rb
 - examples/auth-basic.rb
 - examples/auth-digest.rb
-- examples/auth-webdav.rb
-- examples/blog-ar.rb
-- examples/blog-ar.yml
-- examples/blog-couchdb-run.rb
-- examples/blog-couchdb.rb
-- examples/blog-couchdb.ru
-- examples/blog-couchdb.yml
-- examples/blog-dm.rb
-- examples/blog-dm.yml
-- examples/blog-mongodb-run.rb
-- examples/blog-mongodb.rb
-- examples/blog-mongodb.yml
-- examples/blog-sq.rb
-- examples/blog-sq.yml
 - examples/erb/cf.rhtml
 - examples/erb/cf_layout.rhtml
 - examples/erb/layout.rhtml
@@ -149,31 +91,11 @@ files:
 - examples/haml/layout.haml
 - examples/haml/m_hello.haml
 - examples/haml/style.sass
-- examples/mail/mail_html.rhtml
-- examples/mail/mail_text.rhtml
-- examples/mail/ok.rhtml
-- examples/mail/rubyfr.png
-- examples/mustache/with_class.mustache
-- examples/mustache/without_class.mustache
-- examples/render-binary.rb
-- examples/render-email.rb
-- examples/render-erb.rb
-- examples/render-haml_sass.rb
 - examples/render-image.rb
-- examples/render-json.rb
-- examples/render-markaby.rb
-- examples/render-mustache.rb
-- examples/render-redirect.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
 - examples/rest.rb
 - examples/rest.ru
-- examples/rss.rb
 - examples/sample.rb
 - examples/session.rb
 - examples/soapbox/public/jquery.js
@@ -183,36 +105,39 @@ files:
 - examples/soapbox/soapbox-client.rb
 - examples/soapbox/soapbox.rb
 - examples/soapbox/views/index.rhtml
-- examples/static/coderay.css
-- examples/static/index.html
-- examples/test/index.html
 - examples/upload.rb
 has_rdoc: true
 homepage: http://algorithmique.net
 licenses: []
 
-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 Mustache renderer, you must install mustache.
-  If you want to use JSON renderer, you must install json.
-  If you want to use WebDAV renderer, you must install rack_dav.
-  If you want to use Mail renderer, you must install mail.
-  
-  If you want to use ActiveRecord, you must install active_record.
-  If you want to use DataMapper, you must install dm-core.
-  If you want to use Sequel, you must install sequel.
-  If you want to use CouchDB, you must install couch_foo.
-  If you want to use MongoDB, you must install mongoid.
-  
-  For more information about Capcode, see 
-    http://capcode.rubyforge.org
-  
-  You can also read the Capcode book (fr) at
-    http://algorithmique.net/capcode.html
-  
+post_install_message: "\n\
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\
+  !!                                           !!\n\
+  !!    THIS VERSION IS A MAJOR ENHANCEMENT    !!\n\
+  !!    -----------------------------------    !!\n\
+  !!                                           !!\n\
+  !!  YOU MUST UNINSTALL ALL PREVIOUS          !!\n\
+  !!  VERSIONS !!!                             !!\n\
+  !!                                           !!\n\
+  !!  gem uninstall Capode --version '< 0.9.0' !!\n\
+  !!                                           !!\n\
+  !!  IF YOU DON'T DO IT, THIS ONE WILL NOT    !!\n\
+  !!  WORK !!!                                 !!\n\
+  !!                                           !!\n\
+  !!  Moreover :                               !!\n\
+  !!                                           !!\n\
+  !!  Renderers and database accessors have    !!\n\
+  !!  been extracted and are now in the        !!\n\
+  !!  plugins repository :                     !!\n\
+  !!                                           !!\n\
+  !!  http://github.com/glejeune/Capcode.more  !!\n\
+  !!                                           !!\n\
+  !!  Each plugin is a gem that\xE2\x80\x99s can be       !!\n\
+  !!  installed separately.                    !!\n\
+  !!                                           !!\n\
+  !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n\n\
+  For more information about Capcode, see \n  http://capcode.rubyforge.org\n\n\
+  You can also read the Capcode book (fr) at\n  http://algorithmique.net/capcode.html\n\n"
 rdoc_options: 
 - --quiet
 - --title

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

@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
-     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Class: Capcode::Mab</title>
-  <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-  <meta http-equiv="Content-Script-Type" content="text/javascript" />
-  <link rel="stylesheet" href="../.././rdoc-style.css" type="text/css" media="screen" />
-  <script type="text/javascript">
-  // <![CDATA[
-
-  function popupCode( url ) {
-    window.open(url, "Code", "resizable=yes,scrollbars=yes,toolbar=no,status=no,height=150,width=400")
-  }
-
-  function toggleCode( id ) {
-    if ( document.getElementById )
-      elem = document.getElementById( id );
-    else if ( document.all )
-      elem = eval( "document.all." + id );
-    else
-      return false;
-
-    elemStyle = elem.style;
-    
-    if ( elemStyle.display != "block" ) {
-      elemStyle.display = "block"
-    } else {
-      elemStyle.display = "none"
-    }
-
-    return true;
-  }
-  
-  // Make codeblocks hidden by default
-  document.writeln( "<style type=\"text/css\">div.method-source-code { display: none }</style>" )
-  
-  // ]]>
-  </script>
-
-</head>
-<body>
-
-
-
-    <div id="classHeader">
-        <table class="header-table">
-        <tr class="top-aligned-row">
-          <td><strong>Class</strong></td>
-          <td class="class-name-in-header">Capcode::Mab</td>
-        </tr>
-        <tr class="top-aligned-row">
-            <td><strong>In:</strong></td>
-            <td>
-                <a href="../../files/lib/capcode/render/markaby_rb.html">
-                lib/capcode/render/markaby.rb
-                </a>
-        <br />
-            </td>
-        </tr>
-
-        <tr class="top-aligned-row">
-            <td><strong>Parent:</strong></td>
-            <td>
-                Markaby::Builder
-            </td>
-        </tr>
-        </table>
-    </div>
-  <!-- banner header -->
-
-  <div id="bodyContent">
-
-
-
-  <div id="contextContent">
-
-
-
-   </div>
-
-
-  </div>
-
-
-    <!-- if includes -->
-    <div id="includes">
-      <h3 class="section-bar">Included Modules</h3>
-
-      <div id="includes-list">
-        <span class="include-name"><a href="Views.html">Views</a></span>
-      </div>
-    </div>
-
-    <div id="section">
-
-
-
-
-
-      
-
-
-    <!-- if method_list -->
-
-
-  </div>
-
-
-<div id="validator-badges">
-  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
-</div>
-
-</body>
-</html>