pancake 0.1.27 → 0.1.28

data/TODO

@@ -1,8 +1,7 @@
 TODO:
 
 * Add default middleware to the short stack
-* Add a default base template and some default css to the short stack
-* Add bundler support
-* Do some introductory posts
+* Add before/after filters to the short stack
+* move the mount apps bootloader to after the before_build_stack bootloader which will allow us to mount application later and allow devs to add new things just before building the stack.
 * optimise template lookup
 

data/lib/pancake/bootloaders.rb

@@ -71,6 +71,12 @@ module Pancake
       _bootloaders[name]
     end
 
+    # Provides removal of a bootloader, by replacing it as an empty lambda
+    # :api: public
+    def delete(name)
+      !!self[name] && _bootloaders[name] = nil
+    end
+
     # Add a bootloader.  Inside the block we're inside a class definition.
     # Requirements: define a +run!+ method
     #
@@ -119,6 +125,7 @@ module Pancake
       options[:stack_class] ||= stack
 
       each(conditions) do |name, bl|
+        next if bl.nil?
         bl.call(options)
       end
     end

data/lib/pancake/generators/templates/micro/%stack_name%/config.ru.tt

@@ -3,7 +3,7 @@ require 'rubygems'
 require 'pancake'
 require ::File.join(::File.expand_path(::File.dirname(__FILE__)), "<%= stack_name %>")
 
-# get the application to run.  The applicadtion in the Pancake.start block
+# get the application to run.  The application in the Pancake.start block
 # is the master application.  It will have all requests directed to it through the
 # pancake middleware
 # This should be a very minimal file, but should be used when any stand alone code needs to be included

data/lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config.ru.tt

@@ -1,7 +1,7 @@
 require 'pancake'
 require ::File.join(::File.expand_path(::File.dirname(__FILE__)), "..", "<%= stack_name %>")
 
-# get the application to run.  The applicadtion in the Pancake.start block
+# get the application to run.  The application in the Pancake.start block
 # is the master application.  It will have all requests directed to it through the
 # pancake middleware
 # This should be a very minimal file, but should be used when any stand alone code needs to be included

data/lib/pancake/router.rb

@@ -37,7 +37,7 @@ module Pancake
   # @see http://github.com/joshbuddy/usher
   # @since 0.1.2
   # @author Daniel Neighman
-  class Router < Usher::Interface::RackInterface
+  class Router < Usher::Interface::Rack
     attr_writer :router
 
     CONFIGURATION_KEY = "pancake.request.configuration".freeze
@@ -113,7 +113,7 @@ module Pancake
     end
 
     # Adds a route to the router.
-    # @see Usher::Interface::RackInterface#add
+    # @see Usher::Interface::Rack#add
     def add(path, opts = {}, &block)
       opts = cooerce_options_to_usher(opts)
       route = super(path, opts)
@@ -162,13 +162,16 @@ module Pancake
       opts
     end
 
-    # Overwrites the method in Rack::Interface::RackInterface to mash
+    # Overwrites the method in Rack::Interface::Rack to mash
     # the usher.params into the rack request.params
     # @api private
     def after_match(request, response)
       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)
+
       request.env[ROUTE_KEY] = response.path.route
       request.env['rack.request.query_hash'] = Hashie::Mash.new(request.params) unless request.params.kind_of?(Hashie::Mash)
     end

data/lib/pancake/stack/bootloader.rb

@@ -25,7 +25,7 @@ end
 Pancake::Stack::BootLoader.add(:load_mounted_inits, :level => :init) do
   def run!
     # Mount any stacks this stack may have in it.
-    stack_class.paths_for(:mounts).each{|f| require f}
+    stack_class.paths_for(:mounts).each{|f| require f.join}
   end
 end
 

data/lib/pancake/stacks/short/stack.rb

@@ -170,8 +170,7 @@ module Pancake
         name = options.delete(:_name)
         options[:conditions] ||= {}
         options[:conditions][:request_method] = method.to_s.upcase unless method == :any
-        options[:default_values] ||= {}
-        options[:default_values][:action] = action_name
+        options[:action] ||= action_name
         r = router.add(path, options)
         r.name(name) if name
         r

data/lib/pancake.rb

@@ -13,7 +13,7 @@ require 'extlib/logger'
 require 'extlib/mash'
 require 'extlib/hash'
 require 'usher'
-require 'usher/interface/rack_interface'
+require 'usher/interface/rack'
 require 'tilt'
 
 module Pancake

data/spec/pancake/bootloaders_spec.rb

@@ -30,6 +30,15 @@ describe "Pancake::Stack::BootLoader" do
     FooStack::BootLoader[:my_initializer].should inherit_from(Pancake::BootLoaderMixin::Base)
   end
 
+  it "should allow me to remove a bootloader from another bootloader" do
+    FooStack::BootLoader.add(:foo){ def run!; $captures << :foo; end}
+    FooStack::BootLoader.add(:bar){ def run!; FooStack::BootLoader.delete(:removed); end }
+    FooStack::BootLoader.add(:removed){ def run!; $captures << :removed; end}
+    FooStack.new
+
+    $captures.should == [:foo]
+  end
+
   it "should allow me to add multiple boot loaders" do
     FooStack::BootLoader.add(:foo){ def run!; :foo; end}
     FooStack::BootLoader.add(:bar){ def run!; :bar; end}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2009-11-30 00:00:00 +11:00
+date: 2009-12-18 00:00:00 +11:00
 default_executable: pancake-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,6 +101,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.textile
+- TODO
 files: 
 - LICENSE
 - README.textile