fortitude 0.0.9-java → 0.0.10-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfef6b124f74ca790f7b374119f5f1a2b88851d3
-  data.tar.gz: d74465173f9aeb5008fe0ad11f13187cd02ab7a5
+  metadata.gz: e1a542c4ed9adc0639a95c15852b627673bb55c5
+  data.tar.gz: 905df6f3d00b4e5740e9de43fd0486b4e4b9131e
 SHA512:
-  metadata.gz: bb2840406f5ad37c7aae1c710cc916d43067afa793c0c797c90f4c336d77b7ed4002ced4de37282ce71f414fdebfa56398c8412c6f65512b84d5f0a1d7589049
-  data.tar.gz: a37f299d18af00808f3382cc4adc5ac2c91d4f08f4862fdab6f81f6190b11248d64b01fbd6fbccf047b7d28872a08f65901c81c0b0f3964b15b66cdaf3deaceb
+  metadata.gz: 1245a668c62617e44b205e63f662b2a47735e97d13dd2315b26fdb832adec5a04f1eb5e464e0329f261cfcbdfe351d239306a95d97463714d4c5660c6c3cdd72
+  data.tar.gz: 2f428702bbd1ed28557fe677a2f8b09c13a5864acec8669919fecd042b8a89bad35191dd706f24e3ed1bad4db7d55a47c211bd5fac05bba614eea917c57b2728

data/CHANGES.md

@@ -1,5 +1,74 @@
 # Fortitude Releases
 
+## 0.0.10, 25 November 2014
+
+* Fixed an issue where `#capture` was not working properly if you rendered a widget using `render :widget =>` in a
+  controller. The fix further simplifies Fortitude's support for that feature and integrates even more correctly with
+  Rails in that way. (Thanks to [Leaf](https://github.com/leafo) for the bug report!)
+* Fixed an issue where, if you overrode a "needs" method in a class, subclasses of that class would not use the
+  overridden method, but instead access the "needs" method directly. (Thanks to [Leaf](https://github.com/leafo)
+  for the bug report!)
+* Fixed a simple mistake that meant the module Fortitude uses to declare `needs` methods was not given a name at all,
+  and instead the module it uses to declare helpers was given two names, one of them incorrect. (Thanks to
+  [Leaf](https://github.com/leafo) for catching this.)
+* When you're invoking a widget from another widget using the `#widget` method, and you pass a block, that block is
+  evaluated in the context of the parent widget. (This has always been true.) However, this meant that something like
+  the following was impossible, where you're effectively defining new DSL on a widget-by-widget basis:
+
+```ruby
+class Views::ModalDialog < Views::Base
+  needs :title
+
+  def content
+    h3 "Modal: #{title}"
+    yield
+    button "Submit"
+  end
+
+  def modal_header(name)
+    h5 "Modal header: #{name}"
+    hr
+  end
+end
+
+class Views::MyView < Views::Base
+  needs :username
+
+  def content
+    h1 "User #{username}"
+
+    widget Views::ModalDialog, :title => "User Settings" do
+      modal_header "Settings for #{username}"
+      input :type => :text, :name => :email
+      ...
+    end
+  end
+end
+```
+
+  The problem arises because, within the block in `Views::MyView#content`, you want to be able to access methods from
+  two contexts: the parent widget (for `#username`), and the child widget (for `#modal_header`). Ruby provides no
+  single, simple way to do this, but, without it, it's very difficult to come up with a truly elegant DSL for cases
+  like this.
+
+  Fortitude now supports this via a small bit of `method_missing` magic: the block passed to a widget is still
+  evaluated in the context of the parent, but, if a method is called that is not present, Fortitude looks for that
+  method in the child widget and invokes it there, if present. This allows the above situation, which is important
+  for writing libraries that "feel right" to a Ruby programmer. (The fact that the block is evaluated primarily in the
+  context of the parent widget, like all other Ruby blocks, preserves important standard Ruby semantics, and also
+  means that the onus is on the author of a feature like `Views::ModalDialog` to present method names that are
+  unlikely to conflict with those in use in parent widgets &mdash; which seems correct.)
+
+* You can now render Erector widgets from Fortitude widgets using just `widget MyErectorWidget`, and vice-versa, using
+  either the class-and-assigns or instantiated-widget calling conventions. Note that this integration is not 100%
+  perfect; in particular, passing a block from a Fortitude widget to an Erector widget, or vice-versa, is likely to
+  fail or produce incorrect output due to the way Erector manipulates output buffers. However, the simple case of
+  invoking a widget from another works fine, and can be very useful to those migrating to Fortitude. (Thanks to
+  [Adam Becker](https://github.com/ajb) for the bug report!)
+* Fixed an issue where Fortitude could write the close tag of an element to the wrong output buffer if the output
+  buffer was changed inside the element (as can happen with, among other things, Rails' `cache` method). This could
+  cause the output HTML to be structured improperly. (Thanks to [Leaf](https://github.com/leafo) for the bug report,tracking down the exact cause, and providing the fix!)
+
 ## 0.0.9, 20 November 2014
 
 * Fortitude now supports passing blocks to widgets (above and beyond support for Rails' standard layouts and their

data/CONTRIBUTORS.md

@@ -20,6 +20,16 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
     from Fortitude.
   * Reporting multiple bugs in support for `render :widget => ...`, and many useful pointers to possible fixes and
     additional methods to make the implementation a lot more robust.
+  * Reporting a bug, tracking down the exact cause, and providing a fix for a case where the closing tag of an element
+    would get written to the wrong output buffer if the output buffer was changed inside the element (as could happen
+    with, among other things, Rails' `cache` method).
+  * Reporting a bug where overriding a "needs" method would work only for the class it was defined on, and not any
+    subclasses.
+  * Reporting an issue where the module Fortitude uses to mix in its "needs" methods was not given a name, and instead
+    the module it used to mix in helper methods was given two names, one of them incorrect.
+  * Reporting a bug where using `#capture` inside a widget being rendered via `render :widget => ...` would not work
+    properly.
 * [Adam Becker](https://github.com/ajb) for:
   * Discussion and details around exactly what `:attribute => true`, `:attribute => false`, and so on should render
     from Fortitude.
+  * Reporting an issue where you could not easily render a Fortitude widget from Erector, nor vice-versa.

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'erector'
+# gem 'erector-rails4', :path => '../erector-rails4'

data/lib/fortitude.rb

@@ -5,3 +5,4 @@ require "fortitude/extensions/native_extensions"
 require "fortitude/rendering_context"
 require "fortitude/widget"
 require "fortitude/tilt"
+require "fortitude/erector"

data/lib/fortitude/erector.rb

@@ -3,10 +3,12 @@ module Fortitude
     class << self
       def is_erector_available?
         @is_erector_available ||= begin
-          begin
-            gem 'erector'
-          rescue Gem::LoadError => le
-            # ok
+          %w{erector-rails4 erector}.each do |gem_name|
+            begin
+              gem gem_name
+            rescue Gem::LoadError => le
+              # ok
+            end
           end
 
           begin
@@ -28,6 +30,45 @@ module Fortitude
         return false if widget_class == ::Object
         return is_erector_widget_class?(widget_class.superclass)
       end
+
+      def is_erector_widget?(widget)
+        is_erector_widget_class?(widget.class)
+      end
+    end
+
+    class ErectorOutputBufferHolder
+      def initialize(erector_output)
+        @erector_output = erector_output
+      end
+
+      def output_buffer
+        erector_output.buffer
+      end
+
+      private
+      attr_reader :erector_output
     end
   end
 end
+
+if ::Fortitude::Erector.is_erector_available?
+  ::Erector::AbstractWidget.class_eval do
+    def widget_with_fortitude(target, assigns = {}, options = {}, &block)
+      if (target.kind_of?(::Class) && target < ::Fortitude::Widget)
+        target = target.new(assigns)
+      end
+
+      if target.kind_of?(::Fortitude::Widget)
+        rendering_context = ::Fortitude::RenderingContext.new(
+          :delegate_object => parent,
+          :output_buffer_holder => ::Fortitude::Erector::ErectorOutputBufferHolder.new(output),
+          :helpers_object => helpers)
+        return target.render_to(rendering_context, &block)
+      else
+        return widget_without_fortitude(target, assigns, options, &block)
+      end
+    end
+
+    alias_method_chain :widget, :fortitude
+  end
+end

data/lib/fortitude/method_templates/tag_method_template.rb.smpl

@@ -15,6 +15,7 @@ def #{method_name}(content_or_attributes = nil, attributes = nil)
         _fortitude_raise_no_content_allowed_error(#{tag_object_const})     # :if ! content_allowed
         o.#{concat_method}(#{open_const})
         #{yield_call}
+        o = @_fortitude_output_buffer_holder.output_buffer
         o.#{concat_method}(#{close_const})
       else
         o.#{concat_method}(#{alone_const})
@@ -29,6 +30,7 @@ def #{method_name}(content_or_attributes = nil, attributes = nil)
         _fortitude_raise_no_content_allowed_error(#{tag_object_const})     # :if ! content_allowed
         o.#{concat_method}(#{partial_open_end_const})
         #{yield_call}
+        o = @_fortitude_output_buffer_holder.output_buffer
         o.#{concat_method}(#{close_const})
       else
         o.#{concat_method}(#{partial_open_alone_end_const})
@@ -42,6 +44,7 @@ def #{method_name}(content_or_attributes = nil, attributes = nil)
       if block_given?
         _fortitude_raise_no_content_allowed_error(#{tag_object_const})     # :if ! content_allowed
         #{yield_call}
+        o = @_fortitude_output_buffer_holder.output_buffer
       end
       o.#{concat_method}(#{close_const})
     else
@@ -58,6 +61,7 @@ def #{method_name}(content_or_attributes = nil, attributes = nil)
       if block_given?
         _fortitude_raise_no_content_allowed_error(#{tag_object_const})     # :if ! content_allowed
         #{yield_call}
+        o = @_fortitude_output_buffer_holder.output_buffer
       end
       o.#{concat_method}(#{close_const})
     end

data/lib/fortitude/rails/rendering_methods.rb

@@ -25,9 +25,11 @@ module Fortitude
           return ::Erector::Rails.render(widget, controller.view_context, { }, false, options)
         end
 
+        view_context = controller.view_context
+
         if widget.kind_of?(Class)
           if widget < ::Fortitude::Widget
-            widget = widget.new(widget.extract_needed_assigns_from(controller.view_context.assigns))
+            widget = widget.new(widget.extract_needed_assigns_from(view_context.assigns))
           else
             raise "You tried to render something using 'render :widget' that is a class, but not a subclass of Fortitude::Widget: #{widget.inspect}"
           end
@@ -37,12 +39,16 @@ module Fortitude
           raise "You tried to render something using 'render :widget' that is neither an instance of a subclass of Fortitude::Widget, nor a class that inherits from Fortitude::Widget: #{widget.inspect}"
         end
 
-        rendering_context = controller.create_fortitude_rendering_context(:helpers_object => controller.view_context)
-        widget.render_to(rendering_context)
+        rendering_context = controller.create_fortitude_rendering_context(
+          :helpers_object => view_context, :output_buffer_holder => view_context)
+
+        output_buffer = view_context.with_output_buffer do
+          widget.render_to(rendering_context)
+        end
 
         passed_options = options.dup
         passed_options.delete(:widget)
-        passed_options[:text] = rendering_context.output_buffer_holder.output_buffer.to_s
+        passed_options[:text] = output_buffer.to_s
         passed_options[:layout] = true unless passed_options.has_key?(:layout)
 
         return controller.render_to_string(passed_options)

data/lib/fortitude/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/lib/fortitude/widget/integration.rb

@@ -33,18 +33,46 @@ module Fortitude
 
       # RUBY CALLBACK
       def method_missing(name, *args, &block)
-        if self.class.extra_assigns == :use
-          ivar_name = self.class.instance_variable_name_for_need(name)
-          return instance_variable_get(ivar_name) if instance_variable_defined?(ivar_name)
-        end
+        target_method_and_args = _fortitude_target_method_and_args_for_method_missing(name, *args, &block)
+        if target_method_and_args
+          target = target_method_and_args[0]
+          method = target_method_and_args[1]
+          args = target_method_and_args[2..-1]
 
-        if self.class.automatic_helper_access && @_fortitude_rendering_context && @_fortitude_rendering_context.helpers_object && @_fortitude_rendering_context.helpers_object.respond_to?(name, true)
-          @_fortitude_rendering_context.helpers_object.send(name, *args, &block)
+          target.send(method, *args, &block)
         else
           super(name, *args, &block)
         end
       end
 
+      def respond_to?(name, include_all = false)
+        out = super(name, include_all)
+
+        if (! out)
+          target_method_and_args = _fortitude_target_method_and_args_for_method_missing(name)
+          out = true if target_method_and_args
+        end
+
+        out
+      end
+
+      def _fortitude_target_method_and_args_for_method_missing(missing_method_name, *missing_method_args, &missing_method_block)
+        if self.class.extra_assigns == :use && missing_method_args.length == 0 && (! missing_method_block)
+          ivar_name = self.class.instance_variable_name_for_need(missing_method_name)
+          return [ self, :instance_variable_get, ivar_name ] if instance_variable_defined?(ivar_name)
+        end
+
+        if self.class.automatic_helper_access && @_fortitude_rendering_context && @_fortitude_rendering_context.helpers_object && @_fortitude_rendering_context.helpers_object.respond_to?(missing_method_name, true)
+          return [ @_fortitude_rendering_context.helpers_object, missing_method_name, *missing_method_args ]
+        end
+
+        if @_fortitude_in_block_for_sub_widget
+          return [ @_fortitude_in_block_for_sub_widget, missing_method_name, *missing_method_args ]
+        end
+
+        nil
+      end
+
       included do
         _fortitude_on_class_inheritable_attribute_change(
           :format_output, :enforce_element_nesting_rules, :record_tag_emission) do |attribute_name, old_value, new_value|

data/lib/fortitude/widget/modules_and_subclasses.rb

@@ -47,7 +47,7 @@ module Fortitude
           const_set(:DefinedFortitudeHelpers, @helpers_module)
           @needs_module = Module.new
           include @needs_module
-          const_set(:FortitudeNeedsMethods, @helpers_module)
+          const_set(:FortitudeNeedsMethods, @needs_module)
         end
         private :create_modules!
 

data/lib/fortitude/widget/needs.rb

@@ -64,6 +64,11 @@ module Fortitude
           end
         end
 
+        # INTERNAL USE ONLY
+        def my_needs_as_hash
+          @this_class_needs ||= { }
+        end
+
         # INTERNAL USE ONLY
         def invalidate_needs!(why, klass = self)
           invalidating(:needs, why, klass) do
@@ -117,10 +122,11 @@ module Fortitude
         end
 
         def rebuild_my_needs_methods!
-          n = needs_as_hash
+          all_needs_as_hash = needs_as_hash
+          mnah = my_needs_as_hash
 
           start_time = Time.now
-          needs_text = n.map do |need, default_value|
+          needs_text = all_needs_as_hash.map do |need, default_value|
             Fortitude::MethodTemplates::SimpleCompiledTemplate.template('need_assignment_template').result(:extra_assigns => extra_assigns,
               :need => need, :has_default => (default_value != REQUIRED_NEED),
               :ivar_name => instance_variable_name_for_need(need)
@@ -131,7 +137,7 @@ module Fortitude
             :extra_assigns => extra_assigns, :needs_text => needs_text)
 
           needs_methods_text = ""
-          n.each do |need, default_value|
+          mnah.each do |need, default_value|
             needs_methods_text << (Fortitude::MethodTemplates::SimpleCompiledTemplate.template('need_method_template').result(
               :need => need, :ivar_name => instance_variable_name_for_need(need),
               :debug => self.debug))
@@ -164,6 +170,11 @@ module Fortitude
         @_fortitude_needs_as_hash ||= self.class.needs_as_hash
       end
 
+      # INTERNAL USE ONLY
+      def my_needs_as_hash
+        @_fortitude_my_needs_as_hash ||= self.class.my_needs_as_hash
+      end
+
       # PUBLIC API
       def assigns
         @_fortitude_assigns_proxy ||= begin

data/lib/fortitude/widget/rendering.rb

@@ -53,11 +53,23 @@ module Fortitude
 
       # PUBLIC API
       def widget(w, hash = nil, &block)
-        if w.respond_to?(:render_to)
-          w.render_to(@_fortitude_rendering_context, &block)
-        elsif w.kind_of?(Class)
+        if w.kind_of?(Class) && ((w < ::Fortitude::Widget) || ::Fortitude::Erector.is_erector_widget_class?(w))
           hash ||= { }
-          w.new(hash, &block).render_to(@_fortitude_rendering_context)
+          w = w.new(hash)
+        end
+
+        if w.kind_of?(::Fortitude::Widget)
+          begin
+            @_fortitude_in_block_for_sub_widget = w if block
+            w.render_to(@_fortitude_rendering_context, &block)
+          ensure
+            @_fortitude_in_block_for_sub_widget = nil
+          end
+        elsif ::Fortitude::Erector.is_erector_widget?(w)
+          w.send(:_emit,
+            :parent => rendering_context.helpers_object,
+            :helpers => rendering_context.helpers_object,
+            :output => rendering_context.output_buffer_holder.output_buffer)
         else
           raise "You tried to render a widget, but this is not valid: #{w.inspect}(#{hash.inspect})"
         end
@@ -103,15 +115,15 @@ module Fortitude
         if @_fortitude_block_for_content_method
           @_fortitude_block_for_content_method.call(*args)
         elsif @_fortitude_constructor_block
-          @_fortitude_constructor_block.call(*args)
+          @_fortitude_constructor_block.call(self, *args)
         else
-          @_fortitude_rendering_context.yield_from_widget(*args)
+          @_fortitude_rendering_context.yield_from_widget(self, *args)
         end
       end
 
       # PUBLIC API
       def yield_from_widget(*args)
-        _fortitude_yield_from_widget(self, *args)
+        _fortitude_yield_from_widget(*args)
       end
 
       # PUBLIC API (Erector compatibility)

data/spec/helpers/system_helpers.rb

@@ -59,6 +59,9 @@ module SystemHelpers
     tag :b
     tag :nav, :newline_before => true
     tag :h1, :newline_before => true
+    tag :h3, :newline_before => true
+    tag :h5, :newline_before => true
+    tag :button, :newline_before => true
     tag :img, :content_allowed => false
     tag :script, :newline_before => true, :escape_direct_content => false
     tag :head, :newline_before => true

data/spec/rails/complex_helpers_system_spec.rb

@@ -30,4 +30,34 @@ describe "Rails complex helper support", :type => :rails do
     expect_match("cache_test?a=a2&b=b2",
       /before_cache\(a2,b2\).*inside_cache\(a2,b2\).*after_cache\(a2,b2\)/mi)
   end
+
+  it "should cache with nesting in tags properly" do
+    expect_match("cache_tags_test?a=a1&b=b1",
+      %r{<p\s+class="before_cache">\s*
+          <span>before_cache:\s*a=a1,b=b1</span>\s*
+          <p\s+class="in_cache">\s*
+            <span>in_cache:\s*a=a1,b=b1</span>\s*
+          </p>\s*
+          <span>after_cache:\s*a=a1,b=b1</span>\s*
+         </p>\s*
+
+         <p\s+class="after_cache_2">\s*
+           <span>after_cache_2:\s*a=a1,b=b1</span>\s*
+         </p>}mix
+      )
+
+    expect_match("cache_tags_test?a=a1&b=b2",
+      %r{<p\s+class="before_cache">\s*
+          <span>before_cache:\s*a=a1,b=b2</span>\s*
+          <p\s+class="in_cache">\s*
+            <span>in_cache:\s*a=a1,b=b1</span>\s*
+          </p>\s*
+          <span>after_cache:\s*a=a1,b=b2</span>\s*
+         </p>\s*
+
+         <p\s+class="after_cache_2">\s*
+           <span>after_cache_2:\s*a=a1,b=b2</span>\s*
+         </p>}mix
+      )
+  end
 end

data/spec/rails/erector_coexistence_system_spec.rb

@@ -45,5 +45,25 @@ describe "Erector coexistence support", :type => :rails do
     it "should be able to render an Erector widget with just a class using render :widget" do
       expect_match("render_widget_erector_class", /this is an Erector widget/, :no_layout => true)
     end
+
+    it "should be able to render an Erector widget from a Fortitude widget using just 'widget'" do
+      expect_match("render_erector_widget_from_fortitude_widget",
+        %r{before erector widget: this is my_helper\!\s*inside erector widget: this is my_helper\!, passed_foo\s*after erector widget: this is my_helper\!}mi)
+    end
+
+    it "should be able to render an Erector widget from a Fortitude widget using just 'widget' with an instantiated widget" do
+      expect_match("render_erector_widget_from_fortitude_widget?instantiate_widget=true",
+        %r{before erector widget: this is my_helper\!\s*inside erector widget: this is my_helper\!, passed_foo\s*after erector widget: this is my_helper\!}mi)
+    end
+
+    it "should be able to render a Fortitude widget from an Erector widget using just 'widget'" do
+      expect_match("render_fortitude_widget_from_erector_widget",
+        %r{before fortitude widget: this is my_helper\!\s*inside fortitude widget: this is my_helper\!, passed_foo\s*after fortitude widget: this is my_helper\!}mi)
+    end
+
+    it "should be able to render a Fortitude widget from an Erector widget using just 'widget' with an instantiated widget" do
+      expect_match("render_fortitude_widget_from_erector_widget?instantiate_widget=true",
+        %r{before fortitude widget: this is my_helper\!\s*inside fortitude widget: this is my_helper\!, passed_foo\s*after fortitude widget: this is my_helper\!}mi)
+    end
   end
 end

data/spec/rails/rendering_system_spec.rb

@@ -24,6 +24,10 @@ describe "Rails rendering support", :type => :rails do
       expect_match("render_widget_with_helper", /hello from a widget named Judy/)
     end
 
+    it "should let you use #capture from within a widget passed to 'render :widget =>'" do
+      expect_match("render_widget_with_capture", %r{<p class="one">before_captureafter_capture</p><p class="two">before_splat<p>inside_capture</p>after_splat</p>})
+    end
+
     it "should let you specify just a widget class with 'render :widget =>'" do
       expect_match("render_widget_class_only", /hello from a simple widget/)
     end

data/spec/rails/templates/complex_helpers_system_spec/app/controllers/complex_helpers_system_spec_controller.rb

@@ -11,4 +11,9 @@ class ComplexHelpersSystemSpecController < ApplicationController
     @a = params[:a]
     @b = params[:b]
   end
+
+  def cache_tags_test
+    @a = params[:a]
+    @b = params[:b]
+  end
 end

data/spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_tags_test.rb

@@ -0,0 +1,23 @@
+class Views::ComplexHelpersSystemSpec::CacheTagsTest < Fortitude::Widgets::Html5
+  needs :a, :b
+
+  format_output true
+
+  def content
+    p(:class => 'before_cache') do
+      span "before_cache: a=#{a},b=#{b}"
+
+      cache("cache_tags_test-#{a}") do
+        p(:class => "in_cache") do
+          span "in_cache: a=#{a},b=#{b}"
+        end
+      end
+
+      span("after_cache: a=#{a},b=#{b}")
+    end
+
+    p(:class => "after_cache_2") do
+      span "after_cache_2: a=#{a},b=#{b}"
+    end
+  end
+end

data/spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_test.rb

@@ -3,8 +3,7 @@ class Views::ComplexHelpersSystemSpec::CacheTest < Fortitude::Widgets::Html5
 
   def content
     text "before_cache(#{a},#{b})"
-    # rawtext "fragment_name: #{cache_fragment_name(a)}"
-    cache(a) do
+    cache("cache_test-#{a}") do
       text "inside_cache(#{a},#{b})"
     end
     text "after_cache(#{a},#{b})"

data/spec/rails/templates/erector_coexistence_system_spec/app/controllers/erector_coexistence_system_spec_controller.rb

@@ -32,4 +32,12 @@ class ErectorCoexistenceSystemSpecController < ApplicationController
   def render_widget_erector_class
     render :widget => ::Views::ErectorWidget
   end
+
+  def render_erector_widget_from_fortitude_widget
+    @instantiate_widget = !! (params[:instantiate_widget] == "true")
+  end
+
+  def render_fortitude_widget_from_erector_widget
+    @instantiate_widget = !! (params[:instantiate_widget] == "true")
+  end
 end

data/spec/rails/templates/erector_coexistence_system_spec/app/helpers/application_helper.rb

@@ -0,0 +1,5 @@
+module ApplicationHelper
+  def my_helper
+    "this is my_helper!"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/erector_widget_from_fortitude_widget.rb

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::ErectorWidgetFromFortitudeWidget < ::Erector::Widget
+  needs :foo => 'default_foo'
+
+  def content
+    text "inside erector widget: #{my_helper}, #{@foo}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/fortitude_widget_from_erector_widget.rb

@@ -0,0 +1,7 @@
+class Views::ErectorCoexistenceSystemSpec::FortitudeWidgetFromErectorWidget < ::Fortitude::Widgets::Html5
+  needs :foo => 'default_foo'
+
+  def content
+    text "inside fortitude widget: #{my_helper}, #{foo}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_erector_widget_from_fortitude_widget.rb

@@ -0,0 +1,13 @@
+class Views::ErectorCoexistenceSystemSpec::RenderErectorWidgetFromFortitudeWidget < Fortitude::Widgets::Html5
+  needs :instantiate_widget
+
+  def content
+    text "before erector widget: #{my_helper}"
+    if instantiate_widget
+      widget Views::ErectorCoexistenceSystemSpec::ErectorWidgetFromFortitudeWidget.new(:foo => 'passed_foo')
+    else
+      widget Views::ErectorCoexistenceSystemSpec::ErectorWidgetFromFortitudeWidget, :foo => 'passed_foo'
+    end
+    text "after erector widget: #{my_helper}"
+  end
+end

data/spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_fortitude_widget_from_erector_widget.rb

@@ -0,0 +1,13 @@
+class Views::ErectorCoexistenceSystemSpec::RenderFortitudeWidgetFromErectorWidget < ::Erector::Widget
+  needs :instantiate_widget
+
+  def content
+    text "before fortitude widget: #{my_helper}"
+    if @instantiate_widget
+      widget Views::ErectorCoexistenceSystemSpec::FortitudeWidgetFromErectorWidget.new(:foo => 'passed_foo')
+    else
+      widget Views::ErectorCoexistenceSystemSpec::FortitudeWidgetFromErectorWidget, :foo => 'passed_foo'
+    end
+    text "after fortitude widget: #{my_helper}"
+  end
+end

data/spec/rails/templates/rendering_system_spec/app/controllers/rendering_system_spec_controller.rb

@@ -15,6 +15,10 @@ class RenderingSystemSpecController < ApplicationController
     render :widget => Views::WidgetToRenderWithHelper.new
   end
 
+  def render_widget_with_capture
+    render :widget => Views::WidgetToRenderWithCapture.new
+  end
+
   def render_widget_class_only
     render :widget => Views::WidgetToRenderClassOnly
   end

data/spec/rails/templates/rendering_system_spec/app/views/widget_to_render_with_capture.rb

@@ -0,0 +1,19 @@
+class Views::WidgetToRenderWithCapture < ::Fortitude::Widgets::Html5
+  def content
+    x = nil
+
+    p(:class => 'one') {
+      text "before_capture"
+      x = capture {
+        p "inside_capture"
+      }
+      text "after_capture"
+    }
+
+    p(:class => 'two') {
+      text "before_splat"
+      rawtext(x)
+      text "after_splat"
+    }
+  end
+end

data/spec/system/assigns_system_spec.rb

@@ -44,6 +44,18 @@ describe "Fortitude assigns access", :type => :system do
     expect(render(wc.new(:foo => 'the_foo', :bar => 'the_bar'))).to eq("assigns[:foo] = the_foo, assigns[:bar] = the_bar")
   end
 
+  it "should allow accessing extra assigns via method, and also indicate respond_to?" do
+    wc = widget_class do
+      extra_assigns :use
+
+      def content
+        text "foo = #{foo}, respond_to? #{respond_to?(:foo).inspect}"
+      end
+    end
+
+    expect(render(wc.new(:foo => 'the_foo'))).to eq("foo = the_foo, respond_to? true")
+  end
+
   it "should allow changing assigns, and always return the current value of the assign" do
     wc = widget_class do
       needs :foo

data/spec/system/helpers_system_spec.rb

@@ -93,6 +93,12 @@ describe "Fortitude helper support", :type => :system do
     expect(render(widget_class_with_content { helper3("ho") })).to eq("this is ho helper3")
   end
 
+  it "should indicate that it responds to helpers using respond_to? for automatic helper methods" do
+    expect(render(widget_class_with_content { text "respond_to helper1: #{respond_to?(:helper1)}" } )).to eq("respond_to helper1: true")
+    expect(render(widget_class_with_content { text "respond_to helper2: #{respond_to?(:helper2)}" } )).to eq("respond_to helper2: true")
+    expect(render(widget_class_with_content { text "respond_to helper3: #{respond_to?(:helper3)}" } )).to eq("respond_to helper3: true")
+  end
+
   it "should not allow automatic access to helpers if we say not to" do
     wc = widget_class do
       automatic_helper_access false

data/spec/system/method_precedence_system_spec.rb

@@ -45,4 +45,26 @@ describe "Fortitude method precedence", :type => :system do
     expect(render(wc, :rendering_context => rc(
       :helpers_object => helpers_object))).to eq("foo: method foo, bar: need_bar, baz: helper_baz, <quux></quux>")
   end
+
+  it "should let you override 'needs' methods in superclasses, and have them still apply in subclasses" do
+    wc_parent = widget_class do
+      needs :foo, :bar => 'default_bar'
+
+      def foo
+        "pre#{super}post"
+      end
+
+      def content
+        text "parent: foo: #{foo}, bar: #{bar}"
+      end
+    end
+
+    wc_child = widget_class(:superclass => wc_parent) do
+      def content
+        text "child: foo: #{foo}, bar: #{bar}"
+      end
+    end
+
+    expect(render(wc_child.new(:foo => 'supplied_foo'))).to eq("child: foo: presupplied_foopost, bar: default_bar")
+  end
 end

data/spec/system/setting_inheritance_system_spec.rb

@@ -577,6 +577,14 @@ describe "Fortitude setting inheritance", :type => :system do
       end
     end
 
+    # We need to redefine this method on all child classes, because we let 'needs' methods inherit -- and only
+    # build such methods if the need is defined on the class in question. Without this, the only class that will
+    # actually define the method is @grandparent, and so none of the children will actually be affected when we set
+    # .debug on them.
+    [ @parent1, @child11, @child12, @parent2, @child21, @child22 ].each do |klass|
+      klass.send(:needs, :p => 'abc')
+    end
+
     debug_should_be(false, @grandparent, @parent1, @child11, @child12, @parent2, @child21, @child22)
 
     @parent1.debug true

data/spec/system/yield_system_spec.rb

@@ -185,4 +185,156 @@ describe "Fortitude widgets and 'yield'", :type => :system do
 
     expect(render(wc.new { |widget| widget.text "constructor" }, :rendering_context => the_rc)).to eq("beforeinner_beforemiddleinner_afterafter")
   end
+
+  it "should evaluate blocks passed to #widget in their defining context, but allow falling back to child-widget methods (but only as a recourse)" do
+    wc_sub = widget_class do
+      def baz
+        "sub_baz"
+      end
+
+      def quux
+        "sub_quux"
+      end
+
+      def content
+        text "sub_before"
+        yield
+        text "sub_after"
+      end
+    end
+
+    wc_parent = widget_class do
+      cattr_accessor :wc_sub
+
+      needs :foo
+
+      def bar
+        "wc_bar"
+      end
+
+      def baz
+        "wc_baz"
+      end
+
+      def content
+        text "before"
+        widget wc_sub.new do
+          text "in block: #{foo}, #{bar}, #{baz}, #{quux}"
+          text "respond: #{respond_to?(:foo).inspect}, #{respond_to?(:bar).inspect}, #{respond_to?(:baz).inspect}, #{respond_to?(:quux).inspect}"
+        end
+        text "after"
+      end
+    end
+
+    wc_parent.wc_sub = wc_sub
+
+    expect(render(wc_parent.new(:foo => 'passed_foo'))).to eq("beforesub_beforein block: passed_foo, wc_bar, wc_baz, sub_quuxrespond: true, true, true, truesub_afterafter")
+  end
+
+  it "should allow creating an elegant modal-dialog widget" do
+    parent_class = widget_class do
+      format_output true
+    end
+
+    modal_dialog_module = Module.new do
+      mattr_accessor :modal_dialog_class
+
+      def modal_dialog(title, options = { }, &block)
+        widget(modal_dialog_class.new(options.merge(:title => title)), &block)
+      end
+    end
+
+    modal_section_class = widget_class(:superclass => parent_class) do
+      needs :section_title
+
+      def content
+        div(:class => 'modal_section') do
+          h5 "Modal section: #{section_title}"
+
+          yield("#{section_title}345", "456#{section_title}")
+        end
+      end
+    end
+
+    modal_dialog_class = widget_class(:superclass => parent_class) do
+      cattr_accessor :modal_section_class
+
+      needs :title, :button_text => 'Go!'
+
+      def content
+        div(:class => 'modal_dialog') do
+          h3 "Modal title: #{title}"
+
+          yield("#{title}123", "234#{title}")
+
+          button button_text, :class => 'modal_button'
+        end
+      end
+
+      def modal_section(title, &block)
+        widget(modal_section_class.new(:section_title => title), &block)
+      end
+    end
+
+    modal_dialog_class.modal_section_class = modal_section_class
+    modal_dialog_module.modal_dialog_class = modal_dialog_class
+
+    wc = widget_class(:superclass => parent_class) do
+      needs :name
+
+      def banner(text)
+        p(text, :class => 'banner')
+      end
+
+      def content
+        h1 "Name: #{name}"
+
+        modal_dialog('Details', :button_text => 'Submit Details') { |modal_arg1, modal_arg2|
+          banner "Before details modal_section for #{name}: #{modal_arg1}, #{modal_arg2}"
+
+          modal_section("Details for #{name}") { |section_arg1, section_arg2|
+            p "These are the details for #{name}: #{section_arg1}, #{section_arg2}"
+          }
+
+          p "After details modal_section for #{name}"
+        }
+
+        modal_dialog('Security', :button_text => 'Submit Security') { |modal_arg1, modal_arg2|
+          banner "Before security modal_section for #{name}: #{modal_arg1}, #{modal_arg2}"
+
+          modal_section("Security for #{name}") { |section_arg1, section_arg2|
+            text "These are the security settings for #{name}: #{section_arg1}, #{section_arg2}"
+          }
+
+          text "After security modal_section for #{name}"
+        }
+      end
+    end
+
+    wc.send(:include, modal_dialog_module)
+
+    expect(render(wc.new(:name => 'Jones'))).to match(%r{
+      <h1>Name:\ Jones</h1>\s+
+      <div\ class="modal_dialog">\s+
+        <h3>Modal\ title:\ Details</h3>\s+
+        <p\ class="banner">Before\ details\ modal_section\ for\ Jones:\ Details123,\ 234Details</p>\s+
+        <div\ class="modal_section">\s+
+          <h5>Modal\ section:\ Details\ for\ Jones</h5>\s+
+          <p>These\ are\ the\ details\ for\ Jones:\ Details\ for\ Jones345,\ 456Details\ for\ Jones</p>\s+
+        </div>\s+
+        <p>After\ details\ modal_section\ for\ Jones</p>\s+
+        <button\ class="modal_button">Submit\ Details</button>\s+
+      </div>\s+
+      <div\ class="modal_dialog">\s+
+        <h3>Modal\ title:\ Security</h3>\s+
+        <p\ class="banner">Before\ security\ modal_section\ for\ Jones:\ Security123,\ 234Security</p>\s+
+        <div\ class="modal_section">\s+
+          <h5>Modal\ section:\ Security\ for\ Jones</h5>\s+
+          These\ are\ the\ security\ settings\ for\ Jones:\ Security\ for\ Jones345,\ 456Security\ for\ Jones\s+
+        </div>\s+
+        After\ security\ modal_section\ for\ Jones\s+
+        <button\ class="modal_button">Submit\ Security</button>\s+
+      </div>
+      }mix)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: java
 authors:
 - Andrew Geweke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-11-20 00:00:00.000000000 Z
+date: 2014-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -288,6 +288,7 @@ files:
 - spec/rails/templates/class_loading_system_spec/lib/views/class_loading_system_spec/widget_defined_outside_app_views.rb
 - spec/rails/templates/class_loading_system_spec/lib/views/lib_widget.rb
 - spec/rails/templates/complex_helpers_system_spec/app/controllers/complex_helpers_system_spec_controller.rb
+- spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_tags_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/fields_for_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/form_for_test.rb
@@ -362,10 +363,15 @@ files:
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial_partial.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/controllers/erector_coexistence_system_spec_controller.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/helpers/application_helper.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/erector_widget_in_app_v_views.rb
 - 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_from_fortitude_widget.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_from_erector_widget.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_coexistence_system_spec/render_erector_widget_from_fortitude_widget.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_fortitude_widget_from_erector_widget.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
@@ -483,6 +489,7 @@ files:
 - 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_capture.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
@@ -626,6 +633,7 @@ test_files:
 - spec/rails/templates/class_loading_system_spec/lib/views/class_loading_system_spec/widget_defined_outside_app_views.rb
 - spec/rails/templates/class_loading_system_spec/lib/views/lib_widget.rb
 - spec/rails/templates/complex_helpers_system_spec/app/controllers/complex_helpers_system_spec_controller.rb
+- spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_tags_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/cache_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/fields_for_test.rb
 - spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/form_for_test.rb
@@ -700,10 +708,15 @@ test_files:
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial.html.erb
 - spec/rails/templates/erb_integration_system_spec/app/views/erb_integration_system_spec/prefers_erb_partial_partial.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/controllers/erector_coexistence_system_spec_controller.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/helpers/application_helper.rb
 - spec/rails/templates/erector_coexistence_system_spec/app/v/views/erector_coexistence_system_spec/erector_widget_in_app_v_views.rb
 - 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_from_fortitude_widget.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_from_erector_widget.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_coexistence_system_spec/render_erector_widget_from_fortitude_widget.rb
+- spec/rails/templates/erector_coexistence_system_spec/app/views/erector_coexistence_system_spec/render_fortitude_widget_from_erector_widget.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
@@ -821,6 +834,7 @@ test_files:
 - 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_capture.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