fortitude 0.9.3-java → 0.9.4-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 467436a25faae7e85366ea30823ff7347b3db824
-  data.tar.gz: ab92630c1074a321afd13e52d525b065cf964df2
+  metadata.gz: 2884a8e72cb352ce8949fb50d90e09a3c088cd4d
+  data.tar.gz: 2570a3cc59ba2567fb99c125826cc7c8c7aca494
 SHA512:
-  metadata.gz: b36a5556e62012835d1b0c283cdb6457eb2d292137ae153e3c0da268df71334a64082fa29698742f2973e702ea9c305ef70ed888a8ca777865dc1929deb25e6f
-  data.tar.gz: e7eb439ae801b5defebc88d85fa5c2a02fe67f5c7f2e06098e6819f524abd462629a30a878a246c40bd59862de14b7f6d9cc62a56c8a26d7677c9cffbd488686
+  metadata.gz: 694c82aea14f52773ead6cfb78761571f5e2f8c0bf0f16a536f58ebcfaac9fdab583d717930f0180886d6d57564c6ab89cd8b06106b1320aeb27c95aa9a0f3a6
+  data.tar.gz: f898850d1ae571dd410b0919e557c1190700a0512c51a7a6ab4274a771ec5c4587e6dc58ef892e111a13df30dec62e13db9002544a2733e0b6df59d7d9312178

data/CHANGES.md

@@ -1,5 +1,10 @@
 # Fortitude Releases
 
+## 0.9.4, 11 February 2015
+
+* Fixed an issue where use of Rails' `form_for` or `fields_for` from within another `form_for` or `fields_for` block
+  would not produce the correct output. (Thanks to [Leaf](https://github.com/leafo) for the bug report!)
+
 ## 0.9.3, 2 February 2015
 
 * Fixed a memory leak when using `render :inline`, or certain other cases triggered by a user. (Fortitude widget

data/CONTRIBUTORS.md

@@ -35,6 +35,8 @@ Fortitude is written by [Andrew Geweke](https://github.com/ageweke), with contri
   * Reporting, and helping verify, an issue where creating anonymous subclasses of a Fortitude widget class (like
     those used by `render :inline`) would cause those anonymous subclasses to never be garbage collected, causing
     a memory leak.
+  * Reporting an issue where use of Rails' `form_for` and/or `fields_for` from within another `form_for` or
+    `fields_for` block would not produce the correct output.
 * [Adam Becker](https://github.com/ajb) for:
   * Discussion and details around exactly what `:attribute => true`, `:attribute => false`, and so on should render
     from Fortitude.

data/lib/fortitude/rails/helpers.rb

@@ -67,7 +67,10 @@ module Fortitude
         # From form_options_helper
         %w{select collection_select grouped_collection_select time_zone_select options_for_select} +
         %w{options_from_collection_for_select option_groups_from_collection_for_select grouped_options_for_select} +
-        %w{time_zone_options_for_select collection_radio_buttons collection_check_boxes}
+        %w{time_zone_options_for_select collection_radio_buttons collection_check_boxes} +
+
+        # And these can nest inside each other
+        %w{form_for fields_for}
 
       helper :form_for, :transform => :output_return_value, :output_yielded_methods => FORM_FOR_YIELDED_METHODS_TO_OUTPUT
       helper :fields_for, :transform => :output_return_value, :output_yielded_methods => FORM_FOR_YIELDED_METHODS_TO_OUTPUT

data/lib/fortitude/rails/yielded_object_outputter.rb

@@ -2,9 +2,23 @@ module Fortitude
   module Rails
     YIELDED_OBJECT_OUTPUTTER_SUPERCLASS = if defined?(::BasicObject) then ::BasicObject else ::Object end
     class YieldedObjectOutputter < YIELDED_OBJECT_OUTPUTTER_SUPERCLASS
-      def initialize(widget, yielded_object, method_names)
-        @widget = widget
+      class << self
+        def wrap_block_as_needed(output_target, for_method_name, original_block, yielded_methods_to_output)
+          if original_block && yielded_methods_to_output
+            lambda do |yielded_object, *args|
+              outputter = new(output_target, yielded_object, for_method_name, yielded_methods_to_output)
+              original_block.call(outputter, *args)
+            end
+          else
+            original_block
+          end
+        end
+      end
+
+      def initialize(output_target, yielded_object, for_method_name, method_names)
+        @output_target = output_target
         @yielded_object = yielded_object
+        @for_method_name = for_method_name
         @method_names_hash = { }
         method_names.each do |method_name|
           @method_names_hash[method_name.to_sym] = true
@@ -14,12 +28,13 @@ module Fortitude
       EMPTY_RETURN_VALUE = ''.freeze
 
       def method_missing(method_name, *args, &block)
-        return_value = @yielded_object.send(method_name, *args, &block)
         if @method_names_hash[method_name.to_sym]
-          @widget.rawtext(return_value)
+          block = ::Fortitude::Rails::YieldedObjectOutputter.wrap_block_as_needed(@output_target, method_name, block, @method_names_hash.keys)
+          return_value = @yielded_object.send(method_name, *args, &block)
+          @output_target.rawtext(return_value)
           EMPTY_RETURN_VALUE
         else
-          return_value
+          @yielded_object.send(method_name, *args, &block)
         end
       end
 

data/lib/fortitude/version.rb

@@ -1,3 +1,3 @@
 module Fortitude
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

data/lib/fortitude/widget/helpers.rb

@@ -35,15 +35,10 @@ module Fortitude
             else raise ArgumentError, "Invalid value for :transform: #{transform.inspect}"
             end
 
-            block_transform = "effective_block = block"
-
-            yielded_methods = options[:output_yielded_methods]
-            if yielded_methods
-              block_transform = <<-EOS
-      effective_block = lambda do |yielded_object|
-        block.call(Fortitude::Rails::YieldedObjectOutputter.new(self, yielded_object, #{yielded_methods.inspect}))
-      end
-EOS
+            block_transform = if (yielded_methods_to_output = options[:output_yielded_methods])
+              "effective_block = ::Fortitude::Rails::YieldedObjectOutputter.wrap_block_as_needed(self, #{name.inspect}, block, #{yielded_methods_to_output.inspect})"
+            else
+              "effective_block = block"
             end
 
             text = <<-EOS

data/spec/rails/complex_helpers_system_spec.rb

@@ -22,6 +22,22 @@ describe "Rails complex helper support", :type => :rails do
         OUTSIDE_AFTER}mix)
   end
 
+  it "should render a nested fields_for inside a form_for" do
+    expect_match("nesting_test",
+      %r{OUTSIDE_BEFORE\s*<form.*action=\"/complex_helpers_system_spec/nesting_test\".*
+        INSIDE_FORM_BEFORE\s*
+        FIRST:\s*
+        <input.*person_first_name.*/>\s*
+        WHATSIT\s*BAR:\s*
+        <input.*person_whatsit_bar.*/>\s*
+        AFTER\s*WHATSIT\s*BAR\s*
+        LAST:\s*
+        <input.*person_last_name.*/>\s*
+        INSIDE_FORM_AFTER\s*
+        </form>\s*
+        OUTSIDE_AFTER}mix)
+  end
+
   it "should cache based on a name properly" do
     expect_match("cache_test?a=a1&b=b1",
       /before_cache\(a1,b1\).*inside_cache\(a1,b1\).*after_cache\(a1,b1\)/mi)

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

@@ -7,6 +7,10 @@ class ComplexHelpersSystemSpecController < ApplicationController
     # nothing here
   end
 
+  def nesting_test
+    # nothing here
+  end
+
   def cache_test
     @a = params[:a]
     @b = params[:b]

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

@@ -0,0 +1,21 @@
+class Views::ComplexHelpersSystemSpec::NestingTest < Fortitude::Widgets::Html5
+  def content
+    text "OUTSIDE_BEFORE"
+    form_for :person do |f|
+      text "INSIDE_FORM_BEFORE"
+      text "FIRST: "
+      f.text_field :first_name
+
+      f.fields_for :whatsit do |w|
+        text "WHATSIT BAR: "
+        w.text_field :bar
+        text "AFTER WHATSIT BAR"
+      end
+
+      text "LAST: "
+      f.text_field :last_name
+      text "INSIDE_FORM_AFTER"
+    end
+    text "OUTSIDE_AFTER"
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fortitude
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: java
 authors:
 - Andrew Geweke
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -392,6 +392,7 @@ files:
 - 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
+- spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/nesting_test.rb
 - spec/rails/templates/complex_helpers_system_spec/config/environments/development.rb
 - spec/rails/templates/data_passing_system_spec/app/controllers/data_passing_system_spec_controller.rb
 - spec/rails/templates/data_passing_system_spec/app/views/data_passing_system_spec/_erb_to_parallel_widget_handoff_erb.html.erb
@@ -675,7 +676,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: 'Views Are Code: use all the power of Ruby to build views in your own language.'
@@ -750,6 +751,7 @@ test_files:
 - 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
+- spec/rails/templates/complex_helpers_system_spec/app/views/complex_helpers_system_spec/nesting_test.rb
 - spec/rails/templates/complex_helpers_system_spec/config/environments/development.rb
 - spec/rails/templates/data_passing_system_spec/app/controllers/data_passing_system_spec_controller.rb
 - spec/rails/templates/data_passing_system_spec/app/views/data_passing_system_spec/_erb_to_parallel_widget_handoff_erb.html.erb