pancake 0.1.10 → 0.1.12

data/Rakefile

@@ -11,7 +11,11 @@ begin
     gem.homepage = "http://github.com/hassox/pancake"
     gem.authors = ["Daniel Neighman"]
     gem.add_development_dependency "rspec"
-    gem.add_dependency "usher", ">=0.5.5"
+    gem.add_dependency "usher", ">=0.5.10"
+    gem.add_dependency "extlib"
+    gem.add_dependency "thor"
+    gem.add_dependency "rack"
+    gem.add_dependency "tilt", ">=0.3"
     gem.add_dependency "mynyml-rack-accept-media-types"
     gem.require_path = 'lib'
     gem.autorequire = 'pancake'

data/lib/pancake/bootloaders.rb

@@ -5,7 +5,7 @@ module Pancake
     class Base
       # :api: :public
       attr_accessor :config
-      
+
       # Sets options for the bootloder
       # By including conditions in the bootloader when you declare it
       # You can selectively run bootloaders later
@@ -14,38 +14,38 @@ module Pancake
         @options = opts
         @options[:level] ||= :default
       end
-      
+
       # Provides access to the bootloader options
       # :api: private
       def self.options # :nodoc:
         @options ||= {}
       end
-      
+
       def stack
         raise "No Stack Configured" unless @config[:stack]
         @config[:stack]
       end
-      
+
       def stack_class
         raise "No Stack Class Configured" unless @config[:stack_class]
         @config[:stack_class]
       end
-      
+
       def initialize(config)
         @config = config
       end
-      
+
       # Creates a new instance and runs it
       # :api: private
       def self.call(config)
         new(config).run!
       end
-      
+
       # Checks the conditions with the options of the bootloader
       # To see if this one should be run
       # Only the central bootloaders with the conditions will be checked
       # :api: private
-      def self.run?(conditions = {}) 
+      def self.run?(conditions = {})
         opts = options
         if conditions.keys.include?(:only)
           return conditions[:only].all?{|k,v| opts[k] == v}
@@ -56,7 +56,7 @@ module Pancake
         true
       end
     end
-    
+
     def self.extended(base)
       base.class_eval do
         class_inheritable_reader :_bootloaders, :_central_bootloaders, :_bootloader_map
@@ -64,14 +64,14 @@ module Pancake
         @_bootloader_map = Hash.new{|h,k| h[k] = {:before => [], :after => []}}
       end
     end
-    
+
     # Provides access to an individual bootloader
     # :api: public
     def [](name)
       _bootloaders[name]
     end
-    
-    # Add a bootloader.  Inside the block we're inside a class definition.  
+
+    # Add a bootloader.  Inside the block we're inside a class definition.
     # Requirements: define a +run!+ method
     #
     # Example
@@ -80,19 +80,19 @@ module Pancake
     #       # stuff
     #     end
     #   end
-    # 
+    #
     # :api: public
     def add(name, opts = {}, &block)
       _bootloaders[name] = Class.new(Pancake::BootLoaderMixin::Base, &block)
       raise "You must declare a #run! method on your bootloader" unless _bootloaders[name].method_defined?(:run!)
       before = opts[:before]
       after  = opts[:after]
-      
+
       if opts[:level]
         levels << opts[:level]
         levels.uniq!
       end
-      
+
       # If there are no before or after keys, add it to the central bootloaders
       if before
         _bootloader_map[before][:before] << name
@@ -103,10 +103,10 @@ module Pancake
       end
       _bootloaders[name].options = opts
       _bootloaders[name]
-    end      
-    
+    end
+
     # Runs the bootloaders in order
-    # :api: private 
+    # :api: private
     def run!(options = {}) # :nodoc:
       unless options.keys.include?(:only) || options.keys.include?(:except)
         options[:only] = {:level => :default}
@@ -122,19 +122,19 @@ module Pancake
         bl.call(options)
       end
     end
-    
+
     # Set the stack that this bootloader is responsible for.
     # :api: private
     def stack=(stack) # :nodoc:
       @stack = stack
     end
-    
+
     # 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("::"))
     end
-    
+
     # Resets the bootloaders on the stack
     # :api: public
     def reset!
@@ -142,21 +142,21 @@ module Pancake
       _bootloaders.clear
       _bootloader_map.clear
     end
-    
+
     # Yields each bootloader in order along with it's name
-    # 
+    #
     # Example
     #   FooStack::BootLoader.each do |name, bootloader|
     #     # do stuff
     #   end
-    # 
+    #
     # :api: public
     def each(conditions = {})
       _map_bootloaders(_central_bootloaders, conditions).each do |n|
         yield n, _bootloaders[n]
       end
     end
-    
+
     private
     # Map out the bootloaders by name to run.
     # :api: private
@@ -171,10 +171,10 @@ module Pancake
         end
       end.flatten.compact
     end
-    
+
     def levels
       @levels ||= [:default]
     end
 
   end # BootLoaders
-end # Pancake
+end # Pancake

data/lib/pancake/defaults/configuration.rb

@@ -10,7 +10,8 @@ class Pancake::PancakeConfig
     if Pancake.configuration.log_to_file
       log_dir = File.expand_path(File.join(Pancake.root, File.dirname(log_path)))
       FileUtils.mkdir_p(log_dir)
-      File.join(log_dir, File.basename(log_path))
+      log = File.join(log_dir, File.basename(log_path))
+      File.open(log, (File::WRONLY | File::APPEND | File::CREAT))
     else
       STDOUT
     end

data/lib/pancake/errors.rb

@@ -6,10 +6,11 @@ module Pancake
       def name; self.class.name; end
 
       def code; self.class.code; end
+      alias_method :status, :code
 
       def description; self.class.description; end
     end
-    
+
     class NotFound < HttpError
       self.name = "Not Found"
       self.code = 404
@@ -19,17 +20,17 @@ module Pancake
     class UnknownRouter < NotFound
       self.description = "The router could not be found"
     end
-    
+
     class UnknownConfiguration < NotFound
       self.description = "The configuration could not be found"
     end
-        
+
      class Unauthorized < HttpError
        self.name = "Unauthorized"
        self.code = 401
        self.description = "Authentication is required to access this resource."
      end
-     
+
      class Forbidden < HttpError
        self.name = "Forbidden"
        self.code = 403
@@ -54,8 +55,8 @@ module Pancake
        self.code = 406
        self.description = "The requeseted format could not be provided"
      end
-     
-       
-     
+
+
+
   end
 end

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

@@ -1,5 +1,6 @@
 class <%= stack_name.camel_case %> < Pancake::Stacks::Short
   add_root(__FILE__, "<%= stack_name %>")
+  initialize_stack
 end
 
 require ::File.join(Pancake.get_root(__FILE__, "<%= stack_name %>"), "<%= stack_name %>")

data/lib/pancake/generators/templates/short/%stack_name%/spec/%stack_name%_spec.rb.tt

@@ -1,6 +1,10 @@
 require ::File.expand_path(::File.dirname(__FILE__) + '/spec_helper')
 
 describe "<%= stack_name %>" do
+  def app
+    <%= stack_name %>.stackup
+  end
+
   it "fails" do
     fail "hey buddy, you should probably rename this file and start specing for real"
   end

data/lib/pancake/generators/templates/short/%stack_name%/spec/spec_helper.rb.tt

@@ -1,9 +1,13 @@
 require 'spec'
+require 'rack/test'
+require 'pancake'
+
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require '<%= stack_name -%>'
 
 Spec::Runner.configure do |config|
-  
+  config.include(Rack::Test::Methods)
+  config.include(Pancake::Test::Matchers)
 end

data/lib/pancake/generators/templates/stack/%stack_name%/lib/%stack_name%.rb.tt

@@ -1,3 +1,4 @@
 class <%= stack_name.camel_case %> < Pancake::Stack
   add_root __FILE__, "<%= stack_name %>"
+  initialize_stack
 end

data/lib/pancake/generators/templates/stack/%stack_name%/spec/%stack_name%_spec.rb.tt

@@ -1,6 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "<%= stack_name %>" do
+  def app
+    <%= stack_name %>.stackup
+  end
+
   it "fails" do
     fail "hey buddy, you should probably rename this file and start specing for real"
   end

data/lib/pancake/generators/templates/stack/%stack_name%/spec/spec_helper.rb.tt

@@ -1,9 +1,13 @@
 require 'spec'
+require 'rack/test'
+require 'pancake'
+
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require '<%= stack_name -%>'
 
 Spec::Runner.configure do |config|
-  
+  config.include(Rack::Test::Methods)
+  config.include(Pancake::Test::Matchers)
 end

data/lib/pancake/mixins/render/render.rb

@@ -32,10 +32,12 @@ module Pancake
           end
         end
 
-        _capture_methods[Tilt::HamlTemplate] = :_haml_capture
-        _capture_methods[Tilt::ERBTemplate ] = :_erb_capture
-        _concat_methods[ Tilt::HamlTemplate] = :_haml_concat
-        _concat_methods[ Tilt::ERBTemplate ] = :_erb_concat
+        _capture_methods[Tilt::HamlTemplate   ] = :_haml_capture
+        _capture_methods[Tilt::ERBTemplate    ] = :_erb_capture
+        _capture_methods[Tilt::ErubisTemplate ] = :_erb_capture
+        _concat_methods[ Tilt::HamlTemplate   ] = :_haml_concat
+        _concat_methods[ Tilt::ERBTemplate    ] = :_erb_concat
+        _concat_methods[ Tilt::ErubisTemplate ] = :_erb_concat
 
         module Renderer
           def render(template, opts = {})
@@ -55,6 +57,10 @@ module Pancake
             result
           end
 
+          def partial(*args)
+            _view_context_for.partial(*args)
+          end
+
           def _with_renderer(renderer)
             orig_renderer = @_current_renderer
             @_current_renderer = renderer

data/lib/pancake/mixins/render.rb

@@ -66,22 +66,47 @@ module Pancake
 
       module InstanceMethods
         def render(*args)
-          opts = Hash === args.last ? args.pop : {}
-          name = args.shift
-
+          opts          = Hash === args.last ? args.pop : {}
+          name          = args.shift
+          template_name = _template_name_for(name, opts)
           return opts[:text] if opts[:text]
 
-          # Get the template name to use
-          template = _template_name_for(name, opts)
-
           # Get the view context for the tempalte
-          template, vc_class = self.class._renderer_and_view_context_class_for(template)
+          template, vc_class = self.class._renderer_and_view_context_class_for(template_name)
 
           view_context = vc_class.new(env, self)
           view_context_before_render(view_context)
           view_context.render(template, opts)
         end
 
+        def partial(*args)
+          opts  = Hash === args.last ? args.pop : {}
+          opts  = opts.dup
+          name  = args.shift
+          with  = opts.delete(:with)
+          as    = opts.delete(:as)
+
+          partial_name = _partial_template_name_for(name, opts)
+          # Get the view context for the tempalte
+          template, vc_class = self.class._renderer_and_view_context_class_for(partial_name)
+
+          view_context = vc_class.new(env, self)
+          view_context_before_render(view_context)
+
+          out = ""
+          case with
+          when Array
+            with.each do |item|
+              as.nil? ? (opts[name] = item) : (opts[as] = item)
+              out << view_context.render(template, opts)
+            end
+          else
+            as.nil? ? (opts[name] = with) : (opts[as] = with)
+            out << view_context.render(template, opts)
+          end
+          out
+        end
+
         def template(name_or_template)
           case name_or_template
           when String, Symbol
@@ -93,6 +118,7 @@ module Pancake
           end
         end
 
+
         # A place holder method for any implementor that wants
         # to configure the view context prior to rendering occuring
         # any time this method is overwritten, it should call super!
@@ -106,6 +132,10 @@ module Pancake
           opts[:format] ||= params[:format] || :html
           "#{name}.#{opts[:format]}"
         end
+
+        def _partial_template_name_for(name, opts)
+          "_#{_template_name_for(name, opts)}"
+        end
       end # InstanceMethods
     end # Render
   end # Mixins

data/lib/pancake/mixins/request_helper.rb

@@ -41,6 +41,31 @@ module Pancake
         konfig.router.generate(name, opts)
       end
 
+      # Generate the base url for the router that got you to this point.
+      #
+      # @example
+      #   class MyApp
+      #     router do |r|
+      #       r.mount(SomeApp, "/some_app/:version")
+      #     end
+      #
+      #   include Pancake::RequestHelper
+      #   def call(env)
+      #     @env = env
+      #     base_url(:version => "1.0" #=> "/some_app/1.0
+      #   end
+      #  end
+      #
+      #  @see Usher
+      #  @see Pancake::Router.base_url_for
+      #  @see Pancake::Router#base_url
+      #  @api public
+      #  @author Daniel Neighman
+      def base_url(opts={})
+        konfig = request.env[Pancake::Router::CONFIGURATION_KEY]
+        konfig.router.base_url(opts)
+      end
+
       # Generate a url for any registered configuration with a router
       #
       # @example

data/lib/pancake/mixins/response_helper.rb

@@ -12,6 +12,12 @@ module Pancake
       def status=(st)
         @status = st
       end
+
+      def redirect(location, status = 302)
+        r = Rack::Response.new
+        r.redirect(location, status)
+        r
+      end
     end
   end
 end

data/lib/pancake/router.rb

@@ -21,6 +21,16 @@ module Pancake
     the_router.url(name_or_opts, opts)
   end
 
+  def self.base_url_for(app_name, opts={})
+    config = Pancake.configuration.configs(app_name)
+    the_router = if config && config.router
+      config.router
+    elsif app_name.respond_to?(:router)
+      raise Pancake::Errors::UnknownRouter
+    end
+    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.
@@ -28,21 +38,78 @@ module Pancake
   # @since 0.1.2
   # @author Daniel Neighman
   class Router < Usher::Interface::RackInterface
+    attr_writer :router
+
     CONFIGURATION_KEY = "pancake.request.configuration".freeze
+    ROUTE_KEY         = "pancake.request.matching_route".freeze
 
     class RackApplicationExpected < ArgumentError; end
     attr_accessor :configuration
+    class_inheritable_accessor :mounted_applications
+    self.mounted_applications = []
+
+    class MountedApplication
+      attr_accessor :mounted_app, :mount_path, :args, :stackup_with, :options,:mounted
+      def initialize(mounted_app, mount_path, opts = {})
+        @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
+
+      def name(name = nil)
+        unless name.nil?
+          @name = name
+        end
+        @name
+      end
+
+      def mounted?
+        !!@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
+          app = mounted_app
+        end
+        route.to(app)
+        route.name(@name) if @name
+        route
+      end
+    end
+
 
     # Mounts an application in the router as a sub application in the
     # url space.  This will route directly to the sub application and
-    # skip any middlewares etc.
+    # skip any middlewares etc defined on a stack
     def mount(mounted_app, path, options = {})
-      raise RackApplicationExpected unless mounted_app.respond_to?(:call)
-      exact_match = options.delete(:_exact)
-      route = add(path, options)
-      route.consuming = true
-      route.match_partially! unless exact_match
-      route.to(mounted_app)
+      mounted_app = MountedApplication.new(mounted_app, path, options)
+      self.class.mounted_applications << mounted_app
+      mounted_app
+    end
+
+    def mount_applications!
+      # need to set them as mounted here before we actually to mount them.
+      # if we just mounted them, the inheritance of the routes would mean that only the first would be mounted on this class
+      # and the rest would be mounted on the child class
+      apps = self.class.mounted_applications.select do |a|
+        a.mounted? ? false : (a.mounted = true)
+      end
+
+      apps.each do |app|
+        route = add(app.mount_path, app.options)
+        app.mount!(route)
+      end
     end
 
     # Adds a route to the router.
@@ -67,12 +134,18 @@ module Pancake
       generate(name, options)
     end
 
+    def base_url(opts = {})
+      router.generator.generate_base_url(opts)
+    end
+
     def call(env)
       orig_config = env[CONFIGURATION_KEY]
+      orig_route  = env[ROUTE_KEY]
       env[CONFIGURATION_KEY] = configuration
       super(env)
     ensure
       env[CONFIGURATION_KEY] = orig_config
+      env[ROUTE_KEY]         = orig_route
     end
 
     private
@@ -94,6 +167,7 @@ module Pancake
       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.env[ROUTE_KEY] = response.path.route
     end
   end
 end

data/lib/pancake/stack/bootloader.rb

@@ -15,7 +15,7 @@ end # Pancake
 # :level => :init bootloaders only have the stack class available
 # They do not have :stack available
 # These are not run directly, but are run from inherited stacks
-Pancake::Stack::BootLoader.add(:mount_applications, :level => :init) do
+Pancake::Stack::BootLoader.add(:load_mounted_inits, :level => :init) do
   def run!
     # Mount any stacks this stack may have in it.
     stack_class.roots.each do |root|
@@ -42,15 +42,6 @@ Pancake::Stack::BootLoader.add(:load_application, :level => :init) do
   end
 end
 
-Pancake::Stack::BootLoader.add(:load_routes, :level => :init) do
-  def run!
-    stack_class.roots.each do |root|
-      stack_class.paths_for(:router).each{|f| require f.join}
-    end
-  end
-end
-
-###### -================== Stack Building BootLoaders
 # Pancake stacks need to be built with the following options
 # MyApp::BootLoader.run!({
 #   :stack_class  => self.class,
@@ -61,12 +52,45 @@ end
 #
 #
 
+
+Pancake::Stack::BootLoader.add(:load_routes) do
+  def run!
+    stack_class.roots.each do |root|
+      stack_class.paths_for(:router).each{|f| require f.join}
+    end
+  end
+end
+
+Pancake::Stack::BootLoader.add(:before_mount_applicaions) do
+  def run!
+    stack_class.before_mount_applications.each{|blk| blk.call}
+  end
+end
+
+Pancake::Stack::BootLoader.add(:mount_applications) do
+  def run!
+    stack_class.router.mount_applications!
+  end
+end
+
 Pancake::Stack::BootLoader.add(:initialize_application) do
   def run!
     config[:app] ||= stack_class.new_app_instance
   end
 end
 
+Pancake::Stack::BootLoader.add(:after_initialize_application) do
+  def run!
+    stack_class.after_initialize_application.each{|blk| blk.call}
+  end
+end
+
+Pancake::Stack::BootLoader.add(:before_build_stack) do
+  def run!
+    stack_class.before_build_stack.each{|blk| blk.call}
+  end
+end
+
 Pancake::Stack::BootLoader.add(:build_stack) do
   def run!
     mwares = stack_class.middlewares(Pancake.stack_labels)
@@ -77,3 +101,9 @@ Pancake::Stack::BootLoader.add(:build_stack) do
     app_config.router.configuration = app_config
   end
 end
+
+Pancake::Stack::BootLoader.add(:after_build_stack) do
+  def run!
+    stack_class.after_build_stack.each{|blk| blk.call}
+  end
+end