RubyGems - waves - Versions diffs - 0.7.3 → 0.7.5 - Mend

waves 0.7.3 → 0.7.5

Files changed (96) hide show

data/app/Rakefile +11 -19
data/app/bin/waves-console +3 -5
data/app/bin/waves-server +3 -5
data/app/configurations/development.rb.erb +19 -11
data/app/configurations/mapping.rb.erb +4 -5
data/app/configurations/production.rb.erb +18 -13
data/app/{doc/EMTPY → controllers/.gitignore} +0 -0
data/app/{public/css/EMPTY → doc/.gitignore} +0 -0
data/app/{public/flash/EMPTY → helpers/.gitignore} +0 -0
data/app/lib/application.rb.erb +4 -51
data/app/{public/images/EMPTY → lib/tasks/.gitignore} +0 -0
data/app/{public/javascript/EMPTY → log/.gitignore} +0 -0
data/app/{tmp/sessions/EMPTY → models/.gitignore} +0 -0
data/app/public/css/.gitignore +0 -0
data/app/public/flash/.gitignore +0 -0
data/app/public/images/.gitignore +0 -0
data/app/public/javascript/.gitignore +0 -0
data/app/schema/migrations/.gitignore +0 -0
data/app/startup.rb +5 -0
data/app/templates/layouts/default.mab +2 -2
data/app/tmp/sessions/.gitignore +0 -0
data/app/views/.gitignore +0 -0
data/bin/waves +38 -27
data/bin/waves-console +3 -25
data/bin/waves-server +4 -45
data/lib/commands/waves-console.rb +21 -0
data/lib/commands/waves-server.rb +55 -0
data/lib/controllers/base.rb +11 -0
data/lib/controllers/mixin.rb +130 -102
data/lib/dispatchers/base.rb +65 -50
data/lib/dispatchers/default.rb +79 -52
data/lib/foundations/default.rb +26 -0
data/lib/foundations/simple.rb +30 -0
data/lib/helpers/common.rb +60 -56
data/lib/helpers/default.rb +13 -0
data/lib/helpers/form.rb +39 -38
data/lib/helpers/formatting.rb +11 -11
data/lib/helpers/model.rb +12 -12
data/lib/helpers/view.rb +13 -13
data/lib/layers/default_errors.rb +29 -0
data/lib/layers/mvc.rb +58 -0
data/lib/layers/orm/active_record.rb +41 -0
data/lib/layers/orm/active_record/migrations/empty.rb.erb +9 -0
data/lib/layers/orm/active_record/tasks/schema.rb +30 -0
data/lib/layers/orm/data_mapper.rb +42 -0
data/lib/layers/orm/filebase.rb +22 -0
data/lib/layers/orm/migration.rb +70 -0
data/lib/layers/orm/sequel.rb +82 -0
data/lib/layers/orm/sequel/migrations/empty.rb.erb +9 -0
data/lib/layers/orm/sequel/tasks/schema.rb +24 -0
data/lib/layers/simple.rb +39 -0
data/lib/layers/simple_errors.rb +26 -0
data/lib/mapping/mapping.rb +222 -120
data/lib/mapping/pretty_urls.rb +42 -41
data/lib/renderers/erubis.rb +54 -31
data/lib/renderers/markaby.rb +28 -28
data/lib/renderers/mixin.rb +49 -52
data/lib/runtime/application.rb +66 -48
data/lib/runtime/blackboard.rb +57 -0
data/lib/runtime/configuration.rb +117 -101
data/lib/runtime/console.rb +19 -20
data/lib/runtime/debugger.rb +9 -0
data/lib/runtime/logger.rb +43 -37
data/lib/runtime/mime_types.rb +19 -19
data/lib/runtime/request.rb +72 -46
data/lib/runtime/response.rb +37 -37
data/lib/runtime/response_mixin.rb +26 -23
data/lib/runtime/response_proxy.rb +25 -24
data/lib/runtime/server.rb +99 -80
data/lib/runtime/session.rb +63 -53
data/lib/tasks/cluster.rb +26 -0
data/lib/tasks/gem.rb +31 -0
data/lib/tasks/generate.rb +80 -0
data/lib/utilities/hash.rb +22 -0
data/lib/utilities/inflect.rb +194 -0
data/lib/utilities/integer.rb +15 -12
data/lib/utilities/kernel.rb +32 -32
data/lib/utilities/module.rb +11 -4
data/lib/utilities/object.rb +5 -5
data/lib/utilities/proc.rb +10 -0
data/lib/utilities/string.rb +44 -38
data/lib/utilities/symbol.rb +4 -4
data/lib/views/base.rb +9 -0
data/lib/views/mixin.rb +91 -89
data/lib/waves.rb +29 -9
metadata +52 -26
data/app/configurations/default.rb.erb +0 -8
data/app/controllers/default.rb.erb +0 -29
data/app/helpers/default.rb.erb +0 -13
data/app/lib/startup.rb.erb +0 -3
data/app/lib/tasks/cluster.rb +0 -24
data/app/lib/tasks/generate.rb +0 -15
data/app/lib/tasks/schema.rb +0 -29
data/app/models/default.rb.erb +0 -13
data/app/schema/migrations/templates/empty.rb.erb +0 -9
data/app/views/default.rb.erb +0 -13

data/lib/foundations/default.rb ADDED Viewed

@@ -0,0 +1,26 @@
+module Waves
+  module Foundations
+# The Default foundation supports the common MVC development pattern, a la Rails and Merb. Models, controllers, views, templates, and helpers live in the corresponding directories. When your code calls for a specific M, V, C, or H, Waves tries to load it from a file matching the snake-case of the constant name.  If the file does not exist, Waves creates the constant from a sensible (and customizable) default.
+#
+# This foundation does not include any ORM configuration.  You can include Waves::Layers::ORM::Sequel or custom configure your model.
+    module Default
+      def self.included( app )
+        app.instance_eval do
+          include Waves::Layers::Simple
+          include Waves::Layers::MVC
+          include Waves::Layers::DefaultErrors
+        end
+        Waves << app
+      end
+    end
+  end
+end

data/lib/foundations/simple.rb ADDED Viewed

@@ -0,0 +1,30 @@
+module Waves
+  # A Waves Foundation provides enough functionality to allow a Waves application
+  # to run.  At the bare minimum, this means creating configuration classes in the Configurations
+  # namespace, as is done in the Simple foundation
+  #
+  # Typically, a Foundation will include several Layers, perform any necessary
+  # configuration, and register the application with the Waves module
+  module Foundations
+    # The Simple foundation provides the bare minimum needed to run a Waves application.
+    # It is intended for use as the basis of more fully-featured foundations, but you can
+    # use it as a standalone where all the request processing is done directly in a
+    # mapping lambda.
+    module Simple
+      # On inclusion in a module, the Simple foundation includes Waves::Layers::Simple and
+      # registers the module as a Waves application.
+      def self.included( app )
+        app.instance_eval do
+          include Waves::Layers::Simple
+        end
+        Waves << app
+      end
+    end
+  end
+end

data/lib/helpers/common.rb CHANGED Viewed

@@ -1,62 +1,66 @@
 module Waves
+  # Helper methods can be defined for any view template by simply defining them within the default Helper module in <tt>helpers/default.rb</tt> of the generated application. Helpers specific to a particular View class can be explicitly defined by creating a helper module that corresponds to the View class. For examples, for the +User+ View class, you would define a helper module in <tt>user.rb</tt> named +User+.
+  #
+  # The default helper class initially includes a wide-variety of helpers, including helpers for layouts, Textile formatting, rendering forms, and nested views, as well as helpers for accessing the request and response objects. More helpers will be added in future releases, but in many cases, there is no need to include all of them in your application.
   module Helpers
     # Common helpers are helpers that are needed for just about any Web page. For example,
     # each page will likely have a layout and a doctype.
     module Common
       DOCTYPES = {
-		    :html3 => '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">',
-				:html4_transitional =>
-				  '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"' <<
-				   '"http://www.w3.org/TR/html4/loose.dtd">',
-				:html4_strict =>
-					'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" ' <<
-						'"http://www.w3.org/TR/html4/strict.dtd">',
-				:html4_frameset =>
-				  '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN"' <<
-  				  '"http://www.w3.org/TR/html4/frameset.dtd">',
-				:xhtml1_transitional =>
-				  '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' <<
-				    '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
-				:xhtml1_strict =>
-				  '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"' <<
-				    '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">',
-				:xhtml1_frameset =>
-				  '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"' <<
-				    '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">',
-				:xhtml2 => '<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">'
-		  }
-		  # Invokes a layout view (i.e., a view from the layouts template directory), using
-		  # the assigns parameter to define instance variables for the view. The block is
-		  # evaluated and also passed into the view as the +layout_content+ instance variable.
-		  #
-		  # You can define a layout just by creating a template and then calling the
-		  # +layout_content+ accessor when you want to embed the caller's content.
-		  #
-		  # == Example
-		  #
-		  #   doctype :html4_transitional
-		  #   html do
-		  #     title @title # passed as an assigns parameter
-		  #   end
-		  #   body do
-		  #     layout_content
-		  #   end
-		  #
-			def layout( name, assigns = {}, &block )
-			  assigns[ :layout_content ] = capture(&block)
-				self << Waves.application.views[:layouts].process( request ) do
-					send( name, assigns )
-				end
-			end
-			# The doctype method simply generates a valid DOCTYPE declaration for your page.
-			# Valid options are defined in the +DOCTYPES+ constant.
-			def doctype(type) ; self << DOCTYPES[type||:html4_strict] ; end
-		end
-	end
-end
+        :html3 => "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 3.2//EN\">\n",
+        :html4_transitional =>
+          "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" " <<
+           "\"http://www.w3.org/TR/html4/loose.dtd\">\n",
+        :html4_strict =>
+          "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" " <<
+            "\"http://www.w3.org/TR/html4/strict.dtd\">\n",
+        :html4_frameset =>
+          "<!DOCTYPE html PUBLIC \"-//W3C//DTD HTML 4.01 Frameset//EN\" " <<
+            "\"http://www.w3.org/TR/html4/frameset.dtd\">\n",
+        :xhtml1_transitional =>
+          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" " <<
+            "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n",
+        :xhtml1_strict =>
+          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Strict//EN\" " <<
+            "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd\">\n",
+        :xhtml1_frameset =>
+          "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Frameset//EN\" " <<
+            "\"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd\">\n",
+        :xhtml2 => "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
+      }
+      # Invokes a layout view (i.e., a view from the layouts template directory), using
+      # the assigns parameter to define instance variables for the view. The block is
+      # evaluated and also passed into the view as the +layout_content+ instance variable.
+      #
+      # You can define a layout just by creating a template and then calling the
+      # +layout_content+ accessor when you want to embed the caller's content.
+      #
+      # == Example
+      #
+      #   doctype :html4_transitional
+      #   html do
+      #     title @title # passed as an assigns parameter
+      #   end
+      #   body do
+      #     layout_content
+      #   end
+      #
+      def layout( name, assigns = {}, &block )
+        assigns[ :layout_content ] = capture(&block)
+        self << Waves.application.views[:layouts].process( request ) do
+          send( name, assigns )
+        end
+      end
+      # The doctype method simply generates a valid DOCTYPE declaration for your page.
+      # Valid options are defined in the +DOCTYPES+ constant.
+      def doctype(type) ; self << DOCTYPES[type||:html4_strict] ; end
+    end
+  end
+end

data/lib/helpers/default.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module Waves
+  module Helpers
+    module Default
+      attr_reader :request, :content
+      include Waves::ResponseMixin
+      include Waves::Helpers::Common
+      include Waves::Helpers::Formatting
+      include Waves::Helpers::Model
+      include Waves::Helpers::View
+      include Waves::Helpers::Form
+    end
+  end
+end

data/lib/helpers/form.rb CHANGED Viewed

@@ -1,39 +1,40 @@
 module Waves
-	module Helpers
-		# Form helpers are used in generating forms. Since Markaby already provides Ruby
-		# methods for basic form generation, the focus of this helper is on provide templates
-		# to handle things that go beyond the basics. You must define a form template
-		# directory with templates for each type of form element you wish to use. The names
-		# of the template should match the +type+ option provided in the property method.
-		#
-		# For example, this code:
-		#
-		#   property :name => 'blog.title', :type => :text, :value => @blog.title
-		#
-		# will invoke the +text+ form view (the template in +templates/form/text.mab+),
-		# passing in the name ('blog.title') and the value (@blog.title) as instance variables.
-		#
-		module Form
-			# This method really is a place-holder for common wrappers around groups of
-			# properties. You will usually want to override this. As is, it simply places
-			# a DIV element with class 'properties' around the block.
-			def properties(&block)
-			  div.properties do
-			    yield
-			  end
-			end
-			# Invokes the form view for the +type+ given in the option.
-			def property( options )
-			  self << view( :form, options[:type], options )
-			end
-		end
-	end
-end
+  module Helpers
+    # Form helpers are used in generating forms. Since Markaby already provides Ruby
+    # methods for basic form generation, the focus of this helper is on providing templates
+    # to handle things that go beyond the basics. You must define a form template
+    # directory with templates for each type of form element you wish to use. The names
+    # of the template should match the +type+ option provided in the property method.
+    #
+    # For example, this code:
+    #
+    #   property :name => 'blog.title', :type => :text, :value => @blog.title
+    #
+    # will invoke the +text+ form view (the template in +templates/form/text.mab+),
+    # passing in the name ('blog.title') and the value (@blog.title) as instance variables.
+    #
+    # These helpers are Markaby only.
+    module Form
+      # This method really is a place-holder for common wrappers around groups of
+      # properties. You will usually want to override this. As is, it simply places
+      # a DIV element with class 'properties' around the block.
+      def properties(&block)
+        div.properties do
+          yield
+        end
+      end
+      # Invokes the form view for the +type+ given in the option.
+      def property( options )
+        self << view( :form, options[:type], options )
+      end
+    end
+  end
+end

data/lib/helpers/formatting.rb CHANGED Viewed

@@ -1,17 +1,17 @@
 require 'redcloth'
 module Waves
   module Helpers
-    # Formatting helpers are used to convert specialized content, like Markaby or
+    # Formatting helpers are used to convert specialized content, like Markaby or
     # Textile, into valid HTML. It also provides common escaping functions.
     module Formatting
       # Escape a string as HTML content.
       def escape_html(s); Rack::Utils.escape_html(s); end
       # Escape a URI, converting quotes and spaces and so on.
       def escape_uri(s); Rack::Utils.escape(s); end
       # Treat content as Markaby and evaluate (only works within a Markaby template).
       # Used to pull Markaby content from a file or database into a Markaby template.
       def markaby( content ); self << eval( content ); end
@@ -20,11 +20,11 @@ module Waves
       def textile( content )
         return if content.nil? or content.empty?
         ( ::RedCloth::TEXTILE_TAGS  << [ 96.chr, '&8216;'] ).each do |pat,ent|
-      		content.gsub!( pat, ent.gsub('&','&#') )
-      	end
-      	self << ::RedCloth.new( content ).to_html
+          content.gsub!( pat, ent.gsub('&','&#') )
+        end
+        self << ::RedCloth.new( content ).to_html
       end
-		end
-	end
-end
+    end
+  end
+end

data/lib/helpers/model.rb CHANGED Viewed

@@ -1,6 +1,6 @@
 module Waves
   module Helpers
     # Model helpers allow you to directly access a model from within a view.
     # This is useful when creating things like select boxes that need data
     # from anther model. For example, a Markaby select box for authors might look like:
@@ -17,17 +17,17 @@ module Waves
     # then be called from the template instead of the model helper.
     #
     module Model
       # Just like model.all. Returns all the instances of that model.
-			def all( model )
-			  Waves.application.models[ model ].all( domain )
+      def all( model )
+        Waves.application.models[ model ].all( domain )
       end
       # Finds a specific instance using the name field
-			def find( model, name )
-			  Waves.application.models[ model ][ :name => name ] rescue nil
-			end
-		end
-	end
-end
+      def find( model, name )
+        Waves.application.models[ model ][ :name => name ] rescue nil
+      end
+    end
+  end
+end

data/lib/helpers/view.rb CHANGED Viewed

@@ -1,24 +1,24 @@
 module Waves
   module Helpers
     # View helpers are intended to help reuse views from within other views.
     # Both the +layout+ method in the common helpers and the +property+ method
-    # of the form helpers are specialized instance of this.
-    #
+    # of the form helpers are specialized instance of this.
+    #
     # The star of our show here is the +view+ method. This takes a model, view,
     # and assigns hash (which are converted into instance variables in the target
     # view) and returns the result of evaluating the view as content in the current
     # template.
     module View
       # Invokes the view for the given model, passing the assigns as instance variables.
-			def view( model, view, assigns = {} )
+      def view( model, view, assigns = {} )
         self << Waves.application.views[ model ].process( request ) do
-	        send( view, assigns )
-	      end
-			end
-		end
-	end
-end
+          send( view, assigns )
+        end
+      end
+    end
+  end
+end

data/lib/layers/default_errors.rb ADDED Viewed

@@ -0,0 +1,29 @@
+module Waves
+  module Layers
+    # Configures Waves to use the templates in app/templates/errors for exception handling
+    module DefaultErrors
+      def self.included( app )
+        app.instance_eval do
+          auto_eval :Configurations do
+            auto_eval :Mapping do
+              extend Waves::Mapping
+              handle(Waves::Dispatchers::NotFoundError) do
+                html = Waves.application.views[:errors].process( request ) do
+                  not_found_404( :error => Waves::Dispatchers::NotFoundError )
+                end
+                response.status = '404'
+                response.content_type = 'text/html'
+                response.body = html
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/layers/mvc.rb ADDED Viewed

@@ -0,0 +1,58 @@
+module Waves
+  module Layers
+    # The MVC layer establishes the Models, Views, Controllers, and Helpers namespaces inside
+    # a Waves application.  In each namespace, undefined constants are handled by AutoCode, which
+    # loads the constant from the correct file in the appropriate directory if it exists, or creates
+    # from default otherwise.
+    module MVC
+      def self.included( app )
+        def app.models ; self::Models ; end
+        def app.views ; self::Views ; end
+        def app.controllers ; self::Controllers ; end
+        def app.helpers ; self::Helpers ; end
+        app.instance_eval do
+          auto_create_module( :Models ) do
+            include AutoCode
+            auto_create_class :Default
+            auto_load :Default, :directories => [:models]
+          end
+          auto_eval( :Models ) do
+            auto_create_class true, app::Models::Default
+            auto_load true, :directories => [ :models ]
+          end
+          auto_create_module( :Views ) { include AutoCode }
+          auto_eval( :Views ) do
+            auto_create_class :Default, Waves::Views::Base
+            auto_load :Default, :directories => [:views]
+            auto_create_class true, app::Views::Default
+            auto_load true, :directories => [ :views ]
+          end
+          auto_create_module( :Controllers ) { include AutoCode }
+          auto_eval( :Controllers ) do
+            auto_create_class :Default, Waves::Controllers::Base
+            auto_load :Default, :directories => [:controllers]
+            auto_create_class true, app::Controllers::Default
+            auto_load true, :directories => [ :controllers ]
+          end
+          auto_create_module( :Helpers ) do
+            include AutoCode
+            auto_create_module { include Waves::Helpers::Default }
+            auto_load true, :directories => [ :helpers ]
+          end
+        end
+      end
+    end
+  end
+end