Added support for nested arrays, fixes #1

fredwu · Jul 3, 2012 · aa6c853 · aa6c853
1 parent f0cc9b4
commit aa6c853
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 15 deletions.
diff --git a/lib/api_taster/form_builder.rb b/lib/api_taster/form_builder.rb
@@ -20,18 +20,21 @@ def html
 
     def add_to_buffer(params, parent_labels = [])
       params.each do |label, value|
-        if value.is_a?(Hash)
-          parent_labels << label
+        new_parent_labels = parent_labels.clone << label
 
-          @_buffer += render(
-            :partial => 'api_taster/routes/param_form_legend',
-            :locals  => { :label => print_labels(parent_labels) }
-          )
+        if value.is_a?(Hash)
+          add_legend_to_buffer(parent_labels, label)
 
-          add_to_buffer(value, parent_labels)
+          add_to_buffer(value, new_parent_labels)
         elsif value.is_a?(Array)
           value.each do |v|
-            add_element_to_buffer(parent_labels, "[#{label}][]", v)
+            if v.is_a?(Hash)
+              add_legend_to_buffer(parent_labels, label)
+
+              add_to_buffer(v, new_parent_labels)
+            else
+              add_element_to_buffer(parent_labels, "[#{label}][]", v)
+            end
           end
         else
           add_element_to_buffer(parent_labels, label, value)
@@ -50,6 +53,13 @@ def add_element_to_buffer(parent_labels, label, value)
       )
     end
 
+    def add_legend_to_buffer(parent_labels, label)
+      @_buffer += render(
+        :partial => 'api_taster/routes/param_form_legend',
+        :locals  => { :label => print_labels(parent_labels.clone << label) }
+      )
+    end
+
     def print_labels(parent_labels)
       "[#{parent_labels * ']['}]"
     end

diff --git a/spec/form_builder_spec.rb b/spec/form_builder_spec.rb
@@ -12,11 +12,21 @@ module ApiTaster
     let(:builder) do
       FormBuilder.new({
         :hello => 'world',
-        :nested => {
-          :foo => 'bar',
-          :integer => 1,
-          :array => [1, 2, 3]
-        }
+        :user => {
+          :name => 'Fred',
+          :comment => {
+            :title => [1, 2, 3]
+          }
+        },
+        :items => [
+          { :name => 'flower', :price => '4.95' },
+          { :name => 'pot', :price => '2.45' },
+          :nested_items => [
+            { :name => 'apple' },
+            { :name => 'orange'},
+            :nested_numbers => [3, 4, 5]
+          ]
+        ]
       })
     end
 
@@ -25,7 +35,7 @@ module ApiTaster
     end
 
     it "outputs html" do
-      builder.html.should match('bar')
+      builder.html.should match('world')
     end
 
     context "data types" do
@@ -38,7 +48,11 @@ module ApiTaster
       end
 
       it "does arrays" do
-        builder.html.should match(/name="\[nested\]\[array\]\[\]" value="2"/)
+        builder.html.should match(/name="\[user\]\[comment\]\[title\]\[\]" value="1"/)
+      end
+
+      it "does nested arrays" do
+        builder.html.should match(/name="\[items\]\[nested_items\]\[nested_numbers\]\[\]" value="5"/)
       end
     end
   end