fortitude 0.0.7 → 0.0.9

data/spec/system/setting_inheritance_system_spec.rb

@@ -11,6 +11,7 @@ describe "Fortitude setting inheritance", :type => :system do
   #   - translation_base
   #   - enforce_id_uniqueness
   #   - debug
+  #   - use_localized_content_methods
   #
   # needs are covered by the needs_system_spec, and around_content is covered by the around_content_system_spec;
   # these are not tested here because their semantics are quite a bit more complex than the settings here.
@@ -36,6 +37,32 @@ describe "Fortitude setting inheritance", :type => :system do
   end
 
 
+  def use_localized_content_methods_should_be(expected_result, *klasses)
+    klasses.each do |klass|
+      expect(klass.use_localized_content_methods).to eq(expected_result)
+      send("localized_content_methods_should_be_for_class", expected_result, klass)
+    end
+  end
+
+  def localized_content_methods_should_be_for_class(expected_result, klass)
+    klass.send(:define_method, :content) do
+      text "hello!"
+    end
+
+    klass.send(:define_method, :localized_content_fr) do
+      text "bonjour!"
+    end
+
+    klass.send(:define_method, :widget_locale) { :fr }
+
+    if expected_result
+      expect(render(klass)).to eq("bonjour!")
+    else
+      expect(render(klass)).to eq("hello!")
+    end
+  end
+
+
   def enforce_id_uniqueness_should_be(expected_result, *klasses)
     klasses.each do |klass|
       expect(klass.enforce_id_uniqueness).to eq(expected_result)
@@ -634,4 +661,24 @@ describe "Fortitude setting inheritance", :type => :system do
     use_instance_variables_for_assigns_should_be(false, @grandparent, @parent2, @child21, @child22)
     use_instance_variables_for_assigns_should_be(true, @parent1, @child11, @child12)
   end
+
+  it "should properly inherit use_localized_content_methods" do
+    use_localized_content_methods_should_be(false, @grandparent, @parent1, @child11, @child12, @parent2, @child21, @child22)
+
+    @parent1.use_localized_content_methods true
+    use_localized_content_methods_should_be(false, @grandparent, @parent2, @child21, @child22)
+    use_localized_content_methods_should_be(true, @parent1, @child11, @child12)
+
+    @parent2.use_localized_content_methods false
+    use_localized_content_methods_should_be(false, @grandparent, @parent2, @child21, @child22)
+    use_localized_content_methods_should_be(true, @parent1, @child11, @child12)
+
+    @grandparent.use_localized_content_methods true
+    use_localized_content_methods_should_be(false, @parent2, @child21, @child22)
+    use_localized_content_methods_should_be(true, @grandparent, @parent1, @child11, @child12)
+
+    @grandparent.use_localized_content_methods false
+    use_localized_content_methods_should_be(false, @grandparent, @parent2, @child21, @child22)
+    use_localized_content_methods_should_be(true, @parent1, @child11, @child12)
+  end
 end

data/spec/system/static_method_system_spec.rb

@@ -269,6 +269,8 @@ describe "Fortitude staticization behavior", :type => :system do
   it "should still run the proper localized content methods even if #content, or one of them, is static" do
     $global_value = 12345
     wc = widget_class do
+      use_localized_content_methods true
+
       def initialize(locale)
         self.widget_locale = locale
         super({ })

data/spec/system/tag_rendering_system_spec.rb

@@ -7,6 +7,47 @@ describe "Fortitude tag rendering", :type => :system do
     expect(r(&block)).to eq(value)
   end
 
+  it "should allow passing numbers to a tag" do
+    should_render_to("<p>123.45</p>") { p(123.45) }
+  end
+
+  it "should allow rendering nil to a tag" do
+    should_render_to("<p></p>") { p(nil) }
+  end
+
+  it "should allow rendering nil via text" do
+    should_render_to("") { text(nil) }
+  end
+
+  it "should allow rendering nil via rawtext" do
+    should_render_to("") { rawtext(nil) }
+  end
+
+  it "should render an attribute mapped to nil as missing" do
+    should_render_to("<p></p>") { p(:class => nil) }
+    should_render_to("<p></p>") { p(:foo => { :bar => nil }) }
+  end
+
+  it "should render an attribute mapped to the empty string as the empty string" do
+    should_render_to("<p class=\"\"></p>") { p(:class => '') }
+    should_render_to("<p foo-bar=\"\"></p>") { p(:foo => { :bar => '' }) }
+  end
+
+  it "should render an attribute mapped to false as missing" do
+    should_render_to("<p></p>") { p(:class => false) }
+    should_render_to("<p></p>") { p(:foo => { :bar => false }) }
+  end
+
+  it "should render an attribute mapped to true as just a bare attribute" do
+    should_render_to("<p class></p>") { p(:class => true) }
+    should_render_to("<p foo-bar></p>") { p(:foo => { :bar => true }) }
+  end
+
+  it "should render an attribute mapped to the string 'true' as that string" do
+    should_render_to("<p class=\"true\"></p>") { p(:class => 'true') }
+    should_render_to("<p foo-bar=\"true\"></p>") { p(:foo => { :bar => 'true' }) }
+  end
+
   it "should render a void tag correctly" do
     should_render_to("<hr>") { hr }
   end

data/spec/system/void_tags_system_spec.rb

@@ -12,6 +12,7 @@ describe "Fortitude void tags", :type => :system do
 
   it "should not close void tags by default" do
     vtc = widget_class(:superclass => Fortitude::Widget) do
+      doctype SystemHelpers::TestDoctype.new
       tag :thevoid, :content_allowed => false
 
       def content

data/spec/system/yield_system_spec.rb

@@ -0,0 +1,188 @@
+describe "Fortitude widgets and 'yield'", :type => :system do
+  it "should call the block passed to the constructor when you call 'yield' from #content" do
+    wc = widget_class do
+      def content
+        text "before"
+        yield
+        text "after"
+      end
+    end
+
+    expect(render(wc.new { |widget| widget.text "middle" })).to eq("beforemiddleafter")
+  end
+
+  it "should raise a clear error if you try to 'yield' from #content and there is no block passed" do
+    wc = widget_class do
+      def content
+        text "before"
+        yield
+        text "after"
+      end
+    end
+
+    instance = wc.new
+    e = capture_exception(::Fortitude::Errors::NoBlockToYieldTo) { render(instance) }
+    expect(e.message).to match(/#{Regexp.escape(instance.to_s)}/)
+    expect(e.widget).to eq(instance)
+  end
+
+  it "should allow you to pass the block from #content to another method and run it from there just fine" do
+    wc = widget_class do
+      def content(&block)
+        text "before"
+        foo(&block)
+        text "after"
+      end
+
+      def foo
+        text "inner_before"
+        yield
+        text "inner_after"
+      end
+    end
+
+    expect(render(wc.new { |widget| widget.text "middle" })).to eq("beforeinner_beforemiddleinner_afterafter")
+  end
+
+  it "should allow you to call that same block using #yield_from_widget in #content" do
+    wc = widget_class do
+      def content
+        text "before"
+        yield_from_widget
+        text "after"
+      end
+    end
+
+    expect(render(wc.new { |widget| widget.text "middle" })).to eq("beforemiddleafter")
+  end
+
+  it "should allow you to call that same block using #yield_from_widget in some other method, too" do
+    wc = widget_class do
+      def content
+        text "before"
+        foo
+        text "after"
+      end
+
+      def foo
+        text "inner_before"
+        yield_from_widget
+        text "inner_after"
+      end
+    end
+
+    expect(render(wc.new { |widget| widget.text "middle" })).to eq("beforeinner_beforemiddleinner_afterafter")
+  end
+
+  it "should allow you to pass a block to #widget, and it should work the same way as passing it to the constructor" do
+    wc_sub = widget_class do
+      def content
+        text "inner_before"
+        yield
+        text "inner_after"
+      end
+    end
+
+    wc = widget_class do
+      cattr_accessor :other_widget_class
+
+      def content
+        text "before"
+        widget(self.class.other_widget_class) { text "middle"  }
+        text "after"
+      end
+    end
+
+    wc.other_widget_class = wc_sub
+    expect(render(wc.new)).to eq("beforeinner_beforemiddleinner_afterafter")
+  end
+
+  it "should allow you to pass a block to #widget, and it should work the same way as passing it to the constructor, even if #widget is given a fully-intantiated widget" do
+    wc_sub = widget_class do
+      def content
+        text "inner_before"
+        yield
+        text "inner_after"
+      end
+    end
+
+    wc = widget_class do
+      cattr_accessor :other_widget_class
+
+      def content
+        text "before"
+        sub_widget = self.class.other_widget_class.new
+        widget(sub_widget) { text "middle"  }
+        text "after"
+      end
+    end
+
+    wc.other_widget_class = wc_sub
+    expect(render(wc.new)).to eq("beforeinner_beforemiddleinner_afterafter")
+  end
+
+  it "should use the block passed to #widget in preference to the one in the constructor, if both are passed" do
+    wc_sub = widget_class do
+      def content
+        text "inner_before"
+        yield
+        text "inner_after"
+      end
+    end
+
+    wc = widget_class do
+      cattr_accessor :other_widget_class
+
+      def content
+        text "before"
+        sub_widget = self.class.other_widget_class.new { text "foobar" }
+        widget(sub_widget) { text "middle"  }
+        text "after"
+      end
+    end
+
+    wc.other_widget_class = wc_sub
+    expect(render(wc.new)).to eq("beforeinner_beforemiddleinner_afterafter")
+  end
+
+  it "should use the block passed to the constructor in preference to the layout, if both exist" do
+    the_rc = rc(:yield_block => lambda { raise "kaboomba" })
+
+    wc = widget_class do
+      def content
+        text "before"
+        yield
+        text "after"
+      end
+    end
+
+    expect(render(wc.new { |widget| widget.text "middle" }, :rendering_context => the_rc)).to eq("beforemiddleafter")
+  end
+
+  it "should use the block passed to #content in preference to the one from the constructor or the layout" do
+    the_rc = rc(:yield_block => lambda { raise "kaboomba" })
+
+    wc_sub = widget_class do
+      def content
+        text "inner_before"
+        yield
+        text "inner_after"
+      end
+    end
+
+    wc = widget_class do
+      cattr_accessor :other_widget_class
+
+      def content
+        text "before"
+        other = self.class.other_widget_class.new { text "foobar" }
+        widget(other) { text "middle" }
+        text "after"
+      end
+    end
+
+    wc.other_widget_class = wc_sub
+
+    expect(render(wc.new { |widget| widget.text "constructor" }, :rendering_context => the_rc)).to eq("beforeinner_beforemiddleinner_afterafter")
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - Andrew Geweke
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -170,7 +170,7 @@ files:
 - 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/simple_compiled_template.rb
 - lib/fortitude/method_templates/tag_method_template.rb.smpl
 - lib/fortitude/method_templates/text_method_template.rb.smpl
 - lib/fortitude/rails.rb
@@ -270,12 +270,15 @@ files:
 - spec/rails/templates/class_loading_system_spec/app/models/views/app_models_helper.rb
 - spec/rails/templates/class_loading_system_spec/app/models/views/models_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/autoload_namespace/autoload_widget.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_foo.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_loaded_underscore_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_underscore_view.rb
-- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_underscore_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/app_models.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/autoload_one_widget_from_another.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.html.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/class_should_not_load.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/foo.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/lib_views.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_lib_widget_from_view_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_models_widget_from_view_widget.rb
@@ -332,9 +335,11 @@ files:
 - spec/rails/templates/development_mode_system_spec/app/controllers/development_mode_system_spec_controller.rb
 - spec/rails/templates/development_mode_system_spec/app/controllers/replaced_controller.rb
 - spec/rails/templates/development_mode_system_spec/app/mailers/development_mode_mailer.rb
+- spec/rails/templates/development_mode_system_spec/app/views/base.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_layout_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_view_test.rb
+- spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/form.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_layout_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_view_test.rb
@@ -362,6 +367,8 @@ files:
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/fortitude_widget_in_app_v_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_in_app_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_in_app_views.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_widget.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/config/application.rb
 - spec/rails/templates/helpers_include_all_off_system_spec/app/controllers/helpers_include_all_off_system_spec_controller.rb
 - spec/rails/templates/helpers_include_all_off_system_spec/app/helpers/application_helper.rb
@@ -454,6 +461,7 @@ files:
 - spec/rails/templates/rendering_context_system_spec/app/views/rendering_context_system_spec/uses_specified_context_through_nesting_inner_partial.rb
 - spec/rails/templates/rendering_context_system_spec/lib/simple_rc.rb
 - spec/rails/templates/rendering_system_spec/app/controllers/rendering_system_spec_controller.rb
+- spec/rails/templates/rendering_system_spec/app/helpers/application_helper.rb
 - spec/rails/templates/rendering_system_spec/app/views/layouts/application.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/_layout_for_partial.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/_the_partial.html.erb
@@ -475,6 +483,8 @@ files:
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/widget_with_name.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/word.rb
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render.rb
+- 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_helper.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
@@ -527,6 +537,7 @@ files:
 - spec/system/widget_class_from_spec.rb
 - spec/system/widget_method_system_spec.rb
 - spec/system/widget_return_values_system_spec.rb
+- spec/system/yield_system_spec.rb
 homepage: https://github.com/ageweke/fortitude
 licenses:
 - MIT
@@ -597,12 +608,15 @@ test_files:
 - spec/rails/templates/class_loading_system_spec/app/models/views/app_models_helper.rb
 - spec/rails/templates/class_loading_system_spec/app/models/views/models_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/autoload_namespace/autoload_widget.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_foo.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_loaded_underscore_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_underscore_view.rb
-- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/_underscore_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/app_models.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/autoload_one_widget_from_another.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.html.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/bar.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/class_should_not_load.rb
+- spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/foo.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/lib_views.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_lib_widget_from_view_widget.rb
 - spec/rails/templates/class_loading_system_spec/app/views/class_loading_system_spec/use_models_widget_from_view_widget.rb
@@ -659,9 +673,11 @@ test_files:
 - spec/rails/templates/development_mode_system_spec/app/controllers/development_mode_system_spec_controller.rb
 - spec/rails/templates/development_mode_system_spec/app/controllers/replaced_controller.rb
 - spec/rails/templates/development_mode_system_spec/app/mailers/development_mode_mailer.rb
+- spec/rails/templates/development_mode_system_spec/app/views/base.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_layout_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_mailer/mailer_view_test.rb
+- spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/form.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_formatting_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_layout_test.rb
 - spec/rails/templates/development_mode_system_spec/app/views/development_mode_system_spec/mailer_view_test.rb
@@ -689,6 +705,8 @@ test_files:
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/fortitude_widget_in_app_v_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_in_app_views.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_in_app_views.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_widget.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/fortitude_widget.rb
 - spec/rails/templates/erector_coexistence_system_spec/config/application.rb
 - spec/rails/templates/helpers_include_all_off_system_spec/app/controllers/helpers_include_all_off_system_spec_controller.rb
 - spec/rails/templates/helpers_include_all_off_system_spec/app/helpers/application_helper.rb
@@ -781,6 +799,7 @@ test_files:
 - spec/rails/templates/rendering_context_system_spec/app/views/rendering_context_system_spec/uses_specified_context_through_nesting_inner_partial.rb
 - spec/rails/templates/rendering_context_system_spec/lib/simple_rc.rb
 - spec/rails/templates/rendering_system_spec/app/controllers/rendering_system_spec_controller.rb
+- spec/rails/templates/rendering_system_spec/app/helpers/application_helper.rb
 - spec/rails/templates/rendering_system_spec/app/views/layouts/application.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/_layout_for_partial.html.erb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/_the_partial.html.erb
@@ -802,6 +821,8 @@ test_files:
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/widget_with_name.rb
 - spec/rails/templates/rendering_system_spec/app/views/rendering_system_spec/word.rb
 - spec/rails/templates/rendering_system_spec/app/views/widget_to_render.rb
+- 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_helper.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
@@ -854,3 +875,4 @@ test_files:
 - spec/system/widget_class_from_spec.rb
 - spec/system/widget_method_system_spec.rb
 - spec/system/widget_return_values_system_spec.rb
+- spec/system/yield_system_spec.rb