RubyGems - waves - Versions diffs - 0.8.2 → 0.9.0 - Mend

waves 0.8.2 → 0.9.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (166) hide show

data/bin/waves +4 -3
data/doc/VERSION +1 -1
data/lib/waves.rb +52 -40
data/lib/{caches → waves/caches}/file.rb +3 -1
data/lib/waves/caches/memcached.rb +56 -0
data/lib/{caches → waves/caches}/simple.rb +6 -7
data/lib/{caches → waves/caches}/synchronized.rb +15 -1
data/lib/{commands → waves/commands}/console.rb +4 -4
data/lib/{commands → waves/commands}/generate.rb +6 -5
data/lib/{commands → waves/commands}/help.rb +0 -0
data/lib/{commands → waves/commands}/server.rb +1 -1
data/lib/{dispatchers → waves/dispatchers}/base.rb +17 -31
data/lib/waves/dispatchers/default.rb +19 -0
data/lib/{ext → waves/ext}/float.rb +0 -0
data/lib/{ext → waves/ext}/hash.rb +0 -0
data/lib/{ext → waves/ext}/integer.rb +16 -1
data/lib/{ext → waves/ext}/kernel.rb +3 -7
data/lib/{ext → waves/ext}/module.rb +3 -3
data/lib/{ext → waves/ext}/object.rb +2 -0
data/lib/waves/ext/string.rb +73 -0
data/lib/{ext → waves/ext}/symbol.rb +0 -1
data/lib/{ext → waves/ext}/tempfile.rb +0 -0
data/lib/waves/ext/time.rb +5 -0
data/lib/{foundations → waves/foundations}/classic.rb +9 -21
data/lib/{foundations → waves/foundations}/compact.rb +15 -20
data/lib/waves/foundations/rest.rb +311 -0
data/lib/waves/helpers/basic.rb +13 -0
data/lib/{helpers → waves/helpers}/doc_type.rb +3 -0
data/lib/waves/helpers/form.rb +94 -0
data/lib/waves/helpers/formatting.rb +14 -0
data/lib/waves/layers/mvc.rb +65 -0
data/lib/{layers → waves/layers}/mvc/controllers.rb +0 -0
data/lib/{layers → waves/layers}/mvc/extensions.rb +23 -11
data/lib/{layers → waves/layers}/orm/migration.rb +0 -0
data/lib/{layers → waves/layers}/orm/providers/active_record.rb +2 -5
data/lib/{layers → waves/layers}/orm/providers/active_record/migrations/empty.rb.erb +0 -0
data/lib/{layers → waves/layers}/orm/providers/active_record/tasks/generate.rb +1 -1
data/lib/{layers → waves/layers}/orm/providers/active_record/tasks/schema.rb +1 -1
data/lib/{layers → waves/layers}/orm/providers/data_mapper.rb +0 -0
data/lib/{layers → waves/layers}/orm/providers/filebase.rb +0 -0
data/lib/{layers → waves/layers}/orm/providers/sequel.rb +28 -29
data/lib/{layers → waves/layers}/orm/providers/sequel/migrations/empty.rb.erb +0 -0
data/lib/{layers → waves/layers}/orm/providers/sequel/tasks/generate.rb +1 -1
data/lib/{layers → waves/layers}/orm/providers/sequel/tasks/schema.rb +2 -0
data/lib/waves/layers/rack/rack_cache.rb +32 -0
data/lib/waves/layers/renderers/erubis.rb +52 -0
data/lib/waves/layers/renderers/haml.rb +67 -0
data/lib/waves/layers/renderers/markaby.rb +41 -0
data/lib/waves/layers/text/inflect/english.rb +42 -0
data/lib/waves/matchers/accept.rb +47 -0
data/lib/waves/matchers/ext.rb +27 -0
data/lib/waves/matchers/path.rb +72 -0
data/lib/waves/matchers/query.rb +43 -0
data/lib/waves/matchers/request.rb +86 -0
data/lib/waves/matchers/requested.rb +31 -0
data/lib/{matchers → waves/matchers}/resource.rb +8 -1
data/lib/waves/matchers/traits.rb +30 -0
data/lib/waves/matchers/uri.rb +69 -0
data/lib/waves/media/mime_types.rb +542 -0
data/lib/waves/renderers/mixin.rb +9 -0
data/lib/waves/request/accept.rb +92 -0
data/lib/{runtime → waves/request}/request.rb +77 -61
data/lib/waves/resources/file_mixin.rb +11 -0
data/lib/{resources → waves/resources}/mixin.rb +42 -44
data/lib/waves/resources/paths.rb +132 -0
data/lib/waves/response/client_errors.rb +10 -0
data/lib/waves/response/packaged.rb +19 -0
data/lib/waves/response/redirects.rb +35 -0
data/lib/{runtime → waves/response}/response.rb +29 -11
data/lib/{runtime → waves/response}/response_mixin.rb +30 -17
data/lib/waves/runtime/applications.rb +18 -0
data/lib/{runtime → waves/runtime}/configuration.rb +31 -25
data/lib/waves/runtime/console.rb +24 -0
data/lib/{runtime → waves/runtime}/logger.rb +3 -3
data/lib/{runtime → waves/runtime}/mocks.rb +2 -2
data/lib/waves/runtime/rackup.rb +37 -0
data/lib/waves/runtime/runtime.rb +48 -0
data/lib/waves/runtime/server.rb +33 -0
data/lib/{servers → waves/servers}/base.rb +0 -0
data/lib/{servers → waves/servers}/mongrel.rb +0 -0
data/lib/{servers → waves/servers}/webrick.rb +0 -0
data/lib/{tasks → waves/tasks}/gem.rb +0 -0
data/lib/{tasks → waves/tasks}/generate.rb +0 -0
data/lib/waves/views/cassy.rb +173 -0
data/lib/{views → waves/views}/errors.rb +8 -7
data/lib/waves/views/mixin.rb +23 -0
data/lib/waves/views/templated.rb +40 -0
data/samples/basic/basic_startup.rb +70 -0
data/samples/basic/config.ru +9 -0
data/samples/blog/configurations/development.rb +17 -16
data/samples/blog/configurations/production.rb +0 -11
data/samples/blog/resources/entry.rb +3 -3
data/samples/blog/resources/map.rb +10 -3
data/samples/blog/startup.rb +4 -3
data/templates/classic/Rakefile +28 -29
data/templates/classic/configurations/default.rb.erb +8 -3
data/templates/classic/configurations/development.rb.erb +1 -20
data/templates/classic/configurations/production.rb.erb +2 -16
data/templates/classic/public/images/favicon.ico +0 -0
data/templates/classic/resources/server.rb.erb +9 -0
data/templates/classic/startup.rb.erb +3 -3
data/templates/classic/views/css.rb.erb +14 -0
data/templates/classic/views/default.rb.erb +17 -0
data/templates/classic/views/errors.rb.erb +10 -0
data/templates/classic/views/pages.rb.erb +14 -0
data/templates/compact/startup.rb.erb +8 -3
data/test/ext/object.rb +55 -0
data/test/ext/shortcuts.rb +73 -0
data/test/helpers.rb +17 -0
data/test/match/accept.rb +78 -0
data/test/match/ext.rb +156 -0
data/test/match/methods.rb +22 -0
data/test/match/params.rb +33 -0
data/test/match/path.rb +106 -0
data/test/match/query.rb +60 -0
data/test/match/request.rb +91 -0
data/test/match/requested.rb +149 -0
data/test/match/uri.rb +136 -0
data/test/process/request.rb +75 -0
data/test/process/resource.rb +53 -0
data/test/resources/path.rb +166 -0
data/test/runtime/configurations.rb +19 -0
data/test/runtime/request.rb +63 -0
data/test/runtime/response.rb +85 -0
data/test/views/views.rb +40 -0
metadata +243 -157
data/lib/caches/memcached.rb +0 -40
data/lib/dispatchers/default.rb +0 -25
data/lib/ext/string.rb +0 -20
data/lib/helpers/basic.rb +0 -11
data/lib/helpers/extended.rb +0 -21
data/lib/helpers/form.rb +0 -42
data/lib/helpers/formatting.rb +0 -30
data/lib/helpers/layouts.rb +0 -37
data/lib/helpers/model.rb +0 -37
data/lib/helpers/view.rb +0 -22
data/lib/layers/inflect/english.rb +0 -67
data/lib/layers/mvc.rb +0 -54
data/lib/layers/renderers/erubis.rb +0 -60
data/lib/layers/renderers/haml.rb +0 -47
data/lib/layers/renderers/markaby.rb +0 -29
data/lib/matchers/accept.rb +0 -21
data/lib/matchers/base.rb +0 -30
data/lib/matchers/content_type.rb +0 -17
data/lib/matchers/path.rb +0 -67
data/lib/matchers/query.rb +0 -21
data/lib/matchers/request.rb +0 -27
data/lib/matchers/traits.rb +0 -19
data/lib/matchers/uri.rb +0 -20
data/lib/renderers/mixin.rb +0 -36
data/lib/resources/paths.rb +0 -34
data/lib/runtime/console.rb +0 -23
data/lib/runtime/mime_types.rb +0 -536
data/lib/runtime/monitor.rb +0 -32
data/lib/runtime/runtime.rb +0 -67
data/lib/runtime/server.rb +0 -20
data/lib/runtime/session.rb +0 -27
data/lib/runtime/worker.rb +0 -86
data/lib/views/mixin.rb +0 -62
data/samples/blog/blog.db +0 -0
data/samples/blog/log/waves.production +0 -3
data/templates/classic/resources/map.rb.erb +0 -8
data/templates/classic/templates/errors/not_found_404.mab +0 -7
data/templates/classic/templates/errors/server_error_500.mab +0 -7
data/templates/classic/templates/layouts/default.mab +0 -14
data/templates/classic/tmp/sessions/.gitignore +0 -0

data/lib/waves/helpers/basic.rb ADDED Viewed

@@ -0,0 +1,13 @@
+module Waves
+  module Helpers
+    module Basic
+      # 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
+    end
+  end
+end

data/lib/{helpers → waves/helpers}/doc_type.rb RENAMED Viewed

@@ -27,6 +27,9 @@ module Waves
         :xhtml2 => "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML 2.0//EN\">\n"
       }
+      # Allows you to generate a doctype declaration. Note that if you'll only
+      # need this helper if you're not using Hoshi, since Hoshi already provides
+      # this built-in.
       def doctype(type) ; self << DOCTYPES[type||:html4_strict] ; end
     end

data/lib/waves/helpers/form.rb ADDED Viewed

@@ -0,0 +1,94 @@
+module Waves
+  module Helpers
+    # Form helpers are used in generating forms. Since Hoshi already provides Ruby
+    # methods for basic form generation, the focus of this helper is on providing methods
+    # to handle things that go beyond the basics.
+    #
+    # Example:
+    #
+    # editor( @blog.entry, :heading => 'Edit Blog Entry', :method => :put) {
+    #   property @blog.entry, :name => :title, :type => :text
+    #   property @blog.entry, :name => :content, :type => :text, :size => large
+    #   property @blog.entry, :name => :published?, :type => :boolean
+    # }
+    #
+    module Form
+      def editor( instance, options = {})
+        options = { :method => :put, :buttons => true,
+          :heading => instance.class.name.in_words.title_case }.merge( options )
+        h1 options[:heading] if options[:heading]
+        form( :method => :post, :action => paths.put( instance.key ) ) {
+          input( :type => :hidden, :name => :_method, :value => :put ) if options[:method] == :put
+          div.properties { yield }
+          p( :class => 'button panel' ) { submit; cancel } if options[:buttons]
+        }
+      end
+      def properties(&block)
+        fieldset do
+          yield
+        end
+      end
+      def property( instance, options )
+        div( :class => "property #{options[:type]} #{options[:size]}") {
+          label options[:name].capitalize
+          div( :class => 'control' ) { self.send( "#{options[:type]}_field", instance, options ) }
+        }
+      end
+      def text_field( instance, options )
+        if options[:size] == :large
+          textarea( instance.send( options[:name] ),
+            :name => "#{instance.class.basename.snake_case}.#{options[:name]}" )
+        else
+          input( :name => "#{instance.class.basename.snake_case}.#{options[:name]}",
+            :type => :text, :value => instance.send( options[:name] ) )
+        end
+      end
+      def integer_field( instance, options )
+        input( :name => "#{instance.class.basename.snake_case}.#{options[:name]}",
+          :type => :text, :value => instance.send( options[:name] ) )
+      end
+      def float_field( instance, options )
+        input( :name => "#{instance.class.basename.snake_case}.#{options[:name]}",
+          :type => :text, :value => instance.send( options[:name] ) )
+      end
+      def boolean_field( instance, options )
+        on = instance.send( options[:name] )
+        radio_button( 'Yes', "#{instance.class.basename.snake_case}.#{options[:name]}", 't', on )
+        radio_button( 'No', "#{instance.class.basename.snake_case}.#{options[:name]}", 'f', !on )
+      end
+      def radio_button( label, name, value, on )
+        # can't use hoshi input method here thx 2 checked
+        span label
+        raw( "<input type='radio' name='#{name}' \
+          value='#{value}' #{'checked' if on}/>" )
+      end
+      def file_field( instance, options )
+        input( :type => :file, :name => "#{instance.class.basename.snake_case}.#{options[:name]}" )
+      end
+      def submit( label = "Save")
+        input :type => :submit, :value => label
+      end
+      def cancel( label = "Cancel" )
+        a label, :href => 'javascript:window.history.back()'
+      end
+    end
+  end
+end

data/lib/waves/helpers/formatting.rb ADDED Viewed

@@ -0,0 +1,14 @@
+require 'redcloth'
+module Waves
+  module Helpers
+    module Formatting
+      # Treat content as Textile.
+      def textile( content )
+        raw ::RedCloth.new( content ).to_html
+      end
+    end
+  end
+end

data/lib/waves/layers/mvc.rb ADDED Viewed

@@ -0,0 +1,65 @@
+module Waves
+  module Layers
+    module MVC
+      def self.included( app )
+        require 'waves/layers/mvc/extensions'
+        require 'waves/layers/mvc/controllers'
+        require 'hoshi'
+        require 'waves/helpers/basic'
+        require 'waves/helpers/formatting'
+        require 'waves/helpers/form'
+        app.auto_create_module( :Models ) do
+          auto_create_class :Default
+          auto_load :Default, :directories => [ :models ]
+          auto_create_class true, :Default
+          auto_load true, :directories => [ :models ]
+        end
+        app.auto_create_module( :Views ) do
+          auto_create_class :Default, Hoshi::View[:html4] do
+            include Waves::Views::Mixin
+            include Waves::Helpers::Basic
+            include Waves::Helpers::Formatting
+            include Waves::Helpers::Form
+          end
+          auto_create_class :Templated do
+            include Waves::Views::Mixin
+            include Waves::Views::Templated
+          end
+          auto_load :Default, :directories => [ :views ]
+          auto_create_class true, :Default
+          auto_load true, :directories => [ :views ]
+        end
+        app.auto_create_module( :Controllers ) do
+          auto_create_class :Default, Waves::Controllers::Base
+          auto_load :Default, :directories => [ :controllers ]
+          auto_create_class true, :Default
+          auto_load true, :directories => [ :controllers ]
+        end
+        #
+        # We autoload helpers and so forth to emulate Rails technique
+        # of having an application-level helper (Default) and then one
+        # per view class. However, we only use this with templated views
+        # (since mixing in a helper module is sometimes a bit tricky).
+        # "Native" Waves views (aka Hoshi) are ordinary classes so they
+        # don't really need this, but you can always just include a class
+        # level helper and it will automatically pick up your defaults
+        # if it is not explicitly defined.
+        #
+        app.auto_create_module( :Helpers ) do
+          auto_create_module( :Default )
+          auto_load :Default, :directories => [ :helpers ]
+          auto_create_module( true ) { include app::Helpers::Default }
+          auto_load true, :directories => [ :helpers ]
+        end
+      end
+    end
+  end
+end

data/lib/{layers → waves/layers}/mvc/controllers.rb RENAMED Viewed

File without changes

data/lib/{layers → waves/layers}/mvc/extensions.rb RENAMED Viewed

@@ -4,16 +4,6 @@ module Waves
     module Mixin
-      def controller( resource = nil )
-        resource ||= self.class.basename
-        @controller ||= app::Controllers[ resource ].new( @request )
-      end
-      def view( resource = nil )
-        resource ||= self.class.basename
-        @view ||= app::Views[ resource ].new( @request )
-      end
     end
   end
@@ -32,7 +22,22 @@ module Waves
     #
     # to find an instance of a given model. Again, the plurality of the controller and
     # model must be the same for this to work.
-    def model; app::Models[ model_name.intern ]; end
+    def model( resource = nil )
+      resource ||= self.class.basename.snake_case
+      app::Models[ resource ]
+    end
+    def controller( resource = nil )
+      resource ||= self.class.basename.snake_case
+      @controller ||= {}
+      @controller[resource] ||= app::Controllers[ resource ].new( @request )
+    end
+    def view( resource = nil )
+      resource ||= self.class.basename.snake_case
+      @view ||= {}
+      @view[resource] ||= app::Views[ resource ].new( @request )
+    end
     # MVC Params get automatically destructured with the keys as accessors methods.
     # You can still access the original query by calling request.query
@@ -40,6 +45,13 @@ module Waves
       @query ||= Waves::Request::Query.new(
         Waves::Request::Utilities.destructure( request.query ) )
     end
+    # Both the query and capture merged together
+    def params
+      @params ||= Waves::Request::Query.new( captured ?
+         Waves::Request::Utilities.destructure( request.query ).merge( captured.to_h ) :
+          Waves::Request::Utilities.destructure( request.query ) )
+    end
     # Attributes are just the query elements specific to the model associated with
     # the current resource.

data/lib/{layers → waves/layers}/orm/migration.rb RENAMED Viewed

File without changes

data/lib/{layers → waves/layers}/orm/providers/active_record.rb RENAMED Viewed

@@ -34,18 +34,15 @@ module Waves
           end
           app.auto_create_module( :Models ) do
-            include AutoCode
             auto_create_class :Default, ::ActiveRecord::Base
             auto_load :Default, :directories => [ :models ]
-          end
-          app.auto_eval :Models do
             auto_create_class true, app::Models::Default
             auto_load true, :directories => [ :models ]
             auto_eval true do
+              next if self.basename == "Default"
               app.database
-              set_table_name basename.snake_case.pluralize.intern
+              set_table_name self.basename.snake_case.pluralize.intern
             end
           end

data/lib/{layers → waves/layers}/orm/providers/active_record/migrations/empty.rb.erb RENAMED Viewed

File without changes

data/lib/{layers → waves/layers}/orm/providers/active_record/tasks/generate.rb RENAMED Viewed

@@ -6,7 +6,7 @@ namespace :generate do
       model_name = name.camel_case
       raise "Cannot generate Default yet" if model_name == 'Default'
-      filename = File.expand_path "models/#{name}.rb"
+      filename = File.expand_path "models/#{model_name}.rb"
       if File.exist?(filename)
         $stderr.puts "#{filename} already exists"
         exit

data/lib/{layers → waves/layers}/orm/providers/active_record/tasks/schema.rb RENAMED Viewed

@@ -1,4 +1,4 @@
-require "#{File.dirname(__FILE__)}/../../migration"
+require "#{File.dirname(__FILE__)}/../../../migration"
 namespace :schema do

data/lib/{layers → waves/layers}/orm/providers/data_mapper.rb RENAMED Viewed

File without changes

data/lib/{layers → waves/layers}/orm/providers/filebase.rb RENAMED Viewed

File without changes

data/lib/{layers → waves/layers}/orm/providers/sequel.rb RENAMED Viewed

@@ -1,7 +1,7 @@
 module Waves
   module Layers
     module ORM # :nodoc:
       # The Sequel ORM layer sets up the Sequel connection and configures AutoCode on Models, so that constants in that
       # namespace get loaded from file or created as subclasses of Models::Default.  The dataset for models is set to the
       # snakecased version of the model's class name.
@@ -10,7 +10,7 @@ module Waves
         # - creates on the application module a database method that establishes the Sequel connection
         # - arranges for autoloading/autocreation of missing constants in the Models namespace
         # - defines Sequel-specific helper methods on Waves::Controllers::Base
-        #
+        #
         # The controller helper methdods are:
         # - all
         # - find(name)
@@ -18,45 +18,43 @@ module Waves
         # - delete(name)
         # - update(name)
         #
         def self.included(app)
           gem 'sequel', '>= 2.0.0'
           require 'sequel'
           require "#{File.dirname(__FILE__)}/sequel/tasks/schema" if defined?(Rake)
           require "#{File.dirname(__FILE__)}/sequel/tasks/generate" if defined?(Rake)
-          def app.database ; @sequel ||= ::Sequel.open( Waves.config.database ) ; end
+          def app.database ; @sequel ||= ::Sequel.connect( Waves.config.database ) ; end
+      	  app.database.loggers << Waves.log
           app.auto_create_module( :Models ) do
-            include AutoCode
             auto_create_class :Default, ::Sequel::Model
             auto_load :Default, :directories => [ :models ]
-          end
-          app.auto_eval :Models do
-            auto_create_class true, app::Models::Default
+            auto_create_class true, :Default
             auto_load true, :directories => [ :models ]
             # set the Sequel dataset based on the model class name
-            # note that this is not done for app::Models::Default, as it isn't
+            # note that this is not done for app::Models::Default, as it isn't
             # supposed to represent a table
             auto_eval true do
-              default = superclass.basename.snake_case.pluralize.intern
+              next if self.basename == "Default"
+              default = self.superclass.basename.snake_case.pluralize.intern
               if @dataset && @dataset.opts[:from] != [ default ]
                 # don't clobber dataset from autoloaded file
-              else
-                if respond_to? :set_dataset
-                  set_dataset Waves.main.database[ basename.snake_case.pluralize.intern ]
-                end
+              elsif respond_to? :set_dataset
+                set_dataset Waves.main.database[ basename.snake_case.pluralize.intern ]
               end
             end
           end
           Waves::Controllers::Base.instance_eval do
             include Waves::Layers::ORM::Sequel::ControllerMethods
           end
         end
         # Mixed into Waves::Controllers::Base.  Provides ORM-specific helper methods for model access.
@@ -64,27 +62,28 @@ module Waves
           def all
             model.all
           end
           def find( name )
             model[ :name => name ] or not_found
           end
-          def create
-            model.create( attributes.to_hash )
+          def create(attrs = nil)
+            ats = attrs || attributes
+            model.create( ats.to_hash )
           end
           def delete( name )
             find( name ).destroy
           end
           def update( name )
             instance = find( name )
             instance.update_with_params( attributes.to_hash )
             instance
           end
         end
-      end
+      end
     end
   end
 end

data/lib/{layers → waves/layers}/orm/providers/sequel/migrations/empty.rb.erb RENAMED Viewed

File without changes

data/lib/{layers → waves/layers}/orm/providers/sequel/tasks/generate.rb RENAMED Viewed

@@ -8,7 +8,7 @@ namespace :generate do
       raise "Cannot generate Default yet" if model_name == 'Default'
-      filename = File.expand_path "models/#{name}.rb"
+      filename = File.expand_path "models/#{model_name}.rb"
       if File.exist?(filename)
         $stderr.puts "#{filename} already exists"
         exit

data/lib/{layers → waves/layers}/orm/providers/sequel/tasks/schema.rb RENAMED Viewed

@@ -1,4 +1,5 @@
 require "#{File.dirname(__FILE__)}/../../../migration"
+require 'sequel/extensions/migration'
 namespace :schema do
@@ -9,6 +10,7 @@ namespace :schema do
   desc "Performs Sequel migrations to version=<version>"
   task :migrate do |task|
     version = ENV['version']; version = version.to_i unless version.nil?
     Sequel::Migrator.apply( Waves.main.database, Waves::Layers::ORM.migration_directory , version )
   end