Floppy-amee 0.4.33 → 2.0.0

data/lib/amee.rb

@@ -11,6 +11,18 @@ class String
   def is_json?
     slice(0,1) == '{'
   end
+  def is_v2_json?
+    is_json? && match('"apiVersion".*?:.*?"2.0"')
+  end
+  def is_xml?
+    slice(0,5) == '<?xml'
+  end
+  def is_v2_xml?
+    is_xml? && include?('<Resources xmlns="http://schemas.amee.cc/2.0">')
+  end
+  def is_v2_atom?
+    is_xml? && (include?('<feed ') || include?('<entry ')) && include?('xmlns:amee="http://schemas.amee.cc/2.0"')
+  end
 end
 
 require 'amee/version'
@@ -25,4 +37,28 @@ require 'amee/data_item_value'
 require 'amee/profile'
 require 'amee/profile_category'
 require 'amee/profile_item'
-require 'amee/drill_down'
+require 'amee/drill_down'
+
+class Date
+  def amee2schema
+    strftime("%Y-%m-%dT%H:%M+0000")
+  end
+  def amee1_date
+    strftime("%Y%m%d")
+  end
+  def amee1_month
+    strftime("%Y%m")
+  end
+end
+
+class Time
+  def amee2schema
+    strftime("%Y-%m-%dT%H:%M+0000")
+  end
+  def amee1_date
+    strftime("%Y%m%d")
+  end
+  def amee1_month
+    strftime("%Y%m")
+  end
+end

data/lib/amee/connection.rb

@@ -3,24 +3,29 @@ require 'net/http'
 module AMEE
   class Connection
 
-    def initialize(server, username = nil, password = nil, use_json_if_available = true, enable_caching = false, enable_debug = false)
+    def initialize(server, username, password, options = {})
+      unless options.is_a?(Hash)
+        raise AMEE::ArgumentError.new("Fourth argument must be a hash of options!")
+      end
       @server = server
       @username = username
       @password = password
       @auth_token = nil
-      @use_json_if_available = use_json_if_available
-      if (@username || @password) && !valid?
-       raise "Must specify both username and password for authenticated access"
+      @format = options[:format] || (defined?(JSON) ? :json : :xml)
+      if !valid?
+       raise "You must supply connection details - server, username and password are all required!"
       end
-      @enable_caching = enable_caching
+      @enable_caching = options[:enable_caching]
       if @enable_caching
         $cache ||= {}
       end
       # Make connection to server
       @http = Net::HTTP.new(@server)
       @http.read_timeout = 5
-      @http.set_debug_output($stdout) if enable_debug
+      @http.set_debug_output($stdout) if options[:enable_debug]
     end
+
+    attr_reader :format
     
     def timeout
       @http.read_timeout
@@ -30,19 +35,21 @@ module AMEE
       @http.read_timeout = t
     end
 
+    def version
+      @version
+    end
+
     def valid?
-      !((@username || @password) ? (@username.nil? || @password.nil? || @server.nil?) : @server.nil?)
+      @username && @password && @server
     end
     
-    def can_authenticate?
-      !(@username.nil? || @password.nil?)
-    end
-
     def authenticated?
       !@auth_token.nil?
     end
 
     def get(path, data = {})
+      # Allow format override
+      format = data.delete(:format) || @format
       # Create URL parameters
       params = []
       data.each_pair do |key, value|
@@ -53,12 +60,15 @@ module AMEE
       end
       # Send request
       return $cache[path] if @enable_caching and $cache[path]
-      response = do_request Net::HTTP::Get.new(path)
+      response = do_request(Net::HTTP::Get.new(path), format)
       $cache[path] = response if @enable_caching
       return response
     end
     
     def post(path, data = {})
+      # Allow format override
+      format = data.delete(:format) || @format
+      # Clear cache
       clear_cache
       # Create POST request
       post = Net::HTTP::Post.new(path)
@@ -68,10 +78,13 @@ module AMEE
       end
       post.body = body.join '&'
       # Send request
-      do_request(post)
+      do_request(post, format)
     end
 
     def put(path, data = {})
+      # Allow format override
+      format = data.delete(:format) || @format
+      # Clear cache
       clear_cache
       # Create PUT request
       put = Net::HTTP::Put.new(path)
@@ -81,7 +94,7 @@ module AMEE
       end
       put.body = body.join '&'
       # Send request
-      do_request(put)
+      do_request(put, format)
     end
 
     def delete(path)
@@ -93,24 +106,36 @@ module AMEE
     end
 
     def authenticate
-      unless can_authenticate?        
-        raise AMEE::AuthRequired.new("Authentication required. Please provide your username and password.")
-      end
       response = nil
-      post = Net::HTTP::Post.new("/auth")
+      post = Net::HTTP::Post.new("/auth/signIn")
       post.body = "username=#{@username}&password=#{@password}"
-      post['Accept'] = content_type
+      post['Accept'] = content_type(:xml)
       response = @http.request(post)
       @auth_token = response['authToken']
       unless authenticated?
         raise AMEE::AuthFailed.new("Authentication failed. Please check your username and password.") 
       end
+      # Detect API version
+      if response.body.is_json?
+        @version = JSON.parse(response.body)["user"]["apiVersion"].to_f
+      elsif response.body.is_xml?
+        @version = REXML::Document.new(response.body).elements['Resources'].elements['SignInResource'].elements['User'].elements['ApiVersion'].text.to_f
+      else
+        @version = 1.0
+      end
     end
 
     protected
 
-    def content_type
-      (@use_json_if_available && defined?(JSON)) ? 'application/json' : 'application/xml'
+    def content_type(format = @format)
+      case format
+      when :xml
+        return 'application/xml'
+      when :json
+        return 'application/json'
+      when :atom
+        return 'application/atom+xml'
+      end
     end
     
     def redirect?(response)
@@ -122,21 +147,21 @@ module AMEE
         when '200'
           return true
         when '403'
-          raise AMEE::PermissionDenied.new("You do not have permission to perform the requested operation")
+          raise AMEE::PermissionDenied.new("You do not have permission to perform the requested operation. AMEE Response: #{response.body}")
         when '401'
           authenticate
           return false
         else
-          raise AMEE::UnknownError.new("An error occurred while talking to AMEE: HTTP response code #{response.code}")
+          raise AMEE::UnknownError.new("An error occurred while talking to AMEE: HTTP response code #{response.code}. AMEE Response: #{response.body}")
       end
     end
 
-    def do_request(request)
+    def do_request(request, format = @format)
       # Open HTTP connection
       @http.start
       # Do request
       begin
-        response = send_request(request)
+        response = send_request(request, format)
       end while !response_ok?(response)
       # Return body of response
       return response.body
@@ -147,9 +172,9 @@ module AMEE
       @http.finish if @http.started?
     end
         
-    def send_request(request)
+    def send_request(request, format = @format)
       request['authToken'] = @auth_token
-      request['Accept'] = content_type
+      request['Accept'] = content_type(format)
       response = @http.request(request)
       # Handle 404s
       if response.code == '404'

data/lib/amee/exceptions.rb

@@ -1,14 +1,14 @@
 module AMEE
   
+  class ArgumentError < Exception
+  end
+
   class BadData < Exception
   end
   
   class AuthFailed < Exception  
   end
 
-  class AuthRequired < Exception
-  end
-
   class PermissionDenied < Exception
   end
 

data/lib/amee/profile_category.rb

@@ -7,13 +7,15 @@ module AMEE
       def initialize(data = {})
         @children = data ? data[:children] : []
         @items = data ? data[:items] : []
-        @total_amount_per_month = data[:total_amount_per_month]
+        @total_amount = data[:total_amount]
+        @total_amount_unit = data[:total_amount_unit]
         super
       end
 
       attr_reader :children
       attr_reader :items
-      attr_reader :total_amount_per_month
+      attr_reader :total_amount
+      attr_reader :total_amount_unit
 
       def self.parse_json_profile_item(item)
         item_data = {}
@@ -22,14 +24,33 @@ module AMEE
           case key
             when 'dataItemLabel', 'dataItemUid', 'name', 'path', 'uid'
               item_data[key.to_sym] = value
+            when 'dataItem'
+              item_data[:dataItemLabel] = value['Label']
+              item_data[:dataItemUid] = value['uid']
             when 'created', 'modified', 'label' # ignore these
               nil
             when 'validFrom'
               item_data[:validFrom] = DateTime.strptime(value, "%Y%m%d")
+            when 'startDate'
+              item_data[:startDate] = DateTime.parse(value)
+            when 'endDate'
+              item_data[:endDate] = DateTime.parse(value) rescue nil
             when 'end'
               item_data[:end] = (value == "true")
             when 'amountPerMonth'
               item_data[:amountPerMonth] = value.to_f
+            when 'amount'
+              item_data[:amount] = value['value'].to_f
+              item_data[:amount_unit] = value['unit']
+            when 'itemValues'
+              value.each do |itemval|
+                path = itemval['path'].to_sym
+                item_data[:values][path.to_sym] = {}
+                item_data[:values][path.to_sym][:name] = itemval['name']
+                item_data[:values][path.to_sym][:value] = itemval['value']
+                item_data[:values][path.to_sym][:unit] = itemval['unit']
+                item_data[:values][path.to_sym][:per_unit] = itemval['perUnit']
+              end
             else
               item_data[:values][key.to_sym] = value
           end
@@ -72,7 +93,8 @@ module AMEE
         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[:total_amount] = doc['totalAmountPerMonth']
+        data[:total_amount_unit] = "kg/month"
         data[:children] = []
         if doc['children'] && doc['children']['dataCategories']
           doc['children']['dataCategories'].each do |child|
@@ -92,6 +114,35 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileCategory from JSON data. Check that your URL is correct.")
       end
 
+      def self.from_v2_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] = doc['totalAmount']['value'].to_f rescue nil
+        data[:total_amount_unit] = doc['totalAmount']['unit'] rescue nil
+        data[:children] = []
+        if doc['profileCategories']
+          doc['profileCategories'].each do |child|
+            data[:children] << parse_json_profile_category(child)
+          end
+        end
+        data[:items] = []
+        profile_items = []
+        profile_items.concat doc['profileItems'] rescue nil
+        profile_items << doc['profileItem'] unless doc['profileItem'].nil?
+        profile_items.each do |item|
+          data[:items] << parse_json_profile_item(item)
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 JSON data. Check that your URL is correct.")
+      end
+
       def self.parse_xml_profile_item(item)
         item_data = {}
         item_data[:values] = {}
@@ -149,7 +200,8 @@ module AMEE
         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[: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|
           category_data = {}
@@ -174,6 +226,135 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileCategory from XML data. Check that your URL is correct.")
       end
 
+      def self.parse_v2_xml_profile_item(item)
+        item_data = {}
+        item_data[:values] = {}
+        item.elements.each do |element|
+          key = element.name
+          case key.downcase
+            when 'name', 'path'
+              item_data[key.downcase.to_sym] = element.text
+            when 'dataitem'
+              item_data[:dataItemLabel] = element.elements['Label'].text
+              item_data[:dataItemUid] = element.attributes['uid'].to_s
+            when 'validfrom'
+              item_data[:validFrom] = DateTime.strptime(element.text, "%Y%m%d")
+            when 'startdate'
+              item_data[:startDate] = DateTime.parse(element.text)
+            when 'enddate'
+              item_data[:endDate] = DateTime.parse(element.text) if element.text
+            when 'end'
+              item_data[:end] = (element.text == "true")
+            when 'amount'
+              item_data[:amount] = element.text.to_f
+              item_data[:amount_unit] = element.attributes['unit'].to_s
+            when 'itemvalues'
+              element.elements.each do |itemvalue|
+                path = itemvalue.elements['Path'].text
+                item_data[:values][path.to_sym] = {}
+                item_data[:values][path.to_sym][:name] = itemvalue.elements['Name'].text
+                item_data[:values][path.to_sym][:value] = itemvalue.elements['Value'].text || "0"
+                item_data[:values][path.to_sym][:unit] = itemvalue.elements['Unit'].text
+                item_data[:values][path.to_sym][:per_unit] = itemvalue.elements['PerUnit'].text
+              end
+            else
+              item_data[:values][key.to_sym] = element.text
+          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.from_v2_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] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/TotalAmount').text.to_f rescue nil
+        data[:total_amount_unit] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/TotalAmount/@unit').to_s rescue nil
+        data[:children] = []
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/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
+        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, '/Resources/ProfileCategoryResource/ProfileItems/ProfileItem') do |item|
+          data[:items] << parse_v2_xml_profile_item(item)
+        end
+        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileItem') do |item|
+          data[:items] << parse_v2_xml_profile_item(item)
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 XML data. Check that your URL is correct.")
+      end
+
+      def self.from_v2_atom(response)
+        # Parse XML
+        doc = REXML::Document.new(response)
+        data = {}
+        data[:profile_uid] = REXML::XPath.first(doc, "/feed/@xml:base").to_s.match("/profiles/(.*?)/")[1]
+#        data[:profile_date] = DateTime.strptime(REXML::XPath.first(doc, "/Resources/ProfileCategoryResource/ProfileDate").text, "%Y%m")
+#        data[:name] = REXML::XPath.first(doc, '/feed/title').text
+        data[:path] = REXML::XPath.first(doc, "/feed/@xml:base").to_s.match("/profiles/.*?(/.*)")[1]
+        data[:total_amount] = REXML::XPath.first(doc, '/feed/amee:totalAmount').text.to_f rescue nil
+        data[:total_amount_unit] = REXML::XPath.first(doc, '/feed/amee:totalAmount/@unit').to_s rescue nil
+        data[:children] = []
+#        REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/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
+#        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, '/feed/entry') do |entry|
+          item = {}
+          item[:uid] = entry.elements['id'].text.match("urn:item:(.*)")[1]
+          item[:name] = entry.elements['title'].text
+          item[:path] = item[:uid]
+#          data[:dataItemLabel].should == "gas"
+#          data[:dataItemUid].should == "66056991EE23"
+          item[:amount] = entry.elements['amee:amount'].text.to_f rescue nil
+          item[:amount_unit] = entry.elements['amee:amount'].attributes['unit'].to_s rescue nil
+          item[:startDate] = DateTime.parse(entry.elements['amee:startDate'].text)
+          item[:endDate] = DateTime.parse(entry.elements['amee:endDate'].text) rescue nil
+          item[:values] = {}
+          entry.elements.each do |itemvalue|
+            if itemvalue.name == 'itemValue'
+              path = itemvalue.elements['link'].attributes['href'].to_s.match(".*/(.*)")[1]
+              x = {}
+              x[:path] = path
+              x[:name] = itemvalue.elements['amee:name'].text
+              x[:value] = itemvalue.elements['amee:value'].text unless itemvalue.elements['amee:value'].text == "N/A"
+              x[:value] ||= "0"
+              x[:unit] = itemvalue.elements['amee:unit'].text rescue nil
+              x[:per_unit] = itemvalue.elements['amee:perUnit'].text rescue nil
+              item[:values][path.to_sym] = x
+            end
+          end
+          data[:items] << item
+        end
+        # Create object
+        Category.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileCategory from V2 Atom data. Check that your URL is correct.")
+      end
+
       def self.get_history(connection, path, num_months, end_date = Date.today, items_per_page = 10)
         month = end_date.month
         year = end_date.year
@@ -201,9 +382,15 @@ module AMEE
 
       def self.parse(connection, response)
         # Parse data from response
-        if response.is_json?
+        if response.is_v2_json?
+          cat = Category.from_v2_json(response)
+        elsif response.is_json?
           cat = Category.from_json(response)
-        else
+        elsif response.is_v2_atom?
+          cat = Category.from_v2_atom(response)
+        elsif response.is_v2_xml?
+          cat = Category.from_v2_xml(response)
+        elsif response.is_xml?
           cat = Category.from_xml(response)
         end
         # Store connection in object for future use
@@ -213,10 +400,25 @@ module AMEE
       end
 
 
-      def self.get(connection, path, for_date = Date.today, items_per_page = 10, recurse = false)
+      def self.get(connection, path, options = {})
+        unless options.is_a?(Hash)
+          raise AMEE::ArgumentError.new("Third argument must be a hash of options!")
+        end
+        # Convert to AMEE options
+        if options[:start_date] && connection.version < 2
+          options[:profileDate] = options[:start_date].amee1_month 
+        elsif options[:start_date] && connection.version >= 2
+          options[:startDate] = options[:start_date].amee2schema
+        end
+        options.delete(:start_date)
+        if options[:end_date] && connection.version >= 2
+          options[:endDate] = options[:end_date].amee2schema
+        end
+        options.delete(:end_date)
+        if options[:duration] && connection.version >= 2
+          options[:duration] = "PT#{options[:duration] * 86400}S"
+        end
         # Load data from path
-        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
@@ -230,7 +432,12 @@ module AMEE
       def item(options)
         # Search fields - from most specific to least specific
         item = items.find{ |x| x[:uid] == options[:uid] || x[:name] == options[:name] || x[:dataItemUid] == options[:dataItemUid] || x[:dataItemLabel] == options[:dataItemLabel] }
-        item ? AMEE::Profile::Item.get(connection, "#{full_path}/#{item[:path]}") : nil
+        # Pass through some options
+        new_opts = {}
+        new_opts[:returnUnit] = options[:returnUnit] if options[:returnUnit]
+        new_opts[:returnPerUnit] = options[:returnPerUnit] if options[:returnPerUnit]
+        new_opts[:format] = options[:format] if options[:format]
+        item ? AMEE::Profile::Item.get(connection, "#{full_path}/#{item[:path]}", new_opts) : nil
       end
 
     end

data/lib/amee/profile_item.rb

@@ -4,19 +4,33 @@ module AMEE
 
       def initialize(data = {})
         @values = data ? data[:values] : []
-        @total_amount_per_month = data[:total_amount_per_month]
-        @valid_from = data[:valid_from]
+        @total_amount = data[:total_amount]
+        @total_amount_unit = data[:total_amount_unit]
+        @start_date = data[:start_date] || data[:valid_from]
+        @end_date = data[:end_date] || (data[:end] == true ? @start_date : nil )
         @data_item_uid = data[:data_item_uid]
-        @end = data[:end]
         super
       end
 
       attr_reader :values
-      attr_reader :total_amount_per_month
-      attr_reader :valid_from
-      attr_reader :end
+      attr_reader :total_amount
+      attr_reader :total_amount_unit
+      attr_reader :start_date
+      attr_reader :end_date
       attr_reader :data_item_uid
 
+      # V1 compatibility
+      def valid_from
+        start_date
+      end
+      def end
+        end_date.nil? ? false : start_date == end_date
+      end
+
+      def duration
+        end_date.nil? ? nil : (end_date - start_date).to_f
+      end
+
       def self.from_json(json)
         # Parse json
         doc = JSON.parse(json)
@@ -26,7 +40,8 @@ module AMEE
         data[:uid] = doc['profileItem']['uid']
         data[:name] = doc['profileItem']['name']
         data[:path] = doc['path']
-        data[:total_amount_per_month] = doc['profileItem']['amountPerMonth']
+        data[:total_amount] = doc['profileItem']['amountPerMonth']
+        data[:total_amount_unit] = "kg/month"
         data[:valid_from] = DateTime.strptime(doc['profileItem']['validFrom'], "%Y%m%d")
         data[:end] = doc['profileItem']['end'] == "false" ? false : true
         data[:values] = []
@@ -46,6 +61,38 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileItem from JSON data. Check that your URL is correct.")
       end
 
+      def self.from_v2_json(json)
+        # Parse json
+        doc = JSON.parse(json)
+        data = {}
+        data[:profile_uid] = doc['profile']['uid']
+        data[:data_item_uid] = doc['profileItem']['dataItem']['uid']
+        data[:uid] = doc['profileItem']['uid']
+        data[:name] = doc['profileItem']['name']
+        data[:path] = doc['path']
+        data[:total_amount] = doc['profileItem']['amount']['value'].to_f
+        data[:total_amount_unit] = doc['profileItem']['amount']['unit']
+        data[:start_date] = DateTime.parse(doc['profileItem']['startDate'])
+        data[:end_date] = DateTime.parse(doc['profileItem']['endDate']) rescue nil
+        data[:values] = []
+        doc['profileItem']['itemValues'].each do |item|
+          value_data = {}
+          item.each_pair do |key,value|
+            case key
+              when 'name', 'path', 'uid', 'value', 'unit'
+                value_data[key.downcase.to_sym] = value
+              when 'perUnit'
+                value_data[:per_unit] = value
+            end
+          end
+          data[:values] << value_data
+        end
+        # Create object
+        Item.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 JSON data. Check that your URL is correct.")
+      end
+
       def self.from_xml(xml)
         # Parse XML
         doc = REXML::Document.new(xml)
@@ -55,7 +102,8 @@ module AMEE
         data[:uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/@uid").to_s
         data[:name] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Name').text
         data[:path] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/Path').text || ""
-        data[:total_amount_per_month] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/AmountPerMonth').text.to_f rescue nil
+        data[:total_amount] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/AmountPerMonth').text.to_f rescue nil
+        data[:total_amount_unit] = "kg/month"
         data[:valid_from] = DateTime.strptime(REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/ValidFrom").text, "%Y%m%d")
         data[:end] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/End').text == "false" ? false : true
         data[:values] = []
@@ -78,32 +126,139 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ProfileItem from XML data. Check that your URL is correct.")
       end
 
+      def self.from_v2_xml(xml)
+        # Parse XML
+        doc = REXML::Document.new(xml)
+        data = {}
+        data[:profile_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/Profile/@uid").to_s
+        data[:data_item_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/DataItem/@uid").to_s
+        data[:uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/@uid").to_s
+        data[:name] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Name').text
+        data[:path] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/Path').text || ""
+        data[:total_amount] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Amount').text.to_f rescue nil
+        data[:total_amount_unit] = REXML::XPath.first(doc, '/Resources/ProfileItemResource/ProfileItem/Amount/@unit').to_s rescue nil
+        data[:start_date] = DateTime.parse(REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/StartDate").text)
+        data[:end_date] = DateTime.parse(REXML::XPath.first(doc, "/Resources/ProfileItemResource/ProfileItem/EndDate").text) rescue nil
+        data[:values] = []
+        REXML::XPath.each(doc, '/Resources/ProfileItemResource/ProfileItem/ItemValues/ItemValue') do |item|
+          value_data = {}
+          item.elements.each do |element|
+            key = element.name
+            value = element.text
+            case key
+              when 'Name', 'Path', 'Value', 'Unit'
+                value_data[key.downcase.to_sym] = value
+              when 'PerUnit'
+                value_data[:per_unit] = value
+            end
+          end
+          value_data[:uid] = item.attributes['uid'].to_s
+          data[:values] << value_data
+        end
+        # Create object
+        Item.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 XML data. Check that your URL is correct.")
+      end
+
+      def self.from_v2_atom(response)
+        # Parse XML
+        doc = REXML::Document.new(response)
+        data = {}
+        data[:profile_uid] = REXML::XPath.first(doc, "/entry/@xml:base").to_s.match("/profiles/(.*?)/")[1]
+        #data[:data_item_uid] = REXML::XPath.first(doc, "/Resources/ProfileItemResource/DataItem/@uid").to_s
+        data[:uid] = REXML::XPath.first(doc, "/entry/id").text.match("urn:item:(.*)")[1]
+        data[:name] = REXML::XPath.first(doc, '/entry/title').text
+        data[:path] = REXML::XPath.first(doc, "/entry/@xml:base").to_s.match("/profiles/.*?(/.*)")[1]
+        data[:total_amount] = REXML::XPath.first(doc, '/entry/amee:amount').text.to_f rescue nil
+        data[:total_amount_unit] = REXML::XPath.first(doc, '/entry/amee:amount/@unit').to_s rescue nil
+        data[:start_date] = DateTime.parse(REXML::XPath.first(doc, "/entry/amee:startDate").text)
+        data[:end_date] = DateTime.parse(REXML::XPath.first(doc, "/entry/amee:endDate").text) rescue nil
+        data[:values] = []
+        REXML::XPath.each(doc, '/entry/amee:itemValue') do |item|
+          value_data = {}
+          value_data[:name] = item.elements['amee:name'].text
+          value_data[:value] = item.elements['amee:value'].text unless item.elements['amee:value'].text == "N/A"
+          value_data[:path] = item.elements['link'].attributes['href'].to_s
+          value_data[:unit] = item.elements['amee:unit'].text rescue nil
+          value_data[:per_unit] = item.elements['amee:perUnit'].text rescue nil
+          data[:values] << value_data
+        end
+        # Create object
+        Item.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ProfileItem from V2 ATOM data. Check that your URL is correct.")
+      end
+
       def self.parse(connection, response)
         # Parse data from response
-        if response.is_json?
-          cat = Item.from_json(response)
+        if response.is_v2_json?
+          item = Item.from_v2_json(response)
+        elsif response.is_json?
+          item = Item.from_json(response)
+        elsif response.is_v2_atom?
+          item = Item.from_v2_atom(response)
+        elsif response.is_v2_xml?
+          item = Item.from_v2_xml(response)
         else
-          cat = Item.from_xml(response)
+          item = Item.from_xml(response)
         end
         # Store connection in object for future use
-        cat.connection = connection
+        item.connection = connection
         # Done
-        return cat
+        return item
       end
 
-      def self.get(connection, path, for_date = Date.today)
+     def self.get(connection, path, options = {})
+        unless options.is_a?(Hash)
+          raise AMEE::ArgumentError.new("Third argument must be a hash of options!")
+        end
+        # Convert to AMEE options
+        if options[:start_date] && category.connection.version < 2
+          options[:profileDate] = options[:start_date].amee1_month
+        elsif options[:start_date] && category.connection.version >= 2
+          options[:startDate] = options[:start_date].amee2schema
+        end
+        options.delete(:start_date)
+        if options[:end_date] && category.connection.version >= 2
+          options[:endDate] = options[:end_date].amee2schema
+        end
+        options.delete(:end_date)
+        if options[:duration] && category.connection.version >= 2
+          options[:duration] = "PT#{options[:duration] * 86400}S"
+        end
         # Load data from path
-        response = connection.get(path, :profileDate => for_date.strftime("%Y%m"))
+        response = connection.get(path, options)
         return Item.parse(connection, response)
       rescue
         raise AMEE::BadData.new("Couldn't load ProfileItem. Check that your URL is correct.")
       end
 
-      def self.create(profile, data_item_uid, options = {})
+      def self.create(category, data_item_uid, options = {})
+        # Store format if set
+        format = options[:format]
+        unless options.is_a?(Hash)
+          raise AMEE::ArgumentError.new("Third argument must be a hash of options!")
+        end
+        # Set dates
+        if options[:start_date] && category.connection.version < 2
+          options[:profileDate] = options[:start_date].amee1_month
+        elsif options[:start_date] && category.connection.version >= 2
+          options[:startDate] = options[:start_date].amee2schema
+        end
+        options.delete(:start_date)
+        if options[:end_date] && category.connection.version >= 2
+          options[:endDate] = options[:end_date].amee2schema
+        end        
+        options.delete(:end_date)
+        if options[:duration] && category.connection.version >= 2
+          options[:duration] = "PT#{options[:duration] * 86400}S"
+        end
         # Send data to path
         options.merge! :dataItemUid => data_item_uid
-        response = profile.connection.post(profile.full_path, options)
-        category = Category.parse(profile.connection, response)
+        response = category.connection.post(category.full_path, options)
+        category = Category.parse(category.connection, response)
+        options.merge!(:format => format) if format
         return category.item(options)
       rescue
         raise AMEE::BadData.new("Couldn't create ProfileItem. Check that your information is correct.")
@@ -112,8 +267,8 @@ module AMEE
       def self.update(connection, path, options = {})
         response = connection.put(path, options)
         return Item.parse(connection, response)
-      #rescue
-      #  raise AMEE::BadData.new("Couldn't update ProfileItem. Check that your information is correct.")
+      rescue
+        raise AMEE::BadData.new("Couldn't update ProfileItem. Check that your information is correct.")
       end
 
       def update(options = {})

data/lib/amee/version.rb

@@ -1,9 +1,9 @@
 module AMEE
   
   module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 4
-    TINY  = 33
+    MAJOR = 2
+    MINOR = 0
+    TINY  = 0
     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.33
+  version: 2.0.0
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-10 00:00:00 -08:00
+date: 2009-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: []