Floppy-amee 0.3.1 → 0.4.0

data/README

@@ -21,7 +21,7 @@ Homepage: http://github.com/Floppy/amee-ruby
 Currently, you can read DataCategories, DataItems and DataItemValues. See 
 examples/view_data_*.rb for simple usage examples. You can also get the list
 of available Profiles and create new ones. See examples/list_profiles.rb and
-examples/create_profile.rb for details.
+examples/create_profile.rb for details. You can also load ProfileCategories.
 
 The gem will use the AMEE JSON API if the JSON gem is installed on the local
 system. Otherwise the XML API will be used.

data/examples/create_profile.rb

@@ -23,5 +23,5 @@ end.parse!
 connection = AMEE::Connection.new(options[:server], options[:username], options[:password])
 
 # Create a new profile
-profile = AMEE::Profile.create(connection)
+profile = AMEE::Profile::Profile.create(connection)
 puts "#{profile.uid} created"

data/examples/list_profiles.rb

@@ -20,7 +20,7 @@ end.parse!
 connection = AMEE::Connection.new(options[:server], options[:username], options[:password])
 
 # List all available profiles
-profiles = AMEE::Profile.list(connection)
+profiles = AMEE::Profile::Profile.list(connection)
 puts "#{profiles.size} #{profiles.size == 1 ? "profile" : "profiles"} available in AMEE:"
 profiles.each do |p|
   puts p.uid

data/lib/amee.rb

@@ -22,4 +22,5 @@ require 'amee/profile_object'
 require 'amee/data_category'
 require 'amee/data_item'
 require 'amee/data_item_value'
-require 'amee/profile'
+require 'amee/profile'
+require 'amee/profile_category'

data/lib/amee/data_category.rb

@@ -2,7 +2,7 @@ require 'date'
 
 module AMEE
   module Data
-    class Category < AMEE::DataObject
+    class Category < AMEE::Data::Object
 
       def initialize(data = {})
         @children = data ? data[:children] : []

data/lib/amee/data_item.rb

@@ -1,6 +1,6 @@
 module AMEE
   module Data
-    class Item < AMEE::DataObject
+    class Item < AMEE::Data::Object
 
       def initialize(data = {})
         @values = data ? data[:values] : []

data/lib/amee/data_item_value.rb

@@ -1,6 +1,6 @@
 module AMEE
   module Data
-    class ItemValue < AMEE::DataObject
+    class ItemValue < AMEE::Data::Object
 
       def initialize(data = {})
         @value = data ? data[:value] : nil

data/lib/amee/data_object.rb

@@ -1,9 +1,11 @@
 module AMEE
-  class DataObject < AMEE::Object
+  module Data
+    class Object < AMEE::Object
     
-    def full_path
-      "/data#{@path}"
+      def full_path
+        "/data#{@path}"
+      end
+
     end
-      
   end
 end

data/lib/amee/profile.rb

@@ -1,93 +1,95 @@
 module AMEE
-  class Profile < AMEE::ProfileObject
-    
-    def self.list(connection)
-      # Load data from path
-      response = connection.get('/profiles')      
-      # Parse data from response
-      profiles = []
-      if response.is_json?
-        # Read JSON
-        doc = JSON.parse(response)
-        doc['profiles'].each do |p|
+  module Profile
+    class Profile < AMEE::Profile::Object
+
+      def self.list(connection)
+        # Load data from path
+        response = connection.get('/profiles')
+        # Parse data from response
+        profiles = []
+        if response.is_json?
+          # Read JSON
+          doc = JSON.parse(response)
+          doc['profiles'].each do |p|
+            data = {}
+            data[:uid] = p['uid']
+            data[:created] = DateTime.parse(p['created'])
+            data[:modified] = DateTime.parse(p['modified'])
+            data[:name] = p['name']
+            data[:path] = "/#{p['path']}"
+            # Create profile
+            profile = Profile.new(data)
+            # Store in array
+            profiles << profile
+          end
+        else
+          # Read XML
+          doc = REXML::Document.new(response)
+          REXML::XPath.each(doc, '/Resources/ProfilesResource/Profiles/Profile') do |p|
+            data = {}
+            data[:uid] = p.attributes['uid'].to_s
+            data[:created] = DateTime.parse(p.attributes['created'].to_s)
+            data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
+            data[:name] = p.elements['Name'].text || data[:uid]
+            data[:path] = "/#{p.elements['Path'].text || data[:uid]}"
+            # Create profile
+            profile = Profile.new(data)
+            # Store connection in profile object
+            profile.connection = connection
+            # Store in array
+            profiles << profile
+          end
+        end
+        # Done
+        return profiles
+      rescue
+        raise AMEE::BadData.new("Couldn't load Profile list.")
+      end
+
+      def self.create(connection)
+        # Create new profile
+        response = connection.post('/profiles', :profile => true)
+        # Parse data from response
+        if response.is_json?
+          # Read JSON
+          doc = JSON.parse(response)
+          p = doc['profile']
           data = {}
           data[:uid] = p['uid']
           data[:created] = DateTime.parse(p['created'])
           data[:modified] = DateTime.parse(p['modified'])
           data[:name] = p['name']
-          data[:path] = "/#{p['path']}"
+          data[:path] = p['path']
           # Create profile
-          profile = AMEE::Profile.new(data)
-          # Store in array
-          profiles << profile
-        end
-      else
-        # Read XML
-        doc = REXML::Document.new(response)
-        REXML::XPath.each(doc, '/Resources/ProfilesResource/Profiles/Profile') do |p|
+          profile = Profile.new(data)
+          # Done
+          return profile
+        else
+          # Read XML
+          doc = REXML::Document.new(response)
+          p = REXML::XPath.first(doc, '/Resources/ProfilesResource/Profile')
           data = {}
           data[:uid] = p.attributes['uid'].to_s
           data[:created] = DateTime.parse(p.attributes['created'].to_s)
           data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
           data[:name] = p.elements['Name'].text || data[:uid]
-          data[:path] = "/#{p.elements['Path'].text || data[:uid]}"
+          data[:path] = p.elements['Path'].text || data[:uid]
           # Create profile
-          profile = AMEE::Profile.new(data)
+          profile = Profile.new(data)
           # Store connection in profile object
           profile.connection = connection
-          # Store in array
-          profiles << profile
+          # Done
+          return profile
         end
+      rescue
+        raise AMEE::BadData.new("Couldn't create Profile.")
       end
-      # Done
-      return profiles
-    rescue
-      raise AMEE::BadData.new("Couldn't load Profile list.")
-    end
 
-    def self.create(connection)
-      # Create new profile
-      response = connection.post('/profiles', :profile => true)
-      # Parse data from response
-      if response.is_json?
-        # Read JSON
-        doc = JSON.parse(response)
-        p = doc['profile']
-        data = {}
-        data[:uid] = p['uid']
-        data[:created] = DateTime.parse(p['created'])
-        data[:modified] = DateTime.parse(p['modified'])
-        data[:name] = p['name']
-        data[:path] = p['path']
-        # Create profile
-        profile = AMEE::Profile.new(data)
-        # Done
-        return profile
-      else
-        # Read XML
-        doc = REXML::Document.new(response)
-        p = REXML::XPath.first(doc, '/Resources/ProfilesResource/Profile')
-        data = {}
-        data[:uid] = p.attributes['uid'].to_s
-        data[:created] = DateTime.parse(p.attributes['created'].to_s)
-        data[:modified] = DateTime.parse(p.attributes['modified'].to_s)
-        data[:name] = p.elements['Name'].text || data[:uid]
-        data[:path] = p.elements['Path'].text || data[:uid]
-        # Create profile
-        profile = AMEE::Profile.new(data)
-        # Store connection in profile object
-        profile.connection = connection
-        # Done
-        return profile
-      end
-    rescue
-      raise AMEE::BadData.new("Couldn't create Profile.")
+  #    def delete
+  #      # Create new profile
+  #      response = connection.delete(full_path)
+  #    end
+
     end
-   
-#    def delete
-#      # Create new profile
-#      response = connection.delete(full_path)
-#    end
-    
   end
 end

data/lib/amee/profile_category.rb

@@ -0,0 +1,136 @@
+require 'date'
+
+module AMEE
+  module Profile
+    class Category < AMEE::Profile::Object
+
+      def initialize(data = {})
+        @children = data ? data[:children] : []
+        @items = data ? data[:items] : []
+        @total_amount_per_month = data[:total_amount_per_month]
+        @values = data[:values]
+        super
+      end
+
+      attr_reader :children
+      attr_reader :items
+      attr_reader :total_amount_per_month
+      attr_reader :values
+
+      def self.from_json(json)
+        # Parse json
+        doc = JSON.parse(json)
+        data = {}
+        data[:profile_uid] = doc['profile']['uid']
+        data[:profile_date] = DateTime.strptime(doc['profileDate'], "%Y%m")
+        data[:name] = doc['dataCategory']['name']
+        data[:path] = doc['path']
+        data[:total_amount_per_month] = doc['totalAmountPerMonth']
+        data[:children] = []
+        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
+        end
+        data[:items] = []
+        if doc['children']['profileItems']['rows']
+          doc['children']['profileItems']['rows'].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
+            data[:items] << item_data
+          end
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.")
+      end
+
+      def self.from_xml(xml)
+        # Parse XML
+        doc = REXML::Document.new(xml)
+        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[:total_amount_per_month] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/TotalAmountPerMonth').text.to_f rescue nil
+        data[:children] = []
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileCategories/DataCategory') do |child|
+          category_data = {}
+          category_data[:name] = child.elements['Name'].text
+          category_data[: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/ProfileCategoryResource/Children/ProfileItems/ProfileItem') do |item|
+          item_data = {}
+          item_data[:values] = {}
+          item.elements.each do |element|
+            key = element.name
+            value = element.text
+            case key
+              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
+          data[:items] << item_data
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from XML data. Check that your URL is correct.")
+      end
+      
+      def self.get(connection, path)
+        # Load data from path
+        response = connection.get(path)
+        # Parse data from response
+        if response.is_json?
+          cat = Category.from_json(response)
+        else
+          cat = Category.from_xml(response)
+        end
+        # Store connection in object for future use
+        cat.connection = connection
+        # Done
+        return cat
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory. Check that your URL is correct.")
+      end
+      
+      def child(child_path)
+        AMEE::Profile::Category.get(connection, "#{full_path}/#{child_path}")
+      end
+      
+    end
+  end
+end

data/lib/amee/profile_object.rb

@@ -1,9 +1,20 @@
 module AMEE
-  class ProfileObject < AMEE::Object
-    
-    def full_path
-      "/profiles#{@path}"
-    end
+  module Profile
+    class Object < AMEE::Object
+
+      def initialize(options = {})
+        @profile_uid = options[:profile_uid]
+        @profile_date = options[:profile_date]
+        super
+      end
+
+      attr_reader :profile_uid
+      attr_reader :profile_date
+
+      def full_path
+        "/profiles#{'/' if @profile_uid}#{@profile_uid}#{@path}"
+      end
       
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: Floppy-amee
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-29 00:00:00 -07:00
+date: 2008-09-03 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -30,6 +30,7 @@ files:
 - lib/amee/exceptions.rb
 - lib/amee/profile.rb
 - lib/amee/profile_object.rb
+- lib/amee/profile_category.rb
 - lib/amee/version.rb
 - lib/amee/data_category.rb
 - lib/amee/data_item_value.rb