waves 0.8.2 → 0.9.0

data/bin/waves

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 # WARNING: This strange preamble might look easy to clean-up, but it is needed
-# to work with older versions of gems (< 1.2).
+# to work with older versions of gems (< 1.2). Also allows for local versions of
+# Waves to be used instead of the gem.
 
 require 'rubygems'
 
@@ -24,7 +25,7 @@ require waves
 puts "** Waves #{Waves.version} **"
 
 begin
-  require "commands/#{ARGV.first}"
+  require "waves/commands/#{ARGV.first}"
 rescue LoadError => e
-  require "commands/help"
+  require "waves/commands/help"
 end

data/doc/VERSION

@@ -1 +1 @@
-0.8.2
+0.9.0

data/lib/waves.rb

@@ -1,5 +1,9 @@
+require 'yaml'
+YAML::load_file( File.expand_path( File.dirname( __FILE__ )) + '/../dependencies.yml' ).each { |name,version| gem name, version }
 # External Dependencies
+require "rubygems"
 require 'rack'
+require 'rack/cache'
 require 'daemons'
 
 # a bunch of handy stuff
@@ -13,51 +17,59 @@ require 'benchmark'
 require 'base64'
 require 'functor'
 require 'filebase'
+require 'hive/worker'
 require 'filebase/model'
 
-require 'english/style'
-
 # selected project-specific extensions
-require 'ext/integer'
-require 'ext/float'
-require 'ext/string'
-require 'ext/symbol'
-require 'ext/hash'
-require 'ext/tempfile'
-require 'ext/module'
-require 'ext/object'
-require 'ext/kernel'
+require 'waves/ext/integer'
+require 'waves/ext/float'
+require 'waves/ext/string'
+require 'waves/ext/symbol'
+require 'waves/ext/hash'
+require 'waves/ext/tempfile'
+require 'waves/ext/module'
+require 'waves/ext/object'
+require 'waves/ext/kernel'
+require 'waves/ext/time'
 
 # waves Runtime
-require 'servers/base'
-require 'servers/webrick'
-require 'servers/mongrel'
-require 'dispatchers/base'
-require 'dispatchers/default'
-require 'runtime/logger'
-require 'runtime/mime_types'
-require 'runtime/runtime'
-require 'runtime/worker'
-require 'runtime/request'
-require 'runtime/response'
-require 'runtime/response_mixin'
-require 'runtime/session'
-require 'runtime/configuration'
-require 'caches/simple'
+require 'waves/servers/base'
+require 'waves/servers/webrick'
+require 'waves/servers/mongrel'
+require 'waves/request/accept'
+require 'waves/request/request'
+require 'waves/response/response'
+require 'waves/response/packaged'
+require 'waves/response/client_errors'
+require 'waves/response/response_mixin'
+require 'waves/response/redirects'
+require 'waves/dispatchers/base'
+require 'waves/dispatchers/default'
+require 'waves/runtime/logger'
+require 'waves/media/mime_types'
+require 'waves/runtime/applications'
+require 'waves/runtime/runtime'
+require 'waves/runtime/configuration'
+require 'waves/caches/simple'
 
 # waves URI mapping
-require 'matchers/base'
-require 'matchers/accept'
-require 'matchers/content_type'
-require 'matchers/path'
-require 'matchers/query'
-require 'matchers/traits'
-require 'matchers/uri'
-require 'matchers/request'
-require 'matchers/resource'
-require 'resources/paths'
-require 'resources/mixin'
+require 'waves/matchers/accept'
+require "waves/matchers/ext"
+require 'waves/matchers/path'
+require 'waves/matchers/query'
+require 'waves/matchers/traits'
+require 'waves/matchers/uri'
+require 'waves/matchers/request'
+require 'waves/matchers/resource'
+require 'waves/matchers/requested'
+require 'waves/resources/paths'
+require 'waves/resources/mixin'
+
+require 'waves/views/mixin'
+require 'waves/views/errors'
+require 'waves/renderers/mixin'
 
-require 'views/mixin'
-require 'views/errors'
-require 'renderers/mixin'
+module Waves
+  def self.version ; File.read( File.expand_path( "#{File.dirname(__FILE__)}/../doc/VERSION" ) ) ; end
+  def self.license ; File.read( File.expand_path( "#{File.dirname(__FILE__)}/../doc/LICENSE" ) ) ; end
+end

data/lib/{caches → waves/caches}/file.rb

@@ -1,8 +1,9 @@
-require 'caches/synchronized'
+require 'waves/caches/synchronized'
 
 module Waves
   module Caches
 
+    # A file-based cache, where the keys are the filenames.    
     class File < Simple
 
       def initialize( args )
@@ -34,6 +35,7 @@ module Waves
       
     end
     
+    # A thread-safe version of the File-based cache.
     class SynchronizedFile < Synchronized
       
       def initialize( args )

data/lib/waves/caches/memcached.rb

@@ -0,0 +1,56 @@
+require 'memcached'
+module Waves
+  module Caches
+
+    # A simple interface to Memcached. Pass in the memcached server to 
+    # the constructor, like this:
+    #
+    #   Waves::Caches::Memcached.new( 'localhost:11211' )
+    #
+    # Memcached::NotFound is converted to nil, even though nil is, in fact,
+    # a valid value to want to cache. Rather than force every use of the 
+    # cache interface to add exception handling for the (relatively rare)
+    # case where nil is an expected value, just code those cases using 
+    # the #exists? method.
+    #
+    # This interface is not thread-safe. If you want to use this in apps
+    # where you are handling requests in parallel, use SynchronizedMemcached.
+    #
+    class Memcached < Simple
+
+      def initialize( args )
+        raise ArgumentError, ":servers is nil" if args[ :servers ].nil?
+        @cache = ::Memcached.new( args[ :servers ], args[ :options ] || {} )
+      end
+
+      def store( key, value, ttl = 0, marshal = true )
+        @cache.add( key.to_s, value, ttl, marshal )
+      end
+
+      def fetch( key )
+        @cache.get( key.to_s )
+      rescue ::Memcached::NotFound => e
+        nil
+      end
+
+      def delete( key )
+        @cache.delete( key.to_s )
+      end
+
+      def clear
+        @cache.flush
+      end
+
+    end
+    
+    # A thread-safe version of Memcached.
+    class SynchronizedMemcached < Synchronized
+      
+      def initialize( args )
+        super( Memcached.new( args ) )
+      end
+      
+    end
+
+  end
+end

data/lib/{caches → waves/caches}/simple.rb

@@ -1,12 +1,11 @@
 module Waves
 
   module Caches
-    
-    #
-    # This class is more or less here to establish the basic interface for caching and for
-    # lightweight caching that doesn't require a dedicated caching process.
-    #
-    
+
+    # A simple in-memory cache. This also serves as the base class
+    # for all the Waves caching implementations, so that descendents
+    # only need to override #initialize, #fetch, #store, #delete, and
+    # #clear, since the other methods are defined in terms of those.
     class Simple
       
       def initialize( hash = {} ) ; @cache = hash ; end
@@ -20,6 +19,6 @@ module Waves
       def clear ; @cache = {} ; end
       
     end
-
+    
   end
 end

data/lib/{caches → waves/caches}/synchronized.rb

@@ -4,7 +4,8 @@ module Waves
   module Caches
     
     #
-    # This is just a proxy for the real cache, but adds Waves synchronization
+    # This is just a proxy for the real cache, but adds Waves synchronization. Pass the cache you
+    # want to use when you create the cache.
     #
     
     class Synchronized
@@ -19,7 +20,20 @@ module Waves
       def delete( key ) ; synchronize { @cache.delete( key ) } ; end
       def clear ; synchronize { @cache.clear } ; end
       def synchronize( &block ) ; Waves.synchronize( &block ) ; end
+      
+    end
+    
+    
+    # A thread-safe version of the in-memory cache.
+    class SynchronizedSimple < Synchronized
+      
+      def initialize( args )
+        super( Simple.new( args ) )
+      end
+      
     end
+    
+    
 
   end
 end

data/lib/{commands → waves/commands}/console.rb

@@ -10,7 +10,7 @@ Choice.options do
     desc 'Defaults to development.'
     cast Symbol
   end
-  separator ''  
+  separator ''
   option :startup do
     short '-s'
     long '--startup'
@@ -20,7 +20,7 @@ Choice.options do
   separator ''
 end
 
-require 'runtime/console'
+require 'waves/runtime/console'
 
 begin
   console = Waves::Console.load( Choice.choices )
@@ -28,8 +28,8 @@ begin
   require 'irb'
   require 'irb/completion'
   ARGV.clear
-  Waves.log.info "Runtime console starting ..."
+  Waves.logger.info "Runtime console starting ..."
   IRB.start
 rescue LoadError => e
   puts e.message
-end
+end

data/lib/{commands → waves/commands}/generate.rb

@@ -1,17 +1,18 @@
 require 'choice'
+gem 'rakegen', '=0.6.6'
 require 'rakegen'
 
-waves = File.expand_path( File.dirname( __FILE__ ) / '..' / '..' )
-orms = Dir[ waves / :lib / :layers / :orm / :providers / '*.rb' ].map { |path| File.basename( path, '.rb' )}
+waves = File.expand_path( File.dirname( __FILE__ ) / '..' / '..' / '..' )
+orms = Dir[ waves / :lib / :waves / :layers / :orm / :providers / '*.rb' ].map { |path| File.basename( path, '.rb' )}
 templates = Dir[ waves / :templates / '*' ].map { |path| File.basename( path ) }
 
 Choice.options do
-  
+
   option :help  do
     long '--help'
     desc 'Show this message'
   end
-  
+
   option :orm do
     short '-o'
     long '--orm=ORM'
@@ -49,4 +50,4 @@ generator = Rakegen.new("generate") do |gen|
   gen.template_assigns = options.merge( :name => options.name.gsub('-','_').camel_case )
 end.invoke
 
-puts "** Application created!"
+puts "** Application created!"

data/lib/{commands → waves/commands}/server.rb

@@ -60,7 +60,7 @@ Choice.options do
   separator ''
 end
 
-require 'runtime/server'
+require 'waves/runtime/server'
 begin
   Waves::Server.run( Choice.choices )
 rescue LoadError => e

data/lib/{dispatchers → waves/dispatchers}/base.rb

@@ -2,38 +2,21 @@ module Waves
 
   module Dispatchers
 
-    class NotFoundError < RuntimeError ; end
-    class Unauthorized < RuntimeError; end
-    class BadRequest < RuntimeError; end
-
-    # Redirect exceptions are rescued by the Waves dispatcher and used to set the 
-    # response status and location.
-    class Redirect < SignalException
-      attr_reader :path, :status
-      def initialize( path, status = '302' )
-        @path = path
-        @status = status
-      end
-      def message
-        "location: #{@path} status: #{@status}"
-      end
-    end
-
     #
     # Waves::Dispatchers::Base provides the basic request processing structure
-    # for a Rack application. It creates a Waves request, determines whether 
-    # to enclose the request processing in a mutex benchmarks it, logs it, 
-    # and handles redirects. Derived classes need only process the request 
-    # within the +safe+ method, which must take a Waves::Request and return 
+    # for a Rack application. It creates a Waves request, determines whether
+    # to enclose the request processing in a mutex benchmarks it, logs it,
+    # and handles redirects. Derived classes need only process the request
+    # within the +safe+ method, which must take a Waves::Request and return
     # a Waves::Response.
     #
-    
+
     class Base
 
       # As with any Rack application, a Waves dispatcher must provide a call method
       # that takes an +env+ hash.
       def call( env )
-        response = if Waves.synchronize? or Waves.debug?
+        response = if Waves.synchronize? || Waves.debug?
           Waves.synchronize { Waves.reload ; _call( env )  }
         else
           _call( env )
@@ -43,24 +26,27 @@ module Waves
       # Called by event driven servers like thin and ebb. Returns true if
       # the server should run the request in a separate thread.
       def deferred?( env ) ; Waves.config.resource.new( Waves::Request.new( env ) ).deferred? ; end
-      
+
       private
-      
+
       def _call( env )
         request = Waves::Request.new( env )
         response = request.response
         t = Benchmark.realtime do
           begin
-            safe( request )
-          rescue Dispatchers::Redirect => redirect
-            response.status = redirect.status
-            response.location = redirect.path
+            response.write( safe( request ).to_s ) if response.body.empty?
+          rescue Waves::Response::Packaged => e
+            e.call( response ) if e.respond_to?( :call )
+          else
+            # safeish default
+            response.content_type ||=  Waves::MimeTypes[ request.ext ].first || 'text/html'
+            response.status ||= '200'
           end
         end
-        Waves::Logger.info "#{request.method}: #{request.url} handled in #{(t*1000).round} ms."
+        Waves::Logger.info "#{response.status}: #{request.method} #{request.url} handled in #{(t*1000).round} ms."
         response.finish
       end
-      
+
     end
 
   end

data/lib/waves/dispatchers/default.rb

@@ -0,0 +1,19 @@
+module Waves
+
+  module Dispatchers
+
+    class Default < Base
+
+      #
+      # Takes a Waves::Request and returns a Waves::Response
+      #
+      
+      def safe(request)
+        Waves.config.resource.new( request ).process
+      end
+
+    end
+
+  end
+
+end