Merge remote-tracking branch 'upstream/pull/3409'

[rails.git] / lib / diff_reader.rb

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 5d98ef874406adc14e1cacc0b1ce584641c33e9b..1189c86d0e3236307ec4f4fdb50d42c7c5ecc150 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -85,7 +85,7 @@ class DiffReader
       model = MODELS[model_name]
       if model.nil?
         raise OSM::APIBadUserInput, "Unexpected element type #{model_name}, " \
       model = MODELS[model_name]
       if model.nil?
         raise OSM::APIBadUserInput, "Unexpected element type #{model_name}, " \

-                                       "expected node, way or relation."
+                                    "expected node, way or relation."

       end
       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,
       end
       # new in libxml-ruby >= 2, expand returns an element not associated
       # with a document. this means that there's no encoding parameter,


@@ -138,7 +138,7 @@ class DiffReader
         # create a new element. this code is agnostic of the element type
         # because all the elements support the methods that we're using.
         with_model do |model, xml|
         # create a new element. this code is agnostic of the element type
         # because all the elements support the methods that we're using.
         with_model do |model, xml|

-          new = model.from_xml_node(xml, true)
+          new = model.from_xml_node(xml, :create => true)

           check(model, xml, new)
 
           # when this element is saved it will get a new ID, so we save it
           check(model, xml, new)
 
           # when this element is saved it will get a new ID, so we save it


@@ -174,7 +174,7 @@ class DiffReader
         # with types, but uses duck typing to handle them transparently.
         with_model do |model, xml|
           # get the new element from the XML payload
         # with types, but uses duck typing to handle them transparently.
         with_model do |model, xml|
           # get the new element from the XML payload

-          new = model.from_xml_node(xml, false)
+          new = model.from_xml_node(xml, :create => false)

           check(model, xml, new)
 
           # if the ID is a placeholder then map it to the real ID
           check(model, xml, new)
 
           # if the ID is a placeholder then map it to the real ID