wrapt 0.1.4 → 0.1.5

data/README.textile

@@ -93,6 +93,19 @@ You can also select the layout to use inside a request.  The following sets the
 end
 </code></pre>
 
+Ask the layout to check if a given layout is available.  You can then decide if you want to use that, or leave it as is.
+
+<pre><code>def call(env)
+  content = generate_content_somehow
+  layout = env['layout']
+  layout.template_name = 'error' if layout.template_name?('error')
+
+  layout.content = content
+  Rack::Response.new(layout).finish
+end
+</code></pre>
+
+
 h3. Format
 
 Layouts are associated with a format.  By default the format is html.  Tempaltes are selected by their name with <name>.<format>.<template_type>.

data/lib/wrapt/layout.rb

@@ -14,10 +14,20 @@ class Wrapt
 
     # Is the wrapt instance that created this layouter set as a master?
     # @see Wrapt#master?
+    # @api public
     def master?
       @wrapt.master?
     end
 
+    # Check to see if there is a template of a given name and options
+    # for this layouter.
+    #
+    # @see Wrapt#template
+    # @api public
+    def template_name?(name, opts = {})
+      !!@wrapt.template(name, opts)
+    end
+
     # Gets the format that this layouter has been set to.
     # Defaults to the default_format of the wrapt instance
     #
@@ -142,7 +152,7 @@ class Wrapt
       template = @wrapt.template(template, opts)
 
       output = if template
-        template.render(LayoutContext.new) do |*args|
+        template.render(LayoutContext.new(env)) do |*args|
           label = args.first || :content
           content_for[label]
         end

data/lib/wrapt/layout_context.rb

@@ -3,7 +3,16 @@ class Wrapt
   # Anything that is required to be avaible in the view context should be included into the Helpers module, or the LayoutContext
   # @see Wrapt::Helpers
   class LayoutContext
+    attr_reader :env
     include Tilt::CompileSite
     include Helpers
+
+    def initialize(env)
+      @env = env
+    end
+
+    def request
+      @request = Rack::Request.new(env)
+    end
   end
 end

data/spec/wrapt_spec.rb

@@ -322,5 +322,19 @@ describe Wrapt do
         $wrapped_content.should include("Other Template")
       end
     end
+
+    it "should respond true to a question for a template when there is one defined" do
+      env = Rack::MockRequest.env_for("/")
+      @wrapt.call(env)
+      layout = env['layout']
+      layout.template_name?(:wrapper).should be_true
+    end
+
+    it "Shoudl respond false to a question for a template when there is one defined" do
+      env = Rack::MockRequest.env_for("/")
+      @wrapt.call(env)
+      layout = env['layout']
+      layout.template_name?(:not_a_template).should be_false
+    end
   end
 end

data/wrapt.gemspec

@@ -3,7 +3,7 @@ require 'bundler'
 
 Gem::Specification.new do |s|
   s.name = %q{wrapt}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Daniel Neighman"]
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
 
-  s.files = Dir[File.join('.', "**/*")]
+  s.files = Dir["**/*"]
 
   s.add_dependency 'tilt'
   s.add_dependency 'hashie'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Daniel Neighman
@@ -50,29 +50,28 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- ./Gemfile
-- ./Gemfile.lock
-- ./lib/wrapt/helpers.rb
-- ./lib/wrapt/layout.rb
-- ./lib/wrapt/layout_context.rb
-- ./lib/wrapt/wrapt.rb
-- ./lib/wrapt.rb
-- ./LICENSE
-- ./Rakefile
-- ./README.textile
-- ./spec/alt_layouts/second.html.haml
-- ./spec/layouts/first.html.haml
-- ./spec/layouts/multiple.html.haml
-- ./spec/layouts/other.html.haml
-- ./spec/layouts/wrapper.html.haml
-- ./spec/layouts/wrapper.jsonp.erb
-- ./spec/layouts/wrapper.xml.haml
-- ./spec/spec.opts
-- ./spec/spec_helper.rb
-- ./spec/wrapt_spec.rb
-- ./VERSION
-- ./wrapt-0.1.3.gem
-- ./wrapt.gemspec
+- Gemfile
+- lib/wrapt/helpers.rb
+- lib/wrapt/layout.rb
+- lib/wrapt/layout_context.rb
+- lib/wrapt/wrapt.rb
+- lib/wrapt.rb
+- LICENSE
+- Rakefile
+- README.textile
+- spec/alt_layouts/second.html.haml
+- spec/layouts/first.html.haml
+- spec/layouts/multiple.html.haml
+- spec/layouts/other.html.haml
+- spec/layouts/wrapper.html.haml
+- spec/layouts/wrapper.jsonp.erb
+- spec/layouts/wrapper.xml.haml
+- spec/spec.opts
+- spec/spec_helper.rb
+- spec/wrapt_spec.rb
+- VERSION
+- wrapt-0.1.3.gem
+- wrapt.gemspec
 has_rdoc: true
 homepage: http://github.com/hassox/wrapt
 licenses: []

data/Gemfile.lock

@@ -1,72 +0,0 @@
---- 
-dependencies: 
-  ZenTest: 
-    group: 
-    - :test
-    version: ">= 0"
-  haml: 
-    group: 
-    - :test
-    version: ">= 0"
-  any_view: 
-    group: 
-    - :default
-    version: ">= 0"
-  rake: 
-    group: 
-    - :test
-    version: ">= 0"
-  hashie: 
-    group: 
-    - :default
-    version: ">= 0"
-  rspec: 
-    group: 
-    - :test
-    version: ">= 0"
-  rack: 
-    group: 
-    - :test
-    version: ">= 0"
-  rack-test: 
-    group: 
-    - :test
-    version: ">= 0"
-  tilt: 
-    group: 
-    - :default
-    version: ">= 0"
-specs: 
-- rake: 
-    version: 0.8.7
-- ZenTest: 
-    version: 4.3.1
-- tilt: 
-    version: "0.9"
-    source: 1
-- any_view: 
-    version: 0.2.0pre
-    source: 0
-- haml: 
-    version: 2.2.24
-- hashie: 
-    version: 0.2.0
-- rack: 
-    version: 1.1.0
-- rack-test: 
-    version: 0.5.3
-- rspec: 
-    version: 1.3.0
-hash: 418544cd843b148c4469663f63faf3628ffce373
-sources: 
-- Git: 
-    uri: git://github.com/hassox/any_view.git
-    git: git://github.com/hassox/any_view.git
-    ref: e1db4990883427eb634ae824ef95928f4ca51415
-- Git: 
-    uri: git://github.com/hassox/tilt.git
-    branch: :hassox
-    git: git://github.com/hassox/tilt.git
-    ref: 8c652c803c1a62ec9854e1c320bee58c40546349
-- Rubygems: 
-    uri: http://gemcutter.org