sinatra_more 0.0.11 → 0.0.13

data/VERSION

@@ -1 +1 @@
-0.0.11
+0.0.13

data/lib/sinatra_more/markup_plugin/form_builder/standard_form_builder.rb

@@ -8,7 +8,7 @@ class StandardFormBuilder < AbstractFormBuilder
     class_eval <<-EOF
     def #{field_type}_block(field, options={}, label_options={})
       label_options.reverse_merge!(:caption => options.delete(:caption)) if options[:caption]
-      @template.content_block_tag(:p, :concat => false) do
+      @template.content_block_tag(:p) do
         html =  label(field, label_options)
         html << #{field_type}(field, options)
       end
@@ -18,7 +18,7 @@ class StandardFormBuilder < AbstractFormBuilder
 
   # submit_block("Update")
   def submit_block(caption)
-    @template.content_block_tag(:p, :concat => false) do
+    @template.content_block_tag(:p) do
       @template.submit_tag(caption)
     end
   end

data/lib/sinatra_more/markup_plugin/output_helpers.rb

@@ -3,7 +3,7 @@ module SinatraMore
     # Captures the html from a block of template code for erb or haml
     # capture_html(&block) => "...html..."
     def capture_html(*args, &block)
-      if is_haml?
+      if self.respond_to?(:is_haml?) && is_haml?
          block_is_haml?(block) ? capture_haml(*args, &block) : block.call
       else
         capture_erb(*args, &block)
@@ -19,12 +19,26 @@ module SinatraMore
         @_out_buf << text
       end
     end
+    
+    # Returns true if the block is from an ERB or HAML template; false otherwise.
+    # Used to determine if html should be returned or concatted to view
+    # block_is_template?(block)
+    def block_is_template?(block)
+       block && (block_is_erb?(block) || (self.respond_to?(:block_is_haml?) && block_is_haml?(block)))
+    end
 
     # Used to capture the html from a block of erb code
     # capture_erb(&block) => '...html...'
     def capture_erb(*args, &block)
       erb_with_output_buffer { block.call(*args) }
     end
+    
+    # Used to determine if a block is called from ERB.
+    # 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)
+    end
 
     # Used to direct the buffer for the erb capture
     def erb_with_output_buffer(buf = '') #:nodoc:

data/lib/sinatra_more/markup_plugin/tag_helpers.rb

@@ -11,15 +11,12 @@ module SinatraMore
     # content_tag(:p, "hello", :class => 'light')
     # content_tag(:p, :class => 'dark') do ... end
     # parameters: content_tag(name, content=nil, options={})
-    # options = { :concat => true/false }
     def content_tag(*args, &block)
       name = args.first
       options = args.extract_options!
-      options.reverse_merge!(:concat => true) if block_given?
-      should_concat = options.delete(:concat)
       tag_html = block_given? ? capture_html(&block) : args[1]
       tag_result = tag(name, options.merge(:content => tag_html))
-      should_concat ? concat_content(tag_result) : tag_result
+      block_is_template?(block) ? concat_content(tag_result) : tag_result
     end
     alias content_block_tag content_tag
 

data/sinatra_more.gemspec

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

metadata

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