fortitude 0.9.1-java → 0.9.2-java

data/spec/system/formatting_system_spec.rb

@@ -5,7 +5,8 @@ describe "Fortitude formatting support", :type => :system do
     end
 
     wc.send(:define_method, :content, &block)
-    expect(render(wc)).to eq(text)
+    actual = render(wc)
+    expect(actual).to eq(text)
   end
 
   it "should add newlines around <div> and <p>" do
@@ -60,4 +61,27 @@ describe "Fortitude formatting support", :type => :system do
   </div>
 </div>}) { div(:class => 'foo') { div(:class => 'bar') { } } }
   end
+
+  it "should suppress all formatting inside <pre>" do
+    should_format_to(%{<pre><p>hello
+  world
+there</p></pre>}) { pre { p "hello\n  world\nthere" } }
+  end
+
+  it "should suppress all formatting inside <pre> (complex example)" do
+    should_format_to(%{<div>
+  <pre><p>hello
+  world
+there</p><div><p>another here</p></div><p>yet another</p></pre>
+</div>}) { div { pre { p "hello\n  world\nthere"; div { p "another here" }; p "yet another" } } }
+  end
+
+  it "should suppress all formatting inside <pre>, even with nested <pre> tags" do
+    should_format_to(%{<div>
+  <pre><p>hello
+  world
+there</p><pre><p>another
+  here</p></pre><p>yet another</p></pre>
+</div>}) { div { pre { p "hello\n  world\nthere"; pre { p "another\n  here" }; p "yet another" } } }
+  end
 end

data/spec/system/tag_rendering_system_spec.rb

@@ -92,6 +92,79 @@ describe "Fortitude tag rendering", :type => :system do
     should_render_to("<p>12345</p>") { p 12345 }
   end
 
+  it "should allow returning from within an element, and still render the close tags" do
+    wc = widget_class do
+      def content
+        div {
+          text "content_before"
+          foo
+          text "content_after"
+        }
+      end
+
+      def foo
+        p {
+          text "foo_before"
+          bar
+          text "foo_after"
+        }
+      end
+
+      def bar
+        span {
+          text "bar_first"
+          a {
+            text "bar_before"
+            return
+            text "bar_after"
+          }
+          text "bar_last"
+        }
+      end
+    end
+
+    expect(render(wc)).to eq("<div>content_before<p>foo_before<span>bar_first<a>bar_before</a></span>foo_after</p>content_after</div>")
+  end
+
+  it "should allow raising an exception from within an element, and still render the close tags" do
+    wc = widget_class do
+      def content
+        div {
+          text "content_before"
+          foo
+          text "content_after"
+        }
+      end
+
+      def foo
+        p {
+          text "foo_before"
+          bar
+          text "foo_after"
+        }
+      end
+
+      def bar
+        span {
+          text "bar_first"
+          a {
+            text "bar_before"
+            raise "kaboom"
+            text "bar_after"
+          }
+          text "bar_last"
+        }
+      end
+    end
+
+    widget = wc.new
+    rendering_context = ::Fortitude::RenderingContext.new({ })
+    expect { widget.render_to(rendering_context) }.to raise_error(/kaboom/)
+    output = html_from(rendering_context)
+
+    expect(output).to eq("<div>content_before<p>foo_before<span>bar_first<a>bar_before</a></span></p></div>")
+  end
+
   it "should render a tag using a specific tag_* method" do
     should_render_to("<p>foo</p>") { tag_p "foo" }
   end

data/spec/system/tilt_system_spec.rb

@@ -93,6 +93,11 @@ EOS
     expect(result).to eq("foo: the_foo, bar: the_bar")
   end
 
+  it "should pass explicit locals to the template, as strings" do
+    result = render_text_with_tilt("simple_template_with_variables.rb", SIMPLE_TEMPLATE_WITH_VARIABLES, context_object, { 'foo' => 'the_foo', 'bar' => 'the_bar' })
+    expect(result).to eq("foo: the_foo, bar: the_bar")
+  end
+
   it "should allow passing nil for locals to the template, and should act like there are no variables" do
     result = render_text_with_tilt("simple_template_with_variables.rb", SIMPLE_TEMPLATE_WITH_VARIABLES_ALL_DEFAULTED, context_object, nil)
     expect(result).to eq("foo: something, bar: whatever")
@@ -389,4 +394,30 @@ EOS
     expect(e.tried_class_names).to be_include("String")
     expect(e.message).to match(/String/)
   end
+
+  it "should pass the filename of the template into the eval of the class source" do
+    text = <<-EOS
+class ClassSourceTemplate < Fortitude::Widgets::Html5
+  def self.set_caller!
+    @caller = caller
+  end
+
+  def self.get_caller
+    @caller
+  end
+
+  set_caller!
+
+  def content
+    text "widget file: \#{__FILE__}\n"
+    text "called at: \#{self.class.get_caller.join("\n    ")}"
+  end
+end
+EOS
+
+    full_path = File.join(tempdir, "class_source_template.rb")
+    html = render_text_with_tilt("class_source_template.rb", text)
+    expect(html).to match(/widget file: #{Regexp.escape(full_path)}/)
+    expect(html).to match(/called at: #{Regexp.escape(full_path)}:\d+/)
+  end
 end

data/spec/system/widget_class_from_spec.rb

@@ -38,10 +38,19 @@ describe "Fortitude widget-class-from-(file|source) support", :type => :system d
       expect(wcfs(text)).to eq(::WidgetFromClass2)
     end
 
-    it "should fail if given source code it can't guess the class name from" do
-      expect do
-        wcfs("cname = 'WidgetFromCla' + 'ss3'; eval('class ' + cname + ' < ::Fortitude::Widget; end')")
-      end.to raise_error(::Fortitude::Widget::Files::CannotDetermineWidgetClassNameError)
+    it "should prefer the longest class name to a shorter name" do
+      eval("module WidgetFromClass25; class Widget1 < Fortitude::Widget; end; end")
+      text = "module WidgetFromClass25; module Foo; class Widget1 < Fortitude::Widget; end; end; end"
+      eval(text)
+      expect(wcfs(text)).to eq(::WidgetFromClass25::Foo::Widget1)
+    end
+
+    it "should fail if given source code it can't guess the class name from, returning any :class_names_to_try in the exception" do
+      cdne = capture_exception(::Fortitude::Widget::Files::CannotDetermineWidgetClassNameError) do
+        wcfs("cname = 'WidgetFromCla' + 'ss3'; eval('class ' + cname + ' < ::Fortitude::Widget; end')",
+          :class_names_to_try => [ 'WidgetFromClass3::Foo', 'WidgetFromClass3::Baz' ])
+      end
+      expect(cdne.class_names_to_try).to eq([ 'WidgetFromClass3::Foo', 'WidgetFromClass3::Baz' ])
     end
 
     it "should fail if the source code contains something that isn't a widget class" do
@@ -51,6 +60,13 @@ describe "Fortitude widget-class-from-(file|source) support", :type => :system d
       expect(cdne.tried_class_names).to be_include("WidgetFromClass11")
     end
 
+    it "should fail, but return the object, if the source code contains an object of that class that just isn't a widget class" do
+      cdne = capture_exception(::Fortitude::Widget::Files::CannotDetermineWidgetClassNameError) do
+        wcfs("module WidgetFromClass24\nend")
+      end
+      expect(cdne.resulting_objects).to eq([ ::WidgetFromClass24 ])
+    end
+
     it "should work if given something that's a grandchild of Fortitude::Widget, not a direct child" do
       ::Object.class_eval("class WidgetFromClass12Parent < ::Fortitude::Widget; end")
       expect(wcfs("class WidgetFromClass12 < WidgetFromClass12Parent; end")).to eq(WidgetFromClass12)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: java
 authors:
 - Andrew Geweke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -114,12 +114,12 @@ dependencies:
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.7
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 0.0.7
   prerelease: false
   type: :development
 description: 'Views Are Code: use all the power of Ruby to build views in your own
@@ -140,6 +140,88 @@ files:
 - README-erector.md
 - README.md
 - Rakefile
+- doc/.gitignore
+- doc/Gemfile
+- doc/config.rb
+- doc/source/images/background.png
+- doc/source/images/middleman.png
+- doc/source/images/why/icon_button.png
+- doc/source/images/why/icon_button@2x.png
+- doc/source/images/why/modal_dialog@2x.png
+- doc/source/index.html.pcss
+- doc/source/index.html.rb
+- doc/source/javascripts/all.js
+- doc/source/javascripts/highlight.pack.js
+- doc/source/layouts/layout.rb
+- doc/source/portable/fortitude-bootstrap.rb
+- doc/source/shared/base.pcss
+- doc/source/shared/base.rb
+- doc/source/shared/common.rb
+- doc/source/shared/standard_page.rb
+- doc/source/stylesheets/_shared_prefix.scss
+- doc/source/stylesheets/all.css.scss
+- doc/source/stylesheets/basics.css.scss
+- doc/source/stylesheets/bootstrap_importer.css.scss
+- doc/source/stylesheets/highlight/arta.css
+- doc/source/stylesheets/highlight/ascetic.css
+- doc/source/stylesheets/highlight/atelier-dune.dark.css
+- doc/source/stylesheets/highlight/atelier-dune.light.css
+- doc/source/stylesheets/highlight/atelier-forest.dark.css
+- doc/source/stylesheets/highlight/atelier-forest.light.css
+- doc/source/stylesheets/highlight/atelier-heath.dark.css
+- doc/source/stylesheets/highlight/atelier-heath.light.css
+- doc/source/stylesheets/highlight/atelier-lakeside.dark.css
+- doc/source/stylesheets/highlight/atelier-lakeside.light.css
+- doc/source/stylesheets/highlight/atelier-seaside.dark.css
+- doc/source/stylesheets/highlight/atelier-seaside.light.css
+- doc/source/stylesheets/highlight/brown_paper.css
+- doc/source/stylesheets/highlight/brown_papersq.png
+- doc/source/stylesheets/highlight/codepen-embed.css
+- doc/source/stylesheets/highlight/color-brewer.css
+- doc/source/stylesheets/highlight/dark.css
+- doc/source/stylesheets/highlight/default.css
+- doc/source/stylesheets/highlight/docco.css
+- doc/source/stylesheets/highlight/far.css
+- doc/source/stylesheets/highlight/foundation.css
+- doc/source/stylesheets/highlight/github.css
+- doc/source/stylesheets/highlight/googlecode.css
+- doc/source/stylesheets/highlight/hybrid.css
+- doc/source/stylesheets/highlight/idea.css
+- doc/source/stylesheets/highlight/ir_black.css
+- doc/source/stylesheets/highlight/kimbie.dark.css
+- doc/source/stylesheets/highlight/kimbie.light.css
+- doc/source/stylesheets/highlight/magula.css
+- doc/source/stylesheets/highlight/mono-blue.css
+- doc/source/stylesheets/highlight/monokai.css
+- doc/source/stylesheets/highlight/monokai_sublime.css
+- doc/source/stylesheets/highlight/obsidian.css
+- doc/source/stylesheets/highlight/paraiso.dark.css
+- doc/source/stylesheets/highlight/paraiso.light.css
+- doc/source/stylesheets/highlight/pojoaque.css
+- doc/source/stylesheets/highlight/pojoaque.jpg
+- doc/source/stylesheets/highlight/railscasts.css
+- doc/source/stylesheets/highlight/rainbow.css
+- doc/source/stylesheets/highlight/school_book.css
+- doc/source/stylesheets/highlight/school_book.png
+- doc/source/stylesheets/highlight/solarized_dark.css
+- doc/source/stylesheets/highlight/solarized_light.css
+- doc/source/stylesheets/highlight/sunburst.css
+- doc/source/stylesheets/highlight/tomorrow-night-blue.css
+- doc/source/stylesheets/highlight/tomorrow-night-bright.css
+- doc/source/stylesheets/highlight/tomorrow-night-eighties.css
+- doc/source/stylesheets/highlight/tomorrow-night.css
+- doc/source/stylesheets/highlight/tomorrow.css
+- doc/source/stylesheets/highlight/vs.css
+- doc/source/stylesheets/highlight/xcode.css
+- doc/source/stylesheets/highlight/zenburn.css
+- doc/source/why/a_larger_view.html.rb
+- doc/source/why/a_simple_helper.html.rb
+- doc/source/why/building_a_rich_modal_dialog.html.rb
+- doc/source/why/commonality_and_inheritance.html.rb
+- doc/source/why/example_list.rb
+- doc/source/why/example_page.rb
+- doc/source/why/index.html.rb
+- doc/source/why/other_benefits.html.rb
 - ext/FortitudeJrubyNativeExtService.java
 - ext/com/fortituderuby/ext/fortitude/FortitudeNativeLibrary.java
 - ext/fortitude_native_ext/extconf.rb
@@ -200,6 +282,7 @@ files:
 - lib/fortitude/widget/around_content.rb
 - lib/fortitude/widget/capturing.rb
 - lib/fortitude/widget/content.rb
+- lib/fortitude/widget/convenience.rb
 - lib/fortitude/widget/doctypes.rb
 - lib/fortitude/widget/files.rb
 - lib/fortitude/widget/helpers.rb
@@ -485,6 +568,7 @@ files:
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_collection.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_collection_as.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_file_from_widget.rb
+- spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_hash_subclass.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_html_safe_strings.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_inline_from_widget.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_object.html.erb
@@ -502,6 +586,7 @@ files:
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render_class_only.rb
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render_with_capture.rb
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render_with_helper.rb
+- spec/rails/templates/rendering_system_spec/lib/my_hash.rb
 - spec/rails/templates/rules_system_spec/app/controllers/rules_system_spec_controller.rb
 - spec/rails/templates/rules_system_spec/app/views/layouts/fortitude_layout_with_p.rb
 - spec/rails/templates/rules_system_spec/app/views/rules_system_spec/_intervening_partial_erb_partial.html.erb
@@ -841,6 +926,7 @@ test_files:
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_collection.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_collection_as.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_file_from_widget.rb
+- spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_hash_subclass.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_html_safe_strings.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_inline_from_widget.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/render_object.html.erb
@@ -858,6 +944,7 @@ test_files:
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render_class_only.rb
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render_with_capture.rb
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render_with_helper.rb
+- spec/rails/templates/rendering_system_spec/lib/my_hash.rb
 - spec/rails/templates/rules_system_spec/app/controllers/rules_system_spec_controller.rb
 - spec/rails/templates/rules_system_spec/app/views/layouts/fortitude_layout_with_p.rb
 - spec/rails/templates/rules_system_spec/app/views/rules_system_spec/_intervening_partial_erb_partial.html.erb