pancake 0.1.17 → 0.1.18

data/Rakefile

@@ -16,7 +16,7 @@ begin
     gem.add_dependency "thor"
     gem.add_dependency "rack"
     gem.add_dependency "tilt", ">=0.3"
-    gem.add_dependency "hashie", ">=0.1.3"
+    gem.add_dependency "hashie", ">=0.1.4"
     gem.add_dependency "mynyml-rack-accept-media-types"
     gem.require_path = 'lib'
     gem.autorequire = 'pancake'

data/bin/pancake-gen

@@ -4,12 +4,26 @@ require 'thor'
 require 'thor/runner'
 require 'pancake/generators'
 
-# TODO update for pancake to have a version
 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 "Unknown Generator"
+  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/generators/templates/micro/%stack_name%/Rakefile.tt

@@ -0,0 +1,40 @@
+require 'rubygems'
+require 'rake'
+require 'pancake'
+
+require File.join(Pancake.get_root(__FILE__), "<%= stack_name %>")
+Pancake.root = Pancake.get_root(__FILE__)
+THIS_STACK = <%= stack_name.camel_case %>
+<%= stack_name.camel_case %>.load_rake_tasks!(:master => true)
+
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new(:spec) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.spec_files = FileList['spec/**/*_spec.rb']
+end
+
+Spec::Rake::SpecTask.new(:rcov) do |spec|
+  spec.libs << 'lib' << 'spec'
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rcov = true
+end
+
+
+task :default => :spec
+
+require 'rake/rdoctask'
+Rake::RDocTask.new do |rdoc|
+  if File.exist?('VERSION.yml')
+    config = YAML.load(File.read('VERSION.yml'))
+    version = "#{config[:major]}.#{config[:minor]}.#{config[:patch]}"
+  else
+    version = ""
+  end
+
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title = "foo #{version}"
+  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+

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

@@ -22,7 +22,7 @@ end
 require File.join(File.dirname(__FILE__), "lib", "<%= stack_name %>")
 Pancake.root = Pancake.get_root(__FILE__, "lib", "<%= stack_name %>")
 THIS_STACK = <%= stack_name.camel_case %>
-<%= stack_name.camel_case %>.load_rake_tasks!
+<%= stack_name.camel_case %>.load_rake_tasks!(:master => true)
 
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|

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

@@ -1,3 +1,4 @@
+require 'pancake'
 class <%= stack_name.camel_case %> < Pancake::Stacks::Short
   add_root(__FILE__, "<%= stack_name %>")
 

data/lib/pancake/mixins/render.rb

@@ -96,8 +96,8 @@ module Pancake
           view_context_before_render(view_context)
 
           out = ""
-          case with
-          when Array
+
+          if with.kind_of?(Array)
             with.each do |item|
               as.nil? ? (opts[name] = item) : (opts[as] = item)
               out << view_context.render(template, opts)

data/lib/pancake/mixins/request_helper.rb

@@ -18,6 +18,11 @@ module Pancake
       end
       alias_method :v, :vars
 
+      # Get the configuration for this request.  This will be updated as the request makes its way through the stacks
+      def configuration
+        request.env[Pancake::Router::CONFIGURATION_KEY]
+      end
+
       # Generate a url for the current stacks router.
       #
       # @example
@@ -39,8 +44,7 @@ module Pancake
       # @api public
       # @author Daniel Neighman
       def url(name, opts = {})
-        konfig = request.env[Pancake::Router::CONFIGURATION_KEY]
-        konfig.router.generate(name, opts)
+        configuration.router.generate(name, opts)
       end
 
       # Generate the base url for the router that got you to this point.
@@ -64,8 +68,7 @@ module Pancake
       #  @api public
       #  @author Daniel Neighman
       def base_url(opts={})
-        konfig = request.env[Pancake::Router::CONFIGURATION_KEY]
-        konfig.router.base_url(opts)
+        configuration.router.base_url(opts)
       end
 
       # Generate a url for any registered configuration with a router

data/lib/pancake/stack/configuration.rb

@@ -1,5 +1,6 @@
 module Pancake
   class Stack
+    inheritable_inner_classes :Configuration
 
     class Configuration < Pancake::Configuration::Base
     end
@@ -28,7 +29,7 @@ end # Pancake
 # Setup the default configuration for each stack
 class Pancake::Stack::Configuration
   default :router, lambda{ _router }, "The router for this stack"
-  
+
   def _router
     @_router ||= begin
       unless stack.nil?
@@ -38,7 +39,7 @@ class Pancake::Stack::Configuration
         r.configuration = self
         r
       end
-                   
+
     end
   end
 end

data/lib/pancake/stack/stack.rb

@@ -77,8 +77,8 @@ module Pancake
     # @api public
     def self.load_rake_tasks!(opts={})
       stackup(opts) # load the application
+      master = opts.delete(:master) # Don't get the other stacks to boot as master
       opts[:_rake_files_loaded] ||= []
-
       # For each mounted application, load the rake tasks
       self::Router.mounted_applications.each do |app|
         if app.mounted_app.respond_to?(:load_rake_tasks!)

data/spec/pancake/mixins/request_helper_spec.rb

@@ -42,4 +42,13 @@ describe Pancake::Mixins::RequestHelper do
       foo.v.data.should == :some_data
     end
   end
+
+  describe "configuration" do
+    it "should get the configuraiton from the env" do
+      env = { Pancake::Router::CONFIGURATION_KEY => "konfig"}
+      foo = FooBar.new
+      foo.env = env
+      foo.configuration.should == "konfig"
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2009-11-13 00:00:00 +11:00
+date: 2009-11-14 00:00:00 +11:00
 default_executable: pancake-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -80,7 +80,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.3
+        version: 0.1.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: mynyml-rack-accept-media-types
@@ -127,6 +127,7 @@ files:
 - 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%/Rakefile.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%/public/.empty_directory