dyoder-waves 0.7.3 → 0.7.6

data/lib/utilities/inflect/english.rb

@@ -0,0 +1,84 @@
+module Waves
+  module Inflect
+    # Extends Waves::Inflect::InflectorMethods
+    module English
+        
+      extend 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

data/lib/utilities/integer.rb

@@ -1,17 +1,24 @@
-# Added methods to Integer for commonly used "numeric phrases" like 6.days or 30.megabytes.
-class Integer
-  def seconds ; self ; end
-  def minutes ; self * 60 ; end
-  def hours ; self * 60.minutes ; end
-  def days ; self * 24.hours ; end
-  def weeks ; self * 7.days ; end
-  def bytes ; self ; end
-  def kilobytes ; self * 1024 ; end
-  def megabytes ; self * 1024.kilobytes ; end
-  def gigabytes ; self * 1024.megabytes ; end
-  def terabytes ; self * 1024.gigabytes ; end
-  def petabytes ; self * 1024.terabytes ; end
-  def exabytes ; self * 1024.petabytes ; end
-  def zettabytes ; self * 1024.exabytes ; end
-  def yottabytes ; self * 1024.zettabytes ; end
+module Waves
+  module Utilities
+    module Integer
+      def seconds ; self ; end
+      def minutes ; self * 60 ; end
+      def hours ; self * 60.minutes ; end
+      def days ; self * 24.hours ; end
+      def weeks ; self * 7.days ; end
+      def bytes ; self ; end
+      def kilobytes ; self * 1024 ; end
+      def megabytes ; self * 1024.kilobytes ; end
+      def gigabytes ; self * 1024.megabytes ; end
+      def terabytes ; self * 1024.gigabytes ; end
+      def petabytes ; self * 1024.terabytes ; end
+      def exabytes ; self * 1024.petabytes ; end
+      def zettabytes ; self * 1024.exabytes ; end
+      def yottabytes ; self * 1024.zettabytes ; end
+    end
+  end
 end
+
+class Integer # :nodoc:
+  include Waves::Utilities::Integer
+end

data/lib/utilities/module.rb

@@ -1,17 +1,21 @@
-class Module
-
-  # This comes in handy when you are trying to do meta-programming with modules / classes
-  # that may be nested within other modules / classes. I think I've seen it defined in
-  # facets, but I'm not relying on facets just for this one method.
-  def basename
-    self.name.split('::').last || ''
-  end
-
-  # Just a convenience method for accessing a const within a Module
-  def []( cname )
-    const_get( cname.to_s.camel_case )
-  end
-
-
+module Waves
+  module Utilities
+    module Module
+      # This comes in handy when you are trying to do meta-programming with modules / classes
+      # that may be nested within other modules / classes. I think I've seen it defined in
+      # facets, but I'm not relying on facets just for this one method.
+      def basename
+        self.name.split('::').last || ''
+      end
 
+      # Just a convenience method for accessing a const within a Module
+      def []( cname )
+        const_get( cname.to_s.camel_case )
+      end
+    end
+  end  
 end
+
+class Module # :nodoc:
+  include Waves::Utilities::Module
+end

data/lib/utilities/object.rb

@@ -1,17 +1,25 @@
-class Object
-  # This is an extremely powerful little function that will be built-in to Ruby 1.9.
-  # This version is from Mauricio Fernandez via ruby-talk. Works like instance_eval
-  # except that you can pass parameters to the block. This means you can define a block
-  # intended for use with instance_eval, pass it to another method, which can then
-  # invoke with parameters. This is used quite a bit by the Waves::Mapping code.
-  def instance_exec(*args, &block)
-    mname = "__instance_exec_#{Thread.current.object_id.abs}"
-    class << self; self end.class_eval{ define_method(mname, &block) }
-    begin
-      ret = send(mname, *args)
-    ensure
-      class << self; self end.class_eval{ undef_method(mname) } rescue nil
+module Waves
+  module Utilities
+    module Object
+      # This is an extremely powerful little function that will be built-in to Ruby 1.9.
+      # This version is from Mauricio Fernandez via ruby-talk. Works like instance_eval
+      # except that you can pass parameters to the block. This means you can define a block
+      # intended for use with instance_eval, pass it to another method, which can then
+      # invoke with parameters. This is used quite a bit by the Waves::Mapping code.
+      def instance_exec(*args, &block)
+        mname = "__instance_exec_#{Thread.current.object_id.abs}"
+        class << self; self end.class_eval{ define_method(mname, &block) }
+        begin
+          ret = send(mname, *args)
+        ensure
+          class << self; self end.class_eval{ undef_method(mname) } rescue nil
+        end
+        ret
+      end
     end
-    ret
   end
 end
+
+class Object # :nodoc:
+  include Waves::Utilities::Object
+end

data/lib/utilities/proc.rb

@@ -1,9 +1,16 @@
-class Proc
-
-  def |(lambda)
-    lambda do
-      lambda.call( self.call )
+module Waves
+  module Utilities
+    module Proc
+      # calls the given lambda with the receiver as its argument
+      def |(lambda)
+        lambda do
+          lambda.call( self.call )
+        end
+      end
     end
   end
-
 end
+
+class Proc # :nodoc:
+  include Waves::Utilities::Proc
+end

data/lib/utilities/string.rb

@@ -1,47 +1,61 @@
-# Waves extends String with a variety of methods for changing from singular to plural and back, and switching to different types of case and word separators. These methods are similar to those found in Rails and other frameworks, but some (all?) of the names are different. The names here were chosen for increased clarity and are hopefully easy to adjust to ...
-
-class String
-
-  # Does a File.join on the two arguments joined by the /. Very handy
-  # for doing platform-safe paths without having to use File.join.
-  #
-  # I unfortunately don't recall where i first saw this ... see
-  # Symbol extension as well, allowing for :files / 'afilename.txt'
-
-  def / ( string )
-    File.join(self,string.to_s)
-  end
-
-  def singular
-    Inflect::English.singular(self)
-  end
-
-  alias_method(:singularize, :singular)
-
-  def plural
-    Inflect::English.plural(self)
-  end
-
-  alias_method(:pluralize, :plural)
-
-  def lower_camel_case
-    gsub(/(_)(\w)/) { $2.upcase }
-  end
-
-  def camel_case
-    lower_camel_case.gsub(/^([a-z])/) { $1.upcase }
-  end
-
-  def snake_case
-    gsub(/([a-z\d])([A-Z])/){ "#{$1}_#{$2}"}.tr("-", "_").downcase
-  end
-
-  def title_case
-    gsub(/(^|\s)\s*([a-z])/) { $1 + $2.upcase }
-  end
-
-  def text
-    gsub(/[\_\-\.\:]/,' ')
+module Waves
+  module Utilities
+    
+    # Utility methods mixed into String.
+        
+    module String
+      
+      # Syntactic sugar for using File.join to concatenate the argument to the receiver.
+      #
+      #   require "lib" / "utilities" / "string"
+      #
+      # The idea is not original, but we can't remember where we first saw it.
+      # 
+      # Waves::Utilities::Symbol defines the same method, allowing for :files / 'afilename.txt'
+      
+      def / ( string )
+        File.join(self,string.to_s)
+      end
+
+      def singular
+        Waves::Inflect::English.singular(self)
+      end
+
+      alias_method(:singularize, :singular)
+
+      def plural
+        Waves::Inflect::English.plural(self)
+      end
+
+      alias_method(:pluralize, :plural)
+
+      # produces stringsLikeThis
+      def lower_camel_case
+        gsub(/(_)(\w)/) { $2.upcase }
+      end
+
+      # produces StringsLikeThis
+      def camel_case
+        lower_camel_case.gsub(/^([a-z])/) { $1.upcase }
+      end
+
+      # produces strings_like_this
+      def snake_case
+        gsub(/\s+/,'').gsub(/([a-z\d])([A-Z])/){ "#{$1}_#{$2}"}.tr("-", "_").downcase
+      end
+
+      def title_case
+        gsub(/(^|\s)\s*([a-z])/) { $1 + $2.upcase }
+      end
+
+      def text
+        gsub(/[\_\-\.\:]/,' ')
+      end
+      
+    end
   end
+end
 
+class ::String # :nodoc:
+  include Waves::Utilities::String
 end

data/lib/utilities/symbol.rb

@@ -1,6 +1,9 @@
 class Symbol
   # Does File.join on self and string, converting self to string before invocation.
-  # See String#/ for more.
+  # See String#/ for more.  
+  #
+  # Note:  This overrides any definitions done politely in modules, such as
+  # {Sequel::SQL::ComplexExpressionMethods}[http://sequel.rubyforge.org/classes/Sequel/SQL/ComplexExpressionMethods.html]
   def / ( string )
     self.to_s / string
   end

data/lib/views/base.rb

@@ -0,0 +1,9 @@
+module Waves
+  module Views
+    class Base
+      
+      include Waves::Views::Mixin
+      
+    end
+  end  
+end

data/lib/views/mixin.rb

@@ -60,7 +60,7 @@ module Waves
     # A class method that returns the known Renderers, which is any module that is defined within Waves::Renderers and includes the Renderers::Mixin. You can define new Renderers simply be reopening Waves::Renderers and defining a module that mixes in Renderers::Mixin.
     def Views.renderers
       return [] if Renderers.constants.nil?
-      Renderers.constants.inject([]) do |rx,cname|
+      Renderers.constants.sort.inject([]) do |rx,cname|
         ( Module === (c=Renderers.const_get(cname)) &&
           c < Renderers::Mixin ) ? ( rx << c ) : rx
       end
@@ -84,6 +84,8 @@ module Waves
         @layout = :default
       end
 
+      # Return the first renderer for which a template file can be found.
+      # Uses Renderers::Mixin.filename to construct the filename for each renderer.
       def renderer(path)
         Views.renderers.find do |renderer|
           File.exists?( renderer.filename( path ) )

data/lib/waves.rb

@@ -1,11 +1,12 @@
 # External Dependencies
 require 'rubygems'
 
+# Some scripts need to be able to locate items relative to waves source.
+WAVES = "#{File.dirname(__FILE__)}/.." unless defined?(WAVES)
+
 require 'rack'
 require 'daemons'
 require 'live_console'
-
-gem 'dyoder-autocode'
 require 'autocode'
 
 # for mimetypes only or when using as default handler
@@ -25,10 +26,10 @@ require 'base64'
 require 'utilities/module'
 require 'utilities/string'
 require 'utilities/symbol'
-require 'utilities/kernel'
 require 'utilities/object'
 require 'utilities/integer'
 require 'utilities/inflect'
+require 'utilities/inflect/english'
 require 'utilities/proc'
 require 'utilities/hash'
 # waves Runtime
@@ -45,6 +46,7 @@ require 'runtime/response'
 require 'runtime/response_mixin'
 require 'runtime/response_proxy'
 require 'runtime/session'
+require 'runtime/blackboard'
 require 'runtime/configuration'
 
 # waves URI mapping
@@ -56,20 +58,20 @@ require 'controllers/mixin'
 require 'controllers/base'
 require 'views/mixin'
 require 'views/base'
-require 'renderers/mixin'
-require 'renderers/markaby'
 require 'helpers/tag_helper'
 require 'helpers/url_helper'
+require 'helpers/common'
+require 'helpers/form'
+require 'helpers/formatting'
+require 'helpers/model'
+require 'helpers/view'
+require 'helpers/default'
+require 'helpers/asset_helper'
+require 'helpers/number_helper'
+require 'renderers/mixin'
 require 'renderers/erubis'
-require 'helpers/common.rb'
-require 'helpers/form.rb'
-require 'helpers/formatting.rb'
-require 'helpers/model.rb'
-require 'helpers/view.rb'
+require 'renderers/markaby'
 
-# waves test support
-require 'verify/mapping.rb'
-require 'verify/request.rb'
 
 # waves foundations / layers
 require 'layers/simple'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dyoder-waves
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
+  version: 0.7.6
 platform: ruby
 authors: 
 - Dan Yoder
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-30 00:00:00 -07:00
+date: 2008-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: autocode
+  name: metaid
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -67,7 +67,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sequel
+  name: extensions
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -76,7 +76,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
+  name: live_console
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -85,7 +85,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: extensions
+  name: choice
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -94,7 +94,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: live_console
+  name: daemons
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -103,7 +103,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: choice
+  name: rakegen
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -112,22 +112,22 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: daemons
+  name: sequel
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.0.0
     version: 
 - !ruby/object:Gem::Dependency 
-  name: bacon
+  name: autocode
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 1.0.0
     version: 
 description: 
 email: dan@zeraweb.com
@@ -142,17 +142,34 @@ extra_rdoc_files: []
 files: 
 - lib/commands/waves-console.rb
 - lib/commands/waves-server.rb
+- lib/controllers/base.rb
 - lib/controllers/mixin.rb
 - lib/dispatchers/base.rb
 - lib/dispatchers/default.rb
 - lib/foundations/default.rb
 - lib/foundations/simple.rb
+- lib/helpers/asset_helper.rb
 - lib/helpers/common.rb
+- lib/helpers/default.rb
 - lib/helpers/form.rb
 - lib/helpers/formatting.rb
 - lib/helpers/model.rb
+- lib/helpers/number_helper.rb
+- lib/helpers/tag_helper.rb
+- lib/helpers/url_helper.rb
 - lib/helpers/view.rb
 - lib/layers/default_errors.rb
+- lib/layers/mvc.rb
+- lib/layers/orm/active_record/tasks/generate.rb
+- lib/layers/orm/active_record/tasks/schema.rb
+- lib/layers/orm/active_record.rb
+- lib/layers/orm/data_mapper.rb
+- lib/layers/orm/filebase.rb
+- lib/layers/orm/migration.rb
+- lib/layers/orm/sequel/tasks/generate.rb
+- lib/layers/orm/sequel/tasks/schema.rb
+- lib/layers/orm/sequel.rb
+- lib/layers/simple.rb
 - lib/layers/simple_errors.rb
 - lib/mapping/mapping.rb
 - lib/mapping/pretty_urls.rb
@@ -160,6 +177,7 @@ files:
 - lib/renderers/markaby.rb
 - lib/renderers/mixin.rb
 - lib/runtime/application.rb
+- lib/runtime/blackboard.rb
 - lib/runtime/configuration.rb
 - lib/runtime/console.rb
 - lib/runtime/debugger.rb
@@ -174,38 +192,35 @@ files:
 - lib/tasks/cluster.rb
 - lib/tasks/gem.rb
 - lib/tasks/generate.rb
-- lib/tasks/schema.rb
+- lib/utilities/hash.rb
+- lib/utilities/inflect/english.rb
 - lib/utilities/inflect.rb
 - lib/utilities/integer.rb
-- lib/utilities/kernel.rb
 - lib/utilities/module.rb
 - lib/utilities/object.rb
 - lib/utilities/proc.rb
 - lib/utilities/string.rb
 - lib/utilities/symbol.rb
-- lib/verify/mapping.rb
-- lib/verify/request.rb
+- lib/views/base.rb
 - lib/views/mixin.rb
 - lib/waves.rb
+- lib/layers/orm/active_record/migrations/empty.rb.erb
+- lib/layers/orm/sequel/migrations/empty.rb.erb
 - app/bin
 - app/bin/waves-console
 - app/bin/waves-server
 - app/configurations
-- app/configurations/default.rb.erb
 - app/configurations/development.rb.erb
 - app/configurations/mapping.rb.erb
 - app/configurations/production.rb.erb
 - app/controllers
-- app/controllers/default.rb.erb
 - app/doc
 - app/helpers
-- app/helpers/default.rb.erb
 - app/lib
 - app/lib/application.rb.erb
 - app/lib/tasks
 - app/log
 - app/models
-- app/models/default.rb.erb
 - app/public
 - app/public/css
 - app/public/flash
@@ -214,8 +229,6 @@ files:
 - app/Rakefile
 - app/schema
 - app/schema/migrations
-- app/schema/migrations/templates
-- app/schema/migrations/templates/empty.rb.erb
 - app/startup.rb
 - app/templates
 - app/templates/errors
@@ -226,12 +239,24 @@ files:
 - app/tmp
 - app/tmp/sessions
 - app/views
-- app/views/default.rb.erb
+- app/controllers/.gitignore
+- app/doc/.gitignore
+- app/helpers/.gitignore
+- app/lib/tasks/.gitignore
+- app/log/.gitignore
+- app/models/.gitignore
+- app/public/css/.gitignore
+- app/public/flash/.gitignore
+- app/public/images/.gitignore
+- app/public/javascript/.gitignore
+- app/schema/migrations/.gitignore
+- app/tmp/sessions/.gitignore
+- app/views/.gitignore
 - bin/waves
 - bin/waves-server
 - bin/waves-console
 has_rdoc: true
-homepage: http://dev.zeraweb.com/waves
+homepage: http://rubywaves.com
 post_install_message: 
 rdoc_options: []
 
@@ -252,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.0.1
+rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: Open-source framework for building Ruby-based Web applications.