wrapt 0.1.6 → 0.1.7

data/lib/wrapt/wrapt.rb

@@ -35,12 +35,14 @@ class Wrapt
   #   Default format, default layout or declare the layouter as the "master"
   #
   # @see Wrapt#master!
+  # @see Wrapt#defer!
   # @see Wrapt#layout_dirs
   # @see Wrapt#default_format
   # @see Wrapt#default_template
   def initialize(app)
-    @app = app
+    @app    = app
     @master = false
+    @defer  = false
     yield self if block_given?
   end
 
@@ -54,11 +56,24 @@ class Wrapt
   end
 
   # Checks to see if this layouter is a master
-  # @api private
+  # @api public
   def master?
     !!@master
   end
 
+  # Defers this layout.  Meaning that if there is another layout already in the environment
+  # That should be used and this one should do nothing.
+  # @api public
+  def defer!
+    @defer = true
+  end
+
+  # Checks to see if this mdidleware should be defered
+  # @api public
+  def defered?
+    !!@defer
+  end
+
   # Wrapt allows you to ignore layouts from the client side.
   #
   # This may be useful for esi, or ajax, where you want the content, but not the layout
@@ -95,7 +110,7 @@ class Wrapt
   def call(env)
     env['request.variables'] ||= Hashie::Mash.new
     layout = env['layout']
-    if !layout || (layout && !layout.master?)
+    if !layout || (!self.defered? && !layout.master?)
       env['layout'] = Layout.new(self, env)
     end
     r = @app.call(env) # just return what the app returns… If it wants a layout, it will return it.

data/spec/wrapt_spec.rb

@@ -120,7 +120,10 @@ describe Wrapt do
 
   describe "injecting into the environment" do
     before do
-      @wrapt = Wrapt.new(SpecWraptApp){|w| w.default_template = :wrapper}
+      @wrapt = Wrapt.new(SpecWraptApp){|w|
+        w.default_template = :wrapper
+        w.layout_dirs = layouts_dirs
+      }
       @env = Rack::MockRequest.env_for("/")
     end
 
@@ -173,6 +176,24 @@ describe Wrapt do
       layout = env['layout']
       layout.wrapt.should == @wrapt
     end
+
+    it "should allow me to add a default layout that is not used when there is an upstream layout" do
+      env = Rack::MockRequest.env_for("/foo.html")
+
+      wrapt2 = Wrapt.new(SpecWraptApp) do |wrapt|
+        wrapt.defer!
+        wrapt.default_template = :other
+        wrapt.layout_dirs = layouts_dirs
+      end
+
+      s = @wrapt.call(env)
+      env['layout'].should_not be_nil
+      r = wrapt2.call(env)
+
+      result = r[2].body.to_s
+      result.should include("Wrapper Template")
+      result.should_not include("Other template")
+    end
   end
 
   describe Wrapt::Layout do

data/wrapt.gemspec

@@ -3,7 +3,7 @@ require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{wrapt}
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: wrapt
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -75,9 +75,6 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/wrapt_spec.rb
-- VERSION
-- wrapt-0.1.3.gem
-- wrapt-0.1.5.gem
 - wrapt.gemspec
 has_rdoc: true
 homepage: http://github.com/hassox/wrapt

data/VERSION

@@ -1 +0,0 @@
-0.1.0