pancake 0.2.0 → 0.3.0

data/spec/pancake/stack/stack_configuration_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe "pancake stack configuration" do
 

data/spec/pancake/stack/stack_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require 'spec_helper'
 
 describe "Pancake::Stack" do
   before(:each) do
@@ -48,7 +48,6 @@ describe "Pancake::Stack" do
   # describe "initialize stack" do
 
     it "should mark a stack as initialized once it has called the initialize_stack method" do
-      StackSpecStack::BootLoader
       StackSpecStack.roots << ::Pancake.get_root(__FILE__)
       StackSpecStack.initialize_stack
       StackSpecStack.should be_initialized
@@ -57,7 +56,51 @@ describe "Pancake::Stack" do
     it "should not be initialized when it has not called initialize_stack" do
       StackSpecStack.should_not be_initialized
     end
-  # end
+
+    describe "include pancake stack" do
+      before do
+        $captures = []
+        clear_constants(:GeneralMiddleware, :MySpecStack)
+        Pancake::StackMiddleware.reset!
+
+        class ::GeneralMiddleware
+          def initialize(app)
+            @app = app
+          end
+
+          def call(env)
+            $captures << self.class
+            @app.call(env)
+          end
+        end
+        Pancake.stack(:general).use(GeneralMiddleware)
+      end
+
+      it "should let me tell the stack to include the pancake stack" do
+        lambda do
+          StackSpecStack.include_pancake_stack!
+        end.should_not raise_error
+      end
+
+      it "should remember that I told it to include the pancake stack" do
+        StackSpecStack.include_pancake_stack!
+        StackSpecStack.include_pancake_stack?.should be_true
+      end
+
+      it "should not remember when inherited" do
+        StackSpecStack.include_pancake_stack!
+        class ::MySpecStack < StackSpecStack; end
+        MySpecStack.include_pancake_stack?.should be_false
+      end
+
+      it "should build the stack with the pancake stack out front" do
+        StackSpecStack.roots << Pancake.get_root(__FILE__)
+        StackSpecStack.include_pancake_stack!
+        stack = StackSpecStack.stackup
+        stack.should be_an_instance_of(GeneralMiddleware)
+      end
+    end
+
     describe "master stack" do
       before do
         @b4 = Pancake.master_stack
@@ -110,7 +153,7 @@ describe "Pancake::Stack" do
       end
 
       it "should load rake tasks for mounted applications" do
-        class ::FooSpecStack < Pancake::Stacks::Short
+        class ::FooSpecStack < Pancake::Stack
           add_root(__FILE__, "..", "fixtures", "tasks", "root2")
         end
         StackSpecStack.router.mount(FooSpecStack, "/foo")

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'haml'
 require 'json'
 
 ENV['RACK_ENV'] = "test"
-
+$:.unshift File.dirname(__FILE__)
 $:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 
 require 'pancake'
@@ -18,7 +18,7 @@ Dir[File.join(File.dirname(__FILE__), "helpers", "**/*.rb")].each{|f| require f}
 
 
 Spec::Runner.configure do |config|
-  config.include(Pancake::Matchers)
-  config.include(Pancake::Spec::Helpers)
+  config.include(Pancake::Test::Matchers)
+  config.include(Pancake::Test::Helpers)
   config.include(Rack::Test::Methods)
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -15,8 +15,8 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2010-05-30 00:00:00 +10:00
-default_executable: pancake-gen
+date: 2010-06-20 00:00:00 +10:00
+default_executable: pancake
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: ruby-debug
   requirement: *id001
+  name: wrapt
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -42,24 +42,24 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: wrapt
   requirement: *id002
+  name: rake
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency 
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 29
         segments: 
         - 0
-        - 7
-        - 1
-        version: 0.7.1
-  name: usher
+        - 2
+        - 5
+        version: 0.2.5
   requirement: *id003
+  name: http_router
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -68,13 +68,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 17
         segments: 
         - 0
         - 2
-        version: "0.2"
-  name: any_view
+        - 3
+        version: 0.2.3
   requirement: *id004
+  name: any_view
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
@@ -87,10 +88,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
   requirement: *id005
+  name: thor
   prerelease: false
-  type: :development
+  type: :runtime
 - !ruby/object:Gem::Dependency 
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -101,40 +102,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: hashie
   requirement: *id006
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
   name: rack-accept-media-types
-  requirement: *id007
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: thor
-  requirement: *id008
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,12 +117,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
+  requirement: *id007
   name: rack
-  requirement: *id009
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -158,12 +131,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
   name: json
-  requirement: *id010
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -172,46 +145,31 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id009
   name: rack-test
-  requirement: *id011
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1848230021
+        hash: -1848230024
         segments: 
         - 3
         - 0
         - 0
-        - beta3
-        version: 3.0.0.beta3
+        - beta4
+        version: 3.0.0.beta4
+  requirement: *id010
   name: activesupport
-  requirement: *id012
-  prerelease: false
-  type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id013 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 0
-        - 10
-        version: "0.10"
-  name: tilt
-  requirement: *id013
   prerelease: false
   type: :runtime
 description: Eat Pancake Stacks for Breakfast
 email: has.sox@gmail.com
 executables: 
-- pancake-gen
+- pancake
 extensions: []
 
 extra_rdoc_files: 
@@ -223,7 +181,6 @@ files:
 - README.textile
 - Rakefile
 - TODO.textile
-- lib/pancake/bootloaders.rb
 - lib/pancake/configuration.rb
 - lib/pancake/constants.rb
 - lib/pancake/core_ext/class.rb
@@ -232,32 +189,6 @@ files:
 - lib/pancake/defaults/configuration.rb
 - lib/pancake/defaults/middlewares.rb
 - lib/pancake/errors.rb
-- lib/pancake/generators/base.rb
-- lib/pancake/generators/micro_generator.rb
-- lib/pancake/generators/short_generator.rb
-- lib/pancake/generators/templates/common/dotgitignore
-- lib/pancake/generators/templates/common/dothtaccess
-- lib/pancake/generators/templates/micro/%stack_name%/%stack_name%.rb.tt
-- lib/pancake/generators/templates/micro/%stack_name%/config.ru.tt
-- lib/pancake/generators/templates/micro/%stack_name%/pancake_init.rb.tt
-- lib/pancake/generators/templates/micro/%stack_name%/Rakefile.tt
-- lib/pancake/generators/templates/micro/%stack_name%/views/root.html.haml
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/%stack_name%.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/config.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/environments/development.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/environments/production.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config/environments/staging.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/config.ru.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/tasks/%stack_name%.rake.tt
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/views/root.html.haml
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/LICENSE.tt
-- lib/pancake/generators/templates/short/%stack_name%/pancake_init.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/Rakefile.tt
-- lib/pancake/generators/templates/short/%stack_name%/README.tt
-- lib/pancake/generators/templates/short/%stack_name%/spec/%stack_name%_spec.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/spec/spec_helper.rb.tt
-- lib/pancake/generators/templates/short/%stack_name%/VERSION.tt
 - lib/pancake/generators.rb
 - lib/pancake/hooks/inheritable_inner_classes.rb
 - lib/pancake/hooks/on_inherit.rb
@@ -278,31 +209,35 @@ files:
 - lib/pancake/mixins/url.rb
 - lib/pancake/paths.rb
 - lib/pancake/router.rb
-- lib/pancake/stack/app.rb
-- lib/pancake/stack/bootloader.rb
 - lib/pancake/stack/configuration.rb
 - lib/pancake/stack/defaults/public/favicon.ico
 - lib/pancake/stack/defaults/tasks/pancake.rake
-- lib/pancake/stack/middleware.rb
 - lib/pancake/stack/router.rb
 - lib/pancake/stack/stack.rb
-- lib/pancake/stacks/short/bootloaders.rb
-- lib/pancake/stacks/short/controller.rb
-- lib/pancake/stacks/short/default/views/base.html.haml
-- lib/pancake/stacks/short/default/views/error.html.haml
-- lib/pancake/stacks/short/stack.rb
-- lib/pancake/stacks/short.rb
+- lib/pancake/test/helpers.rb
 - lib/pancake/test/matchers.rb
+- lib/pancake/vendor/hashie/Gemfile
+- lib/pancake/vendor/hashie/Gemfile.lock
+- lib/pancake/vendor/hashie/hashie.gemspec
+- lib/pancake/vendor/hashie/lib/hashie/clash.rb
+- lib/pancake/vendor/hashie/lib/hashie/dash.rb
+- lib/pancake/vendor/hashie/lib/hashie/hash.rb
+- lib/pancake/vendor/hashie/lib/hashie/hash_extensions.rb
+- lib/pancake/vendor/hashie/lib/hashie/mash.rb
+- lib/pancake/vendor/hashie/lib/hashie.rb
+- lib/pancake/vendor/hashie/LICENSE
+- lib/pancake/vendor/hashie/Rakefile
+- lib/pancake/vendor/hashie/README.rdoc
+- lib/pancake/vendor/hashie/spec/hashie/clash_spec.rb
+- lib/pancake/vendor/hashie/spec/hashie/dash_spec.rb
+- lib/pancake/vendor/hashie/spec/hashie/hash_spec.rb
+- lib/pancake/vendor/hashie/spec/hashie/mash_spec.rb
+- lib/pancake/vendor/hashie/spec/spec.opts
+- lib/pancake/vendor/hashie/spec/spec_helper.rb
+- lib/pancake/vendor/hashie/VERSION
 - lib/pancake.rb
-- lib/pancake/generators/templates/micro/%stack_name%/public/.empty_directory
-- lib/pancake/generators/templates/micro/%stack_name%/tmp/.empty_directory
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/models/.empty_directory
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/mounts/.empty_directory
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/public/.empty_directory
-- lib/pancake/generators/templates/short/%stack_name%/lib/%stack_name%/tmp/.empty_directory
-- spec/helpers/helpers.rb
-- spec/helpers/matchers.rb
-- spec/pancake/bootloaders_spec.rb
+- lib/pancake/vendor/hashie/.document
+- lib/pancake/vendor/hashie/.gitignore
 - spec/pancake/configuration_spec.rb
 - spec/pancake/constants_spec.rb
 - spec/pancake/defaults/configuration_spec.rb
@@ -395,19 +330,12 @@ files:
 - spec/pancake/mixins/stack_helper_spec.rb
 - spec/pancake/pancake_spec.rb
 - spec/pancake/paths_spec.rb
-- spec/pancake/stack/app_spec.rb
-- spec/pancake/stack/bootloader_spec.rb
-- spec/pancake/stack/middleware_spec.rb
 - spec/pancake/stack/router_spec.rb
 - spec/pancake/stack/stack_configuration_spec.rb
 - spec/pancake/stack/stack_spec.rb
-- spec/pancake/stacks/short/controller_spec.rb
-- spec/pancake/stacks/short/middlewares_spec.rb
-- spec/pancake/stacks/short/router_spec.rb
-- spec/pancake/stacks/short/stack_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- bin/pancake-gen
+- bin/pancake
 - bin/rubyforge
 has_rdoc: true
 homepage: http://github.com/hassox/pancake

data/bin/pancake-gen

@@ -1,30 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'thor'
-require 'thor/group'
-require 'thor/runner'
-require 'pancake/generators'
-
-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
-