pancake 0.1.8 → 0.1.10

data/lib/pancake.rb

@@ -24,9 +24,11 @@ module Pancake
   end
 
   module Mixins
+    autoload :RequestHelper,"pancake/mixins/request_helper"
     autoload :Publish,      "pancake/mixins/publish"
     autoload :Render,       "pancake/mixins/render"
     autoload :StackHelper, "pancake/mixins/stack_helper"
+    autoload :ResponseHelper,  "pancake/mixins/response_helper"
   end
 
   module Middlewares

data/lib/pancake/mixins/render.rb

@@ -10,8 +10,11 @@ module Pancake
         base.class_eval do
           extend  Pancake::Mixins::Render::ClassMethods
           include Pancake::Mixins::Render::InstanceMethods
+          include Pancake::Mixins::RequestHelper
 
-          class self::ViewContext < Pancake::Mixins::Render::ViewContext; end
+          class self::ViewContext < Pancake::Mixins::Render::ViewContext
+            include Pancake::Mixins::RequestHelper
+          end
           inheritable_inner_classes :ViewContext
 
           unless ancestors.include?(Pancake::Paths)
@@ -74,7 +77,7 @@ module Pancake
           # Get the view context for the tempalte
           template, vc_class = self.class._renderer_and_view_context_class_for(template)
 
-          view_context = vc_class.new(self)
+          view_context = vc_class.new(env, self)
           view_context_before_render(view_context)
           view_context.render(template, opts)
         end

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

@@ -8,10 +8,10 @@ module Pancake
         include Renderer
         include ContentInheritance
 
-
         attr_reader :_view_context_for
-        def initialize(renderer_for = nil)
+        def initialize(env, renderer_for = nil )
           super
+          @env = env
           @_view_context_for = renderer_for
         end
 

data/lib/pancake/mixins/request_helper.rb

@@ -3,29 +3,17 @@ module Pancake
     # Some helpers for requests that come in handy for applications that
     # are part of stacks
     module RequestHelper
+      VAULT_KEY = 'pancake.request.vault'
 
-      # A setter for the rack environment
-      # @api public
-      def env=(env)
-        @env = env
-      end
-
-      # An accessor for the rack environment variable
-      # @api public
-      def env
-        @env
-      end
-
-      def headers
-        @headers ||= {}
-      end
-
-      def status
-        @status ||= 200
-      end
-
-      def status=(st)
-        @status = st
+      # A data vault that allows you to carry data accross middlewares, controller / views etc.
+      # Stores the data in session for the length of the request.
+      #
+      # @example
+      #   v[:user] = @user
+      #   # This is now stored in the environment and is available later
+      def v
+        env[VAULT_KEY] ||= {}
+        env[VAULT_KEY]
       end
 
       # Generate a url for the current stacks router.
@@ -75,6 +63,18 @@ module Pancake
         end
       end
 
+      # A setter for the rack environment
+      # @api public
+      def env=(env)
+        @env = env
+      end
+
+      # An accessor for the rack environment variable
+      # @api public
+      def env
+        @env
+      end
+
       # A handy request method that gets hold of the current request
       # object for the current rack request.
       # Any including class _must_ provide an +env+ method that exposes

data/lib/pancake/mixins/response_helper.rb

@@ -0,0 +1,17 @@
+module Pancake
+  module Mixins
+    module ResponseHelper
+      def headers
+        @headers ||= {}
+      end
+
+      def status
+        @status ||= 200
+      end
+
+      def status=(st)
+        @status = st
+      end
+    end
+  end
+end

data/lib/pancake/stack/router.rb

@@ -4,8 +4,22 @@ module Pancake
     inheritable_inner_classes :Router
 
     class_inheritable_accessor :_router
+
     @_router = self::Router.new
 
+    # Resets the router to use the stacks namespaced router.
+    # This allows a router to mixin a module, and have that module
+    # mixed in to child stacks/routers.  Effectively, this will reset the scope of inheritance so that a stack type can have particular route helpers
+    #
+    # When the router is rest, any routes declared in parent stacks will be lost.
+    # @example
+    #   MyStack.reset_router! # => Replaces the current router with MyStack::Router (instance)
+    #
+    # @api public
+    def self.reset_router!
+      self._router = self::Router.new
+    end
+
     def self.router
       yield _router if block_given?
       _router

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

@@ -7,6 +7,7 @@ module Pancake
         extend  Mixins::Publish
         include Mixins::Render
         include Mixins::RequestHelper
+        include Mixins::ResponseHelper
         include Mixins::StackHelper
 
         class_inheritable_accessor :_handle_exception

data/spec/pancake/fixtures/stacks/short/foobar/views/template.html.haml

@@ -0,0 +1,3 @@
+.content
+  In Template
+= url(:foobar)

data/spec/pancake/fixtures/stacks/short/foobar/views/vault.html.haml

@@ -0,0 +1,3 @@
+.content
+  In Vault
+= v[:my_data]

data/spec/pancake/mixins/render/view_context_spec.rb

@@ -8,6 +8,10 @@ describe Pancake::Mixins::Render::ViewContext do
       include Pancake::Mixins::Render
       attr_accessor :params, :data
 
+      def initialize(env)
+        @env = env
+      end
+
       def _template_name_for(name, opts)
         "#{name}"
       end
@@ -33,6 +37,10 @@ describe Pancake::Mixins::Render::ViewContext do
       FooBar::ViewContext.should inherit_from(Pancake::Mixins::Render::ViewContext)
     end
 
+    it "should include the Pancake::Mixins::RequestHelper helper" do
+      (Pancake::Mixins::RequestHelper > FooBar::ViewContext).should be_true
+    end
+
     #it "should allow me to setup the view context before the view is run" do
     #  FooBar.class_eval do
     #    def view_context_before_render(context)
@@ -86,12 +94,12 @@ describe Pancake::Mixins::Render::ViewContext do
     end
 
     it "should provide access to the object the view context is rendering for" do
-      context = FooBar::ViewContext.new(@renderer)
+      context = FooBar::ViewContext.new({}, @renderer)
       context._view_context_for.should == @renderer
     end
 
     it "should grab the template from the view context when rendering" do
-      context = FooBar::ViewContext.new(@renderer)
+      context = FooBar::ViewContext.new({}, @renderer)
       @renderer.should_receive(:template).with(:foo).and_return(@renderer)
       context.render(:foo, :some => :opts)
     end
@@ -102,7 +110,7 @@ describe Pancake::Mixins::Render::ViewContext do
     end
 
     it "should render the haml template with a capture" do
-      result = FooBar.new.render(:capture_haml)
+      result = FooBar.new({}).render(:capture_haml)
       result.should_not include("captured haml")
 
       context = $captures.first
@@ -111,7 +119,7 @@ describe Pancake::Mixins::Render::ViewContext do
     end
 
     it "should capture in erb" do
-      result = FooBar.new.render(:capture_erb)
+      result = FooBar.new({}).render(:capture_erb)
       result.should_not include("captured erb")
       context = $captures.first
       context.should_not be_nil
@@ -119,19 +127,19 @@ describe Pancake::Mixins::Render::ViewContext do
     end
 
     it "should concat in haml" do
-      result = FooBar.new.render(:concat_haml)
+      result = FooBar.new({}).render(:concat_haml)
       result.should include("concatenated")
     end
 
     it "should concat in erb" do
-      result = FooBar.new.render(:concat_erb)
+      result = FooBar.new({}).render(:concat_erb)
       result.should include("concatenated")
     end
   end
 
   describe "content_block" do
     before do
-      @foo = FooBar.new
+      @foo = FooBar.new({})
     end
 
     it "should include the default text" do
@@ -174,7 +182,7 @@ describe Pancake::Mixins::Render::ViewContext do
 
   describe "super blocks" do
     before do
-      @foo = FooBar.new
+      @foo = FooBar.new({})
     end
 
     it "should render the super text" do
@@ -224,7 +232,7 @@ describe Pancake::Mixins::Render::ViewContext do
 
   describe "multiple context blocks" do
     before do
-      @foo = FooBar.new
+      @foo = FooBar.new({})
     end
 
     it "should allow nested default captures" do

data/spec/pancake/mixins/request_helper_spec.rb

@@ -24,4 +24,13 @@ describe Pancake::Mixins::RequestHelper do
     end
   end
 
+  describe "v" do
+    it "should store the data put into v into the env" do
+      env = {}
+      foo = FooBar.new
+      foo.env = env
+      foo.v[:data] = :some_data
+      env[Pancake::Mixins::RequestHelper::VAULT_KEY][:data].should == :some_data
+    end
+  end
 end

data/spec/pancake/stack/router_spec.rb

@@ -215,6 +215,19 @@ describe "stack router" do
     BarApp::Router.should inherit_from(FooApp::Router)
   end
 
+  it "should grab a new copy of the router rather than instantiate an inherited one" do
+    class ::BarApp < FooApp; end
+    FooApp.router.class.should == Pancake::Stack::Router
+    BarApp.router.class.should == Pancake::Stack::Router
+  end
+
+  it "should reset the router to the namespaced router" do
+    class ::BarApp < FooApp; end
+    BarApp.reset_router!
+    BarApp.router.class.should == BarApp::Router
+  end
+
+
   describe "generating urls inside an application" do
     before do
       class ::BarApp < FooApp;  end

data/spec/pancake/stacks/short/controller_spec.rb

@@ -107,6 +107,57 @@ describe Pancake::Stacks::Short::Controller do
     end
   end
 
+  describe "request helper methods" do
+    before do
+      class ::RequestFoo < Pancake::Stacks::Short
+        add_root(__FILE__, "..", "..", "fixtures", "stacks", "short", "foobar")
+        get "/foobar", :_name => :foobar do
+          url(:foobar)
+        end
+
+        get "/template", :_name => :template do
+          render :template
+        end
+
+        get "/vault" do
+          v[:my_data] = "some data"
+          render :vault
+        end
+      end
+    end
+
+    after do
+      clear_constants :RequestFoo
+    end
+
+    def app
+      RequestFoo.stackup
+    end
+
+    it "should include the request helper methods" do
+      (Pancake::Mixins::RequestHelper > ShortFoo::Controller).should be_true
+    end
+
+    it "should provide access to the request methods in the controller" do
+      result = get "/foobar"
+      result.body.should == "/foobar"
+    end
+
+    it "should provide access to the helper methods in the views" do
+      result = get "/template"
+      result.status.should == 200
+      result.body.should include("/foobar")
+      result.body.should include("In Template")
+    end
+
+    it "should allow me to get information between the view and the controller" do
+      result = get "/vault"
+      result.status.should == 200
+      result.body.should include("some data")
+      result.body.should include("In Vault")
+    end
+  end
+
   describe "accept type negotiations" do
     before do
       class ::ShortBar < Pancake::Stacks::Short
@@ -247,8 +298,6 @@ describe Pancake::Stacks::Short::Controller do
         r = get "/foo.svg"
         r.status.should == 406
       end
-
-
     end
 
     describe "custom error handling" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pancake
 version: !ruby/object:Gem::Version 
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -9,7 +9,7 @@ autorequire: pancake
 bindir: bin
 cert_chain: []
 
-date: 2009-10-12 00:00:00 +11:00
+date: 2009-10-13 00:00:00 +11:00
 default_executable: pancake-gen
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -127,6 +127,7 @@ files:
 - lib/pancake/mixins/render/template.rb
 - lib/pancake/mixins/render/view_context.rb
 - lib/pancake/mixins/request_helper.rb
+- lib/pancake/mixins/response_helper.rb
 - lib/pancake/mixins/stack_helper.rb
 - lib/pancake/mixins/url.rb
 - lib/pancake/paths.rb
@@ -198,6 +199,8 @@ files:
 - spec/pancake/fixtures/stacks/short/foobar/other_root/views/base.html.haml
 - spec/pancake/fixtures/stacks/short/foobar/views/basic.html.haml
 - spec/pancake/fixtures/stacks/short/foobar/views/inherited_from_base.html.haml
+- spec/pancake/fixtures/stacks/short/foobar/views/template.html.haml
+- spec/pancake/fixtures/stacks/short/foobar/views/vault.html.haml
 - spec/pancake/hooks/on_inherit_spec.rb
 - spec/pancake/inheritance_spec.rb
 - spec/pancake/middleware_spec.rb