pancake 0.1.29 → 0.2.0

data/README.textile

@@ -78,10 +78,6 @@ end</code></pre>
 
 A stack doesn't have to mount other stacks.  Pancake stacks are full applications in their own right and can be used standalone as Rack endpoints, or as middleware.
 
-Rails 3 is shipping with a pluggable router which can be the awesome "Usher":http://github.com/joshbuddy/usher router.  If you use Usher in your Rails app, you'll be able to mount Pancake stacks directly.  For now, you can mount them as Metals.
-
-TODO: Demonstrate in a gist mounting pancake in a rails application
-
 All stacks are namespaced.  Pancake makes heavy use of namespacing to help construct applications concisely.
 
 h2. Middleware In Stacks

data/Rakefile

@@ -1,35 +1,7 @@
 require 'rubygems'
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "pancake"
-    gem.summary = %Q{Eat Pancake Stacks for Breakfast}
-    gem.description = %Q{Eat Pancake Stacks for Breakfast}
-    gem.email = "has.sox@gmail.com"
-    gem.homepage = "http://github.com/hassox/pancake"
-    gem.authors = ["Daniel Neighman"]
-    gem.add_development_dependency "rspec"
-    gem.add_dependency "usher", ">=0.6.4"
-    gem.add_development_dependency "extlib"
-    gem.add_development_dependency "thor"
-    gem.add_dependency "rack"
-    gem.add_dependency "tilt", ">=0.3"
-    gem.add_dependency "hashie", ">=0.1.4"
-    gem.add_dependency "rack-accept-media-types"
-    gem.require_path = 'lib'
-    gem.autorequire = 'pancake'
-    gem.bindir = "bin"
-    gem.executables = %w( pancake-gen )
-    gem.files = %w(LICENSE README.textile Rakefile TODO) + Dir.glob("{lib,spec,bin}/**/{*,.[a-z]*}")
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
 require 'spec/rake/spectask'
+
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.spec_opts = %w(--format progress --color)
@@ -41,9 +13,6 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
-
-task :spec => :check_dependencies
-
 task :default => :spec
 
 require 'rake/rdoctask'

data/TODO.textile

@@ -0,0 +1,19 @@
+h1. TODO
+
+* Port to active support (minimal) & remove extlib
+* Simplify middleware implementation to use TSort
+* Incorporate url_mount (or simliar) into the router for open route mounting
+* Add before / after filters to short stack
+* Provide a streamlined way to specify middleware in an application
+* Create a syrup gem that configures some basic middlewares
+** Provide a way to turn middleware on and off
+** Possible inclusions:
+*** Wrapt
+*** Compass
+*** ESI
+* Remove automatic asset path namespacing
+* Reduce complexity of bootloaders
+* Proivde easy to use hooks in the bootloaders
+* Add a to_s method on the configuration so that configuation may be easily interrogated
+* Add an example into the generated applications showing how to add mime types
+* Error handling in stacks needs improvement

data/bin/pancake-gen

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'thor'
+require 'thor/group'
 require 'thor/runner'
 require 'pancake/generators'
 

data/lib/pancake.rb

@@ -1,67 +1,54 @@
 require 'rubygems'
 require 'hashie'
-require 'extlib/class'
-require 'extlib/boolean'
-require 'extlib/module'
-require 'extlib/nil'
-require 'extlib/numeric'
-require 'extlib/object'
-require 'extlib/symbol'
-require 'extlib/blank'
-require "extlib/dictionary"
-require 'extlib/logger'
-require 'extlib/mash'
-require 'extlib/hash'
+require 'active_support/core_ext/class'
+require 'active_support/inflector'
+require 'active_support/core_ext/string/inflections'
+require 'active_support/ordered_hash'
 require 'usher'
 require 'usher/interface/rack'
 require 'tilt'
 
 module Pancake
-  autoload    :Logger,    "pancake/logger"
-  autoload    :Constants, "pancake/constants"
-  autoload    :Console,   "pancake/console"
+  autoload    :Logger,          "pancake/logger"
+  autoload    :Constants,       "pancake/constants"
+  autoload    :Console,         "pancake/console"
+  autoload    :Paths,           "pancake/paths"
+  autoload    :Configuration,   "pancake/configuration"
+  autoload    :BootLoaderMixin, "pancake/bootloaders"
+  autoload    :MimeTypes,       "pancake/mime_types"
+  autoload    :Middleware,      "pancake/middleware"
+  autoload    :Router,          "pancake/router"
+  autoload    :Errors,          "pancake/errors"
+  autoload    :Stack,           "pancake/stack/stack"
 
   module Stacks
     autoload :Short,      "pancake/stacks/short"
   end
 
+  module Hooks
+    autoload :OnInherit,                'pancake/hooks/on_inherit'
+    autoload :InheritableInnerClasses,  'pancake/hooks/inheritable_inner_classes'
+  end
+
   module Mixins
-    autoload :RequestHelper,"pancake/mixins/request_helper"
-    autoload :Publish,      "pancake/mixins/publish"
-    autoload :Render,       "pancake/mixins/render"
-    autoload :StackHelper, "pancake/mixins/stack_helper"
-    autoload :ResponseHelper,  "pancake/mixins/response_helper"
+    autoload :RequestHelper,  "pancake/mixins/request_helper"
+    autoload :Publish,        "pancake/mixins/publish"
+    autoload :Render,         "pancake/mixins/render"
+    autoload :StackHelper,    "pancake/mixins/stack_helper"
+    autoload :ResponseHelper, "pancake/mixins/response_helper"
   end
 
   module Middlewares
     autoload :Static,       "pancake/middlewares/static"
-    autoload :Logger,     "pancake/middlewares/logger"
+    autoload :Logger,       "pancake/middlewares/logger"
   end
 
   module Test
     autoload :Matchers,    "pancake/test/matchers"
   end
-
 end
 
-require 'pancake/paths'
-require 'pancake/hooks/on_inherit'
-require 'pancake/hooks/inheritable_inner_classes'
 require 'pancake/core_ext/class'
 require 'pancake/core_ext/object'
 require 'pancake/core_ext/symbol'
-require 'pancake/configuration'
-require 'pancake/bootloaders'
-require 'pancake/mime_types'
-require 'pancake/middleware'
-require 'pancake/router'
 require 'pancake/master'
-require 'pancake/errors'
-require 'pancake/stack/stack'
-require 'pancake/stack/configuration'
-require 'pancake/stack/router'
-require 'pancake/stack/bootloader'
-require 'pancake/stack/app'
-require 'pancake/mixins/request_helper'
-require 'pancake/defaults/middlewares'
-require 'pancake/defaults/configuration'

data/lib/pancake/bootloaders.rb

@@ -59,7 +59,7 @@ module Pancake
 
     def self.extended(base)
       base.class_eval do
-        class_inheritable_reader :_bootloaders, :_central_bootloaders, :_bootloader_map
+        extlib_inheritable_reader :_bootloaders, :_central_bootloaders, :_bootloader_map
         @_bootloaders, @_central_bootloaders = {}, []
         @_bootloader_map = Hash.new{|h,k| h[k] = {:before => [], :after => []}}
       end
@@ -139,7 +139,7 @@ module Pancake
     # Access to the stack that this bootloader is responsible for
     # :api: public
     def stack
-      @stack ||= Object.full_const_get(self.name.split("::")[0..-2].join("::"))
+      @stack ||= self.name.split("::")[0..-2].join("::").constantize
     end
 
     # Resets the bootloaders on the stack

data/lib/pancake/configuration.rb

@@ -2,7 +2,7 @@ module Pancake
   class Configuration
 
     class Base
-      class_inheritable_reader :defaults
+      extlib_inheritable_reader :defaults
       @defaults = Hash.new{|h,k| h[k] = {:value => nil, :description => ""}}
 
       # Set a default on the the configuartion

data/lib/pancake/core_ext/class.rb

@@ -36,9 +36,9 @@ class Class
       end # unless
     end # ivars.each
   end # self.deep_inheritable_reader
-  
+
   def deep_copy_class_inheritable_accessor(*ivars)
     deep_copy_class_inheritable_reader(*ivars)
-    class_inheritable_writer(*ivars)
+    extlib_inheritable_writer(*ivars)
   end
-end # Class
+end # Class

data/lib/pancake/errors.rb

@@ -1,7 +1,7 @@
 module Pancake
   module Errors
     class HttpError < StandardError
-      class_inheritable_accessor :name, :code, :description
+      extlib_inheritable_accessor :error_name, :code, :description
 
       def name; self.class.name; end
 
@@ -12,7 +12,7 @@ module Pancake
     end
 
     class NotFound < HttpError
-      self.name = "Not Found"
+      self.error_name = "Not Found"
       self.code = 404
       self.description = "The requested resource could not be found but may be available again in the future."
     end
@@ -26,13 +26,13 @@ module Pancake
     end
 
      class Unauthorized < HttpError
-       self.name = "Unauthorized"
+       self.error_name = "Unauthorized"
        self.code = 401
        self.description = "Authentication is required to access this resource."
      end
 
      class Forbidden < HttpError
-       self.name = "Forbidden"
+       self.error_name = "Forbidden"
        self.code = 403
        self.description = "Access to this resource is denied."
      end
@@ -40,7 +40,7 @@ module Pancake
      class Server < HttpError
        attr_accessor :exceptions
 
-       self.name = "Server Error"
+       self.error_name = "Server Error"
        self.code = 500
        self.description = "An internal server error"
 
@@ -51,12 +51,10 @@ module Pancake
      end
 
      class NotAcceptable < HttpError
-       self.name =  "Not Acceptable"
+       self.error_name =  "Not Acceptable"
        self.code = 406
        self.description = "The requeseted format could not be provided"
      end
 
-
-
   end
 end

data/lib/pancake/generators.rb

@@ -1,4 +1,5 @@
 require 'thor'
+require 'thor/group'
 require 'extlib'
 
 require File.join(File.dirname(__FILE__), "generators", "base.rb")

data/lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/environments/development.rb.tt

@@ -1,8 +1,5 @@
 Pancake.logger.info "Loading Development Environment"
 
-# Set the middleware lables to load
-Pancake.stack_labels = [:development]
-
 # Pancake.handle_errors!(true) # uncomment to have the stack handle any errors that occur
 
 class <%= stack_name.camel_case %>

data/lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/environments/production.rb.tt

@@ -1,8 +1,5 @@
 Pancake.logger.info "Loading Production Environment"
 
-# Set the middleware lables to load
-Pancake.stack_labels = [:production]
-
 Pancake.handle_errors!(true) # uncomment to have the stack handle any errors that occur
 
 class <%= stack_name.camel_case %>

data/lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/environments/staging.rb.tt

@@ -1,8 +1,5 @@
 Pancake.logger.info "Loading Staging Environment"
 
-# Set the middleware lables to load
-Pancake.stack_labels = [:staging]
-
 Pancake.handle_errors!(true) # uncomment to have the stack handle any errors that occur
 
 class <%= stack_name.camel_case %>

data/lib/pancake/hooks/inheritable_inner_classes.rb

@@ -1,30 +1,30 @@
 module Pancake
-  module Hooks 
+  module Hooks
     module InheritableInnerClasses
       def self.extended(base)
         base.class_eval do
-          class_inheritable_reader :_inhertiable_inner_classes
+          extlib_inheritable_reader :_inhertiable_inner_classes
           @_inhertiable_inner_classes = []
         end
       end # extended
-  
+
       # Declare inner classes to be inherited when the outer class in inherited
       # The best way to show this is by example:
       #
-      # @example 
+      # @example
       #   class Foo
       #     inheritable_inner_class :Bar
       #
       #     class Bar
       #     end
       #   end
-      #   
+      #
       #   class Baz < Foo
       #     # When Foo is inherited, the following occurs
       #     class Bar < Foo::Bar; end
       #   end
       #
-      # This provides a more organic inheritance where the child gets their own 
+      # This provides a more organic inheritance where the child gets their own
       # version of the inner class which is actually inherited from the parents inner class.
       # The inheritance chain remains intact.
       #
@@ -39,7 +39,7 @@ module Pancake
         end
         _inhertiable_inner_classes
       end
-      
+
       # The inherited hook that sets up inherited inner classes.  Remember if you overwrite this method, you should
       # call super!
       #
@@ -51,10 +51,9 @@ module Pancake
         class_defs = inheritable_inner_classes.map do |klass|
           "class #{klass} < superclass::#{klass}; end\n"
         end
-        # puts "#{base.name} is INHERITING INNER CLASSES #{class_defs.inspect}"
         base.class_eval(class_defs.join)
       end
-      
+
     end # InheritableInnerClasses
   end # Hooks
-end # Pancake
+end # Pancake

data/lib/pancake/hooks/on_inherit.rb

@@ -3,22 +3,22 @@ module Pancake
     module OnInherit
       def self.extended(base)
         base.class_eval do
-          class_inheritable_reader :_on_inherit
+          extlib_inheritable_reader :_on_inherit
           @_on_inherit = []
         end
       end
-    
+
       # Provides an inheritance hook to all extended classes
-      # Allows ou to hook into the inheritance 
+      # Allows ou to hook into the inheritance
       def inherited(base)
         super
         _on_inherit.each{|b| b.call(base,self)}
       end
-    
+
       # A hook to add code when the stack is inherited
       # The code will be executed when the class is inherited
-      # 
-      # @example 
+      #
+      # @example
       #   MyClass.on_inherit do |base, parent|
       #     # do stuff here between the child and parent
       #   end
@@ -31,4 +31,4 @@ module Pancake
       end
     end # OnInherit
   end # Hooks
-end # Pancake
+end # Pancake

data/lib/pancake/logger.rb

@@ -1,16 +1,3 @@
-# Pancake::Logger == Merb::Logger
-class Pancake::Logger < Extlib::Logger
-  # :api: public
-  def verbose!(message, level = :warn)
-    send("#{level}!", message) if Pancake.configuration.verbose_logging
-  end
-
-  # :api: public
-  def verbose(message, level = :warn)
-    send(level, message) if Pancake.configuration.verbose_logging
-  end
-end
-
 # require "time" # httpdate
 # ==== Public Pancake Logger API
 #
@@ -62,7 +49,7 @@ module Pancake
     # :warn:: A warning
     # :info:: generic (useful) information about system operation
     # :debug:: low-level information for developers
-    Levels = Mash.new({
+    Levels = Hashie::Mash.new({
       :fatal => 7,
       :error => 6,
       :warn  => 4,

data/lib/pancake/master.rb

@@ -19,8 +19,7 @@ module Pancake
     # @api public
     # @author Daniel Neighman
     def start(opts, &block)
-      raise "You must specify a root directory for pancake" unless opts[:root]
-      self.root = opts[:root]
+      self.root = opts[:root] || Dir.pwd
 
       # Build Pancake
       the_app = instance_eval(&block)
@@ -45,52 +44,15 @@ module Pancake
       File.expand_path(File.join(File.dirname(file), *args))
     end
 
-    # Labels that specify what kind of stack you're intending on loading.
-    # This is a simliar concept to environments but it is in fact seperate conceptually.
-    #
-    # The reasoning is that you may want to use a particular stack type or types.
-    # By using stack labels, you can define middleware to be active.
-    #
-    # @example
-    #   Pancake.stack_labels == [:development, :demo]
-    #
-    #   # This would activate middleware marked with :development or :demo or the implicit :any label
-    #
-    # @return [Array<Symbol>]
-    #   An array of labels to activate
-    #   The default is [:production]
-    # @see Pancake.stack_labels= to set the labels for this stack
-    # @see Pancake::Middleware#stack to see how to specify middleware to be active for the given labels
-    # @api public
-    # @author Daniel Neighman
-    def stack_labels
-      return @stack_labels unless @stack_labels.nil? || @stack_labels.empty?
-      self.stack_labels = [:production]
-    end
-
-    # Sets the stack labels to activate the associated middleware
-    #
-    # @param [Array<Symbol>, Symbol] An array of labels or a single label, specifying the middlewares to activate
-    #
-    # @example
-    #   Pancake.stack_labels = [:demo, :production]
-    #
-    # @see Pancake.stack_labels
-    # @see Pancake::Middleware#stack
-    # @api public
-    # @author Daniel Neighman
-    def stack_labels=(*labels)
-      @stack_labels = labels.flatten.compact
-    end
 
     def handle_errors!(*args)
       @handle_errors = begin
-                         if args.size > 1
-                           args.flatten
-                         else
-                           args.first
-                         end
-                      end
+        if args.size > 1
+          args.flatten
+        else
+          args.first
+        end
+      end
     end
 
     def handle_errors?