Tweaking the format

lib/vebra/parse.rb

@@ -81,7 +81,7 @@ def parse_node(node)
               end
             elsif child_result
               # if this attribute already exists, create or extend a collection
-              if node_hash[attr_key].respond_to?(:<<)
+              if node_hash[attr_key].respond_to?(:<<) && node_hash[attr_key].respond_to?(:each)
                 # if the attribute's value is a collection already, add inject the new value
                 node_hash[attr_key] << child_result
               else
@@ -142,7 +142,8 @@ def mappings
         'BranchID'    => 'branch_id',
         'web_status'  => 'status',
         'available'   => 'available_on',
-        'uploaded'    => 'uploaded_on'
+        'uploaded'    => 'uploaded_on',
+        'price'       => 'price_attributes'
       }
     end
 
@@ -226,10 +227,17 @@ def customise(hash)
         hash[:attributes][:vebra_id] = hash[:attributes].delete(:id)
       end
 
-      # was: { :type => #<value> }
+      # was: { :price_attributes => { :value => #<value>, ... } }
+      # now: { :price_attributes => { ... }, :price => #<value> }
+      if hash[:price_attributes]
+        hash[:price] = hash[:price_attributes].delete(:value)
+      end
+
+      # was: { :type => [#<value>, #<value>] } or: { :type => #<value> }
       # now: { :property_type => #<value> }
       if hash[:type]
         hash[:property_type] = hash.delete(:type)
+        hash[:property_type] = hash[:property_type].first if hash[:property_type].respond_to?(:each)
       end
 
       # was: { :reference => { :agents => #<value> } }

spec/support/expected_output.rb

@@ -24,13 +24,14 @@
     :display => "Market Place, Reading, Berkshire, RG1 2DE"
   },
 
-  :price => {
+  :price_attributes => {
     :qualifier => "per month",
     :currency => "GBP",
-    :rent => "pcm",
-    :value => 1000
+    :rent => "pcm"
   },
 
+  :price => 1000,
+
   :rm_qualifier => 0,
   :available_on => Date.parse('12/03/2012'),
   :uploaded_on => Date.parse('14/03/2012'),

spec/support/sample_input.xml

@@ -28,7 +28,7 @@
   <service_charge />
   <rateable_value />
   <type>House</type>
-  <type>(Not Specified)</type>
+  <type>House</type>
   <furnished>0</furnished>
   <rm_type>8</rm_type>
   <let_bond>0</let_bond>