pancake 0.2.0 → 0.3.0

data/bin/pancake

@@ -0,0 +1,96 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'thor/runner'
+require 'pancake'
+
+Pancake.load_generators!
+
+class PancakeGeneratorRunner < Thor
+  map "-T" => :list, "-i" => :install, "-u" => :update, "-v" => :version
+
+desc "list [SEARCH]", "List the available pancake tasks (--substring means .*SEARCH)"
+  method_options :substring => :boolean, :all => :boolean
+  def list(search="")
+    search = ".*#{search}" if options["substring"]
+    search = /^#{search}.*/i
+    group  = options[:group] || "standard"
+
+    klasses = Thor::Base.subclasses.select do |k|
+      (options[:all] || k.group == group) && k.namespace =~ search
+    end
+
+    display_klasses(klasses)
+  end
+
+  def method_missing(meth, *args, &blk)
+    klass, task = Thor::Util.find_class_and_task_by_namespace(meth.to_s)
+    unless klass
+      puts "Could not find a generator for #{meth.to_s}"
+      exit(1)
+    end
+    args.unshift(task) if task
+    klass.start(args, :shell => self.shell)
+  end
+
+  private
+  def display_klasses(klasses)
+    klasses -= [Thor, Thor::Runner, Thor::Group]
+
+    # Remove subclasses
+    klasses.dup.each do |klass|
+      klasses -= Thor::Util.thor_classes_in(klass)
+    end
+
+    klasses.reject!{|k| k == self.class}
+
+    list = Hash.new { |h,k| h[k] = [] }
+    groups = klasses.select { |k| k.ancestors.include?(Thor::Group) }
+
+    # Get classes which inherit from Thor
+    (klasses - groups).each { |k| list[k.namespace] += k.printable_tasks(false) }
+
+    # Get classes which inherit from Thor::Base
+    groups.map! { |k| k.printable_tasks(false).first }
+    list["root"] = groups
+
+    # Order namespaces with default coming first
+    list = list.sort{ |a,b| a[0].sub(/^default/, '') <=> b[0].sub(/^default/, '') }
+    list.each { |n, tasks| display_tasks(n, tasks) unless tasks.empty? }
+  end
+
+  def display_tasks(namespace, list)
+    list.sort!{ |a,b| a[0] <=> b[0] }
+
+    say shell.set_color(namespace, :blue, true)
+    say "-" * namespace.size
+
+    print_table(list, :truncate => true)
+    say
+  end
+end
+
+PancakeGeneratorRunner.start
+
+#case ARGV.shift
+#when "short"
+#  Pancake::Generators::Short.start
+#when "micro"
+#  Pancake::Generators::Micro.start
+#when '-v', '--version'
+#  version_file = File.dirname(__FILE__) + '/../VERSION'
+#  if File.exists?(version_file) and version = File.read(version_file)
+#    puts "Pancake Version: #{version}"
+#  end
+#else
+#  puts %{
+#  Usage: pancake-gen [type|options] /path/to/your/app
+#
+#      Type can be:
+#        micro, short
+#
+#      Options:
+#      -v, --version                    Show the version number and quit.
+#      -h, --help                       Show this help message and quit.
+#  }
+#end
+

data/lib/pancake.rb

@@ -1,11 +1,12 @@
 require 'rubygems'
+#require 'hashie'
+$:.unshift File.join(File.dirname(__FILE__), "pancake", "vendor", "hashie", "lib")
 require 'hashie'
 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 'http_router'
 require 'tilt'
 
 module Pancake
@@ -14,16 +15,12 @@ module Pancake
   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
+  autoload    :PancakeConfig,   "pancake/defaults/configuration"
 
   module Hooks
     autoload :OnInherit,                'pancake/hooks/on_inherit'
@@ -45,6 +42,7 @@ module Pancake
 
   module Test
     autoload :Matchers,    "pancake/test/matchers"
+    autoload :Helpers,     "pancake/test/helpers"
   end
 end
 

data/lib/pancake/configuration.rb

@@ -71,7 +71,8 @@ module Pancake
             # If the default is a proc, do not cache it
             case defaults[name][:value]
             when Proc
-              instance_eval(&defaults[name][:value])
+              p = defaults[name][:value]
+              instance_eval &p
             else
               val = defaults[name][:value]
               val = val.dup rescue val
@@ -111,28 +112,6 @@ module Pancake
     end # self
   end # Configuration
 
-  class PancakeConfig < Configuration::Base
-    def stacks(label = nil)
-      @stacks ||=  {}
-      result = label.nil? ? @stacks : @stacks[label]
-      yield result if block_given?
-      result
-    end
-
-    def configs(label = nil)
-      @configs ||= Hash.new do |h,k|
-        if (k.is_a?(Class) || k.is_a?(Module)) && defined?(k::Configuration)
-          h[k] = k::Configuration.new
-        else
-          nil
-        end
-      end
-      result = label.nil? ? @configs : @configs[label]
-      yield result if block_given?
-      result
-    end
-  end
-
   def self.configuration
     @configuration ||= PancakeConfig.new
   end

data/lib/pancake/core_ext/object.rb

@@ -19,4 +19,4 @@ unless Object.method_defined?(:instance_exec)
       ret
     end
   end
-end
+end

data/lib/pancake/defaults/configuration.rb

@@ -1,4 +1,4 @@
-class Pancake::PancakeConfig
+class Pancake::PancakeConfig < Pancake::Configuration::Base
   default :log_path,        Proc.new{ "log/pancake_#{Pancake.env}.log"}
   default :log_level,       :info
   default :log_delimiter,   " ~ "
@@ -20,4 +20,24 @@ class Pancake::PancakeConfig
   def reset_log_stream!
     values.delete(:log_stream)
   end
+
+  def stacks(label = nil)
+    @stacks ||=  {}
+    result = label.nil? ? @stacks : @stacks[label]
+    yield result if block_given?
+    result
+  end
+
+  def configs(label = nil)
+    @configs ||= Hash.new do |h,k|
+      if (k.is_a?(Class) || k.is_a?(Module)) && defined?(k::Configuration)
+        h[k] = k::Configuration.new
+      else
+        nil
+      end
+    end
+    result = label.nil? ? @configs : @configs[label]
+    yield result if block_given?
+    result
+  end
 end

data/lib/pancake/generators.rb

@@ -1,8 +1,5 @@
 require 'thor'
 require 'thor/group'
-require 'extlib'
-
-require File.join(File.dirname(__FILE__), "generators", "base.rb")
 
 Dir[File.join(File.dirname(__FILE__), "generators", "*.rb")].each do |f|
  require f unless f == 'base.rb'

data/lib/pancake/hooks/inheritable_inner_classes.rb

@@ -3,8 +3,9 @@ module Pancake
     module InheritableInnerClasses
       def self.extended(base)
         base.class_eval do
-          extlib_inheritable_reader :_inhertiable_inner_classes
-          @_inhertiable_inner_classes = []
+          extlib_inheritable_reader :_inhertiable_inner_classes, :_before_inner_class_inheritance
+          @_inhertiable_inner_classes      = []
+          @_before_inner_class_inheritance = []
         end
       end # extended
 
@@ -40,6 +41,16 @@ module Pancake
         _inhertiable_inner_classes
       end
 
+      # Runs any hooks before the inheritance of any inner classes
+      #
+      # @api public
+      # @since 0.3.0
+      # @author Daniel Neighman
+      def before_inner_class_inheritance(&blk)
+        _before_inner_class_inheritance << blk if blk
+        _before_inner_class_inheritance
+      end
+
       # The inherited hook that sets up inherited inner classes.  Remember if you overwrite this method, you should
       # call super!
       #
@@ -49,11 +60,13 @@ module Pancake
       def inherited(base)
         super
         class_defs = inheritable_inner_classes.map do |klass|
+          _before_inner_class_inheritance.each{|blk| blk.call(base.superclass) }
           "class #{klass} < superclass::#{klass}; end\n"
         end
         base.class_eval(class_defs.join)
       end
 
+
     end # InheritableInnerClasses
   end # Hooks
 end # Pancake

data/lib/pancake/master.rb

@@ -7,6 +7,37 @@ module Pancake
 
   class << self
     attr_accessor :root
+    attr_accessor :_before_build, :_generators
+
+    def before_build(&blk)
+      unless _before_build
+        self._before_build = []
+      end
+      _before_build << blk if blk
+      _before_build
+    end
+
+    def generators(&blk)
+      self._generators = [] unless _generators
+      _generators << blk if blk
+      _generators
+    end
+
+    def load_generators!
+      return if @load_generators
+      @load_generators = true
+      generators.each{|b| b.call}
+
+      # load any global generator files
+      highest = {}
+      Gem.find_files("pancake/generators/global.rb").sort.reverse.each do |f|
+        f =~ /gems\/([^\/]+?)-(\d\.[^\/]+?)\/lib\/pancake/
+        highest[$1] ||= begin
+          require f
+          f
+        end
+      end
+    end
 
     # Start Pancake.  This provides a full pancake stack to use inside a rack application
     #
@@ -18,11 +49,13 @@ module Pancake
     #
     # @api public
     # @author Daniel Neighman
-    def start(opts, &block)
+    def start(opts = {}, &block)
       self.root = opts[:root] || Dir.pwd
 
       # Build Pancake
       the_app = instance_eval(&block)
+      before_build.each{|blk| blk.call}
+
       Pancake::Middleware.build(the_app, middlewares)
     end
 

data/lib/pancake/mixins/render.rb

@@ -70,7 +70,6 @@ module Pancake
           when Template
             name
           when String, Symbol
-
             template_names = case __template = _template_name_for(name, opts)
             when String, Symbol
               [__template]
@@ -176,7 +175,7 @@ module Pancake
         end
 
         def _partial_template_name_for(name, opts)
-          "_#{_template_name_for(name, opts)}"
+          "_#{name}"
         end
       end # InstanceMethods
     end # Render

data/lib/pancake/mixins/stack_helper.rb

@@ -19,7 +19,7 @@ module Pancake
           end
           ns = name.split("::")
           until ns.empty? || klass
-            r = ns.join("::").constantize
+            r = ActiveSupport::Inflector.constantize(ns.join("::"))
             if r.ancestors.include?(::Pancake::Stack)
               klass = r
             else

data/lib/pancake/router.rb

@@ -1,8 +1,4 @@
 module Pancake
-  # Get the ability to mark this as a consuming route.
-  class ::Usher::Route
-    attr_accessor :consuming
-  end
 
   # Generate a url for any pancake configuration that has a router
   #
@@ -28,17 +24,16 @@ module Pancake
     elsif app_name.respond_to?(:router)
       raise Pancake::Errors::UnknownRouter
     end
-    the_router.base_url(opts)
+    the_router.respond_to?(:base_url) ?
+      the_router.base_url(opts) :
+      "/"
   end
 
-  # The pancake router is a customized version of the Usher router.
-  # Usher is a fast tree based router that can generate routes, have
-  # nested routers, and even generate from nested routers.
-  # @see http://github.com/joshbuddy/usher
+  # The pancake router uses a http_router router
+  # @see http://github.com/joshbuddy/http_router
   # @since 0.1.2
   # @author Daniel Neighman
-  class Router < Usher::Interface::Rack
-    attr_writer   :router
+  class Router < HttpRouter
     attr_accessor :stack
 
     CONFIGURATION_KEY = "pancake.request.configuration".freeze
@@ -56,7 +51,6 @@ module Pancake
         @mounted_app, @mount_path = mounted_app, mount_path
         @stackup_with = opts.delete(:_stackup)      || :stackup
         @args         = opts.delete(:_args)         || []
-        @exact_match  = opts.delete(:_exact_match)  || false
         @options      = opts
       end
 
@@ -71,14 +65,8 @@ module Pancake
         !!@mounted
       end
 
-      def exact_match?
-        !!@exact_match
-      end
-
       def mount!(route)
         app = nil
-        route.consuming = true
-        route.match_partially! unless exact_match?
         if mounted_app.respond_to?(stackup_with)
           app = mounted_app.send(stackup_with, *args)
         else
@@ -86,10 +74,15 @@ module Pancake
         end
         route.to(app)
         route.name(@name) if @name
+        route.partial
         route
       end
     end
 
+    def dup
+      puts "Called DUP: #{caller.first}"
+      clone
+    end
 
     # Mounts an application in the router as a sub application in the
     # url space.  This will route directly to the sub application and
@@ -114,37 +107,13 @@ module Pancake
       end
     end
 
-    # Adds a route to the router.
-    # @see Usher::Interface::Rack#add
-    def add(path, opts = {}, &block)
-      opts = cooerce_options_to_usher(opts)
-      route = super(path, opts)
-      if block_given?
-        route.to(block)
-      end
-      route
-    end
-
-    # Generate a url
-    def url(name_or_path, options = {})
-      if Hash === name_or_path
-        name = nil
-        options = name_or_path
-      else
-        name = name_or_path
-      end
-      u = generate(name, options)
-      return u if u.nil?
-      u.empty? ? "/" : u
-    end
-
     def base_url(opts = {})
-      router.generator.generate_base_url(opts)
+      url_mount.nil? ? "/" : url_mount.url(opts)
     end
 
     def call(env)
       apply_layout = env[LAYOUT_KEY]
-      env[LAYOUT_KEY] = true if stack.use_layout?
+      env[LAYOUT_KEY] = true if stack && stack.use_layout?
 
       orig_config = env[CONFIGURATION_KEY]
       orig_route  = env[ROUTE_KEY]
@@ -158,29 +127,15 @@ module Pancake
     end
 
     private
-    # Canoodles the options into a format that usher is happy to
-    # accept.  This is so that we can have a different interface from
-    # the raw usher when we're first declaring the route.
-    # @api private
-    def cooerce_options_to_usher(opts)
-      defaults = opts.delete(:_defaults)
-      opts[:default_values] ||= {}
-      opts[:default_values].merge!(defaults) if defaults
-      opts
-    end
-
-    # Overwrites the method in Rack::Interface::Rack to mash
-    # the usher.params into the rack request.params
-    # @api private
-    def after_match(request, response)
+    def process_params(env, response)
+      request = Rack::Request.new(env)
       request.env['rack.request.query_hash'] = request.params.dup
       super
-      consume_path!(request, response) if !response.partial_match? && response.path.route.consuming
-      request.params.merge!(request.env['usher.params']) unless request.env['usher.params'].empty?
 
-      request.params.merge!(response.destination) if response.destination.is_a?(Hash)
+      env['router.params'] = Hashie::Mash.new(env['router.params']) if env['router.params'] && ! env['router.params'].empty?
 
-      request.env[ROUTE_KEY] = response.path.route
+      request.env['rack.request.query_hash'].merge!(env['router.params']) unless env['router.params'].nil?
+      # make the request params a hashie mash
       request.env['rack.request.query_hash'] = Hashie::Mash.new(request.params) unless request.params.kind_of?(Hashie::Mash)
     end
   end