amee 2.0.35 → 2.2.0

data/lib/amee/data_item_value.rb

@@ -30,11 +30,11 @@ module AMEE
       def from_profile?
         @from_profile
       end
-      
+
       def from_data?
         @from_data
       end
-      
+
       attr_accessor :start_date
       attr_accessor :uid
 
@@ -65,10 +65,10 @@ module AMEE
         data[:start_date] = DateTime.parse(doc['startDate']) rescue nil
         # Create object
         ItemValue.new(data)
-      rescue 
+      rescue
         raise AMEE::BadData.new("Couldn't load DataItemValue from JSON. Check that your URL is correct.\n#{json}")
       end
-      
+
       def self.from_xml(xml, path)
         # Read XML
         doc = xml.is_a?(String) ? REXML::Document.new(xml) : xml
@@ -135,7 +135,7 @@ module AMEE
         end
       end
 
-      def self.parse(connection, response, path) 
+      def self.parse(connection, response, path)
         if response.is_json?
           value = ItemValue.from_json(response, path)
         else
@@ -148,7 +148,7 @@ module AMEE
       rescue
         raise AMEE::BadData.new("Couldn't load DataItemValue. Check that your URL is correct.\n#{response}")
       end
-      
+
       def self.create(data_item, options = {})
 
         # Do we want to automatically fetch the item afterwards?
@@ -159,7 +159,7 @@ module AMEE
         unless options.is_a?(Hash)
           raise AMEE::ArgumentError.new("Third argument must be a hash of options!")
         end
-  
+
         # Set startDate
         if (options[:start_date])
           options[:startDate] = options[:start_date].xmlschema
@@ -167,7 +167,7 @@ module AMEE
         end
 
         response = data_item.connection.post(data_item.full_path, options)
-        location = response['Location'].match("http://.*?(/.*)")[1]
+        location = response['Location'].match("https??://.*?(/.*)")[1]
         if get_item == true
           get_options = {}
           get_options[:format] = format if format
@@ -200,7 +200,7 @@ module AMEE
       rescue
         raise AMEE::BadData.new("Couldn't update DataItemValue. Check that your information is correct.\n#{response}")
       end
-      
+
       def update(options = {})
         AMEE::Data::ItemValue.update(connection, full_path, options)
       end
@@ -210,8 +210,8 @@ module AMEE
         connection.delete(path)
         rescue
          raise AMEE::BadData.new("Couldn't delete DataItemValue. Check that your information is correct.")
-      end      
-    
+      end
+
     end
   end
 end

data/lib/amee/item_definition.rb

@@ -1,57 +1,43 @@
 module AMEE
   module Admin
 
-    class ItemDefinitionList < Array
-
-      def initialize(connection, options = {})
-        # Load data from path
-        response = connection.get('/definitions/itemDefinitions', options).body
-        # Parse data from response
-        if response.is_json?
-          # Read JSON
-          doc = JSON.parse(response)
-          @pager = AMEE::Pager.from_json(doc['pager'])
-          doc['itemDefinitions'].each do |p|
-            data = {}
-            data[:uid] = p['uid']
-            data[:name] = p['name']
-            # Create ItemDefinition
-            item_definition = ItemDefinition.new(data)
-            # Store in array
-            self << item_definition
-          end
-        else
-          # Read XML
-          doc = REXML::Document.new(response)
-          @pager = AMEE::Pager.from_xml(REXML::XPath.first(doc, '/Resources/ItemDefinitionsResource/Pager'))
-          REXML::XPath.each(doc, '/Resources/ItemDefinitionsResource/ItemDefinitions/ItemDefinition') do |p|
-            data = {}
-            data[:uid] = p.attributes['uid'].to_s
-            data[:name] = p.elements['Name'].text || data[:uid]
-            # Create ItemDefinition
-            item_definition = ItemDefinition.new(data)
-            # Store connection in ItemDefinition object
-            item_definition.connection = connection
-            # Store in array
-            self << item_definition
-          end
-        end
-      rescue
-        raise AMEE::BadData.new("Couldn't load ItemDefinition list.\n#{response}")
+    class ItemDefinitionList < AMEE::Collection
+      def collectionpath
+        '/definitions/itemDefinitions'
+      end
+      def klass
+        ItemDefinition
+      end
+      def jsoncollector
+        @doc['itemDefinitions']
+      end
+      def xmlcollectorpath
+        '/Resources/ItemDefinitionsResource/ItemDefinitions/ItemDefinition'
       end
 
-      attr_reader :pager
-
+      def parse_json(p)
+        data = {}
+        data[:uid] = p['uid']
+        data[:name] = p['name']
+        data
+      end
+      def parse_xml(p)
+        data = {}
+        data[:uid] = x '@uid',:doc=>p
+        data[:name] = x('Name',:doc=>p) || data[:uid]
+        data
+      end
     end
 
     class ItemDefinition < AMEE::Object
 
       def initialize(data = {})
         @name = data[:name]
+        @drill_downs = data[:drillDown]
         super
       end
 
-      attr_reader :name
+      attr_reader :name, :drill_downs
 
       def self.list(connection)
         ItemDefinitionList.new(connection)
@@ -78,6 +64,7 @@ module AMEE
         data[:created] = DateTime.parse(doc['itemDefinition']['created'])
         data[:modified] = DateTime.parse(doc['itemDefinition']['modified'])
         data[:name] = doc['itemDefinition']['name']
+        data[:drillDown] = doc['itemDefinition']['drillDown'].split(",") rescue nil
         # Create object
         ItemDefinition.new(data)
       rescue
@@ -93,6 +80,7 @@ module AMEE
         data[:created] = DateTime.parse(REXML::XPath.first(doc, prefix + "ItemDefinition/@created").to_s)
         data[:modified] = DateTime.parse(REXML::XPath.first(doc, prefix + "ItemDefinition/@modified").to_s)
         data[:name] = REXML::XPath.first(doc, prefix + "ItemDefinition/Name").text
+        data[:drillDown] = REXML::XPath.first(doc, prefix + "ItemDefinition/DrillDown").text.split(",") rescue nil
         # Create object
         ItemDefinition.new(data)
       rescue
@@ -127,6 +115,14 @@ module AMEE
         raise AMEE::BadData.new("Couldn't update ItemDefinition. Check that your information is correct.\n#{response}")
       end
 
+      def self.load(connection,uid,options={})
+        ItemDefinition.get(connection,"/definitions/itemDefinitions/#{uid}",options)
+      end
+
+      def item_value_definition_list
+        @item_value_definitions ||= AMEE::Admin::ItemValueDefinitionList.new(connection,uid)
+      end
+
       def self.create(connection, options = {})
         unless options.is_a?(Hash)
           raise AMEE::ArgumentError.new("Second argument must be a hash of options!")
@@ -152,7 +148,5 @@ module AMEE
       end
 
     end
-
   end
-
 end

data/lib/amee/item_value_definition.rb

@@ -0,0 +1,231 @@
+module AMEE
+  module Admin
+
+    class ItemValueDefinitionList < AMEE::Collection
+      # TODO this class does not yet page through multiple pages
+      def initialize(connection,uid,options={})
+        @uid=uid
+        super(connection,options)
+      end
+      def klass
+        ItemValueDefinition
+      end
+      def collectionpath
+        "/definitions/itemDefinitions/#{@uid}/itemValueDefinitions"
+      end
+
+      def jsoncollector
+        @doc['itemValueDefinitions']
+      end
+      def xmlcollectorpath
+        '/Resources/ItemValueDefinitionsResource/ItemValueDefinitions/ItemValueDefinition'
+      end
+
+      def parse_json(p)
+        data = {}
+        data[:itemdefuid] = @uid
+        data[:uid] = p['uid']
+        data[:name] = p['name']
+        data[:path] = p['path']
+        data[:unit] = p['unit']
+        data[:perunit] = p['perunit']
+        data[:valuetype] = p['valueDefinition']['valueType']
+        data=ItemValueDefinition.parsetype(data,p['drillDown'],p['fromProfile'],p['fromData'])
+        
+      end
+      def parse_xml(p)
+        data = {}
+        data[:itemdefuid] = @uid
+        data[:uid] = x '@uid',:doc => p
+        data[:name] = x 'Name',:doc => p  || data[:uid]
+        data[:path] = x 'Path',:doc => p
+        data[:unit] = x 'Unit',:doc => p
+        data[:perunit] = x 'PerUnit',:doc => p
+        data[:valuetype] =x 'ValueDefinition/ValueType',:doc => p
+        drill=(x('DrillDown',:doc => p)=='true')
+        profile=(x('FromProfile',:doc => p)=='true')
+        ldata=(x('FromData',:doc => p)=='true')
+        data=ItemValueDefinition.parsetype(data,drill,profile,ldata)
+        
+      end
+    end
+
+    class ItemValueDefinition < AMEE::Object
+
+      def initialize(data = {})
+        @itemdefuid=data[:itemdefuid]
+        @name = data[:name]
+        @uid = data[:uid]
+        @path = data[:path]
+        @type = data[:type]
+        @unit = data[:unit]
+        @perunit = data[:perunit]
+        @valuetype = data[:valuetype]
+        @default = data[:default] == "" ? nil : data[:default]
+        @choices = data[:choices] || []
+        @versions = data[:versions] || []
+        super
+      end
+
+      attr_reader :name,:uid,:path,:itemdefuid, :type, :valuetype, :unit, :perunit, :type, :default, :choices, :versions
+
+      def profile?
+        type=='profile'
+      end
+
+      def data?
+        type=='data'
+      end
+
+      def drill?
+        type=='drill'
+      end
+
+      def self.list(connection)
+        ItemValueDefinitionList.new(connection)
+      end
+
+      def self.parse(connection, response, is_list = true)
+        # Parse data from response
+        if response.is_json?
+          item_definition = ItemValueDefinition.from_json(response)
+        else
+          item_definition = ItemValueDefinition.from_xml(response, is_list)
+        end
+        # Store connection in object for future use
+        item_definition.connection = connection
+        # Done
+        return item_definition
+      end
+
+      def self.from_json(json)
+        # Read JSON
+        doc = JSON.parse(json)
+        data = {}
+        p=doc['itemValueDefinition']
+        data[:uid] = p['uid']
+        data[:itemdefuid] = p['itemDefinition']['uid']
+        data[:created] = DateTime.parse(p['created'])
+        data[:modified] = DateTime.parse(p['modified'])
+        data[:name] = p['name']
+        data[:path] = p['path']
+        data[:unit] = p['unit']
+        data[:perunit] = p['perUnit']
+        data[:valuetype] = p['valueDefinition']['valueType']
+        data[:default] = p['value']
+        data[:choices] = p['choices'].split(',')
+        data[:versions] = p['apiVersions'].map{|v| v['apiVersion']}
+        data=ItemValueDefinition.parsetype(data,p['drillDown'],p['fromProfile'],p['fromData'])
+        # Create object
+        ItemValueDefinition.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ItemValueDefinition from JSON. Check that your URL is correct.\n#{json}")
+      end
+
+      def self.parsetype(data,drill,profile,ldata)
+        ( (profile && !(drill||ldata) ) || ldata) or raise 'inconsistent type'
+        data[:type]='profile' if profile
+        data[:type]='data' if ldata
+        data[:type]='drill' if drill
+        data
+      end
+
+      def self.from_xml(xml, is_list = true)
+        prefix = is_list ? "/Resources/ItemValueDefinitionsResource/" : "/Resources/ItemValueDefinitionResource/"
+        # Parse data from response into hash
+        doc = REXML::Document.new(xml)
+        data = {}
+        data[:uid] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/@uid").to_s
+        data[:itemdefuid] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/ItemDefinition/@uid").to_s
+        data[:created] = DateTime.parse(REXML::XPath.first(doc, prefix + "ItemValueDefinition/@created").to_s)
+        data[:modified] = DateTime.parse(REXML::XPath.first(doc, prefix + "ItemValueDefinition/@modified").to_s)
+        data[:name] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/Name").text
+        data[:path] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/Path").text
+        uxml=REXML::XPath.first(doc, prefix + "ItemValueDefinition/Unit")
+        data[:unit] = uxml ? uxml.text : nil
+        puxml=data[:perunit] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/PerUnit")
+        data[:perunit] = puxml ? puxml.text : nil
+        data[:valuetype] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/ValueDefinition/ValueType").text
+        data[:default] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/Value").text
+        data[:choices] = REXML::XPath.first(doc, prefix + "ItemValueDefinition/Choices").text.split(',') rescue nil
+        data[:versions] = REXML::XPath.each(doc, prefix + "ItemValueDefinition/APIVersions/APIVersion").map{|v| v.text}
+        drill=(REXML::XPath.first(doc, prefix + "ItemValueDefinition/DrillDown").text=='true')
+        profile=(REXML::XPath.first(doc, prefix + "ItemValueDefinition/FromProfile").text=='true')
+        ldata=(REXML::XPath.first(doc, prefix + "ItemValueDefinition/FromData").text=='true')
+        data=parsetype(data,drill,profile,ldata)
+        # Create object
+        ItemValueDefinition.new(data)
+      rescue
+        raise AMEE::BadData.new("Couldn't load ItemValueDefinition from XML. Check that your URL is correct.\n#{xml}")
+      end
+
+      def self.get(connection, path, options = {})
+        # Load data from path
+        response = connection.get(path, options).body
+        # Parse response
+        item_definition = ItemValueDefinition.parse(connection, response, false)
+        # Done
+        return item_definition
+      rescue
+        raise AMEE::BadData.new("Couldn't load ItemValueDefinition. Check that your URL is correct.\n#{response}")
+      end
+
+ 
+
+      def self.load(connection,itemdefuid,ivduid,options={})
+        ItemValueDefinition.get(connection,"/definitions/itemDefinitions/#{itemdefuid}/itemValueDefinitions/#{ivduid}",options)
+      end
+
+      def reload(connection)
+        ItemValueDefinition.load(connection,itemdefuid,uid)
+      end
+
+      def self.update(connection, path, options = {})
+        raise AMEE::NotSupported
+        #        # Do we want to automatically fetch the item afterwards?
+        #        get_item = options.delete(:get_item)
+        #        get_item = true if get_item.nil?
+        #        # Go
+        #        response = connection.put(path, options)
+        #        if get_item
+        #          if response.body.empty?
+        #            return ItemValueDefinition.get(connection, path)
+        #          else
+        #            return ItemValueDefinition.parse(connection, response.body)
+        #          end
+        #        end
+        #      rescue
+        #        raise AMEE::BadData.new("Couldn't update ItemValueDefinition. Check that your information is correct.\n#{response}")
+      end
+
+      def self.create(connection,itemdefuid, options = {})
+        raise AMEE::NotSupported
+        #        unless options.is_a?(Hash)
+        #          raise AMEE::ArgumentError.new("Second argument must be a hash of options!")
+        #        end
+        #        # Send data
+        #        response = connection.post("/definitions/itemDefinitions/#{itemdefuid}/itemValueDefintions", options).body
+        #        # Parse response
+        #        item_value_definition = ItemValueDefinition.parse(connection, response)
+        #        # Get the ItemValueDefinition again
+        #        return ItemValueDefinition.load(connection,itemdefuid , item_value_definition.uid)
+        #      rescue
+        #        raise AMEE::BadData.new("Couldn't create ItemValueDefinition. Check that your information is correct.\n#{response}")
+      end
+
+      def self.delete(connection, itemdefuid,item_value_definition)
+        raise AMEE::NotSupported
+        #        # Deleting takes a while... up the timeout to 120 seconds temporarily
+        #        t = connection.timeout
+        #        connection.timeout = 120
+        #        connection.delete("/definitions/itemDefinitions/#{itemdefuid}/itemValueDefinitions/" + item_value_definition.uid)
+        #        connection.timeout = t
+        #      rescue
+        #        raise AMEE::BadData.new("Couldn't delete ItemValueDefinition. Check that your information is correct.")
+      end
+
+    end
+
+  end
+
+end

data/lib/amee/logger.rb

@@ -0,0 +1,18 @@
+# Log4r logger for AMEE rubgem
+# by default, just log to stderr
+# clients can change this thus
+# AMEE::Log.to logtothis
+
+module AMEE
+  module Logger
+    @@log=Log4r::Logger.new('AMEERuby')
+    @@log.outputters=[Log4r::StderrOutputter.new('AMEERubyStdout')]
+    @@log.level=Log4r::WARN
+    def self.log
+      @@log
+    end
+    def self.to(log)
+      @@log=log
+    end
+  end
+end