manveru-innate 2009.02.25 → 2009.03.24

data/lib/innate/helper.rb

@@ -147,11 +147,8 @@ module Innate
     #     Innate::HelpersHelper.each_include(self, :cgi, :link, :aspect)
     #   end
     def each_include(into, *names, &block)
-      return if names.empty?
-      mods = each(*names, &block)
-      into.include(*mods)
-    rescue NoMethodError
-      into.__send__(:include, *mods)
+      return if names.compact.empty?
+      into.__send__(:include, *each(*names, &block))
     end
 
     # Based on a simple set of rules we will first construct the most likely
@@ -162,10 +159,10 @@ module Innate
     # helper :foo # => Foo
     def get(name)
       name = name.to_s.split('_').map{|e| e.capitalize}.join
+
       POOL.each do |namespace|
-        if found = namespace.constants.grep(/^#{name}$/i).first
-          return namespace.const_get(found)
-        end
+        found = namespace.constants.grep(/^#{name}$/i).first
+        return namespace.const_get(found) if found
       end
 
       nil
@@ -174,11 +171,11 @@ module Innate
     # Figure out files that might have the helper we ask for and then require
     # the first we find, if any.
     def try_require(name)
-      found = Dir[glob(name)].first
-      require(File.expand_path(found))
-    rescue Exception => exception
-      Log.error(exception)
-      raise LoadError, "Helper #{name} not found"
+      if found = Dir[glob(name)].first
+        require(found) || true
+      else
+        raise(LoadError, "Helper #{name} not found")
+      end
     end
 
     # Return a nice list of filenames in correct locations with correct

data/lib/innate/log/hub.rb

@@ -38,6 +38,7 @@ module Innate
 
   class LogHub
     include Logger::Severity
+    include Optional
 
     attr_accessor :loggers, :program, :active
 

data/lib/innate/log.rb

@@ -2,13 +2,10 @@ require 'innate/log/hub'
 require 'innate/log/color_formatter'
 
 module Innate
-  logdev, *params = options.log.params
-  color = options.log.color
-  color = Logger::ColorFormatter.color?(logdev) if color.nil?
+  logdev = $stderr
+  logger = Logger.new(logdev)
 
-  logger = Logger.new(logdev, *params)
-
-  if color
+  if Logger::ColorFormatter.color?(logdev)
     begin
       require 'win32console' if RUBY_PLATFORM =~ /win32/i
 

data/lib/{rack → innate}/middleware_compiler.rb

@@ -1,4 +1,4 @@
-module Rack
+module Innate
   class MiddlewareCompiler
     COMPILED = {}
 
@@ -13,15 +13,18 @@ module Rack
     attr_reader :middlewares, :name
 
     def initialize(name)
-      @name = name
+      @name = name.to_sym
       @middlewares = []
       @compiled = nil
       yield(self) if block_given?
     end
 
-    # FIXME: Should we use `|` or `+`?
-    def use(*mws)
-      @middlewares = mws | @middlewares
+    def use(app, *args, &block)
+      @middlewares << [app, args, block]
+    end
+
+    def apps(*middlewares)
+      @middlewares.concat(middlewares.map{|mw| [mw, [], nil]})
     end
 
     def run(app)
@@ -33,12 +36,15 @@ module Rack
     end
 
     # Default application for Innate
-    def innate
-      public_root = ::File.join(Innate.options.app.root.to_s,
-                                Innate.options.app.public.to_s)
-      cascade(
-        Rack::File.new(public_root),
-        Innate::Current.new(Innate::Route.new, Innate::Rewrite.new))
+    def innate(app = Innate::DynaMap, options = Innate.options)
+      roots, publics = options[:roots], options[:publics]
+
+      joined = roots.map{|root| publics.map{|public| ::File.join(root, public)}}
+
+      apps = joined.flatten.map{|pr| Rack::File.new(pr) }
+      apps << Current.new(Route.new(app), Rewrite.new(app))
+
+      cascade(*apps)
     end
 
     def static(path)
@@ -65,7 +71,8 @@ module Rack
     end
 
     def compile!
-      @compiled = @middlewares.inject(@app){|a,e| e.new(a) }
+      @compiled = @middlewares.inject(@app){|s, (app, args, block)|
+        app.new(s, *args, &block) }
       self
     end
   end

data/lib/innate/mock.rb

@@ -1,6 +1,7 @@
 module Innate
   module Mock
     HTTP_METHODS = %w[ CONNECT DELETE GET HEAD OPTIONS POST PUT TRACE ]
+    OPTIONS = {:app => Innate}
 
     HTTP_METHODS.each do |method|
       (class << self; self; end).
@@ -13,8 +14,8 @@ module Innate
       mock_request.request(method, *args)
     end
 
-    def self.mock_request
-      Rack::MockRequest.new(Innate)
+    def self.mock_request(app = OPTIONS[:app])
+      Rack::MockRequest.new(app)
     end
 
     def self.session