waves 0.8.2 → 0.9.0

data/samples/blog/configurations/production.rb

@@ -10,17 +10,6 @@ module Blog
       host '0.0.0.0'
       port 4000
 
-      application do
-        use ::Rack::Static, 
-          :urls => %w( /css /javascript /favicon.ico ), 
-          :root => 'public'
-        use Rack::Session::Cookie, 
-          :key => 'blog.session', :path => '/',
-          :expire_after => 3.days
-        run ::Waves::Dispatchers::Default.new
-      end
-      
-
     end
   end
 end

data/samples/blog/resources/entry.rb

@@ -6,8 +6,8 @@ module Blog
         view.list( plural => controller.all )
       end
             
-      on :get, :show => [ 'entry', :name ] do
-        view.show( :entry => controller.find( captured.name ) )
+      on :get, :show => [ 'entry', :name ] do 
+  		  view.show( :entry => controller.find( captured.name ) )
       end
       
       on :get, :edit => [ 'entry', :name, 'edit' ] do
@@ -16,7 +16,7 @@ module Blog
       
       on :put, :update => [ 'entry', :name ] do
         controller.update( captured.name )
-        redirect( paths.show( captured.name ))
+        redirect( paths.show( captured  .name ))
       end
       
       on :post, :create => [ 'entry' ] do

data/samples/blog/resources/map.rb

@@ -1,9 +1,16 @@
+require "autocode"
+
 module Blog
+
   module Resources
-    class Map < Waves::Resources::Base
-      
+    include AutoCode
+    auto_load true, :directories => "resources"
+
+    class Map
+      include Waves::Resources::Mixin
+
       on( true ) { to( :entry ) }
-      
+
     end
   end
 end

data/samples/blog/startup.rb

@@ -1,6 +1,7 @@
-require 'foundations/classic'
-require 'layers/orm/providers/sequel'
-require 'layers/renderers/markaby'
+require 'waves/foundations/classic'
+require 'waves/layers/orm/providers/sequel'
+require 'waves/layers/renderers/markaby'
+
 module Blog
   include Waves::Foundations::Classic
   include Waves::Layers::ORM::Sequel

data/templates/classic/Rakefile

@@ -21,13 +21,13 @@ else
 end
 
 require waves
-require 'runtime/console'
+require 'waves/runtime/console'
 
 begin
   Waves::Console.load(:mode => ENV['mode'])
 
   # load tasks from waves framework
-  %w( generate gem ).each { |task| require "tasks/#{task}.rb" }
+  %w( generate gem ).each { |task| require "waves/tasks/#{task}.rb" }
 
   # load tasks from this app's lib/tasks
   Dir["lib/tasks/*.{rb,rake}"].each { |task| require task }
@@ -43,35 +43,36 @@ end
 
 namespace :waves do
   
-  desc "freeze src=<wherever> to ./waves"
-  task :freeze do
-
-    target = "#{Dir.pwd}/waves"
-    src = ENV['src']
-    raise "Please specify the location of waves using src=wherever" unless src
-    raise "No directory found at '#{src}'" unless File.directory?(src) 
-      
-    items = FileList["#{src}/*"]
-    puts "Freezing from: #{src}"
-    items.each do |item|
-      puts "copying #{item}"
-      cp_r item, target
-    end
-    
-  end
-  
   desc "unfreeze (i.e. delete) the waves source at ./waves"
-  task :unfreeze do
+  task :thaw do
     frozen = "#{Dir.pwd}/waves"
     rm_r frozen if File.exist?(frozen)
   end
   
-  # Convenience task to allow you to freeze the current Waves
-  # source without knowing where it is.  This task only gets
-  # defined when the Rakefile successfully loaded Waves and if
-  # there's nothing in the way at ./waves
-  if defined?(WAVES) && !File.exist?("#{Dir.pwd}/waves")
-    namespace :freeze do
+  namespace :freeze do
+    
+    desc "freeze source=<wherever> to ./waves"
+    task :using do
+
+      target = "#{Dir.pwd}/waves"
+      src = ENV['source']
+      raise "Please specify the location of waves using src=wherever" unless src
+      raise "No directory found at '#{src}'" unless File.directory?(src) 
+      
+      items = FileList["#{src}/*"]
+      puts "Freezing from: #{src}"
+      items.each do |item|
+        puts "copying #{item}"
+        cp_r item, target
+      end
+    
+    end
+  
+    # Convenience task to allow you to freeze the current Waves
+    # source without knowing where it is.  This task only gets
+    # defined when the Rakefile successfully loaded Waves and if
+    # there's nothing in the way at ./waves
+    if defined?(WAVES) && !File.exist?("#{Dir.pwd}/waves")
       desc "freeze current Waves source to ./waves"
       task :current do
         target = "#{Dir.pwd}/waves"
@@ -82,9 +83,7 @@ namespace :waves do
           puts "copying #{item}"
           cp_r item, target
         end
-
       end
     end
   end
-  
-end
+end

data/templates/classic/configurations/default.rb.erb

@@ -1,9 +1,14 @@
 module <%= @name %>
   module Configurations
     class Default  < Waves::Configurations::Default      
-    
-	    resource <%= @name %>::Resources::Map
-      
+	    resource <%= @name %>::Resources::Server
+      reloadable [ <%= @name %> ]
+      host '127.0.0.1' ; port 3000 ; log :level => :debug
+	    use Rack::Session::Pool, :expire_after => 1.day
+      use ::Rack::Static, :urls => %w( /css /images /javascript /favicon.ico ), :root => 'public'
+      dispatcher ::Waves::Dispatchers::Default
+      server Waves::Servers::Mongrel
+      dependencies []
     end
   end
 end

data/templates/classic/configurations/development.rb.erb

@@ -1,26 +1,7 @@
 module <%= @name %>
-
   module Configurations
-
     class Development < Default
-
-      database :adapter => 'sqlite', :database => '<%= @name.downcase %>'
-
-      reloadable [ <%= @name %> ]
-      log :level => :debug
-      host '127.0.0.1'
-      port 3000
-      dependencies []
-
-      application do
-        use ::Rack::ShowExceptions
-        use ::Rack::Static, :urls => [ '/css/', '/javascript/', '/favicon.ico' ], :root => 'public'
-        run ::Waves::Dispatchers::Default.new
-      end
-
-      server Waves::Servers::Mongrel
+      database :adapter => 'sqlite', :database => 'db/development'
     end
-
   end
-
 end

data/templates/classic/configurations/production.rb.erb

@@ -1,29 +1,15 @@
 module <%= @name %>
-
   module Configurations
-
     class Production < Default
-
-      database :host => 'localhost', :adapter => 'mysql', :database => '<%= @name.downcase %>',
+      database :host => 'localhost', :adapter => 'mysql', 
+        :database => '<%= @name.downcase %>',
         :user => 'root', :password => ''
-
       reloadable []
-
       log :level => :error,
         :output => ( :log / "waves.#{$$}" ),
         :rotation => :weekly
-
       host '0.0.0.0'
-
       port 80
-
-      application do
-        use ::Rack::Static, :urls => [ '/css/', '/javascript/', '/favicon.ico' ], :root => 'public'
-        run ::Waves::Dispatchers::Default.new
-      end
-      
-      server Waves::Servers::Mongrel
-
     end
   end
 end

data/templates/classic/resources/server.rb.erb

@@ -0,0 +1,9 @@
+module <%= @name %>
+  module Resources
+    class Server < <%= @name%>::Resources::Default      
+      def get
+        view(:pages).welcome
+      end
+    end
+  end
+end

data/templates/classic/startup.rb.erb

@@ -1,6 +1,6 @@
-require 'foundations/classic'
+require 'waves/foundations/classic'
 <% if @orm %>
-require 'layers/orm/providers/<%= @orm %>'
+require 'waves/layers/orm/providers/<%= @orm %>'
 <% end %>
 
 module <%= @name %>
@@ -8,4 +8,4 @@ module <%= @name %>
   <% if @orm %>
   include Waves::Layers::ORM::<%= @orm.camel_case %>
   <% end %>
-end
+end

data/templates/classic/views/css.rb.erb

@@ -0,0 +1,14 @@
+require 'waves/views/cassy'
+class <%= @name %>::Views::Css < Cassy
+  
+  include Waves::Views::Mixin
+  
+  def default
+    body {
+      font_family 'sans-serif'
+      width '800px'
+      margin '20px auto'
+    }
+  end
+  
+end

data/templates/classic/views/default.rb.erb

@@ -0,0 +1,17 @@
+class <%= @name %>::Views::Default
+  
+  include Waves::Views::Mixin
+  
+  def stylesheet
+    style { view(:css).default }
+  end
+  
+  def layout
+    doctype
+    html {
+      head { stylesheet }
+      body { yield }
+    }
+  end
+  
+end

data/templates/classic/views/errors.rb.erb

@@ -0,0 +1,10 @@
+class <%= @name %>::Views::Errors < <%= @name %>::Views::Default
+  
+  def not_found_404
+    layout {
+      h1 'Sorry, But We Can't Find That'
+      p "This URL cannot be resolved by this server."
+    }
+  end
+  
+end

data/templates/classic/views/pages.rb.erb

@@ -0,0 +1,14 @@
+class <%= @name %>::Views::Pages < <%= @name %>::Views::Default
+  
+  def welcome
+    layout {
+      h1 'Welcome To The Blog Application'
+      p {
+        raw "This is an empty Waves application. The good news is that Waves is " <<
+             "up and running just fine. Next, you should add your own resources. "
+        a "Find out how.", :href => 'http://rubywaves.com/'
+      }
+    }
+  end
+  
+end

data/templates/compact/startup.rb.erb

@@ -1,6 +1,6 @@
-require 'foundations/compact'
+require 'waves/foundations/compact'
 <% if @orm %>
-require 'layers/orm/<%= @orm %>'
+require 'waves/layers/orm/<%= @orm %>'
 <% end %>
 
 module <%= @name %>
@@ -8,4 +8,9 @@ module <%= @name %>
   <% if @orm %>
   include Waves::Layers::ORM::<%= @orm.camel_case %>
   <% end %>
-end
+  module Resources
+    class Server
+      on( true ) { 'Hello, from Waves!' }
+    end
+  end
+end

data/test/ext/object.rb

@@ -0,0 +1,55 @@
+require "#{File.dirname(__FILE__)}/../helpers.rb"
+
+describe "Object#cache_method_missing" do
+  
+  before do
+    class A; end
+  end
+  
+  after do
+    Object.instance_eval { remove_const(:A) if const_defined?(:A) }
+  end
+  
+  it "defines the missing method" do
+    A.module_eval do
+      def method_missing(name, *args)
+        cache_method_missing name, "'hi'", *args
+      end
+    end
+    A.new.bar
+    A.new.should.respond_to :bar
+  end
+  
+  it "passes along the args" do
+    A.module_eval do
+      def method_missing(name, *args, &block)
+        cache_method_missing name, "args.join('-')", *args
+      end
+    end
+    
+    A.new.bar(1, 2, 3).should == "1-2-3"
+  end
+  
+  it "passes along the block" do
+    A.module_eval do
+      def method_missing(name, *args, &block)
+        cache_method_missing name, "block.call", *args, &block
+      end
+    end
+    
+    A.new.bar { 'bye' }.should == 'bye'
+  end  
+  
+end
+
+describe "Object#instance_exec" do
+  
+  before do
+    @block = lambda { |guy| "Howdy, #{guy}!" }
+  end
+  
+  it "works like instance_eval, but it takes args and gives them to the block" do
+    instance_exec( "Steve", &@block ).should == "Howdy, Steve!"
+  end
+  
+end

data/test/ext/shortcuts.rb

@@ -0,0 +1,73 @@
+require "#{File.dirname(__FILE__)}/../helpers.rb"
+
+describe "Waves::Ext::String" do
+  it "defines / as syntactic sugar for File.join" do
+    ( "lib" / "utilities" ).should == File.join( "lib", "utilities" )
+    ( "lib" / :utilities ).should == File.join( "lib", "utilities" )
+    ( "lib" / 3 ).should == File.join( "lib", "3" )
+  end
+end
+
+describe "A monkeypatch to Symbol" do
+  
+  it "defines / as syntactic sugar for File.join" do
+    ( :lib / :utilities ).should == File.join( "lib", "utilities")
+  end
+  
+end
+
+describe "Waves::Ext::Hash" do
+  
+  it "adds a non-destructive method for converting all hash keys to strings" do
+    h = { :a => 1, 'b' => 2, 3 => 3}
+    h.stringify_keys.should == { 'a' => 1, 'b' => 2, '3' => 3}
+    h.should == { :a => 1, 'b' => 2, 3 => 3}
+  end
+  
+  it "adds a destructive method for converting hash keys to symbols" do
+    h = { "two" => 2, :three => 3}
+    h.symbolize_keys!
+    h.should == { :two => 2, :three => 3 }
+  end
+  
+end
+
+describe "Waves::Ext::Integer" do
+
+  it "has an absolutely pedantic amount of helpers" do
+    1.kilobytes.should == "1_024".to_i
+    1.megabytes.should == "1_048_576".to_i
+    1.gigabytes.should == "1_073_741_824".to_i
+    1.terabytes.should == "1_099_511_627_776".to_i
+    1.petabytes.should == "1_125_899_906_842_624".to_i
+    1.exabytes.should == "1_152_921_504_606_846_976".to_i
+    1.zettabytes.should == "1_180_591_620_717_411_303_424".to_i
+    1.yottabytes.should == "1_208_925_819_614_629_174_706_176".to_i
+  end
+
+end
+
+describe "Waves::Ext::Module" do
+  
+  before do
+    module Eenie; module Meenie; module Miney; end; end ; end
+  end
+  
+  it "defines a basename method" do
+    Eenie::Meenie.basename.should == "Meenie"
+    Eenie::Meenie::Miney.basename.should == "Miney"
+  end
+  
+  it "defines [] for easy access to namespaced constants" do
+    Eenie[:Meenie].should == Eenie::Meenie
+  end
+  
+  it "defines a method for obtaining the outermost constant name" do
+    Eenie::Meenie::Miney.rootname.should == "Eenie"
+  end
+  
+  it "defines a method for obtaining the outermost constant" do
+    Eenie::Meenie::Miney.root.should == Eenie
+  end
+  
+end