waves 0.7.6 → 0.7.7

data/app/Rakefile

@@ -3,12 +3,70 @@
 # Warning:  This file is clobbered when you update your
 # application with the waves script.  Accordingly, you may
 # wish to keep your tasks in .rb or .rake files in lib/tasks
-require 'startup'
-Waves::Console.load(:mode => ENV['mode'])
 
-# load tasks from waves framework
-%w( cluster generate gem ).each { |task| require "tasks/#{task}.rb" }
+begin
+  require 'startup'
+  Waves::Console.load(:mode => ENV['mode'])
 
-# load tasks from this app's lib/tasks
-Dir["lib/tasks/*.{rb,rake}"].each { |task| require task }
+  # load tasks from waves framework
+  %w( cluster generate gem ).each { |task| require "tasks/#{task}.rb" }
 
+  # load tasks from this app's lib/tasks
+  Dir["lib/tasks/*.{rb,rake}"].each { |task| require task }
+  
+rescue LoadError => e
+  if e.message == 'no such file to load -- waves'
+    puts "Can't find Waves source.  Install gem, freeze Waves, or define WAVES in startup.rb"
+    puts
+  else
+    raise e
+  end
+end
+
+namespace :waves do
+  
+  desc "freeze src=<wherever> to ./waves"
+  task :freeze do
+
+    target = "#{Dir.pwd}/waves"
+    src = ENV['src']
+    raise "Please specify the location of waves using src=wherever" unless src
+    raise "No directory found at '#{src}'" unless File.directory?(src) 
+      
+    items = FileList["#{src}/*"]
+    puts "Freezing from: #{src}"
+    items.each do |item|
+      puts "copying #{item}"
+      cp_r item, target
+    end
+    
+  end
+  
+  desc "unfreeze (i.e. delete) the waves source at ./waves"
+  task :unfreeze do
+    frozen = "#{Dir.pwd}/waves"
+    rm_r frozen if File.exist?(frozen)
+  end
+  
+  # Convenience task to allow you to freeze the current Waves
+  # source without knowing where it is.  This task only gets
+  # defined when the Rakefile successfully loaded Waves and if
+  # there's nothing in the way at ./waves
+  if defined?(WAVES) && !File.exist?("#{Dir.pwd}/waves")
+    namespace :freeze do
+      desc "freeze current Waves source to ./waves"
+      task :current do
+        target = "#{Dir.pwd}/waves"
+        current = File.expand_path( WAVES )
+        items = FileList["#{current}/*"]
+        puts "Freezing from: #{current}"
+        items.each do |item|
+          puts "copying #{item}"
+          cp_r item, target
+        end
+
+      end
+    end
+  end
+  
+end

data/app/configurations/development.rb.erb

@@ -14,12 +14,13 @@ module <%= @name %>
 
       port 3000
 
-    handler ::Rack::Handler::Mongrel, :Host => host, :Port => port
+      handler ::Rack::Handler::Mongrel, :Host => host, :Port => port
       # handler ::Rack::Handler::WEBrick, :BindAddress => host, :Port => port
       # handler ::Rack::Handler::Thin, :Host => host, :Port => port
 
       application do
         use ::Rack::ShowExceptions
+        use ::Rack::Static, :urls => [ '/css/', '/javascript/', '/images/' ], :root => 'public'
         run ::Waves::Dispatchers::Default.new
       end
 

data/app/configurations/mapping.rb.erb

@@ -3,6 +3,7 @@ module <%= @name %>
   module Configurations
 
     module Mapping
+      extend Waves::Mapping
       # your custom rules go here
       include Waves::Mapping::PrettyUrls::RestRules
       include Waves::Mapping::PrettyUrls::GetRules

data/app/configurations/production.rb.erb

@@ -22,6 +22,7 @@ module <%= @name %>
       # handler ::Rack::Handler::Thin, :Host => host, :Port => port
 
       application do
+        use ::Rack::Static, :urls => [ '/css/', '/javascript/', '/images/' ], :root => 'public'
         run ::Waves::Dispatchers::Default.new
       end
 

data/app/lib/application.rb.erb

@@ -1,5 +1,5 @@
-require 'layers/orm/sequel'
+<%= @orm_require %>
 module <%= @name %>
   include Waves::Foundations::Default
-  include Waves::Layers::ORM::Sequel
+  <%= @orm_include %>
 end

data/bin/waves

@@ -1,8 +1,26 @@
 #!/usr/bin/env ruby
+
+# = Generate or update a Waves application
+# 
+# The +waves+ script generates a new Waves application or updates an existing app.  The script uses {RakeGen}[http://github.com/automatthew/rakegen] for file copies and template processing, and the current version of RakeGen requires you to affirm that you want to clobber each and every file when doing an update.
+#
+# == Usage
+# 
+#   # Generate a Waves app using the default ORM layer, which is currently Sequel
+#   waves /path/to/app  
+#
+#   # Generate an app using the default ORM layer, which is currently Sequel
+#   waves /path/to/app --orm=active_record
+#
+#   # Generate an app that does not include an ORM layer
+#   waves /path/to/app -o none 
+
 require 'rubygems'
 require 'choice'
 require 'rakegen'
 
+
+
 # if we're in the waves source, prepend it to the load path
 waves_lib = File.expand_path( "#{File.dirname(__FILE__)}/../../waves/lib" )
 $:.unshift waves_lib if File.exist?(waves_lib)
@@ -21,6 +39,23 @@ Choice.options do
     desc 'Show this message'
   end
   
+  option :orm do
+    short '-o'
+    long '--orm=ORM'
+    desc "Select an ORM (e.g. active_record, sequel, none)"
+    default "sequel"
+  end
+  
+end
+
+orm = Choice.choices.orm.snake_case
+orm_require, orm_include = case orm
+when 'sequel'
+  ["require 'layers/orm/sequel'", "include Waves::Layers::ORM::Sequel"]
+when 'active_record'
+  ["require 'layers/orm/active_record'", "include Waves::Layers::ORM::ActiveRecord"]
+when 'none'
+  ['', '# This app was generated without an ORM layer']
 end
 
 app_path = ARGV[0]
@@ -37,7 +72,7 @@ template = "#{WAVES}/app"
 generator = Rakegen.new("waves:app") do |gen|
   gen.source = template
   gen.target = app_path
-  gen.template_assigns = {:name => app_name.camel_case}
+  gen.template_assigns = {:name => app_name.camel_case, :orm_require => orm_require, :orm_include => orm_include }
   gen.executables = %w{ bin/waves-console  bin/waves-server}
 end
 

data/doc/HISTORY

@@ -0,0 +1,44 @@
+0.7.7
+- ActiveRecord ORM layer
+- base controller helpers that rely on a particular ORM are now defined in the ORM layers
+- Sequel requires moved into the self.included block, to help with the mem footprint
+- rake generate:model reappeared
+- rake waves:freeze and waves:unfreeze
+- Rack::Static declared for /css, /javascript, and /images in generated applications
+- added Lawrence Pit's Haml renderer
+- English inflector pulled into its own layer, in the hope of allowing localization someday
+- utility monkeypatches pulled into modules where possible, for better troubleshooting
+- docs, samples, and verify now actually included in the gem
+- monkeypatch to Tempfile to work around problem with file uploading and Rack.
+0.7.6
+- added metaid as gem dependency
+- Special handling in Windows for interrupts ('cause Windows has trouble with those)
+- Fixed query param destructuring to work for 3+ levels
+0.7.5
+- Foundations and Layers
+- Sequel ORM is now a Layer, instead of being baked in
+- Almost all boilerplate code removed from generated app, by virtue of the Layers refactoring
+- Configuration attribute for selecting a Rack handler
+- Mapping#handle method to register blocks that handle exceptions (e.g. NotFoundError)
+- Blackboard, a very simple shared storaged usable during request processing.
+- Fixed waves script to work when installed as gem (regression)
+- Revised and extended documentation
+- Expanded spec coverage
+0.7.3:
+- Added explicit require for daemons gem
+- Added support for running off source
+- Added support for using SQLite
+- Improved inflection
+- Windows support for waves, waves-server, and waves-console
+0.7.2:
+- Minor bug fixes, improved documentation
+0.7.1:
+- Minor bug fixes, improved documentation
+0.7.0:
+- Minor bug fixes, improved documentation
+0.6.9:
+- Minor bug fixes, improved documentation
+0.6.8:
+- Minor bug fixes, improved documentation
+0.6.7:
+- Initial gem release.

data/doc/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2007-8 Dan Yoder
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/doc/rdoc/classes/Erubis/Context.html

@@ -0,0 +1,218 @@
+<?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: Erubis::Context</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">Erubis::Context</td>
+        </tr>
+        <tr class="top-aligned-row">
+            <td><strong>In:</strong></td>
+            <td>
+                <a href="../../files/lib/renderers/erubis_rb.html">
+                lib/renderers/erubis.rb
+                </a>
+        <br />
+            </td>
+        </tr>
+
+        <tr class="top-aligned-row">
+            <td><strong>Parent:</strong></td>
+            <td>
+                Object
+            </td>
+        </tr>
+        </table>
+    </div>
+  <!-- banner header -->
+
+  <div id="bodyContent">
+
+
+
+  <div id="contextContent">
+
+    <div id="description">
+      <p>
+This is added to the Erubis Content class to allow the same helper methods
+to be used with both Markaby and Erubis.
+</p>
+
+    </div>
+
+
+   </div>
+
+    <div id="method-list">
+      <h3 class="section-bar">Methods</h3>
+
+      <div class="name-list">
+      <a href="#M000004">&lt;&lt;</a>&nbsp;&nbsp;
+      <a href="#M000005">capture</a>&nbsp;&nbsp;
+      <a href="#M000006">render</a>&nbsp;&nbsp;
+      </div>
+    </div>
+
+  </div>
+
+
+    <!-- if includes -->
+    <div id="includes">
+      <h3 class="section-bar">Included Modules</h3>
+
+      <div id="includes-list">
+        <span class="include-name"><a href="../Waves/Helpers/UrlHelper.html">Waves::Helpers::UrlHelper</a></span>
+        <span class="include-name"><a href="../Waves/Helpers/TagHelper.html">Waves::Helpers::TagHelper</a></span>
+        <span class="include-name"><a href="../Waves/Helpers/AssetHelper.html">Waves::Helpers::AssetHelper</a></span>
+        <span class="include-name"><a href="../Waves/Helpers/NumberHelper.html">Waves::Helpers::NumberHelper</a></span>
+      </div>
+    </div>
+
+    <div id="section">
+
+
+
+
+
+      
+
+
+    <!-- if method_list -->
+    <div id="methods">
+      <h3 class="section-bar">Public Instance methods</h3>
+
+      <div id="method-M000004" class="method-detail">
+        <a name="M000004"></a>
+
+        <div class="method-heading">
+          <a href="#M000004" class="method-signature">
+          <span class="method-name">&lt;&lt;</span><span class="method-args">(s)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000004-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000004-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/renderers/erubis.rb, line 13</span>
+13:     <span class="ruby-keyword kw">def</span> <span class="ruby-operator">&lt;&lt;</span>(<span class="ruby-identifier">s</span>) 
+14:       <span class="ruby-identifier">eval</span>(<span class="ruby-value str">&quot;_buf&quot;</span>, <span class="ruby-ivar">@binding</span>).<span class="ruby-identifier">concat</span> <span class="ruby-identifier">s</span> <span class="ruby-comment cmt"># add to rendered output</span>
+15:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000005" class="method-detail">
+        <a name="M000005"></a>
+
+        <div class="method-heading">
+          <a href="#M000005" class="method-signature">
+          <span class="method-name">capture</span><span class="method-args">() {|| ...}</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000005-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000005-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/renderers/erubis.rb, line 17</span>
+17:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">capture</span>
+18:       <span class="ruby-identifier">eval</span>(<span class="ruby-value str">&quot;_context.push(_buf); _buf = ''&quot;</span>, <span class="ruby-ivar">@binding</span>) <span class="ruby-comment cmt">#ignore output from that eval, will be added via &quot;&lt;&lt;&quot;</span>
+19:       <span class="ruby-identifier">result</span> = <span class="ruby-constant">Erubis</span><span class="ruby-operator">::</span><span class="ruby-constant">Eruby</span>.<span class="ruby-identifier">new</span>(<span class="ruby-keyword kw">yield</span>).<span class="ruby-identifier">result</span> <span class="ruby-ivar">@binding</span>
+20:       <span class="ruby-identifier">eval</span>(<span class="ruby-value str">&quot;_buf = _context.pop&quot;</span>, <span class="ruby-ivar">@binding</span>)
+21:       <span class="ruby-identifier">result</span>
+22:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+      <div id="method-M000006" class="method-detail">
+        <a name="M000006"></a>
+
+        <div class="method-heading">
+          <a href="#M000006" class="method-signature">
+          <span class="method-name">render</span><span class="method-args">(eruby)</span>
+          </a>
+        </div>
+      
+        <div class="method-description">
+          <p><a class="source-toggle" href="#"
+            onclick="toggleCode('M000006-source');return false;">[Source]</a></p>
+          <div class="method-source-code" id="M000006-source">
+<pre>
+    <span class="ruby-comment cmt"># File lib/renderers/erubis.rb, line 24</span>
+24:     <span class="ruby-keyword kw">def</span> <span class="ruby-identifier">render</span>(<span class="ruby-identifier">eruby</span>)
+25:       <span class="ruby-keyword kw">unless</span> <span class="ruby-ivar">@binding</span>
+26:         <span class="ruby-ivar">@binding</span> = <span class="ruby-identifier">binding</span>
+27:         <span class="ruby-identifier">eval</span>(<span class="ruby-value str">&quot;_buf = ''; _context = []&quot;</span>, <span class="ruby-ivar">@binding</span>)
+28:       <span class="ruby-keyword kw">end</span>
+29:       <span class="ruby-identifier">eruby</span>.<span class="ruby-identifier">result</span> <span class="ruby-ivar">@binding</span>
+30:     <span class="ruby-keyword kw">end</span>
+</pre>
+          </div>
+        </div>
+      </div>
+
+
+    </div>
+
+
+  </div>
+
+
+<div id="validator-badges">
+  <p><small><a href="http://validator.w3.org/check/referer">[Validate]</a></small></p>
+</div>
+
+</body>
+</html>