amee 2.0.35 → 2.2.0

data/lib/amee/object.rb

@@ -1,6 +1,7 @@
 module AMEE
   class Object
-    
+    include ParseHelper
+    extend ParseHelper # because sometimes things parse themselves in class methdos
     def initialize(data = nil)
       @uid = data ? data[:uid] : nil
       @created = data ? data[:created] : Time.now
@@ -9,13 +10,13 @@ module AMEE
       @name = data ? data[:name] : nil
       @connection = data ? data[:connection] : nil
     end
-    
+
     attr_accessor :connection
     attr_reader :uid
     attr_reader :created
     attr_reader :modified
     attr_reader :path
     attr_reader :name
-    
+
   end
 end

data/lib/amee/pager.rb

@@ -56,6 +56,49 @@ module AMEE
                         :items_per_page => node["itemsPerPage"],
                         :items_found => node["itemsFound"]})
     end
+    def more?
+      current_page<=last_page
+    end
+    def next!
+      @current_page+=1
+      more?
+    end
+    def page_fragment
+      "?page=#{current_page}"
+    end
+    def options
+      {:page => current_page}
+    end
+  end
 
+  class Limiter
+    extend ParseHelper
+    def initialize(data)
+      @offset=data[:resultStart] || 0
+      @limit=data[:resultLimit] || 10
+      @truncated=data[:truncated] || false
+    end
+    attr_reader :offset,:limit,:truncated
+    def more?
+      truncated
+    end
+    def next!
+      @offset+=limit
+      more?
+    end
+    def page_fragment
+      "?resultStart=#{offset}&resultLimit=#{limit}"
+    end
+    def options
+      {:resultStart=>offset,:resultLimit=>limit}
+    end
+    def self.from_json(doc,options={})
+      raise AMEE::NotSupported
+    end
+    def self.from_xml(node,options={})
+      t=x('@truncated',:doc=>node)
+      options[:truncated] = (t=='true') if t
+      Limiter.new options
+    end
   end
 end

data/lib/amee/parse_helper.rb

@@ -0,0 +1,29 @@
+module ParseHelper
+  def x(xpath,options = {})
+    doc = options[:doc] || @doc
+    preamble = options[:meta] == true ? metaxmlpathpreamble : xmlpathpreamble
+    nodes=REXML::XPath.match(doc,"#{preamble}#{xpath}")
+    if nodes.length==1
+      if nodes.first.respond_to?(:text)
+        return nodes.first.text
+        elsif nodes.first.respond_to?(:to_s)
+          return nodes.first.to_s
+      end
+    end
+
+    if nodes.length>1
+      if nodes.first.respond_to?(:text)
+        return nodes.map{|x| x.text}
+        elsif nodes.first.respond_to?(:to_s)
+          return nodes.map{|x| x.to_s}
+      end
+    end
+    return nil
+    
+  end
+  def xmlpathpreamble
+    ''
+  end
+  private :x
+
+end

data/lib/amee/profile_category.rb

@@ -9,6 +9,8 @@ module AMEE
         @items = data ? data[:items] : []
         @total_amount = data[:total_amount]
         @total_amount_unit = data[:total_amount_unit]
+        @amounts = data[:amounts] || []
+        @notes = data[:notes] || []
         @start_date = data[:start_date]
         @end_date = data[:end_date]
         @pager = data[:pager]
@@ -19,6 +21,8 @@ module AMEE
       attr_reader :items
       attr_reader :total_amount
       attr_reader :total_amount_unit
+      attr_reader :amounts
+      attr_reader :notes
       attr_reader :pager
 
       def start_date
@@ -59,7 +63,27 @@ module AMEE
               item_data[:amount] = value['value'].to_f
               item_data[:amount_unit] = value['unit']
             when 'amounts'
-              # add new code per COM-69 here.
+              item_data[:amounts] = []
+              if value['amount']
+                value['amount'].each do |x|
+                  d = {}
+                  d[:type] = x['type']
+                  d[:value] = x['value'].to_f
+                  d[:unit] = x['unit']
+                  d[:per_unit] = x['perUnit']
+                  d[:default] = x['default'] == 'true'
+                  item_data[:amounts] << d
+                end
+              end
+              item_data[:notes] = []
+              if value['note']
+                value['note'].each do |x|
+                  d = {}
+                  d[:type] = x['type']
+                  d[:value] = x['value']
+                  item_data[:notes] << d
+                end
+              end
             when 'itemValues'
               value.each do |itemval|
                 path = itemval['path'].to_sym
@@ -295,7 +319,25 @@ module AMEE
               item_data[:amount] = element.text.to_f
               item_data[:amount_unit] = element.attributes['unit'].to_s
             when 'amounts'
-              # add new code per COM-69 here.
+              element.elements.each do |x|
+                case x.name
+                when 'Amount'
+                  item_data[:amounts] ||= []
+                  d = {}
+                  d[:type] = x.attributes['type'].to_s
+                  d[:value] = x.text.to_f
+                  d[:unit] = x.attributes['unit'].to_s
+                  d[:per_unit] = x.attributes['perUnit'].to_s if x.attributes['perUnit']
+                  d[:default] = x.attributes['default'] == 'true'
+                  item_data[:amounts] << d
+                when 'Note'
+                  item_data[:notes] ||= []
+                  d = {}
+                  d[:type] = x.attributes['type'].to_s
+                  d[:value] = x.text
+                  item_data[:notes] << d
+                end
+              end
             when 'itemvalues'
               element.elements.each do |itemvalue|
                 path = itemvalue.elements['Path'].text

data/lib/amee/profile_item.rb

@@ -6,6 +6,8 @@ module AMEE
         @values = data ? data[:values] : []
         @total_amount = data[:total_amount]
         @total_amount_unit = data[:total_amount_unit]
+        @amounts = data[:amounts] || []
+        @notes = data[:notes] || []
         @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]
@@ -15,6 +17,8 @@ module AMEE
       attr_reader :values
       attr_reader :total_amount
       attr_reader :total_amount_unit
+      attr_reader :amounts
+      attr_reader :notes
       attr_reader :start_date
       attr_reader :end_date
       attr_reader :data_item_uid
@@ -87,6 +91,27 @@ module AMEE
           end
           data[:values] << value_data
         end
+        if doc['profileItem']['amounts']
+          if doc['profileItem']['amounts']['amount']
+            data[:amounts] = doc['profileItem']['amounts']['amount'].map do |item|
+              {
+                :type => item['type'],
+                :value => item['value'].to_f,
+                :unit => item['unit'],
+                :per_unit => item['perUnit'],
+                :default => (item['default'] == 'true'),
+              }
+            end
+          end
+          if doc['profileItem']['amounts']['note']
+            data[:notes] = doc['profileItem']['amounts']['note'].map do |item|
+              {
+                :type => item['type'],
+                :value => item['value'],
+              }
+            end
+          end
+        end
         # Create object
         Item.new(data)
       rescue
@@ -114,7 +139,7 @@ module AMEE
             value = element.text
             case key
               when 'Name', 'Path', 'Value'
-                value_data[key.downcase.to_sym] = value              
+                value_data[key.downcase.to_sym] = value
             end
           end
           value_data[:uid] = item.attributes['uid'].to_s
@@ -155,6 +180,22 @@ module AMEE
           value_data[:uid] = item.attributes['uid'].to_s
           data[:values] << value_data
         end
+        data[:amounts] = REXML::XPath.each(doc, '/Resources/ProfileItemResource/ProfileItem/Amounts/Amount').map do |item|
+          x = {
+            :type => item.attribute('type').value,
+            :value => item.text.to_f,
+            :unit => item.attribute('unit').value,
+          }
+          x[:per_unit] = item.attribute('perUnit').value if item.attribute('perUnit')
+          x[:default] = (item.attribute('default').value == 'true') if item.attribute('default')
+          x
+        end
+        data[:notes] = REXML::XPath.each(doc, '/Resources/ProfileItemResource/ProfileItem/Amounts/Note').map do |item|
+          {
+            :type => item.attribute('type').value,
+            :value => item.text,
+          }
+        end
         # Create object
         Item.new(data)
       rescue
@@ -255,7 +296,7 @@ module AMEE
         end
         if options[:end_date] && connection.version >= 2
           options[:endDate] = options[:end_date].xmlschema
-        end        
+        end
         if options[:duration] && connection.version >= 2
           options[:duration] = "PT#{options[:duration] * 86400}S"
         end
@@ -263,7 +304,7 @@ module AMEE
         options.merge! :dataItemUid => data_item_uid
         response = connection.post(path, options)
         if response['Location']
-          location = response['Location'].match("http://.*?(/.*)")[1]
+          location = response['Location'].match("https??://.*?(/.*)")[1]
         else
           category = Category.parse(connection, response.body, nil)
           location = category.full_path + "/" + category.items[0][:path]
@@ -316,7 +357,7 @@ module AMEE
         options.delete(:start_date)
         if options[:end_date] && connection.version >= 2
           options[:endDate] = options[:end_date].xmlschema
-        end        
+        end
         options.delete(:end_date)
         if options[:duration] && connection.version >= 2
           options[:duration] = "PT#{options[:duration] * 86400}S"

data/lib/amee/rails.rb

@@ -9,6 +9,9 @@ module AMEE
       def self.global(options = {})
         unless @connection
           $AMEE_CONFIG ||= {} # Make default values nil
+          if $AMEE_CONFIG['ssl'] == false
+            options.merge! :ssl => false
+          end
           @connection = self.connect($AMEE_CONFIG['server'], $AMEE_CONFIG['username'], $AMEE_CONFIG['password'], options)
           # Also store as $amee for backwards compatibility, though this is now deprecated
           $amee = @connection
@@ -25,6 +28,7 @@ module AMEE
 
     def self.included(base)
       base.extend ClassMethods
+      AMEE::Logger.to(::Rails.logger) if defined? ::Rails
     end
 
     module ClassMethods
@@ -36,7 +40,7 @@ module AMEE
         alias_method_chain :save, :amee
         before_destroy :amee_destroy
         # Check that this object has an AMEE profile UID when saving
-        validates_presence_of :amee_profile        
+        validates_presence_of :amee_profile
       end
     end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 73
+  hash: 7
   prerelease: false
   segments: 
   - 2
+  - 2
   - 0
-  - 35
-  version: 2.0.35
+  version: 2.2.0
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 +01:00
+date: 2010-07-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,6 +62,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: log4r
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: 
 email: james@floppy.org.uk
 executables: 
@@ -73,6 +87,7 @@ extra_rdoc_files: []
 files: 
 - README
 - COPYING
+- CHANGELOG
 - lib/amee.rb
 - lib/amee/connection.rb
 - lib/amee/data_item.rb
@@ -93,7 +108,11 @@ files:
 - lib/amee/rails.rb
 - lib/amee/pager.rb
 - lib/amee/item_definition.rb
+- lib/amee/item_value_definition.rb
 - lib/amee/user.rb
+- lib/amee/collection.rb
+- lib/amee/parse_helper.rb
+- lib/amee/logger.rb
 - bin/ameesh
 - examples/list_profiles.rb
 - examples/create_profile.rb
@@ -103,6 +122,7 @@ files:
 - init.rb
 - rails/init.rb
 - amee.example.yml
+- cacert.pem
 has_rdoc: true
 homepage: http://github.com/Floppy/amee-ruby
 licenses: []