Floppy-amee 0.4.28 → 0.4.29

data/lib/amee/data_item_value.rb

@@ -65,7 +65,7 @@ module AMEE
         data[:from_data] = REXML::XPath.first(doc, '/Resources/DataItemValueResource/ItemValue/ItemValueDefinition/FromData').text == "true" ? true : false
         # Create object
         ItemValue.new(data)
-      rescue 
+      rescue
         raise AMEE::BadData.new("Couldn't load DataItemValue from XML. Check that your URL is correct.")
       end
 

data/lib/amee/profile_category.rb

@@ -15,6 +15,55 @@ module AMEE
       attr_reader :items
       attr_reader :total_amount_per_month
 
+      def self.parse_json_profile_item(item)
+        item_data = {}
+        item_data[:values] = {}
+        item.each_pair do |key, value|
+          case key
+            when 'dataItemLabel', 'dataItemUid', 'name', 'path', 'uid'
+              item_data[key.to_sym] = value
+            when 'created', 'modified', 'label' # ignore these
+              nil
+            when 'validFrom'
+              item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
+            when 'end'
+              item_data[:end] = (value == "true")
+            when 'amountPerMonth'
+              item_data[:amountPerMonth] = value.to_f
+            else
+              item_data[:values][key.to_sym] = value
+          end
+        end
+        item_data[:path] ||= item_data[:uid] # Fill in path if not retrieved from response
+        return item_data
+      end
+
+      def self.parse_json_profile_category(category)
+        datacat = category['dataCategory'] ? category['dataCategory'] : category
+        category_data = {}
+        category_data[:name] = datacat['name']
+        category_data[:path] = datacat['path']
+        category_data[:uid] = datacat['uid']
+        category_data[:totalAmountPerMonth] = category['totalAmountPerMonth'].to_f
+        category_data[:children] = []
+        category_data[:items] = []
+        if category['children']
+          category['children'].each do |child|
+            if child[0] == 'dataCategories'
+              child[1].each do |child_cat|
+                category_data[:children] << parse_json_profile_category(child_cat)
+              end
+            end
+            if child[0] == 'profileItems' && child[1]['rows']
+              child[1]['rows'].each do |child_item|
+                category_data[:items] << parse_json_profile_item(child_item)
+              end
+            end
+          end
+        end
+        return category_data
+      end
+
       def self.from_json(json)
         # Parse json
         doc = JSON.parse(json)
@@ -27,11 +76,7 @@ module AMEE
         data[:children] = []
         if doc['children'] && doc['children']['dataCategories']
           doc['children']['dataCategories'].each do |child|
-            category_data = {}
-            category_data[:name] = child['name']
-            category_data[:path] = child['path']
-            category_data[:uid] = child['uid']
-            data[:children] << category_data
+            data[:children] << parse_json_profile_category(child)
           end
         end
         data[:items] = []
@@ -39,31 +84,61 @@ module AMEE
         profile_items.concat doc['children']['profileItems']['rows'] rescue nil
         profile_items << doc['profileItem'] unless doc['profileItem'].nil?
         profile_items.each do |item|
-          item_data = {}
-          item_data[:values] = {}
-          item.each_pair do |key, value|
-            case key
-              when 'dataItemLabel', 'dataItemUid', 'name', 'path', 'uid'
-                item_data[key.to_sym] = value
-              when 'created', 'modified', 'label' # ignore these
-                nil
-              when 'validFrom'
-                item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
-              when 'end'
-                item_data[:end] = (value == "true")
-              when 'amountPerMonth'
-                item_data[:amountPerMonth] = value.to_f
-              else
-                item_data[:values][key.to_sym] = value
-            end
-          end
-          item_data[:path] ||= item_data[:uid] # Fill in path if not retrieved from response
-          data[:items] << item_data
+          data[:items] << parse_json_profile_item(item)
         end
         # Create object
         Category.new(data)
-      rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.")
+      #rescue
+      #  raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.")
+      end
+
+      def self.parse_xml_profile_item(item)
+        item_data = {}
+        item_data[:values] = {}
+        item.elements.each do |element|
+          key = element.name
+          value = element.text
+          case key.downcase
+            when 'dataitemlabel', 'dataitemuid', 'name', 'path'
+              item_data[key.to_sym] = value
+            when 'validfrom'
+              item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
+            when 'end'
+              item_data[:end] = (value == "true")
+            when 'amountpermonth'
+              item_data[:amountPerMonth] = value.to_f
+            else
+              item_data[:values][key.to_sym] = value
+          end
+        end
+        item_data[:uid] = item.attributes['uid'].to_s
+        item_data[:path] ||= item_data[:uid] # Fill in path if not retrieved from response
+        return item_data
+      end
+
+      def self.parse_xml_profile_category(category)
+        category_data = {}
+        category_data[:name] = category.elements['DataCategory'].elements['Name'].text
+        category_data[:path] = category.elements['DataCategory'].elements['Path'].text
+        category_data[:uid] = category.elements['DataCategory'].attributes['uid'].to_s
+        category_data[:totalAmountPerMonth] = category.elements['TotalAmountPerMonth'].text.to_f rescue nil
+        category_data[:children] = []
+        category_data[:items] = []
+        if category.elements['Children']
+          category.elements['Children'].each do |child|
+            if child.name == 'ProfileCategories'
+              child.each do |child_cat|
+                category_data[:children] << parse_xml_profile_category(child_cat)
+              end
+            end
+            if child.name == 'ProfileItems'
+              child.each do |child_item|
+                category_data[:items] << parse_xml_profile_item(child_item)
+              end
+            end
+          end
+        end
+        return category_data
       end
 
       def self.from_xml(xml)
@@ -83,29 +158,15 @@ module AMEE
           category_data[:uid] = child.attributes['uid'].to_s
           data[:children] << category_data
         end
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileCategories/ProfileCategory') do |child|
+          data[:children] << parse_xml_profile_category(child)
+        end
         data[:items] = []
-        REXML::XPath.each(doc, '//ProfileItem') do |item|
-          item_data = {}
-          item_data[:values] = {}
-          item.elements.each do |element|
-            key = element.name
-            value = element.text
-            case key.downcase
-              when 'dataitemlabel', 'dataitemuid', 'name', 'path'
-                item_data[key.to_sym] = value
-              when 'validfrom'
-                item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
-              when 'end'
-                item_data[:end] = (value == "true")
-              when 'amountpermonth'
-                item_data[:amountPerMonth] = value.to_f
-              else
-                item_data[:values][key.to_sym] = value
-            end
-          end
-          item_data[:uid] = item.attributes['uid'].to_s
-          item_data[:path] ||= item_data[:uid] # Fill in path if not retrieved from response
-          data[:items] << item_data
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileItems/ProfileItem') do |item|
+          data[:items] << parse_xml_profile_item(item)
+        end
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileItem') do |item|
+          data[:items] << parse_xml_profile_item(item)
         end
         # Create object
         Category.new(data)
@@ -152,12 +213,14 @@ module AMEE
       end
 
 
-      def self.get(connection, path, for_date = Date.today, items_per_page = 10)
+      def self.get(connection, path, for_date = Date.today, items_per_page = 10, recurse = false)
         # Load data from path
-        response = connection.get(path, :profileDate => for_date.strftime("%Y%m"), :itemsPerPage => items_per_page)
+        options = {:profileDate => for_date.strftime("%Y%m"), :itemsPerPage => items_per_page}
+        options[:recurse] = true if recurse == true
+        response = connection.get(path, options)
         return Category.parse(connection, response)
-      rescue
-        raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
+      #rescue
+      #  raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
       end
       
       def child(child_path)

data/lib/amee/version.rb

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

metadata

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