fix handling of parameter names passed to merge-params; the keys are …

…symbols, not strings

dryml/features/merge_params.feature

@@ -0,0 +1,36 @@
+Feature: merge-params
+
+  Scenario: merge-params with a param name
+    Given a file named "doctest_taglib.dryml" with:
+    """
+    <def tag="myp">
+      <p param="foo">This is foo</p>
+      <p param="bar">This is bar</p>
+    </def>
+    """
+    And a file named "doctest_extend.dryml" with:
+    """
+    <extend tag="myp">
+      <old-myp merge-params="bar" />
+    </extend>
+    """
+    And a file named "doctest.dryml" with:
+    """
+    <myp>
+      <foo:>
+        New stuff
+      </foo:>
+      <bar:>
+        Brand-new bar
+      </bar:>
+    </myp>
+    """
+    When I include the taglib "doctest_taglib"
+    And I include the taglib "doctest_extend"
+    When I render "doctest.dryml"
+    Then the output DOM should be:
+    """
+    <p class="foo">This is foo</p>
+    <p class="bar">Brand-new bar</p>
+    """
+

dryml/lib/dryml/template.rb

@@ -629,7 +629,7 @@ def parameter_tags_hash(el, containing_tag_name=nil)
                        elsif is_code_attribute?(merge_params)
                          merge_params[1..-1]
                        else
-                         merge_param_names = merge_params.split(/\s*,\s*/).*.gsub("-", "_")
+                         merge_param_names = merge_params.split(/\s*,\s*/).*.gsub("-", "_").*.to_sym
                          "all_parameters & #{merge_param_names.inspect}"
                        end
         "merge_parameter_hashes({#{param_items}}, (#{extra_params}) || {})"