amee 3.2.1 → 4.0.0

data/lib/amee/rails.rb

@@ -12,23 +12,23 @@ module AMEE
       def self.global(options = {})
         unless @connection
           $AMEE_CONFIG ||= {} # Make default values nil
-          if $AMEE_CONFIG[:ssl] == false
+          if $AMEE_CONFIG['ssl'] == false
             options.merge! :ssl => false
           end
-          if $AMEE_CONFIG[:retries]
-            options.merge! :retries => $AMEE_CONFIG[:retries].to_i
+          if $AMEE_CONFIG['retries']
+            options.merge! :retries => $AMEE_CONFIG['retries'].to_i
           end
-          if $AMEE_CONFIG[:timeout]
-            options.merge! :timeout => $AMEE_CONFIG[:timeout].to_i
+          if $AMEE_CONFIG['timeout']
+            options.merge! :timeout => $AMEE_CONFIG['timeout'].to_i
           end
-          if $AMEE_CONFIG[:cache] == 'rails'
+          if $AMEE_CONFIG['cache'] == 'rails'
             # Pass in the rails cache store
             options[:cache_store] = ActionController::Base.cache_store
           else
-            options[:cache] ||= $AMEE_CONFIG[:cache] if $AMEE_CONFIG[:cache].present?
+            options[:cache] ||= $AMEE_CONFIG['cache'] if $AMEE_CONFIG['cache'].present?
           end
-          options[:enable_debug]   ||= $AMEE_CONFIG[:debug] if $AMEE_CONFIG[:debug].present?
-          @connection = self.connect($AMEE_CONFIG[:server], $AMEE_CONFIG[:username], $AMEE_CONFIG[:password], options)
+          options[:enable_debug]   ||= $AMEE_CONFIG['debug'] if $AMEE_CONFIG['debug'].present?
+          @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
         end
@@ -52,20 +52,16 @@ module AMEE
         # Include the instance methods for creation and desctruction
         include InstanceMethods
         # Install callbacks
-        before_validation_on_create :amee_create
-        alias_method_chain :save, :amee
+        before_validation :amee_create, :on => :create
+        after_save :amee_save
         before_destroy :amee_destroy
         # Check that this object has an AMEE profile UID when saving
-        validates_presence_of :amee_profile
+        validates :amee_profile, :presence => true
       end
     end
 
     module InstanceMethods
 
-      def save_with_amee
-        save_without_amee && amee_save
-      end
-
       def amee_create
         # Create profile
         profile = AMEE::Profile::Profile.create(amee_connection)

data/lib/amee/v3.rb

@@ -1,6 +1,8 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
+AMEE_API_VERSION = '3.3'
+
 require 'amee/v3/meta_helper'
 require 'amee/v3/collection'
 require 'amee/v3/connection'

data/lib/amee/v3/collection.rb

@@ -8,7 +8,8 @@ module AMEE
       collectionpath=~/^\/3/
     end
 
-    def fetch_with_v3
+    alias_method :fetch_without_v3, :fetch
+    def fetch
       @options.merge! @pager.options if @pager
       retries = [1] * connection.retries
       begin
@@ -33,9 +34,9 @@ module AMEE
         end
       end
     end
-    alias_method_chain :fetch, :v3
 
-    def each_page_with_v3
+    alias_method :each_page_without_v3, :each_page
+    def each_page
       @pager=AMEE::Limiter.new(@options) if v3
       # in v3 need to specify limit to start with, not in v2
       begin           
@@ -54,8 +55,5 @@ module AMEE
       end while @pager && @pager.next! #pager is nil if no pager in response,
       # pager.next! is false if @pager said current=last.
     end
-    alias_method_chain :each_page, :v3
-
   end
 end
-

data/lib/amee/v3/connection.rb

@@ -3,11 +3,6 @@
 
 module AMEE
   class Connection
-
-    def self.api_version
-      '3'
-    end
-      
     def v3_connection
       @v3_http ||= begin
         @v3_http = Net::HTTP.new(v3_hostname, @port)

data/lib/amee/v3/item_definition.rb

@@ -7,14 +7,13 @@ module AMEE
 
       include ParseHelper
 
-      def initialize_with_v3(data = {})
+      alias_method :initialize_without_v3, :initialize
+      def initialize(data = {})
         @usages = data[:usages] || []
-        @algorithms = data[:algorithms] || {}
         initialize_without_v3(data)
       end
-      alias_method_chain :initialize, :v3
 
-      attr_accessor :usages, :algorithms
+      attr_accessor :usages
 
       def self.metaxmlpathpreamble
         '/Representation/ItemDefinition/'
@@ -26,7 +25,7 @@ module AMEE
 
       def self.v3_get(connection, uid, options={})
         # Load data from path
-        response = connection.v3_get("/#{AMEE::Connection.api_version}/definitions/#{uid};full", options)
+        response = connection.v3_get("/#{AMEE_API_VERSION}/definitions/#{uid};full", options)
         # Parse response
         item_definition = ItemDefinition.parse(connection, response, false)
         # Done
@@ -35,7 +34,10 @@ module AMEE
         raise AMEE::BadData.new("Couldn't load ItemDefinition. Check that your URL is correct.\n#{$!}\n#{response}")
       end
 
-      def self.from_xml_with_v3(xml, is_list = true)
+      class << self
+        alias_method :from_xml_without_v3, :from_xml
+      end
+      def self.from_xml(xml, is_list = true)
         return self.from_xml_without_v3(xml, is_list) if xml.include?('<Resources>')
         # Parse data from response into hash
         doc = load_xml_doc(xml)
@@ -46,34 +48,25 @@ module AMEE
         data[:name] = x 'Name', :doc => doc, :meta => true
         data[:drillDown] = x('DrillDown', :doc => doc, :meta => true).split(",") rescue nil
         data[:usages] = [(x 'Usages/Usage/Name', :doc => doc, :meta => true)].flatten.delete_if{|x| x.nil?}
-        data[:algorithms] = begin
-          names = [(x 'Algorithms/Algorithm/Name', :doc => doc, :meta => true)].flatten.delete_if{|x| x.nil?}
-          uids = [(x 'Algorithms/Algorithm/@uid', :doc => doc, :meta => true)].flatten.delete_if{|x| x.nil?}
-          Hash[names.zip(uids)]
-        end
         # Create object
         ItemDefinition.new(data)
       rescue
         raise AMEE::BadData.new("Couldn't load ItemDefinition from XML. Check that your URL is correct.\n#{$!}\n#{xml}")
       end
-      class << self
-        alias_method_chain :from_xml, :v3
-      end
 
       def save!
         save_options = {
           :usages => @usages.join(','),
           :name => @name
         }
-        @connection.v3_put("/#{AMEE::Connection.api_version}/definitions/#{@uid}",save_options)
+        @connection.v3_put("/#{AMEE_API_VERSION}/definitions/#{@uid}",save_options)
       end
 
-      def expire_cache_with_v3
-        @connection.expire_matching("/#{AMEE::Connection.api_version}/definitions/#{@uid}.*")
+      alias_method :expire_cache_without_v3, :expire_cache
+      def expire_cache
+        @connection.expire_matching("/#{AMEE_API_VERSION}/definitions/#{@uid}.*")
         expire_cache_without_v3
       end
-      alias_method_chain :expire_cache, :v3
-
     end
   end
 end

data/lib/amee/v3/item_value_definition.rb

@@ -6,14 +6,14 @@ module AMEE
     class ItemValueDefinition
       include MetaHelper
 
-      def initialize_with_v3(data = {})
+      alias_method :initialize_without_v3, :initialize
+      def initialize(data = {})
         storemeta(data[:meta]) if data[:meta]
         initialize_without_v3(data)
       end
-      alias_method_chain :initialize, :v3
 
       def metapath
-        "/#{AMEE::Connection.api_version}/definitions/#{itemdefuid}/values/#{uid};wikiDoc;usages"
+        "/#{AMEE_API_VERSION}/definitions/#{itemdefuid}/values/#{uid};wikiDoc;usages"
       end
       def metaxmlpathpreamble
         '/Representation/ItemValueDefinition/'
@@ -88,12 +88,11 @@ EOF
         end
       end
 
-      def expire_cache_with_v3
-        @connection.expire_matching("/#{AMEE::Connection.api_version}/definitions/#{itemdefuid}/values/#{uid}.*")
+      alias_method :expire_cache_without_v3, :expire_cache
+      def expire_cache
+          @connection.expire_matching("/#{AMEE_API_VERSION}/definitions/#{itemdefuid}/values/#{uid}.*")
         expire_cache_without_v3
       end
-      alias_method_chain :expire_cache, :v3
-
     end
   end
 end

data/lib/amee/v3/item_value_definition_list.rb

@@ -6,14 +6,14 @@ module AMEE
 
     class ItemValueDefinitionList < AMEE::Collection
 
-      def initialize_with_v3(connection,uid,options={}, &block)
+      alias_method :initialize_without_v3, :initialize
+      def initialize(connection,uid,options={}, &block)
         @use_v3_connection = true
         initialize_without_v3(connection, uid, options, &block)
       end
-      alias_method_chain :initialize, :v3
 
       def collectionpath
-        "/#{AMEE::Connection.api_version}/definitions/#{@uid}/values;full"
+        "/#{AMEE_API_VERSION}/definitions/#{@uid}/values;full"
       end
 
       def xmlcollectorpath

data/lib/amee/v3/return_value_definition.rb

@@ -15,7 +15,7 @@ module AMEE
         ReturnValueDefinition
       end
       def collectionpath
-        "/#{AMEE::Connection.api_version}/definitions/#{@uid}/returnvalues;full"
+        "/#{AMEE_API_VERSION}/definitions/#{@uid}/returnvalues;full"
       end
 
       def jsoncollector
@@ -138,7 +138,7 @@ module AMEE
  
 
       def self.load(connection,itemdefuid,ivduid,options={})
-        ReturnValueDefinition.get(connection,"/#{AMEE::Connection.api_version}/definitions/#{itemdefuid}/returnvalues/#{ivduid};full",options)
+        ReturnValueDefinition.get(connection,"/#{AMEE_API_VERSION}/definitions/#{itemdefuid}/returnvalues/#{ivduid};full",options)
       end
 
       def reload(connection)
@@ -178,7 +178,7 @@ module AMEE
         end
         
         options.merge!(:returnobj=>true)
-        response = connection.v3_post("/#{AMEE::Connection.api_version}/definitions/#{itemdefuid}/returnvalues", options)
+        response = connection.v3_post("/#{AMEE_API_VERSION}/definitions/#{itemdefuid}/returnvalues", options)
         return ReturnValueDefinition.load(connection,itemdefuid , response['Location'].split('/')[7])
       rescue
         raise AMEE::BadData.new("Couldn't create ReturnValueDefinition. Check that your information is correct.\n#{response}")
@@ -189,7 +189,7 @@ module AMEE
         # Deleting takes a while... up the timeout to 120 seconds temporarily
         t = connection.timeout
         connection.timeout = 120
-        connection.v3_delete("/#{AMEE::Connection.api_version}/definitions/#{itemdefuid}/returnvalues/" + return_value_definition.uid)
+        connection.v3_delete("/#{AMEE_API_VERSION}/definitions/#{itemdefuid}/returnvalues/" + return_value_definition.uid)
         connection.timeout = t
       rescue
         raise AMEE::BadData.new("Couldn't delete ReturnValueDefinition. Check that your information is correct.")

data/spec/amee_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 describe "AMEE module" do
 

data/spec/cache_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 require 'ostruct'
 
 describe AMEE::Connection do

data/spec/connection_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 describe AMEE::Connection do
 

data/spec/data_category_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 describe AMEE::Data::Category do
 
@@ -127,7 +127,7 @@ describe AMEE::Data::Category, "with an authenticated XML connection" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(0)
     connection.should_receive(:get).with("/data/transport/plane/generic", {:itemsPerPage => 10}).and_return(flexmock(:body => '<?xml version="1.0" encoding="UTF-8"?><Resources><DataCategoryResource><Path>/transport/plane/generic</Path><DataCategory created="2007-08-01 09:00:23.0" modified="2007-08-01 09:00:23.0" uid="FBA97B70DBDF"><Name>Generic</Name><Path>generic</Path><Environment uid="5F5887BCF726"/><DataCategory uid="6F3692D81CD9"><Name>Plane</Name><Path>plane</Path></DataCategory><ItemDefinition uid="441BF4BEA15B"/></DataCategory><Children><DataCategories/><DataItems><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="AD63A83B4D41"><kgCO2PerPassengerJourney>0</kgCO2PerPassengerJourney><type>domestic</type><label>domestic</label><size>-</size><path>AD63A83B4D41</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0.158</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="FFC7A05D54AD"><kgCO2PerPassengerJourney>73</kgCO2PerPassengerJourney><type>domestic</type><label>domestic, one way</label><size>one way</size><path>FFC7A05D54AD</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="F5498AD6FC75"><kgCO2PerPassengerJourney>146</kgCO2PerPassengerJourney><type>domestic</type><label>domestic, return</label><size>return</size><path>F5498AD6FC75</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="7D4220DF72F9"><kgCO2PerPassengerJourney>0</kgCO2PerPassengerJourney><type>long haul</type><label>long haul</label><size>-</size><path>7D4220DF72F9</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0.105</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="46117F6C0B7E"><kgCO2PerPassengerJourney>801</kgCO2PerPassengerJourney><type>long haul</type><label>long haul, one way</label><size>one way</size><path>46117F6C0B7E</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="96D538B1B246"><kgCO2PerPassengerJourney>1602</kgCO2PerPassengerJourney><type>long haul</type><label>long haul, return</label><size>return</size><path>96D538B1B246</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="9DA419052FDF"><kgCO2PerPassengerJourney>0</kgCO2PerPassengerJourney><type>short haul</type><label>short haul</label><size>-</size><path>9DA419052FDF</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0.13</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="84B4A14C7424"><kgCO2PerPassengerJourney>170</kgCO2PerPassengerJourney><type>short haul</type><label>short haul, one way</label><size>one way</size><path>84B4A14C7424</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0</kgCO2PerPassengerKm></DataItem><DataItem created="2007-08-01 09:00:41.0" modified="2007-08-01 09:00:41.0" uid="8DA1BEAA1013"><kgCO2PerPassengerJourney>340</kgCO2PerPassengerJourney><type>short haul</type><label>short haul, return</label><size>return</size><path>8DA1BEAA1013</path><source>DfT INAS Division, 29 March 2007</source><kgCO2PerPassengerKm>0</kgCO2PerPassengerKm></DataItem></DataItems><Pager><Start>0</Start><From>1</From><To>9</To><Items>9</Items><CurrentPage>1</CurrentPage><RequestedPage>1</RequestedPage><NextPage>-1</NextPage><PreviousPage>-1</PreviousPage><LastPage>1</LastPage><ItemsPerPage>10</ItemsPerPage><ItemsFound>9</ItemsFound></Pager></Children></DataCategoryResource></Resources>'))
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/441BF4BEA15B;full",{}).and_return(fixture('itemdef_441BF4BEA15B.xml')).once
+    connection.should_receive(:v3_get).with("/3.3/definitions/441BF4BEA15B;full",{}).and_return(fixture('itemdef_441BF4BEA15B.xml')).once
     @data = AMEE::Data::Category.get(connection, "/data/transport/plane/generic")
     @data.uid.should == "FBA97B70DBDF"
     @data.itemdef.should == "441BF4BEA15B"
@@ -138,7 +138,7 @@ describe AMEE::Data::Category, "with an authenticated XML connection" do
   it "should fail gracefully with bad XML" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(0)
-    connection.should_receive(:get).with("/data", {:itemsPerPage => 10}).and_return(flexmock(:body => fixture('data.xml').first(12)))
+    connection.should_receive(:get).with("/data", {:itemsPerPage => 10}).and_return(flexmock(:body => fixture('data.xml')[0,12]))
     connection.should_receive(:expire).with("/data").once
     lambda{AMEE::Data::Category.get(connection, "/data")}.should raise_error(REXML::ParseException)
   end
@@ -146,7 +146,7 @@ describe AMEE::Data::Category, "with an authenticated XML connection" do
   it "should retry if bad XML is received first time" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(2)
-    connection.should_receive(:get).with("/data", {:itemsPerPage => 10}).and_return(flexmock(:body => fixture('data.xml').first(12))).twice
+    connection.should_receive(:get).with("/data", {:itemsPerPage => 10}).and_return(flexmock(:body => fixture('data.xml')[0,12])).twice
     connection.should_receive(:expire).with("/data").twice
     connection.should_receive(:get).with("/data", {:itemsPerPage => 10}).and_return(flexmock(:body => fixture('data.xml'))).once
     lambda{AMEE::Data::Category.get(connection, "/data")}.should_not raise_error

data/spec/data_item_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 describe AMEE::Data::Item do
 
@@ -127,7 +127,7 @@ describe AMEE::Data::Item, "with an authenticated connection" do
   it "should fail gracefully with bad XML" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(0)
-    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.xml').first(12)))
+    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.xml')[0,12]))
     connection.should_receive(:expire).with("/data/transport/plane/generic/AD63A83B4D41").once
     lambda{AMEE::Data::Item.get(connection, "/data/transport/plane/generic/AD63A83B4D41")}.should raise_error(REXML::ParseException)
   end
@@ -135,7 +135,7 @@ describe AMEE::Data::Item, "with an authenticated connection" do
   it "should retry if bad XML is received first time" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(2)
-    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.xml').first(12))).twice
+    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.xml')[0,12])).twice
     connection.should_receive(:expire).with("/data/transport/plane/generic/AD63A83B4D41").twice
     connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.xml'))).once
     lambda{AMEE::Data::Item.get(connection, "/data/transport/plane/generic/AD63A83B4D41")}.should_not raise_error
@@ -152,7 +152,7 @@ describe AMEE::Data::Item, "with an authenticated connection" do
   it "should fail gracefully with bad JSON" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(0)
-    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.json').first(12)))
+    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.json')[0,12]))
     connection.should_receive(:expire).with("/data/transport/plane/generic/AD63A83B4D41").once
     lambda{AMEE::Data::Item.get(connection, "/data/transport/plane/generic/AD63A83B4D41")}.should raise_error(JSON::ParserError)
   end
@@ -160,7 +160,7 @@ describe AMEE::Data::Item, "with an authenticated connection" do
   it "should retry if bad JSON is received first time" do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(2)
-    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.json').first(12))).twice
+    connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.json')[0,12])).twice
     connection.should_receive(:expire).with("/data/transport/plane/generic/AD63A83B4D41").twice
     connection.should_receive(:get).with("/data/transport/plane/generic/AD63A83B4D41", {}).and_return(flexmock(:body => fixture('AD63A83B4D41.json'))).once
     lambda{AMEE::Data::Item.get(connection, "/data/transport/plane/generic/AD63A83B4D41")}.should_not raise_error

data/spec/data_item_value_history_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 TestSeriesOne=[[AMEE::Epoch,1],[AMEE::Epoch+1,2],[AMEE::Epoch+3,4]]
 TestSeriesTwo=[[AMEE::Epoch,2],[AMEE::Epoch+1,6],[AMEE::Epoch+5,7],[AMEE::Epoch+9,11]]

data/spec/data_item_value_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 
 MockResourceShortPath="/transport/plane/generic/AD63A83B4D41/kgCO2PerPassengerJourney"

data/spec/data_object_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 describe AMEE::Data::Object do
 

data/spec/drill_down_spec.rb

@@ -1,7 +1,7 @@
 # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
-require File.dirname(__FILE__) + '/spec_helper.rb'
+require 'spec_helper.rb'
 
 describe AMEE::Data::DrillDown do
   

data/spec/fixtures/itemdef.xml

@@ -14,12 +14,7 @@
                 <Name>usageOther</Name>
             </Usage>
         </Usages>
-        <Algorithms>
-            <Algorithm uid="D4E4779CA7AB">
-                <Name>default</Name>
-            </Algorithm>
-        </Algorithms>
     </ItemDefinition>
     <Status>OK</Status>
-    <Version>3.6.0</Version>
+    <Version>3.1.0</Version>
 </Representation>

data/spec/fixtures/itemdef_441BF4BEA15B.xml

@@ -1,22 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <Representation>
-  <ItemDefinition created="2007-07-27T07:30:44Z" modified="2011-08-17T08:09:06Z" status="ACTIVE" uid="441BF4BEA15B">
-    <Name>Plane Generic</Name>
-    <DrillDown>type,size</DrillDown>
-    <Usages>
-      <Usage present="true">
-        <Name>default</Name>
-      </Usage>
-    </Usages>
-    <Algorithms>
-      <Algorithm uid="EC4B78451B43">
-        <Name>default</Name>
-      </Algorithm>
-      <Algorithm uid="595AF9E4E1E5">
-        <Name>perMonth</Name>
-      </Algorithm>
-    </Algorithms>
-  </ItemDefinition>
-  <Status>OK</Status>
-  <Version>3.6.0</Version>
-</Representation>
+    <ItemDefinition created="2007-07-27T07:30:44Z" modified="2010-08-24T17:17:01Z" status="ACTIVE" uid="441BF4BEA15B">
+        <Name>Plane Generic</Name>
+        <DrillDown>type,size</DrillDown>
+        <Usages>
+            <Usage present="true">
+                <Name>default</Name>
+            </Usage>
+        </Usages>
+    </ItemDefinition>
+    <Status>OK</Status>
+    <Version>3.1.0</Version>
+</Representation>