sinatra-content-for2 0.2.3 → 0.2.4

data/.gitignore

@@ -1,3 +1,4 @@
-doc
-dist
-tmp
+doc/
+dist/
+tmp/
+*.swp

data/README.rdoc

@@ -29,6 +29,8 @@ so if you have problems with that, make sure to check for this.
 
 <B>Note</b> Use <tt><%= yield_content ... %></tt> in Erubis.
 
+Also we provide content_for? method that checks that block is defined.
+
 == Usage
 
 If you're writing "classic" style apps, then requring 
@@ -51,3 +53,5 @@ Code by foca[http://github.com/foca], inspired on the Ruby on Rails
 helpers with the same name. Haml support by mattly[http://github.com/mattly].
 Erubis support by hiroyuki[http://github.com/hryk].
 Bundler/etc. unicode compatibility by arnabc[https://github.com/arnabc] and akzhan[https://github.com/akzhan].
+content_for? method by BrunoGrasselli[https://github.com/BrunoGrasselli].
+

data/lib/sinatra/content_for2.rb

@@ -16,6 +16,20 @@ module Sinatra
     def content_for(key, &block)
       content_blocks[key.to_sym] << block if block_given?
     end
+    
+    # Check if a block of content with the given key was defined. For
+    # example:
+    #
+    #     <% content_for :head do %>
+    #       <script type="text/javascript" src="/foo.js"></script>
+    #     <% end %>
+    #
+    #     <% if content_for? :head %>
+    #       <span>content "head" was defined.</span>
+    #     <% end %>
+    def content_for?(key)
+      content_blocks[key.to_sym].any?
+    end
 
     # Render the captured blocks for a given key. For example:
     #

data/sinatra-content-for2.gemspec

@@ -2,8 +2,8 @@
 
 Gem::Specification.new do |s|
   s.name    = "sinatra-content-for2"
-  s.version = "0.2.3"
-  s.date    = "2011-01-13"
+  s.version = "0.2.4"
+  s.date    = "2011-02-04"
 
   s.description = "Small Sinatra extension to add a content_for helper similar to Rails'"
   s.summary     = "Small Sinatra extension to add a content_for helper similar to Rails'"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.require_paths     = ["lib"]
   s.rubyforge_project = "sinatra-ditties"
   s.has_rdoc          = true
-  s.rubygems_version  = "1.3.1"
+  s.rubygems_version  = "1.3.7"
 
   s.add_dependency "sinatra"
 

data/test/content_for_test.rb

@@ -8,27 +8,31 @@ rescue LoadError
 end
 
 require 'contest'
-require 'sinatra/test'
+require 'sinatra'
+require 'erubis'
 require 'haml'
+require 'rack/test'
 
 begin
   require 'redgreen'
 rescue LoadError
 end
 
-require File.dirname(__FILE__) + '/../lib/sinatra/content_for'
+$LOAD_PATH.unshift('./lib')
+
+require 'sinatra/content_for2'
 
 Sinatra::Base.set :environment, :test
 
 module Sinatra
   class Base
     set :environment, :test
-    helpers ContentFor
+    helpers ContentFor2
   end
 end
 
 class Test::Unit::TestCase
-  include Sinatra::Test
+  include Rack::Test::Methods
 
   class << self
     alias_method :it, :test
@@ -37,11 +41,15 @@ class Test::Unit::TestCase
   def mock_app(base=Sinatra::Base, &block)
     @app = Sinatra.new(base, &block)
   end
+
+  def app
+    @app
+  end
 end
 
 class ContentForTest < Test::Unit::TestCase
-  context 'using erb' do
-    def erb_app(view)
+  context 'using erubis' do
+    def erubis_app(view)
       mock_app {
         layout { '<% yield_content :foo %>' }
         get('/') { erb view } 
@@ -49,23 +57,23 @@ class ContentForTest < Test::Unit::TestCase
     end
 
     it 'renders blocks declared with the same key you use when rendering' do
-      erb_app '<% content_for :foo do %>foo<% end %>'
+      erubis_app '<% content_for :foo do %>foo<% end %>'
 
       get '/'
-      assert ok?
-      assert_equal 'foo', body
+      assert last_response.ok?
+      assert_equal 'foo', last_response.body
     end
 
     it 'does not render a block with a different key' do
-      erb_app '<% content_for :bar do %>bar<% end %>'
+      erubis_app '<% content_for :bar do %>bar<% end %>'
 
       get '/'
-      assert ok?
-      assert_equal '', body
+      assert last_response.ok?
+      assert_equal '', last_response.body
     end
 
     it 'renders multiple blocks with the same key' do
-      erb_app <<-erb_snippet
+      erubis_app <<-erb_snippet
         <% content_for :foo do %>foo<% end %>
         <% content_for :foo do %>bar<% end %>
         <% content_for :baz do %>WON'T RENDER ME<% end %>
@@ -73,8 +81,8 @@ class ContentForTest < Test::Unit::TestCase
       erb_snippet
 
       get '/'
-      assert ok?
-      assert_equal 'foobarbaz', body
+      assert last_response.ok?
+      assert_equal 'foobarbaz', last_response.body
     end
 
     it 'passes values to the blocks' do
@@ -84,8 +92,8 @@ class ContentForTest < Test::Unit::TestCase
       }
 
       get '/'
-      assert ok?
-      assert_equal '<i>1</i> 2', body
+      assert last_response.ok?
+      assert_equal '<i>1</i> 2', last_response.body
     end
   end
 
@@ -104,8 +112,8 @@ class ContentForTest < Test::Unit::TestCase
 haml_end
 
       get '/'
-      assert ok?
-      assert_equal "foo\n", body
+      assert last_response.ok?
+      assert_equal "foo\n", last_response.body
     end
 
     it 'does not render a block with a different key' do
@@ -115,8 +123,8 @@ haml_end
 haml_end
 
       get '/'
-      assert ok?
-      assert_equal "\n", body
+      assert last_response.ok?
+      assert_equal "\n", last_response.body
     end
 
     it 'renders multiple blocks with the same key' do
@@ -132,8 +140,8 @@ haml_end
 haml_end
 
       get '/'
-      assert ok?
-      assert_equal "foo\nbar\nbaz\n", body
+      assert last_response.ok?
+      assert_equal "foo\nbar\nbaz\n", last_response.body
     end
 
     it 'passes values to the blocks' do
@@ -149,8 +157,38 @@ haml_end
       }
 
       get '/'
-      assert ok?
-      assert_equal "<i>1</i>\n2\n", body
+      assert last_response.ok?
+      assert_equal "<i>1</i>\n2\n", last_response.body
+    end
+  end
+
+  context 'content_for?' do
+    class TestApp
+      include Sinatra::ContentFor2
+    end
+
+    setup do
+      @helper = TestApp.new 
+    end
+
+    context 'defined content' do
+      setup do
+        @helper.instance_variable_set(:@content_blocks, {:test => ["block"]})
+      end
+
+      it 'returns true' do
+        assert_equal @helper.content_for?(:test), true
+      end
+    end
+
+    context 'undefined content' do
+      setup do
+        @helper.instance_variable_set(:@content_blocks, {:test => []})
+      end
+
+      it 'returns false' do
+        assert_equal @helper.content_for?(:test), false
+      end
     end
   end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-content-for2
 version: !ruby/object:Gem::Version 
-  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 3
-  version: 0.2.3
+  - 4
+  version: 0.2.4
 platform: ruby
 authors: 
 - "Nicol\xC3\xA1s Sanguinetti"
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +03:00
+date: 2011-02-04 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,7 +51,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -68,7 +64,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -103,7 +98,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -112,7 +106,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"