amee 2.0.25 → 2.0.26

data/README

@@ -12,11 +12,12 @@ Documentation: http://docs.github.com/Floppy/amee-ruby
 
 == INSTALLATION
 
-1) Enable gems from github, if you haven't already done so (rubygems >= 1.2): 
-    > sudo gem sources -a http://gems.github.com
+1) Enable gems from gemcutter, if you haven't already done so: 
+    > sudo gem install gemcutter
+    > sudo gem tumble
 
 2) Install gem
-    > sudo gem install Floppy-amee
+    > sudo gem install amee
 
 == IMPORTANT CHANGES in 2.0.25
 
@@ -59,7 +60,7 @@ This gem can also be used as a Rails plugin. You can either extract it into
 vendor/plugins, or use the new-style config.gem command in environment.rb. For
 example:
 
-    config.gem "Floppy-amee", :lib => "amee", :source => "http://gems.github.com", :version => '>= 0.3.0'
+    config.gem "amee", :version => '>= 2.0.26'
 
 If you copy amee.example.yml from the gem source directory to amee.yml in your
 app's config directory, a persistent AMEE connection will be available from 
@@ -103,4 +104,4 @@ ones are:
 
 3) total_amount_per_month functions have been replaced with total_amount. There are also
    total_amount_unit and total_amount_per_unit functions which give the units that the total
-   amount is in.
+   amount is in.

data/lib/amee/data_category.rb

@@ -7,11 +7,13 @@ module AMEE
       def initialize(data = {})
         @children = data ? data[:children] : []
         @items = data ? data[:items] : []
+        @pager = data ? data[:pager] : nil
         super
       end
 
       attr_reader :children
       attr_reader :items
+      attr_reader :pager
 
       def self.from_json(json)
         # Parse json
@@ -23,6 +25,7 @@ module AMEE
         data[:name] = doc['dataCategory']['name']
         data[:path] = doc['path']
         data[:children] = []
+        data[:pager] = AMEE::Pager.from_json(doc['children']['pager'])
         doc['children']['dataCategories'].each do |child|
           category_data = {}
           category_data[:name] = child['name']
@@ -55,6 +58,7 @@ module AMEE
         data[:modified] = DateTime.parse(REXML::XPath.first(doc, "/Resources/DataCategoryResource/DataCategory/@modified").to_s)
         data[:name] = REXML::XPath.first(doc, '/Resources/DataCategoryResource/DataCategory/?ame').text
         data[:path] = REXML::XPath.first(doc, '/Resources/DataCategoryResource//?ath').text || ""
+        data[:pager] = AMEE::Pager.from_xml(REXML::XPath.first(doc, '//Pager'))
         data[:children] = []
         REXML::XPath.each(doc, '/Resources/DataCategoryResource//Children/DataCategories/DataCategory') do |child|
           category_data = {}

data/lib/amee/pager.rb

@@ -28,6 +28,7 @@ module AMEE
     attr_reader :items_found
 
     def self.from_xml(node)
+      return nil if node.nil? || node.elements.empty?
       return Pager.new({:start => node.elements["Start"].text.to_i,
                         :from => node.elements["From"].text.to_i,
                         :to => node.elements["To"].text.to_i,
@@ -42,6 +43,7 @@ module AMEE
     end
 
     def self.from_json(node)
+      return nil if node.nil? || node.empty?
       return Pager.new({:start => node["start"],
                         :from => node["from"],
                         :to => node["to"],
@@ -56,4 +58,4 @@ module AMEE
     end
 
   end
-end
+end

data/lib/amee/profile_category.rb

@@ -11,6 +11,7 @@ module AMEE
         @total_amount_unit = data[:total_amount_unit]
         @start_date = data[:start_date]
         @end_date = data[:end_date]
+        @pager = data[:pager]
         super
       end
 
@@ -18,6 +19,7 @@ module AMEE
       attr_reader :items
       attr_reader :total_amount
       attr_reader :total_amount_unit
+      attr_reader :pager
 
       def start_date
         @start_date || profile_date
@@ -109,6 +111,7 @@ module AMEE
         data[:path] = doc['path']
         data[:total_amount] = doc['totalAmountPerMonth']
         data[:total_amount_unit] = "kg/month"
+        data[:pager] = AMEE::Pager.from_json(doc['children']['pager']) rescue nil
         data[:children] = []
         if doc['children'] && doc['children']['dataCategories']
           doc['children']['dataCategories'].each do |child|
@@ -139,6 +142,7 @@ module AMEE
         data[:path] = doc['path']
         data[:total_amount] = doc['totalAmount']['value'].to_f rescue nil
         data[:total_amount_unit] = doc['totalAmount']['unit'] rescue nil
+        data[:pager] = AMEE::Pager.from_json(doc['pager']) rescue nil
         data[:children] = []
         if doc['profileCategories']
           doc['profileCategories'].each do |child|
@@ -238,6 +242,7 @@ module AMEE
         data[:path] = "/#{data[:path]}" if data[:path].slice(0,1) != '/'
         data[:total_amount] = REXML::XPath.first(doc, '/Resources/ProfileCategoryResource/TotalAmountPerMonth').text.to_f rescue nil
         data[:total_amount_unit] = "kg/month"
+        data[:pager] = AMEE::Pager.from_xml(REXML::XPath.first(doc, '//Pager'))
         data[:children] = []
         REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/Children/ProfileCategories/DataCategory | /Resources/ProfileCategoryResource/Children/DataCategories/DataCategory') do |child|
           category_data = {}
@@ -318,6 +323,7 @@ module AMEE
         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[:pager] = AMEE::Pager.from_xml(REXML::XPath.first(doc, '//Pager'))
         data[:children] = []
         REXML::XPath.each(doc, '/Resources/ProfileCategoryResource/ProfileCategories/DataCategory') do |child|
           category_data = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  version: 2.0.25
+  version: 2.0.26
 platform: ruby
 authors: 
 - James Smith
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-01 00:00:00 +01:00
+date: 2009-10-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency