fortitude 0.0.1 → 0.0.2

data/spec/system/tag_rendering_system_spec.rb

@@ -8,13 +8,21 @@ describe "Fortitude tag rendering", :type => :system do
   end
 
   it "should render a void tag correctly" do
-    should_render_to("<hr/>") { hr }
+    should_render_to("<hr>") { hr }
   end
 
   it "should not allow passing text content in a block to a tag that doesn't take content" do
     expect { r { br { text "hi" } } }.to raise_error(Fortitude::Errors::NoContentAllowed)
   end
 
+  it "should render a non-self-closing tag correctly" do
+    should_render_to("<script></script>") { script }
+    should_render_to("<script></script>") { script { } }
+    should_render_to("<script></script>") { script('') }
+    should_render_to("<script></script>") { script('') { } }
+    should_render_to("<script src=\"foo\"></script>") { script(:src => "foo") }
+  end
+
   it "should quote HTML specs at you when you screw up" do
     expect { r { br { text "hi" } } }.to raise_error(Fortitude::Errors::NoContentAllowed, /THE_SPEC_FOR_BR/)
   end
@@ -104,36 +112,36 @@ describe "Fortitude tag rendering", :type => :system do
   end
 
   it "should render a tag with an attribute correctly" do
-    should_render_to("<hr class=\"foo\"/>") { hr 'class' => 'foo' }
+    should_render_to("<hr class=\"foo\">") { hr 'class' => 'foo' }
   end
 
   it "should convert symbol attribute names to strings" do
-    should_render_to("<hr class=\"foo\"/>") { hr :class => 'foo' }
+    should_render_to("<hr class=\"foo\">") { hr :class => 'foo' }
   end
 
   it "should convert symbol attribute values to strings" do
-    should_render_to("<hr class=\"foo\"/>") { hr 'class' => :foo }
+    should_render_to("<hr class=\"foo\">") { hr 'class' => :foo }
   end
 
   it "should allow numbers for attribute names" do
-    should_render_to("<hr 12345=\"foo\"/>") { hr 12345 => 'foo' }
+    should_render_to("<hr 12345=\"foo\">") { hr 12345 => 'foo' }
   end
 
   it "should allow numbers for attribute values, and still quote them" do
-    should_render_to("<hr class=\"12345\"/>") { hr 'class' => 12345 }
+    should_render_to("<hr class=\"12345\">") { hr 'class' => 12345 }
   end
 
   it "should escape attribute names" do
-    should_render_to("<hr &lt;&amp;&quot;&gt;=\"foo\"/>") { hr '<&">' => "foo" }
+    should_render_to("<hr &lt;&amp;&quot;&gt;=\"foo\">") { hr '<&">' => "foo" }
   end
 
   it "should escape attribute values" do
-    should_render_to("<hr class=\"&lt;&amp;&quot;&gt;\"/>") { hr :class => "<&\">" }
+    should_render_to("<hr class=\"&lt;&amp;&quot;&gt;\">") { hr :class => "<&\">" }
   end
 
   it "should separate multiple attributes with spaces" do
     result = r { hr 'class' => "foo", 'other' => "bar" }
-    expect(result).to match(%r{^<hr .*\"/>$})
+    expect(result).to match(%r{^<hr .*\">$})
     expect(result).to match(%r{ class=\"foo\"})
     expect(result).to match(%r{ other=\"bar\"})
   end
@@ -152,7 +160,7 @@ describe "Fortitude tag rendering", :type => :system do
       order.each_with_index do |attrname, index|
         expected_string << " #{attrname}=\"order#{index}\""
       end
-      expected_string << "/>"
+      expected_string << ">"
 
       should_render_to(expected_string) { hr attributes }
     end
@@ -200,54 +208,53 @@ describe "Fortitude tag rendering", :type => :system do
 
   it "should render attribute values that are hashes as a sequence of prefixed attributes" do
     result = r { p :data => { :foo => 'bar', :bar => 'baz' } }
-    expect(result).to match(%r{^<p .*\"/>$})
+    expect(result).to match(%r{^<p .*\"></p>$})
     expect(result).to match(%r{ data-foo=\"bar\"})
     expect(result).to match(%r{ data-bar=\"baz\"})
   end
 
   it "should render an arbitrary object as an attribute key, escaping it" do
     foo = arbitrary_object_with_to_s("and&<>\"this")
-    should_render_to("<p and&amp;&lt;&gt;&quot;this=\"bar\"/>") { p foo => "bar" }
+    should_render_to("<p and&amp;&lt;&gt;&quot;this=\"bar\"></p>") { p foo => "bar" }
   end
 
   it "should render an arbitrary object as an attribute value, escaping it" do
     foo = arbitrary_object_with_to_s("and&<>\"this")
-    should_render_to("<p foo=\"and&amp;&lt;&gt;&quot;this\"/>") { p :foo => foo }
+    should_render_to("<p foo=\"and&amp;&lt;&gt;&quot;this\"></p>") { p :foo => foo }
   end
 
   it "should render an arbitrary object as an attribute key nested in a hash, escaping it" do
     foo = arbitrary_object_with_to_s("and&<>\"this")
-    should_render_to("<p data-and&amp;&lt;&gt;&quot;this=\"bar\"/>") { p :data => { foo => "bar" } }
+    should_render_to("<p data-and&amp;&lt;&gt;&quot;this=\"bar\"></p>") { p :data => { foo => "bar" } }
   end
 
   it "should render an arbitrary object as an attribute value nested in a hash, escaping it" do
     foo = arbitrary_object_with_to_s("and&<>\"this")
-    should_render_to("<p data-and&amp;&lt;&gt;&quot;this=\"bar\"/>") { p :data => { foo => "bar" } }
+    should_render_to("<p data-and&amp;&lt;&gt;&quot;this=\"bar\"></p>") { p :data => { foo => "bar" } }
   end
 
   it "should allow an arbitrary object as an attribute key, mapping to a hash" do
     foo = arbitrary_object_with_to_s("and&<>\"this")
     result = r { p foo => { :foo => 'bar', :bar => 'baz' } }
-    expect(result).to match(%r{^<p .*\"/>$})
+    expect(result).to match(%r{^<p .*\"></p>$})
     expect(result).to match(%r{ and&amp;&lt;&gt;&quot;this-foo=\"bar\"})
     expect(result).to match(%r{ and&amp;&lt;&gt;&quot;this-bar=\"baz\"})
-    # should_render_to("<p and&amp;&lt;&gt;&quot;this-foo=\"bar\" and&amp;&lt;&gt;&quot;this-bar=\"baz\"/>")
   end
 
   it "should allow multi-level hash nesting" do
     result = r { p :foo => { :bar => 'bar', :baz => { :a => 'xxx', 'b' => :yyy } } }
-    expect(result).to match(%r{^<p .*\"/>})
+    expect(result).to match(%r{^<p .*\"></p>})
     expect(result).to match(%r{ foo-bar=\"bar\"})
     expect(result).to match(%r{ foo-baz-a=\"xxx\"})
     expect(result).to match(%r{ foo-baz-b=\"yyy\"})
   end
 
   it "should allow arrays as attribute values, separating elements with spaces" do
-    should_render_to("<p foo=\"bar baz quux\"/>") { p :foo => [ 'bar', 'baz', 'quux' ]}
+    should_render_to("<p foo=\"bar baz quux\"></p>") { p :foo => [ 'bar', 'baz', 'quux' ]}
   end
 
   it "should allow arrays as attribute values, calling #to_s on values in them" do
     quux = arbitrary_object_with_to_s("quux")
-    should_render_to("<p foo=\"bar baz quux\"/>") { p :foo => [ 'bar', :baz, quux ]}
+    should_render_to("<p foo=\"bar baz quux\"></p>") { p :foo => [ 'bar', :baz, quux ]}
   end
 end

data/spec/system/tag_rules_system_spec.rb

@@ -14,7 +14,7 @@ describe "Fortitude tag rules enforcement", :type => :system do
   end
 
   it "should allow a <b> inside a <p>" do
-    expect(render(widget_class_with_content { p { b } })).to eq('<p><b/></p>')
+    expect(render(widget_class_with_content { p { b } })).to eq('<p><b></b></p>')
   end
 
   it "should not allow text where it's, well, not allowed, when specified directly" do

data/spec/system/tag_updating_system_spec.rb

@@ -62,7 +62,7 @@ describe "Fortitude tag updating", :type => :system do
       end
     end
 
-    expect(render(@derived_class)).to eq("<foo quux=\"baz\"/>")
+    expect(render(@derived_class)).to eq("<foo quux=\"baz\"></foo>")
 
     @base_class.class_eval do
       def content
@@ -81,7 +81,7 @@ describe "Fortitude tag updating", :type => :system do
       end
     end
 
-    expect(render(@derived_class)).to eq("<foo quux=\"baz\"/>")
+    expect(render(@derived_class)).to eq("<foo quux=\"baz\"></foo>")
   end
 
   it "should allow modifying a tag's :can_enclose" do
@@ -156,7 +156,7 @@ describe "Fortitude tag updating", :type => :system do
       end
     end
 
-    expect(render(@base_class)).to eq("<p bonk=\"whatever\"/>")
+    expect(render(@base_class)).to eq("<p bonk=\"whatever\"></p>")
 
     other_widget = widget_class do
       enforce_attribute_rules true

data/spec/system/tilt_system_spec.rb

@@ -42,6 +42,10 @@ EOS
     expect(render_text_with_tilt("simple_template.rb", text)).to eq("this is<p>a simple widget</p>!")
   end
 
+  it "should allow the Tilt template to be created with an empty string, since earlier versions of Tilt do that" do
+    expect { Fortitude::Tilt::FortitudeTemplate.new { "" } }.not_to raise_error
+  end
+
   SIMPLE_TEMPLATE_WITH_VARIABLES = <<-EOS
 class SimpleTemplateWithVariables < Fortitude::Widgets::Html5
   needs :foo, :bar => 'whatever'

data/spec/system/void_tags_system_spec.rb

@@ -5,34 +5,36 @@ describe "Fortitude void tags", :type => :system do
 
       def content
         thevoid
+        thevoid(:foo => 'bar')
       end
     end
   end
 
-  it "should close void tags by default" do
+  it "should not close void tags by default" do
     vtc = widget_class(:superclass => Fortitude::Widget) do
       tag :thevoid, :content_allowed => false
 
       def content
         thevoid
+        thevoid(:foo => 'bar')
       end
     end
 
-    expect(render(vtc)).to eq("<thevoid/>")
+    expect(render(vtc)).to eq("<thevoid><thevoid foo=\"bar\">")
   end
 
   it "should not close void tags if asked not to" do
     klass = void_tag_class
     klass.close_void_tags false
 
-    expect(render(klass)).to eq("<thevoid>")
+    expect(render(klass)).to eq("<thevoid><thevoid foo=\"bar\">")
   end
 
   it "should close void tags if asked to" do
     klass = void_tag_class
     klass.close_void_tags true
 
-    expect(render(klass)).to eq("<thevoid/>")
+    expect(render(klass)).to eq("<thevoid/><thevoid foo=\"bar\"/>")
   end
 
   it "should not affect non-void tags with no content" do
@@ -40,12 +42,49 @@ describe "Fortitude void tags", :type => :system do
     klass.class_eval do
       def content
         p
+        p(:foo => "bar")
         div ""
+        div(:foo => "bar")
         span { }
+        span(:foo => "bar")
       end
     end
     klass.close_void_tags false
 
-    expect(render(klass)).to eq("<p/><div></div><span></span>")
+    expect(render(klass)).to eq("<p></p><p foo=\"bar\"></p><div></div><div foo=\"bar\"></div><span></span><span foo=\"bar\"></span>")
+  end
+
+  it "should not affect non-void tags with no content, and close_void_tags set to true" do
+    klass = void_tag_class
+    klass.class_eval do
+      def content
+        p
+        p(:foo => "bar")
+        div ""
+        div(:foo => "bar")
+        span { }
+        span(:foo => "bar")
+      end
+    end
+    klass.close_void_tags true
+
+    expect(render(klass)).to eq("<p></p><p foo=\"bar\"></p><div></div><div foo=\"bar\"></div><span></span><span foo=\"bar\"></span>")
+  end
+
+  it "should not affect non-void tags with no content, and close_void_tags set to false" do
+    klass = void_tag_class
+    klass.class_eval do
+      def content
+        p
+        p(:foo => "bar")
+        div ""
+        div(:foo => "bar")
+        span { }
+        span(:foo => "bar")
+      end
+    end
+    klass.close_void_tags false
+
+    expect(render(klass)).to eq("<p></p><p foo=\"bar\"></p><div></div><div foo=\"bar\"></div><span></span><span foo=\"bar\"></span>")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Andrew Geweke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-19 00:00:00.000000000 Z
+date: 2014-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -120,6 +120,7 @@ files:
 - ".gitignore"
 - ".rspec-local"
 - ".travis.yml"
+- CHANGES.md
 - Gemfile
 - LICENSE.txt
 - README-erector.md
@@ -131,9 +132,6 @@ files:
 - ext/fortitude_native_ext/fortitude_native_ext.c
 - fortitude.gemspec
 - lib/fortitude.rb
-- lib/fortitude/assign_locals_from_template.rb.smpl
-- lib/fortitude/assigns_proxy.rb
-- lib/fortitude/class_inheritable_attributes.rb
 - lib/fortitude/doctypes.rb
 - lib/fortitude/doctypes/base.rb
 - lib/fortitude/doctypes/html4.rb
@@ -151,31 +149,54 @@ files:
 - lib/fortitude/doctypes/xhtml10_transitional.rb
 - lib/fortitude/doctypes/xhtml11.rb
 - lib/fortitude/errors.rb
-- lib/fortitude/fortitude_ruby_ext.rb
-- lib/fortitude/instance_variable_set.rb
-- lib/fortitude/need_assignment_template.rb.smpl
-- lib/fortitude/need_method_template.rb.smpl
-- lib/fortitude/non_rails_widget_methods.rb
-- lib/fortitude/partial_tag_placeholder.rb
+- lib/fortitude/extensions/fortitude_ruby_ext.rb
+- lib/fortitude/extensions/native_extensions.rb
+- lib/fortitude/method_templates/assign_locals_from_template.rb.smpl
+- lib/fortitude/method_templates/need_assignment_template.rb.smpl
+- lib/fortitude/method_templates/need_method_template.rb.smpl
+- lib/fortitude/method_templates/simple_template.rb
+- lib/fortitude/method_templates/tag_method_template.rb.smpl
+- lib/fortitude/method_templates/text_method_template.rb.smpl
+- lib/fortitude/rails.rb
 - lib/fortitude/rails/helpers.rb
+- lib/fortitude/rails/railtie.rb
 - lib/fortitude/rails/renderer.rb
 - lib/fortitude/rails/template_handler.rb
 - lib/fortitude/rails/widget_methods.rb
 - lib/fortitude/rails/yielded_object_outputter.rb
-- lib/fortitude/railtie.rb
 - lib/fortitude/rendering_context.rb
-- lib/fortitude/simple_template.rb
-- lib/fortitude/staticized_method.rb
-- lib/fortitude/tag.rb
-- lib/fortitude/tag_method_template.rb.smpl
-- lib/fortitude/tag_return_value.rb
-- lib/fortitude/tag_store.rb
-- lib/fortitude/tag_support.rb
-- lib/fortitude/tags_module.rb
-- lib/fortitude/text_method_template.rb.smpl
+- lib/fortitude/support/assigns_proxy.rb
+- lib/fortitude/support/class_inheritable_attributes.rb
+- lib/fortitude/support/instance_variable_set.rb
+- lib/fortitude/support/staticized_method.rb
+- lib/fortitude/tags/partial_tag_placeholder.rb
+- lib/fortitude/tags/tag.rb
+- lib/fortitude/tags/tag_return_value.rb
+- lib/fortitude/tags/tag_store.rb
+- lib/fortitude/tags/tag_support.rb
+- lib/fortitude/tags/tags_module.rb
+- lib/fortitude/tilt.rb
 - lib/fortitude/tilt/fortitude_template.rb
 - lib/fortitude/version.rb
 - lib/fortitude/widget.rb
+- lib/fortitude/widget/around_content.rb
+- lib/fortitude/widget/capturing.rb
+- lib/fortitude/widget/content.rb
+- lib/fortitude/widget/doctypes.rb
+- lib/fortitude/widget/helpers.rb
+- lib/fortitude/widget/integration.rb
+- lib/fortitude/widget/localization.rb
+- lib/fortitude/widget/modules_and_subclasses.rb
+- lib/fortitude/widget/needs.rb
+- lib/fortitude/widget/non_rails_widget_methods.rb
+- lib/fortitude/widget/rendering.rb
+- lib/fortitude/widget/start_and_end_comments.rb
+- lib/fortitude/widget/staticization.rb
+- lib/fortitude/widget/tag_like_methods.rb
+- lib/fortitude/widget/tags.rb
+- lib/fortitude/widget/temporary_overrides.rb
+- lib/fortitude/widget/widget_class_inheritable_attributes.rb
+- lib/fortitude/widgets.rb
 - lib/fortitude/widgets/html4_frameset.rb
 - lib/fortitude/widgets/html4_strict.rb
 - lib/fortitude/widgets/html4_transitional.rb

data/lib/fortitude/assigns_proxy.rb

@@ -1,75 +0,0 @@
-require 'active_support/core_ext'
-
-module Fortitude
-  class AssignsProxy
-    def initialize(widget, keys)
-      @widget = widget
-      @keys = { }
-      keys.each { |k| @keys[k] = true }
-    end
-
-    def is_default?(x)
-      !! @widget._fortitude_default_assigns[x.to_sym]
-    end
-
-    def keys
-      @keys.keys
-    end
-
-    def has_key?(x)
-      !! @keys[x.to_sym]
-    end
-
-    def [](x)
-      if has_key?(x)
-        ivar_name = @widget.class.instance_variable_name_for_need(x)
-        @widget.instance_variable_get(ivar_name)
-      end
-    end
-
-    def []=(x, y)
-      if has_key?(x)
-        ivar_name = @widget.class.instance_variable_name_for_need(x)
-        @widget.instance_variable_set(ivar_name, y)
-      end
-    end
-
-    def to_hash
-      out = { }
-      keys.each { |k| out[k] = self[k] }
-      out
-    end
-
-    def to_h
-      to_hash
-    end
-
-    def length
-      @keys.length
-    end
-
-    def size
-      @keys.size
-    end
-
-    def to_s
-      "<Assigns for #{@widget}: #{to_hash}>"
-    end
-
-    def inspect
-      "<Assigns for #{@widget}: #{to_hash.inspect}>"
-    end
-
-    def member?(x)
-      has_key?(x)
-    end
-
-    def store(key, value)
-      self[key] = value
-    end
-
-    delegate :==, :assoc, :each, :each_pair, :each_key, :each_value, :empty?, :eql?, :fetch, :flatten,
-      :has_value?, :hash, :include?, :invert, :key, :key?, :merge, :rassoc, :reject, :select,
-      :to_a, :value?, :values, :values_at, :to => :to_hash
-  end
-end