exocora 0.1.0 → 0.1.1

data/lib/exocora.rb

@@ -14,9 +14,9 @@ BASEDIR = File.dirname(File.expand_path(__FILE__))
 $LOAD_PATH.unshift(BASEDIR)
 $LOAD_PATH.uniq!
 
-require 'string'
-require 'array'
-require 'cgi'
+require 'support/string'
+require 'support/array'
+require 'support/cgi'
 require 'exocora/support'
 require 'exocora/errors'
 require 'exocora/validation'

data/lib/exocora/errors.rb

@@ -28,20 +28,16 @@ module Exocora
 
   # Represents an error encountered when processing a template.
   class TemplateError < RuntimeError
-    attr_accessor :message, :exception
-    def initialize(message, exception)
+    attr_accessor :message, :original
+    def initialize(message, original)
       @message = message
-      @exception = exception
+      @original = original
     end
 
     def to_html
       "<p>" + Erubis::XmlHelper::escape_xml(@message) + "</p>" +
       "<p>The original exception was:</p>" +
-      if @exception.respond_to? :to_html
-        @exception.to_html
-      else
-        Erubis::XmlHelper::escape_xml(@exception.to_s)
-      end
+      @original.to_html
     end
   end
 end

data/lib/exocora/sheet.rb

@@ -22,6 +22,13 @@ module Exocora
       @log_file = self.class.to_s.underscore + '.log'
     end
 
+    # Add a validation to the validation stack
+    def self.add_validation(param, validation)
+      @@validations[param.to_sym] ||= []
+      @@validations[param.to_sym] << validation
+      validation
+    end
+
     # Adds a validation condition for a parameter.
     # validate :query { |q| q.size > 0 }
     # validate :query, "is invalid" { |q| 
@@ -31,10 +38,12 @@ module Exocora
         validation.when block
       end
 
-      @@validations[param.to_s] ||= []
-      @@validations[param.to_s] << validation
-      
-      validation
+      add_validation param, validation
+    end
+
+    # Ensure that a parameter is non-nil
+    def self.validate_presence_of(param, *params)
+      add_validation param, ValidationOfPresence.new(*params)
     end
 
     # Creates an instance of this sheet, and runs it.
@@ -42,6 +51,12 @@ module Exocora
       new.run
     end
 
+    # Adds an error on a parameter
+    def add_error(param, error)
+      @errors[param] ||= []
+      @errors[param] << error
+    end
+
     # Casts incoming CGI parameters to nil, numerics, collapses single-element
     # arrays, and so forth.
     def cast_params(params)
@@ -57,6 +72,10 @@ module Exocora
           end
         end
 
+        # I prefer indexing by symbols
+        key = key.to_sym
+
+        # Store cast values
         if values.empty?
           cast[key] = nil
         elsif values.size == 1
@@ -99,10 +118,11 @@ module Exocora
     end
 
     # Breaks the normal rendering flow, and outputs an HTTP redirect header.
-    def redirect_to(uri_fragment)
+    def redirect_to(uri_fragment = @cgi.uri, params = {})
       @headers['Status'] = '302 Moved'
-      @headers['Location'] = @cgi.full_uri_for uri_fragment
+      @headers['Location'] = url_for(@cgi.full_uri_for(uri_fragment), params)
       output
+      exit
     end
 
     # Renders the erubis template for this action. Takes a hash of variables to
@@ -123,8 +143,13 @@ module Exocora
       # Perform templating
       begin
         result = eruby.evaluate context
-      rescue
-        raise TemplateError.new("Encountered error processing template #{template_filename}.", $!)
+      rescue Exception => e
+        if e.backtrace.first =~ /\(erubis\):(\d+)/
+          message = "encountered error processing template #{template_filename} at line #{$1}"
+        else
+          message = "encountered error processing template #{template_filename}"
+        end
+        raise TemplateError.new(message, e)
       end
 
       # Output result
@@ -161,6 +186,13 @@ module Exocora
       end
     end
 
+    # Returns a URL for the given url and parameters
+    def url_for(url = @cgi.uri, params = {})
+      url + params.inject('?') do |query_string, pair|
+        query_string << CGI::escape(pair[0].to_s) + '=' + CGI::escape(pair[1].to_s)
+      end
+    end
+
     # Sets the name of the template to render.
     def use_template(template)
       @template = template
@@ -187,13 +219,23 @@ module Exocora
           unless values.kind_of? Array
             values = [values]
           end
- 
-          values.each do |value| 
+
+#          if validation.kind_of? ValidationOfPresence
+#            # Make sure we perform a validation even if no parameters are
+#            # present.
+#            begin
+#              validation.validate values.first
+#            rescue ValidationError => e
+#              @errors[param] ||= []
+#              @errors[param] << e
+#            end
+#          end
+
+          values.each do |value|
             begin
               validation.validate(value)
             rescue ValidationError => e
-              @errors[param] ||= []
-              @errors[param] << e
+              add_error param, e
             end
           end
         end

data/lib/exocora/validation.rb

@@ -4,9 +4,11 @@ module Exocora
   # Otherwise, compares filter === value.
   
   class Validation
+    DEFAULT_MESSAGE = 'must be present'
+
     attr_accessor :message, :filter, :negate
 
-    def initialize(filter = Object, message = 'must be valid')
+    def initialize(filter=Object, message=DEFAULT_MESSAGE)
       @filter = filter
       @message = message
       @negate = false
@@ -70,4 +72,22 @@ module Exocora
     alias :with :if
     alias :when :if
   end
+
+  # ValidationOfPresence is a special validation which ensures its value
+  # is both present and non-empty.
+  class ValidationOfPresence < Validation
+    DEFAULT_MESSAGE = 'must be present'
+
+    def initialize(message=DEFAULT_MESSAGE)
+      @message = message
+    end
+
+    def validate(value = nil)
+      if value.nil? or (value.respond_to? :empty? and value.empty?)
+        raise ValidationError.new(value, @message)
+      else
+        value
+      end
+    end
+  end
 end

data/lib/exocora/version.rb

@@ -1,6 +1,6 @@
 module Exocora
   APP_NAME = 'exocora'
-  APP_VERSION = '0.1.0'
+  APP_VERSION = '0.1.1'
   APP_AUTHOR = 'aphyr'
   APP_EMAIL = 'aphyr@aphyr.com'
   APP_URL = 'http://aphyr.com/'

data/lib/{cgi.rb → support/cgi.rb}

@@ -30,7 +30,7 @@ class CGI
     else
       uri << 'https://' + server_name + ':' + server_port
     end
-    uri
+    uri << '/'
   end
 
   # Try to guess the relative path for this request. (http://host/directory/)

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
+rubygems_version: 0.9.2
 specification_version: 1
 name: exocora
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2008-03-27 00:00:00 -05:00
+  version: 0.1.1
+date: 2008-03-30 00:00:00 -05:00
 summary: A small framework for cgi scripts
 require_paths: 
 - lib
@@ -20,7 +20,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
+      version: 1.8.5
   version: 
 platform: ruby
 signing_key: 
@@ -35,10 +35,11 @@ files:
 - examples/hello_world.cgi
 - examples/request.rhtml
 - examples/request.cgi
-- lib/cgi.rb
-- lib/array.rb
 - lib/exocora.rb
-- lib/string.rb
+- lib/support
+- lib/support/cgi.rb
+- lib/support/array.rb
+- lib/support/string.rb
 - lib/exocora
 - lib/exocora/support.rb
 - lib/exocora/validation.rb