Floppy-amee 2.0.1 → 2.0.2

data/lib/amee/data_category.rb

@@ -53,22 +53,22 @@ module AMEE
         data[:uid] = REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@uid").to_s
         data[:created] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@created").to_s)
         data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@modified").to_s)
-        data[:name] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/Name').text
-        data[:path] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/Path').text || ""
+        data[:name] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/?ame').text
+        data[:path] = REXML::XPath.first(doc, '/Resources/DataCategoryResource//?ath').text || ""
         data[:children] = []
-        REXML::XPath.each(doc, '/Resources/DataCategoryResource/Children/DataCategories/DataCategory') do |child|
+        REXML::XPath.each(doc, '/Resources/DataCategoryResource//Children/DataCategories/DataCategory') do |child|
           category_data = {}
-          category_data[:name] = child.elements['Name'].text
-          category_data[:path] = child.elements['Path'].text
+          category_data[:name] = (child.elements['Name'] || child.elements['name']).text
+          category_data[:path] = (child.elements['Path'] || child.elements['path']).text
           category_data[:uid] = child.attributes['uid'].to_s
           data[:children] << category_data
         end
         data[:items] = []
-        REXML::XPath.each(doc, '/Resources/DataCategoryResource/Children/DataItems/DataItem') do |item|
+        REXML::XPath.each(doc, '/Resources/DataCategoryResource//Children/DataItems/DataItem') do |item|
           item_data = {}
-          item_data[:label] = item.elements['label'].text
-          item_data[:path] = item.elements['path'].text
           item_data[:uid] = item.attributes['uid'].to_s
+          item_data[:label] = item.elements['label'].text
+          item_data[:path] = item.elements['path'] ? item.elements['path'].text : item_data[:uid]
           data[:items] << item_data
         end
         # Create object

data/lib/amee/drill_down.rb

@@ -59,15 +59,17 @@ module AMEE
         # Parse XML
         doc = REXML::Document.new(xml)
         data = {}
-        data[:choice_name] = REXML::XPath.first(doc, "/Resources/DrillDownResource/Choices/Name").text
+        data[:choice_name] = REXML::XPath.first(doc, "/Resources/DrillDownResource/Choices/?ame").text
         choices = []
-        REXML::XPath.each(doc, "/Resources/DrillDownResource/Choices/Choices/Choice") do |c|
-          choices << c.elements['Value'].text
+        REXML::XPath.each(doc, "/Resources/DrillDownResource/Choices//Choice") do |c|
+          choices << (c.elements['Value'] || c.elements['value']).text
         end
         data[:choices] = choices
         selections = {}
         REXML::XPath.each(doc, "/Resources/DrillDownResource/Selections/Choice") do |c|
-          selections[c.elements['Name'].text] = c.elements['Value'].text
+          name = (c.elements['Name'] || c.elements['name']).text
+          value = (c.elements['Value'] || c.elements['value']).text
+          selections[name] = value
         end
         data[:selections] = selections
         # Create object

data/lib/amee/profile_category.rb

@@ -198,15 +198,16 @@ module AMEE
         data = {}
         data[:profile_uid] = REXML::XPath.first(doc, "/Resources/ProfileCategoryResource/Profile/@uid").to_s
         data[:profile_date] = DateTime.strptime(REXML::XPath.first(doc, "/Resources/ProfileCategoryResource/ProfileDate").text, "%Y%m")
-        data[:name] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/DataCategory/Name').text
-        data[:path] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/Path').text || ""
+        data[:name] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/DataCategory/?ame').text
+        data[:path] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/Path | /Resources/ProfileCategoryResource/DataCategory/path').text || ""
+        data[:path] = "/#{data[:path]}" if data[:path].slice(0,1) != '/'
         data[:total_amount] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/TotalAmountPerMonth').text.to_f rescue nil
         data[:total_amount_unit] = "kg/month"
         data[:children] = []
-        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileCategories/DataCategory') do |child|
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileCategories/DataCategory | /Resources/ProfileCategoryResource/Children/DataCategories/DataCategory') do |child|
           category_data = {}
-          category_data[:name] = child.elements['Name'].text
-          category_data[:path] = child.elements['Path'].text
+          category_data[:name] = (child.elements['Name'] || child.elements['name']).text
+          category_data[:path] = (child.elements['Path'] || child.elements['path']).text
           category_data[:uid] = child.attributes['uid'].to_s
           data[:children] << category_data
         end

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 0
-    TINY  = 1
+    TINY  = 2
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-19 00:00:00 -08:00
+date: 2009-02-20 00:00:00 -08:00
 default_executable: 
 dependencies: []