waves 0.7.6 → 0.7.7

data/lib/foundations/default.rb

@@ -11,6 +11,7 @@ module Waves
 
         app.instance_eval do
 
+          include Waves::Layers::Inflect::English
           include Waves::Layers::Simple
           include Waves::Layers::MVC          
           include Waves::Layers::DefaultErrors

data/lib/layers/default_errors.rb

@@ -6,23 +6,20 @@ module Waves
 
       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
+        app.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

data/lib/layers/inflect/english.rb

@@ -0,0 +1,24 @@
+require 'layers/inflect/english/rules'
+require 'layers/inflect/english/string'
+module Waves
+  module Layers
+    module Inflect
+      module English
+        
+        def self.included(app)
+          
+
+          
+          String.class_eval do
+            include Waves::Layers::Inflect::English::StringMethods
+          end
+          
+        end
+        
+      end
+    end
+  end
+end
+
+
+

data/lib/layers/inflect/english/rules.rb

@@ -0,0 +1,88 @@
+module Waves
+  module Layers
+    module Inflect
+      module English
+        # Extends Waves::Inflect::InflectorMethods
+        module Rules
+        
+          extend Waves::Inflect::InflectorMethods
+
+          # One argument means singular and plural are the same.
+          word 'equipment'
+          word 'information'
+          word 'money'
+          word 'species'
+          word 'series'
+          word 'fish'
+          word 'sheep'
+          word 'moose'
+          word 'hovercraft'
+
+          # Two arguments defines a singular and plural exception.
+          word 'Swiss'     , 'Swiss'
+          word 'life'      , 'lives'
+          word 'wife'      , 'wives'
+          word 'cactus'    , 'cacti'
+          word 'goose'     , 'geese'
+          word 'criterion' , 'criteria'
+          word 'alias'     , 'aliases'
+          word 'status'    , 'statuses'
+          word 'axis'      , 'axes'
+          word 'crisis'    , 'crises'
+          word 'testis'    , 'testes'
+          word 'child'     , 'children'
+          word 'person'    , 'people'
+          word 'potato'    , 'potatoes'
+          word 'tomato'    , 'tomatoes'
+          word 'buffalo'   , 'buffaloes'
+          word 'torpedo'   , 'torpedoes'
+          word 'quiz'      , 'quizes'
+          word 'matrix'    , 'matrices'
+          word 'vertex'    , 'vetices'
+          word 'index'     , 'indices'
+          word 'ox'        , 'oxen'
+          word 'mouse'     , 'mice'
+          word 'louse'     , 'lice'
+          word 'thesis'    , 'theses'
+          word 'thief'     , 'thieves'
+          word 'analysis'  , 'analyses'
+
+          # One-way singularization exception (convert plural to singular).
+          singular_word 'cactus', 'cacti'
+
+          # General rules.
+          rule 'hive' , 'hives'
+          rule 'rf'   , 'rves'
+          rule 'af'   , 'aves'
+          rule 'ero'  , 'eroes'
+          rule 'man'  , 'men'
+          rule 'ch'   , 'ches'
+          rule 'sh'   , 'shes'
+          rule 'ss'   , 'sses'
+          rule 'ta'   , 'tum'
+          rule 'ia'   , 'ium'
+          rule 'ra'   , 'rum'
+          rule 'ay'   , 'ays'
+          rule 'ey'   , 'eys'
+          rule 'oy'   , 'oys'
+          rule 'uy'   , 'uys'
+          rule 'y'    , 'ies'
+          rule 'x'    , 'xes'
+          rule 'lf'   , 'lves'
+          rule 'us'   , 'uses'
+          rule ''     , 's'
+
+          # One-way singular rules.
+          singular_rule 'of' , 'ofs' # proof
+          singular_rule 'o'  , 'oes' # hero, heroes
+          singular_rule 'f'  , 'ves'
+
+          # One-way plural rules.
+          plural_rule 'fe' , 'ves' # safe, wife
+          plural_rule 's'  , 'ses'
+        
+        end
+      end
+    end
+  end
+end

data/lib/layers/inflect/english/string.rb

@@ -0,0 +1,24 @@
+module Waves
+  module Layers
+    module Inflect
+      module English
+        module StringMethods
+        
+          def singular
+            English::Rules.singular(self)
+          end
+
+          alias_method(:singularize, :singular)
+
+          def plural
+            English::Rules.plural(self)
+          end
+
+          alias_method(:pluralize, :plural)
+        
+        end
+      end
+    end
+  end
+end
+

data/lib/layers/mvc.rb

@@ -13,45 +13,41 @@ module Waves
         def app.controllers ; self::Controllers ; end
         def app.helpers ; self::Helpers ; end
         
+        app.auto_create_module( :Models ) do
+          include AutoCode
+          auto_create_class :Default
+          auto_load :Default, :directories => [:models]
+        end
+        
+        app.auto_eval( :Models ) do
+          auto_create_class true, app::Models::Default
+          auto_load true, :directories => [ :models ]
+        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
+        app.auto_create_module( :Views ) { include AutoCode }
+        
+        app.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
+        app.auto_create_module( :Controllers ) { include AutoCode }
+        
+        app.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          
+        app.auto_create_module( :Helpers ) do
+          include AutoCode
+          auto_create_module { include Waves::Helpers::Default }
+          auto_load true, :directories => [ :helpers ]
+        end          
 
-        end
       end
     end
   end

data/lib/layers/orm/active_record.rb

@@ -1,41 +1,92 @@
-class Symbol
-  # Protect ActiveRecord from itself by undefining the to_proc method.
-  # Don't worry, AR will redefine it.
-  alias :extensions_to_proc :to_proc
-  remove_method :to_proc
-end
-require 'active_record'
-
-if defined?(Rake)
-  require File.dirname(__FILE__) / :active_record / :tasks / :schema
-end
-
 module Waves
-  module Orm
-
-    Model = ::ActiveRecord::Base
+  module Layers
+    module ORM
 
-    module ActiveRecord
+      # Sets up the ActiveRecord connection and configures AutoCode on Models, so that constants in that
+      # namespace get loaded from file or created as subclasses of Models::Default
+      module ActiveRecord
+        
+        # On inclusion, this module:
+        # - creates on the application module a database method that establishes and returns the ActiveRecord connection
+        # - arranges for autoloading/autocreation of missing constants in the Models namespace
+        # - defines ActiveRecord-specific helper methods on Waves::Controllers::Base
+        # 
+        # The controller helper methdods are:
+        # - all
+        # - find(name)
+        # - create
+        # - delete(name)
+        # - update(name)
+        
+        def self.included(app)
+          
+          class Symbol
+            # Protect ActiveRecord from itself by undefining the to_proc method.
+            # Don't worry, AR will redefine it.
+            alias :extensions_to_proc :to_proc
+            remove_method :to_proc
+          end
+          require 'active_record'
+          require "#{File.dirname(__FILE__)}/active_record/tasks/schema"    if defined?(Rake)
+          require "#{File.dirname(__FILE__)}/active_record/tasks/generate"  if defined?(Rake)
+          
+          def app.database
+            unless @database
+              ::ActiveRecord::Base.establish_connection(config.database)
+              @database = ::ActiveRecord::Base.connection
+            end
+            @database
+          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 ]
 
-      def active_record
-        unless @active_record
-          ::ActiveRecord::Base.establish_connection(config.database)
-          @active_record = ::ActiveRecord::Base.connection
+            auto_eval true do
+              app.database
+              set_table_name basename.snake_case.pluralize.intern
+            end
+          end
+          
+          Waves::Controllers::Base.instance_eval do
+            include Waves::Layers::ORM::ActiveRecord::ControllerMethods
+          end
+          
         end
-        @active_record
-      end
-
-      def database
-        @database ||= active_record
-      end
-
-      def model_config(context, name)
-        active_record
-        context.set_table_name(name)
+        
+        # Mixed into Waves::Controllers::Base.  Provides ORM-specific helper methods for model access.
+        module ControllerMethods
+          def all
+            model.find(:all)
+          end
+          
+          def find( id )
+            model.find(id) or not_found
+          end
+          
+          def create
+            model.create( attributes )
+          end
+          
+          def delete( id )
+            find( id ).destroy
+          end
+          
+          def update( id )
+            instance = find( id )
+            instance.update_attributes( attributes )
+            instance
+          end
+        end
+        
       end
-
     end
   end
 end
 
-::Application.extend(Waves::Orm::ActiveRecord)

data/lib/layers/orm/active_record/tasks/generate.rb

@@ -0,0 +1,28 @@
+namespace :generate do
+  
+    desc 'Generate an ActiveRecord model, with name=<name>'
+    task :model do |task|
+      name = ENV['name']
+      model_name = name.camel_case
+      raise "Cannot generate Default yet" if model_name == 'Default'
+
+      filename = File.expand_path "models/#{name}.rb"
+      if File.exist?(filename)
+        $stderr.puts "#{filename} already exists" 
+        exit
+      end
+
+      model = <<TEXT
+module #{Waves.application.name}
+  module Models
+    class #{model_name} < Default
+
+    end
+  end
+end
+TEXT
+
+      File.write( filename, model )
+    end
+  
+end

data/lib/layers/orm/active_record/tasks/schema.rb

@@ -1,28 +1,20 @@
-require File.dirname(__FILE__) / ".." / ".." / :migration
-include Waves::Orm
+require "#{File.dirname(__FILE__)}/../../migration"
+
 namespace :schema do
 
-  desc "Create a new ActiveRecord Migration using ENV['name']."
+  desc "Create ActiveRecord migration with name=<name>"
   task :migration do |task|
-
-    source          = Migration.template(:active_record, ENV['template'])
-    destination     = Migration.destination(ENV['name'])
-    migration_name  = Migration.migration_name(ENV['name'])
-
-    context = {:class_name => migration_name.camel_case}
-
-    Migration.write_erb(context, source, destination)
-
+    Waves::Layers::ORM.create_migration_for(ActiveRecord)
   end
 
-  desc 'Performs migration from version, to version.'
+  desc "Performs ActiveRecord migrations to version=<version>"
   task :migrate => :connect do |task|
     version = ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-    ActiveRecord::Migrator.migrate(Migration.directory, version)
+    ActiveRecord::Migrator.migrate(Waves::Layers::ORM.migration_directory, version)
   end
 
   task :connect do
-    Application.database
+    Waves.application.database
     ActiveRecord::Base.logger = Logger.new($stdout)
   end