waves 0.7.6 → 0.7.7

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,10 +1,16 @@
-class Proc
-
-  # calls the given lambda with the receiver as its argument
-  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

@@ -17,18 +17,6 @@ module Waves
         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)
-
       # produces stringsLikeThis
       def lower_camel_case
         gsub(/(_)(\w)/) { $2.upcase }

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/utilities/tempfile.rb

@@ -0,0 +1,9 @@
+# Patch Ruby's Tempfile class to work around a problem uploading files with Rack.
+# 
+# The fix came from here: http://sinatra.lighthouseapp.com/projects/9779/tickets/1
+# 
+# This is fixed in Rack already, but it hasn't made it into a gem.
+class Tempfile
+  # Make == act like eql?
+  def ==(other) ; eql?(other) || super ; end
+end

data/lib/waves.rb

@@ -26,12 +26,12 @@ 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/proc'
 require 'utilities/hash'
+require 'utilities/tempfile'
 # waves Runtime
 require 'dispatchers/base'
 require 'dispatchers/default'
@@ -71,6 +71,7 @@ require 'helpers/number_helper'
 require 'renderers/mixin'
 require 'renderers/erubis'
 require 'renderers/markaby'
+require 'renderers/haml'
 
 
 # waves foundations / layers
@@ -79,4 +80,5 @@ require 'layers/simple_errors'
 require 'foundations/simple'
 require 'layers/mvc'
 require 'layers/default_errors'
+require 'layers/inflect/english'
 require 'foundations/default'

data/samples/blog/Rakefile

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+#
+# 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" }
+
+# load tasks from this app's lib/tasks
+Dir["lib/tasks/*.{rb,rake}"].each { |task| require task }
+

data/samples/blog/bin/waves-console

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'startup'
+require 'commands/waves-console'

data/samples/blog/bin/waves-server

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'startup'
+require 'commands/waves-server'

data/samples/blog/configurations/development.rb

@@ -0,0 +1,31 @@
+module Blog
+
+  module Configurations
+
+    class Development < Default
+
+      database :adapter => 'sqlite', :database => 'blog.db'
+
+      reloadable [ Blog ]
+
+      log :level => :debug
+
+      host '127.0.0.1'
+
+      port 3000
+
+      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' ], :root => 'public'
+        run ::Waves::Dispatchers::Default.new
+      end
+
+    end
+
+  end
+
+end

data/samples/blog/configurations/mapping.rb

@@ -0,0 +1,23 @@
+module Blog
+
+  module Configurations
+
+    module Mapping
+      extend Waves::Mapping
+      
+      path '/', :method => :get do
+        redirect("/entries")
+      end
+      
+      path %r{^/comments/?$}, :method => :post do
+        resource( :comment ) do
+          controller { comment = create; redirect( "/entry/#{comment.entry.name}" ) }
+        end
+      end
+      include Waves::Mapping::PrettyUrls::RestRules
+      include Waves::Mapping::PrettyUrls::GetRules
+    end
+
+  end
+
+end

data/samples/blog/configurations/production.rb

@@ -0,0 +1,30 @@
+module Blog
+
+  module Configurations
+
+    class Production < Default
+
+      database :host => 'localhost', :adapter => 'mysql', :database => 'blog',
+        :user => 'root', :password => ''
+
+      reloadable []
+
+      log :level => :error,
+        :output => ( :log / "waves.#{$$}" ),
+        :rotation => :weekly
+
+      host '0.0.0.0'
+
+      port 80
+
+      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
+        run ::Waves::Dispatchers::Default.new
+      end
+
+    end
+  end
+end

data/samples/blog/lib/application.rb

@@ -0,0 +1,5 @@
+require 'layers/orm/sequel'
+module Blog
+  include Waves::Foundations::Default
+  include Waves::Layers::ORM::Sequel
+end

data/samples/blog/models/comment.rb

@@ -0,0 +1,14 @@
+module Blog
+
+  module Models
+
+    class Comment < Default
+      many_to_one :entry, :class => Blog::Models::Entry
+      before_save do
+        set_with_params(:updated_on => Time.now) if columns.include? :updated_on
+      end
+    end
+
+  end
+
+end

data/samples/blog/models/entry.rb

@@ -0,0 +1,14 @@
+module Blog
+
+  module Models
+
+    class Entry < Default
+      one_to_many :comments, :class => Blog::Models::Comment, :key => :entry_id, :order => :updated_on
+      before_save do
+        set_with_params(:updated_on => Time.now) if columns.include? :updated_on
+      end
+    end
+
+  end
+
+end

data/samples/blog/public/css/site.css

@@ -0,0 +1,2 @@
+body { font-family: Verdana, Arial, sans-serif; background-color: white; }
+h1, h2, h3, p, label, li { margin-bottom: 20px; }

data/samples/blog/public/javascript/site.js

@@ -0,0 +1,13 @@
+$(document).ready( function() {
+  $('a.delete').click( function() {
+    if ( confirm("Are you sure?") ) {
+      var href = $(this).attr('href');
+      $.ajax({ type: 'delete', url: href,
+        success: function() { window.location = '/entries'; }
+      });
+    }
+    // this isn't really a link ...
+    // so tell the browser we've handled it
+    return false;
+  });
+});

data/samples/blog/schema/migrations/001_initial_schema.rb

@@ -0,0 +1,17 @@
+class InitialSchema < Sequel::Migration
+
+  def up
+    create_table :entries do
+      primary_key :id
+      text :name
+      text :title
+      text :summary
+      text :content
+    end
+  end
+
+  def down
+    drop_table :entries
+  end
+
+end

data/samples/blog/schema/migrations/002_add_comments.rb

@@ -0,0 +1,18 @@
+class AddComments < Sequel::Migration
+
+  def up
+    create_table :comments do
+      primary_key :id
+      foreign_key :entry_id, :table => :entries
+      text :name
+      text :email
+      text :content
+      timestamp :updated_on
+    end
+  end
+
+  def down
+    drop_table :comments
+  end
+
+end

data/samples/blog/schema/migrations/templates/empty.rb.erb

@@ -0,0 +1,9 @@
+class <%= class_name %> < Sequel::Migration
+
+  def up
+  end
+
+  def down
+  end
+
+end