Capcode 0.9.7 → 0.9.8

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

@@ -111,7 +111,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
       <h3 class="section-bar">Methods</h3>
 
       <div class="name-list">
-      <a href="#M000022">http_authentication</a>&nbsp;&nbsp;
+      <a href="#M000024">http_authentication</a>&nbsp;&nbsp;
       </div>
     </div>
 
@@ -133,11 +133,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
     <div id="methods">
       <h3 class="section-bar">Public Instance methods</h3>
 
-      <div id="method-M000022" class="method-detail">
-        <a name="M000022"></a>
+      <div id="method-M000024" class="method-detail">
+        <a name="M000024"></a>
 
         <div class="method-heading">
-          <a href="#M000022" class="method-signature">
+          <a href="#M000024" class="method-signature">
           <span class="method-name">http_authentication</span><span class="method-args">( opts = {}, &amp;b )</span>
           </a>
         </div>
@@ -173,8 +173,8 @@ The block must return a Hash of username =&gt; password like that :
   }
 </pre>
           <p><a class="source-toggle" href="#"
-            onclick="toggleCode('M000022-source');return false;">[Source]</a></p>
-          <div class="method-source-code" id="M000022-source">
+            onclick="toggleCode('M000024-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000024-source">
 <pre>
      <span class="ruby-comment cmt"># File lib/capcode/helpers/auth.rb, line 105</span>
 105:       <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">http_authentication</span>( <span class="ruby-identifier">opts</span> = {}, <span class="ruby-operator">&amp;</span><span class="ruby-identifier">b</span> )

data/doc/rdoc/created.rid

@@ -1 +1 @@
-Wed, 02 Jun 2010 21:48:10 +0200
+Wed, 15 Sep 2010 14:22:01 +0200

data/doc/rdoc/files/README_rdoc.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 02 21:45:10 +0200 2010</td>
+      <td>Wed Sep 15 13:59:53 +0200 2010</td>
     </tr>
     </table>
   </div>
@@ -91,6 +91,30 @@ href="http://www.algorithmique.net/capcode">www.algorithmique.net/capcode</a>/
 <a href="../classes/Capcode.html">Capcode</a> is a web microframework
 </p>
 <h2>FEATURES/PROBLEMS:</h2>
+<h3>0.9.8</h3>
+<ul>
+<li>Add &quot;any&quot; to easly replace an <tt>alias_method :post, :get</tt>
+
+</li>
+<li>Bug correction in Filter : actions are now executed in the order they are
+declared
+
+</li>
+<li>Filters execution stop at the first non nul response
+
+</li>
+<li>Add &quot;log&quot; helper
+
+</li>
+<li>Add <a href="http://unicorn.bogomips.org/">Unicorn</a> and <a
+href="http://rainbows.rubyforge.org/">Rainbows</a> supports
+(<b>EXPERIMENTAL</b>)
+
+</li>
+<li>Add &#8212;server option
+
+</li>
+</ul>
 <h3>0.9.7</h3>
 <ul>
 <li>Major bug correction in Capcode.URL
@@ -254,7 +278,7 @@ renderer
 <li>Add :content_type option to renderers (see render-image.rb)
 
 </li>
-<li>Add <a href="../classes/Capcode.html#M000012">Capcode.set</a> for
+<li>Add <a href="../classes/Capcode.html#M000013">Capcode.set</a> for
 configuration. So Capcode::Herpers#erb_path=, Capcode::Herpers#sass_path=
 and Capcode::Herpers#haml_path= are deprecated, you must now use `set :erb,
 &#8230;&#8217;, `set :sass, &#8230;&#8217; and `set :haml, &#8230;&#8217;

data/doc/rdoc/files/lib/capcode/configuration_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Fri May 28 11:59:09 +0200 2010</td>
+      <td>Sun Jun 20 13:09:06 +0200 2010</td>
     </tr>
     </table>
   </div>

data/doc/rdoc/files/lib/capcode/filters_rb.html

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Feb 10 08:55:11 +0100 2010</td>
+      <td>Wed Sep 15 14:21:40 +0200 2010</td>
     </tr>
     </table>
   </div>

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

@@ -56,7 +56,7 @@
     </tr>
     <tr class="top-aligned-row">
       <td><strong>Last Update:</strong></td>
-      <td>Wed Jun 02 21:43:29 +0200 2010</td>
+      <td>Wed Sep 15 14:11:05 +0200 2010</td>
     </tr>
     </table>
   </div>
@@ -93,6 +93,9 @@ Please read the README.rdoc file !
       capcode/filters&nbsp;&nbsp;
       capcode/ext/rack/urlmap&nbsp;&nbsp;
       mongrel&nbsp;&nbsp;
+      unicorn/launcher&nbsp;&nbsp;
+      unicorn/launcher&nbsp;&nbsp;
+      rainbows&nbsp;&nbsp;
       </div>
     </div>
 

data/doc/rdoc/fr_method_index.html

@@ -21,30 +21,32 @@
   <h1 class="section-bar">Methods</h1>
   <div id="index-entries">
     <a href="classes/Capcode.html#M000001">Route (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000019">URL (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000020">URL (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000010">application (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000014">args (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000015">args= (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode.html#M000013">before_filter (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000020">content_for (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000015">args (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000016">args= (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode.html#M000014">before_filter (Capcode)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000021">content_for (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000003">env (Capcode)</a><br />
-    <a href="classes/Capcode/Configuration.html#M000025">get (Capcode::Configuration)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000027">get (Capcode::Configuration)</a><br />
     <a href="classes/Capcode.html#M000009">http_authentication (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers/Authorization.html#M000022">http_authentication (Capcode::Helpers::Authorization)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000017">json (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers/Authorization.html#M000024">http_authentication (Capcode::Helpers::Authorization)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000018">json (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000023">log (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode.html#M000012">logger (Capcode)</a><br />
     <a href="classes/Capcode.html#M000007">map (Capcode)</a><br />
-    <a href="classes/Capcode/Configuration.html#M000026">options (Capcode::Configuration)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000028">options (Capcode::Configuration)</a><br />
     <a href="classes/Capcode.html#M000002">params (Capcode)</a><br />
-    <a href="classes/Capcode/Configuration.html#M000023">print_debug (Capcode::Configuration)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000018">redirect (Capcode::Helpers)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000016">render (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000025">print_debug (Capcode::Configuration)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000019">redirect (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000017">render (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000005">request (Capcode)</a><br />
     <a href="classes/Capcode.html#M000006">response (Capcode)</a><br />
     <a href="classes/Capcode.html#M000011">run (Capcode)</a><br />
     <a href="classes/Capcode.html#M000004">session (Capcode)</a><br />
-    <a href="classes/Capcode/Configuration.html#M000024">set (Capcode::Configuration)</a><br />
-    <a href="classes/Capcode.html#M000012">set (Capcode)</a><br />
-    <a href="classes/Capcode/Helpers.html#M000021">static (Capcode::Helpers)</a><br />
+    <a href="classes/Capcode/Configuration.html#M000026">set (Capcode::Configuration)</a><br />
+    <a href="classes/Capcode.html#M000013">set (Capcode)</a><br />
+    <a href="classes/Capcode/Helpers.html#M000022">static (Capcode::Helpers)</a><br />
     <a href="classes/Capcode.html#M000008">use (Capcode)</a><br />
   </div>
 </div>

data/examples/rest-run.rb

@@ -1,3 +1,3 @@
 require 'rest'
 
-run Capcode.run()
+Capcode.run( :log => "rest.log" )

data/examples/rest.log

@@ -0,0 +1,70 @@
+# Logfile created on Sun Jun 13 20:42:18 +0200 2010 by logger.rb/22285
+127.0.0.1 - - [13/Jun/2010 20:42:24] "GET / HTTP/1.1" 200 586 0.0173
+GET...
+127.0.0.1 - - [13/Jun/2010 20:42:27] "GET /action?data=1 HTTP/1.1" 200 619 0.0082
+POST...
+127.0.0.1 - - [13/Jun/2010 20:42:30] "POST /action HTTP/1.1" 200 620 0.0080
+DELETE...
+127.0.0.1 - - [13/Jun/2010 20:42:33] "POST /action HTTP/1.1" 200 622 0.0078
+PUT...
+127.0.0.1 - - [13/Jun/2010 20:42:37] "POST /action HTTP/1.1" 200 619 0.0066
+127.0.0.1 - - [13/Jun/2010 20:43:33] "GET / HTTP/1.1" 200 586 0.0165
+GET...
+127.0.0.1 - - [13/Jun/2010 20:43:37] "GET /action?data=A HTTP/1.1" 200 619 0.0075
+POST...
+127.0.0.1 - - [13/Jun/2010 20:43:40] "POST /action HTTP/1.1" 200 620 0.0081
+DELETE...
+127.0.0.1 - - [13/Jun/2010 20:43:42] "POST /action HTTP/1.1" 200 622 0.0073
+PUT...
+127.0.0.1 - - [13/Jun/2010 20:43:43] "POST /action HTTP/1.1" 200 619 0.0072
+127.0.0.1 - - [13/Jun/2010 20:48:07] "GET / HTTP/1.1" 200 586 0.0173
+GET...
+127.0.0.1 - - [13/Jun/2010 20:48:13] "GET /action?data=a HTTP/1.1" 200 619 0.0092
+127.0.0.1 - - [13/Jun/2010 20:48:43] "GET / HTTP/1.1" 200 586 0.0157
+GET...
+127.0.0.1 - - [13/Jun/2010 20:48:46] "GET /action?data=z HTTP/1.1" 200 619 0.0072
+GET...
+127.0.0.1 - - [13/Jun/2010 20:49:01] "GET /action?data=zz HTTP/1.1" 200 620 0.0064
+127.0.0.1 - - [20/Jun/2010 12:53:42] "GET / HTTP/1.1" 200 586 0.0804
+127.0.0.1 - - [20/Jun/2010 12:53:43] "GET /favicon.ico HTTP/1.1" 200 586 0.0068
+GET...
+127.0.0.1 - - [20/Jun/2010 12:53:46] "GET /action?data=pipo HTTP/1.1" 200 622 0.0080
+127.0.0.1 - - [20/Jun/2010 13:03:30] "GET / HTTP/1.1" 200 586 0.0208
+127.0.0.1 - - [20/Jun/2010 13:03:32] "GET / HTTP/1.1" 200 586 0.0058
+127.0.0.1 - - [20/Jun/2010 13:03:32] "GET /favicon.ico HTTP/1.1" 200 586 0.0652
+GET...
+127.0.0.1 - - [20/Jun/2010 13:03:36] "GET /action?data=pipo HTTP/1.1" 200 622 0.0076
+POST...
+127.0.0.1 - - [20/Jun/2010 13:03:39] "POST /action HTTP/1.1" 200 623 0.0077
+DELETE...
+127.0.0.1 - - [20/Jun/2010 13:03:43] "POST /action HTTP/1.1" 200 624 0.0071
+PUT...
+127.0.0.1 - - [20/Jun/2010 13:03:46] "POST /action HTTP/1.1" 200 625 0.0072
+127.0.0.1 - - [20/Jun/2010 13:05:02] "GET / HTTP/1.1" 200 586 0.0328
+GET...
+127.0.0.1 - - [20/Jun/2010 13:05:05] "GET /action?data=pipo HTTP/1.1" 200 622 0.0079
+POST...
+127.0.0.1 - - [20/Jun/2010 13:05:08] "POST /action HTTP/1.1" 200 623 0.0093
+DELETE...
+127.0.0.1 - - [20/Jun/2010 13:05:11] "POST /action HTTP/1.1" 200 624 0.0096
+PUT...
+127.0.0.1 - - [20/Jun/2010 13:05:14] "POST /action HTTP/1.1" 200 625 0.0092
+127.0.0.1 - - [20/Jun/2010 13:13:15] "GET / HTTP/1.1" 200 586 0.0290
+GET...
+127.0.0.1 - - [20/Jun/2010 13:13:19] "GET /action?data=A HTTP/1.1" 200 619 0.0081
+POST...
+127.0.0.1 - - [20/Jun/2010 13:13:22] "POST /action HTTP/1.1" 200 620 0.0101
+DELETE...
+127.0.0.1 - - [20/Jun/2010 13:13:23] "POST /action HTTP/1.1" 200 622 0.0111
+PUT...
+127.0.0.1 - - [20/Jun/2010 13:13:26] "POST /action HTTP/1.1" 200 619 0.2896
+127.0.0.1 - - [02/Sep/2010 14:43:18] "GET / HTTP/1.1" 200 586 0.1292
+127.0.0.1 - - [02/Sep/2010 14:43:18] "GET /favicon.ico HTTP/1.1" 200 586 0.0082
+GET...
+127.0.0.1 - - [02/Sep/2010 14:43:21] "GET /action?data=get HTTP/1.1" 200 621 0.0068
+POST...
+127.0.0.1 - - [02/Sep/2010 14:43:24] "POST /action HTTP/1.1" 200 623 0.0066
+DELETE...
+127.0.0.1 - - [02/Sep/2010 14:43:27] "POST /action HTTP/1.1" 200 625 0.0070
+PUT...
+127.0.0.1 - - [02/Sep/2010 14:43:31] "POST /action HTTP/1.1" 200 621 0.0800

data/examples/rest.rb

@@ -10,21 +10,22 @@ module Capcode
   end
   
   class Action < Route "/action"
-    def get( )
+    def any
       @method = env["REQUEST_METHOD"]
+      log.write( "#{@method}...\n" )
       @data = params["data"]
       render :markaby => :action, :layout => :forms
     end
    
-    alias_method :post, :get
-    
     def delete
+      log.write( "DELETE...\n" )
       @method = "DELETE"
       @data = params["data"]
       render :markaby => :action, :layout => :forms
     end
     
     def put
+      log.write( "PUT...\n" )
       @method = "PUT"
       @data = params["data"]
       render :markaby => :action, :layout => :forms

data/examples/rest.ru

@@ -1,3 +1,3 @@
 require 'rest'
 
-run Capcode.application()
+run Capcode.application( :log => "rest.log" )

data/lib/capcode.rb

@@ -285,6 +285,13 @@ module Capcode
       }
     end
     
+    # Use the Rack logger
+    #
+    #   log.write( "This is a log !" )
+    def log
+      Capcode.logger || env['rack.errors']
+    end
+    
     include Authorization
   end
   
@@ -484,15 +491,25 @@ module Capcode
             filter_output = Capcode::Filter.execute( self )
 
             if( filter_output.nil? )
-              case @env["REQUEST_METHOD"]
-                when "GET"                      
-                  get( *args )
-                when "POST"
-                  _method = params.delete( "_method" ) { |_| "post" }
+              # case @env["REQUEST_METHOD"]
+              #   when "GET"                      
+              #     get( *args )
+              #   when "POST"
+              #     _method = params.delete( "_method" ) { |_| "post" }
+              #     send( _method.downcase.to_sym, *args )
+              #   else
+              #     _method = @env["REQUEST_METHOD"]
+              #     send( _method.downcase.to_sym, *args )
+              # end
+              begin
+                _method = params.delete( "_method" ) { |_| @env["REQUEST_METHOD"] }
+                if self.class.method_defined?( _method.downcase.to_sym )
                   send( _method.downcase.to_sym, *args )
                 else
-                  _method = @env["REQUEST_METHOD"]
-                  send( _method.downcase.to_sym, *args )
+                  any( *args )
+                end
+              rescue => e
+                raise e.class, e.to_s
               end
             else
               filter_output
@@ -639,6 +656,7 @@ module Capcode
       app = Rack::Lint.new(app)
       app = Rack::ShowExceptions.new(app)
       #app = Rack::Reloader.new(app) ## -- NE RELOAD QUE capcode.rb -- So !!!
+      app = Rack::CommonLogger.new( app, @cclogger = Logger.new(Capcode::Configuration.get(:log)) )
       
       middlewares.each do |mw|
         middleware, args, block = mw
@@ -695,6 +713,9 @@ module Capcode
         opts.on( "-s", "--static PATH", "Static directory -- relative to the root directory (default: #{Capcode::Configuration.get(:static)})" ) { |r|
           Capcode::Configuration.set :static, r
         }
+        opts.on( "-S", "--server SERVER", "Server to use (default: #{Capcode::Configuration.get(:server)})" ) { |r|
+          Capcode::Configuration.set :server, r
+        }
 
         opts.separator ""
         opts.separator "Common options:"
@@ -764,7 +785,6 @@ module Capcode
         else
           app = application(Capcode::Configuration.get)
         end
-        app = Rack::CommonLogger.new( app, Logger.new(Capcode::Configuration.get(:log)) )
         
         if Capcode::Configuration.get(:console)
           puts "Run console..."
@@ -789,6 +809,15 @@ module Capcode
           Rack::Handler::Thin.run( app, {:Port => Capcode::Configuration.get(:port), :Host => Capcode::Configuration.get(:host)} ) { |server|
             trap "SIGINT", proc { server.stop }
           }
+        when "unicorn"
+          require 'unicorn/launcher'
+          puts "** Starting Unicorn on #{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"
+          Unicorn.run( app, {:listeners => ["#{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"]} )
+        when "rainbows"
+          require 'unicorn/launcher'
+          require 'rainbows'
+          puts "** Starting Rainbow on #{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"
+          Rainbows.run( app, {:listeners => ["#{Capcode::Configuration.get(:host)}:#{Capcode::Configuration.get(:port)}"]} )
         end
       end
     end
@@ -797,6 +826,10 @@ module Capcode
       @routes ||= {}
     end
     
+    def logger
+      @cclogger
+    end
+    
     def static #:nodoc:
       @static_dir ||= nil
     end

data/lib/capcode/configuration.rb

@@ -9,7 +9,7 @@ module Capcode
         @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,
+          :server => args[:server]||Capcode::Configuration.get(:server)||"mongrel",
           :log => args[:log]||Capcode::Configuration.get(:log)||$stdout,
           :session => args[:session]||Capcode::Configuration.get(:session)||{},
           :pid => args[:pid]||Capcode::Configuration.get(:pid)||"#{$0}.pid",
@@ -36,7 +36,7 @@ module Capcode
       # 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>:server</tt> = Server type (webrick, mongrel, thin, unicorn or rainbow)
       # * <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)

data/lib/capcode/filters.rb

@@ -13,6 +13,7 @@ module Capcode
     # 
     def before_filter( action, opts = {} )
       Capcode::Filter.filters[action] = { }
+      Capcode::Filter.ordered_actions << action
       
       opts.each do |k, v|
         Capcode::Filter.filters[action][k] = v
@@ -26,6 +27,10 @@ module Capcode
         @filters ||= { }
       end
       
+      def ordered_actions
+        @ordered_actions ||= []
+      end
+      
       def execute( klass ) #:nodoc:
         klass_sym = "#{klass.class}".split( /::/)[-1].to_sym
         actions = []
@@ -39,8 +44,9 @@ module Capcode
 
         klass.class.instance_eval{ include Capcode }
         rCod = nil
-        actions.each do |a|
+        ordered_actions.clone.delete_if{ |x| not actions.include?(x) }.each do |a|
           rCod = klass.send( a )
+          break unless rCod.nil?
         end
         
         return rCod

data/lib/capcode/version.rb

@@ -1,3 +1,3 @@
 module Capcode
-  CAPCOD_VERION="0.9.7"
+  CAPCOD_VERION="0.9.8"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: Capcode
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 43
   prerelease: false
   segments: 
   - 0
   - 9
-  - 7
-  version: 0.9.7
+  - 8
+  version: 0.9.8
 platform: ruby
 authors: 
 - "Gr\xC3\xA9goire Lejeune"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +02:00
+date: 2010-09-15 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,6 +112,7 @@ files:
 - examples/render-image.rb
 - examples/render-text.rb
 - examples/rest-run.rb
+- examples/rest.log
 - examples/rest.rb
 - examples/rest.ru
 - examples/route.rb