sinatra_more 0.1.7 → 0.1.8

data/README.rdoc

@@ -3,8 +3,8 @@
 == Introduction
 
 Note: This library is still experimental and may not be ready for production just yet. 
-That being said, work is being put into reaching solid test coverage and the gem is being actively used
-on a number of sinatra projects. This notice will be removed once sufficient testing has been done.
+That being said the gem is being actively used on a number of sinatra projects.
+In addition, the gem has fairly solid test coverage ensuring that everything works as expected.
 
 This will be a plugin which expands sinatra's capabilities in a variety of ways. 
 Note that as much as possible, all helpers have been created to work with haml, erb, and erubis. 
@@ -290,7 +290,7 @@ provided to make interacting with warden dead simple.
 
 == Known Issues
 
-* Tag helper methods that accept blocks work unreliably in ERB.
+* No serious issues known
 
 == Note on Patches/Pull Requests
  

data/VERSION

@@ -1 +1 @@
-0.1.7
+0.1.8

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -56,7 +56,7 @@ module SinatraMore
     # NOTE: This doesn't actually work yet because the variable __in_erb_template 
     # hasn't been defined in ERB. We need to find a way to fix this.
     def block_is_erb?(block)
-      block && eval('defined? __in_erb_template', block)
+      has_erb_buffer? || block && eval('defined? __in_erb_template', block)
     end
 
     # Used to direct the buffer for the erb capture

data/sinatra_more.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{sinatra_more}
-  s.version = "0.1.7"
+  s.version = "0.1.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Esquenazi"]

data/test/fixtures/markup_app/app.rb

@@ -37,11 +37,7 @@ class MarkupDemo < Sinatra::Base
     end
 
     def determine_block_is_template(name, &block)
-      if block_given?
-        concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
-      else
-        concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
-      end
+      concat_content "<p class='is_template'>The #{name} block passed in is a template</p>" if block_is_template?(block)
     end
   end
 end

data/test/fixtures/markup_app/views/capture_concat.erb

@@ -6,7 +6,7 @@
 
 <% concat_in_p('Concat Line 3') %>
 
-<% determine_block_is_template('haml') do %>
+<% determine_block_is_template('erb') do %>
   <span>This is erb</span>
   <span>This is erb</span>
 <% end %>

data/test/markup_plugin/test_asset_tag_helpers.rb

@@ -42,8 +42,7 @@ class TestAssetTagHelpers < Test::Unit::TestCase
     should "display link block element in erb" do
       visit '/erb/link_to'
       assert_have_selector :a, :content => "Test 1 No Block", :href => '/test1', :class => 'test', :id => 'test1'
-      #TODO fix this selector below in erb
-      # assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
+      assert_have_selector :a, :content => "Test 2 With Block", :href => '/test2', :class => 'test', :id => 'test2'
     end
   end
 

data/test/markup_plugin/test_output_helpers.rb

@@ -35,9 +35,9 @@ class TestOutputHelpers < Test::Unit::TestCase
   context 'for #block_is_template?' do
     should "work for erb templates" do
       visit '/erb/capture_concat'
-      # TODO Get ERB template detection working
-      # assert_have_selector 'p', :content => "The erb block passed in is a template", :class => 'is_template'
-      assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
+      assert_have_selector 'p', :content => "The erb block passed in is a template", :class => 'is_template'
+      # TODO Get ERB template detection working (fix block_is_erb? method)
+      # assert_have_no_selector 'p', :content => "The ruby block passed in is a template", :class => 'is_template'
     end
 
     should "work for haml templates" do

data/test/markup_plugin/test_tag_helpers.rb

@@ -36,9 +36,8 @@ class TestTagHelpers < Test::Unit::TestCase
       visit '/erb/content_tag'
       assert_have_selector :p, :content => "Test 1", :class => 'test', :id => 'test1'
       assert_have_selector :p, :content => "Test 2"
-      # TODO get these to work in erb
-      # assert_have_selector :p, :content => "Test 3"
-      # assert_have_selector :p, :content => "Test 4"
+      assert_have_selector :p, :content => "Test 3"
+      assert_have_selector :p, :content => "Test 4"
     end
     should "support tags with haml" do
       visit '/haml/content_tag'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra_more
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors: 
 - Nathan Esquenazi