amee 3.2.1 → 4.0.0

data/spec/rails_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 'amee/rails'
 require 'active_record'
 
@@ -33,11 +33,6 @@ describe AMEE::Rails do
       @test.klass.method_defined?(:amee_create).should be_true
     end
 
-    it "should have save_with_amee and save_without_amee functions" do
-      @test.klass.method_defined?(:save_with_amee).should be_true
-      @test.klass.method_defined?(:save_without_amee).should be_true
-    end
-
     it "should have an amee_save function" do
       @test.klass.method_defined?(:amee_save).should be_true
     end

data/spec/spec_helper.rb

@@ -2,14 +2,13 @@
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
 require 'rubygems'
-require 'spec'
-require 'rspec_spinner'
-require 'activesupport'
+require 'rspec'
+require 'logger'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 require 'amee'
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :flexmock
 end
 

data/spec/user_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::Admin::User do
 
@@ -89,7 +89,7 @@ describe AMEE::Admin::User, "with an authenticated connection with environment"
     @data.username.should == @options[:username]
     @data.name.should == @options[:name]
     @data.email.should == @options[:email]
-    @data.api_version.should be_close(@options[:apiVersion], 1e-9)
+    @data.api_version.should be_within(1.0e-09).of(@options[:apiVersion])
     @data.status.should == "ACTIVE"
   end
 
@@ -103,7 +103,7 @@ describe AMEE::Admin::User, "with an authenticated connection with environment"
     @data.username.should == @options[:username]
     @data.name.should == @options[:name]
     @data.email.should == @options[:email]
-    @data.api_version.should be_close(@options[:apiVersion], 1e-9)
+    @data.api_version.should be_within(1.0e-09).of(@options[:apiVersion])
     @data.status.should == "ACTIVE"
   end
 
@@ -138,7 +138,7 @@ describe AMEE::Admin::User, "with an authenticated connection with environment"
     @new_data.username.should == @new_options[:username]
     @new_data.name.should == @new_options[:name]
     @new_data.email.should == @new_options[:email]
-    @new_data.api_version.should be_close(@new_options[:APIVersion],1e-9)
+    @new_data.api_version.should be_within(1.0e-09).of(@new_options[:APIVersion])
   end
 
   it "can delete an existing user" do
@@ -189,7 +189,7 @@ describe AMEE::Admin::User, "with an authenticated connection without environmen
     @data.username.should == @options[:username]
     @data.name.should == @options[:name]
     @data.email.should == @options[:email]
-    @data.api_version.should be_close(@options[:apiVersion], 1e-9)
+    @data.api_version.should be_within(1.0e-09).of(@options[:apiVersion])
     @data.status.should == "ACTIVE"
   end
 
@@ -203,7 +203,7 @@ describe AMEE::Admin::User, "with an authenticated connection without environmen
     @data.username.should == @options[:username]
     @data.name.should == @options[:name]
     @data.email.should == @options[:email]
-    @data.api_version.should be_close(@options[:apiVersion], 1e-9)
+    @data.api_version.should be_within(1.0e-09).of(@options[:apiVersion])
     @data.status.should == "ACTIVE"
   end
 
@@ -238,7 +238,7 @@ describe AMEE::Admin::User, "with an authenticated connection without environmen
     @new_data.username.should == @new_options[:username]
     @new_data.name.should == @new_options[:name]
     @new_data.email.should == @new_options[:email]
-    @new_data.api_version.should be_close(@new_options[:APIVersion],1e-9)
+    @new_data.api_version.should be_within(1.0e-09).of(@new_options[:APIVersion])
   end
 
   it "can delete an existing user" do

data/spec/v3/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
 
@@ -26,7 +26,7 @@ describe AMEE::Connection do
       mock.should_receive(:finish => nil)
       mock
     }
-    @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory").should == "OK"
+    @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory").should == "OK"
   end
 
   it "should be able to get from meta server" do
@@ -35,7 +35,7 @@ describe AMEE::Connection do
       mock.should_receive(:request).and_return(flexmock(:code => '200', :body => "OK"))
       mock.should_receive(:finish => nil)
     end
-    @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory").should == "OK"
+    @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory").should == "OK"
   end
 
   it "should be able to handle failed gets from meta server" do
@@ -45,8 +45,8 @@ describe AMEE::Connection do
       mock.should_receive(:finish => nil)
     end
     lambda {
-      @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory").should == nil
-    }.should raise_error(AMEE::NotFound, "The URL was not found on the server.\nRequest: GET /#{AMEE::Connection.api_version}/categories/SomeCategory")
+      @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory").should == nil
+    }.should raise_error(AMEE::NotFound, "The URL was not found on the server.\nRequest: GET /#{AMEE_API_VERSION}/categories/SomeCategory")
   end
 
   it "should be able to post to meta server" do
@@ -55,7 +55,7 @@ describe AMEE::Connection do
       mock.should_receive(:request).and_return(flexmock(:code => '200', :body => "OK"))
       mock.should_receive(:finish => nil)
     end
-    @c.v3_put("/#{AMEE::Connection.api_version}/categories/SomeCategory", {:arg => "test"}).should == "OK"
+    @c.v3_put("/#{AMEE_API_VERSION}/categories/SomeCategory", {:arg => "test"}).should == "OK"
   end
 
   it "should be able to handle failed gets from meta server" do
@@ -65,7 +65,7 @@ describe AMEE::Connection do
       mock.should_receive(:finish => nil)
     end
     lambda {
-      @c.v3_put("/#{AMEE::Connection.api_version}/categories/SomeCategory", {:arg => "test"}).should == "OK"
+      @c.v3_put("/#{AMEE_API_VERSION}/categories/SomeCategory", {:arg => "test"}).should == "OK"
     }.should raise_error
   end
 
@@ -120,7 +120,7 @@ describe AMEE::Connection, "with retry enabled" do
         mock.should_receive(:finish => nil)
       end
       lambda {
-        @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory")
+        @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory")
       }.should_not raise_error        
     end
 
@@ -131,7 +131,7 @@ describe AMEE::Connection, "with retry enabled" do
         mock.should_receive(:finish => nil)
       end
       lambda {
-        @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory")
+        @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory")
       }.should raise_error(e)
     end
   end
@@ -150,7 +150,7 @@ describe AMEE::Connection, "with retry enabled" do
         mock.should_receive(:finish => nil)
       end
       lambda {
-        @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory")
+        @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory")
       }.should_not raise_error        
     end
 
@@ -161,7 +161,7 @@ describe AMEE::Connection, "with retry enabled" do
         mock.should_receive(:finish => nil)
       end
       lambda {
-        @c.v3_get("/#{AMEE::Connection.api_version}/categories/SomeCategory")
+        @c.v3_get("/#{AMEE_API_VERSION}/categories/SomeCategory")
       }.should raise_error(AMEE::ConnectionFailed)
     end
   end  

data/spec/v3/item_definition_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::Admin::ItemDefinition do
 
@@ -19,7 +19,7 @@ describe AMEE::Admin::ItemDefinition, "with an authenticated v3 connection" do
 
   it "should parse XML correctly" do
     connection = flexmock "connection"
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef.xml'))
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef.xml'))
     @data = AMEE::Admin::ItemDefinition.load(connection,"472D78F6584E")
     @data.uid.should == "472D78F6584E"
     @data.created.should == DateTime.new(2009,8,31,12,41,18)
@@ -27,29 +27,27 @@ describe AMEE::Admin::ItemDefinition, "with an authenticated v3 connection" do
     @data.name.should == "Power Stations And Stuff"
     @data.drill_downs.should == %w{state county metroArea city zipCode plantName powWowWow}
     @data.usages.should == ['usageOne', 'usageThree', 'usageOther']
-    @data.algorithms['default'].should eql "D4E4779CA7AB"
   end
 
-  it "should parse XML correctly if there are no usages or algorithms" do
+  it "should parse XML correctly if there are no usages" do
     connection = flexmock "connection"
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef_no_usages.xml'))
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef_no_usages.xml'))
     @data = AMEE::Admin::ItemDefinition.load(connection,"472D78F6584E")
     @data.usages.should == []
-    @data.algorithms.should == {}
   end
 
   it "should parse XML correctly if there is just one usage" do
     connection = flexmock "connection"
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef_one_usage.xml'))
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef_one_usage.xml'))
     @data = AMEE::Admin::ItemDefinition.load(connection,"472D78F6584E")
     @data.usages.should == ['usageOne']
   end
 
   it "should be able to load an item value definition list" do
     connection = flexmock "connection"
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef.xml')).once
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_return(fixture('itemdef.xml')).once
     connection.should_receive(:retries).and_return(0).once
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E/values;full", {:resultStart => 0, :resultLimit => 10}).and_return(fixture('ivdlist.xml')).once
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E/values;full", {:resultStart => 0, :resultLimit => 10}).and_return(fixture('ivdlist.xml')).once
     @data = AMEE::Admin::ItemDefinition.load(connection,"472D78F6584E")
     @data.uid.should == "472D78F6584E"
     @list=@data.item_value_definition_list
@@ -79,20 +77,20 @@ describe AMEE::Admin::ItemDefinition, "with an authenticated v3 connection" do
   it "should fail gracefully with incorrect data" do
     connection = flexmock "connection"
     xml = '<?xml version="1.0" encoding="UTF-8"?><Resources>'
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_return(xml)
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_return(xml)
     lambda{AMEE::Admin::ItemDefinition.load(connection, "472D78F6584E")}.should raise_error(AMEE::BadData)
   end
 
   it "should fail gracefully on other errors" do
     connection = flexmock "connection"
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_raise("unidentified error")
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_raise("unidentified error")
     lambda{AMEE::Admin::ItemDefinition.load(connection, "472D78F6584E")}.should raise_error(AMEE::BadData)
   end
 
   it "should support updating" do
     connection = flexmock "connection"
-    connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E;full", {}).and_return('<?xml version="1.0" encoding="UTF-8" standalone="no"?><Representation><ItemDefinition created="2009-08-31T12:41:18Z" modified="2010-08-13T14:54:33Z" status="ACTIVE" uid="472D78F6584E"><Name>Power Stations And Stuff</Name><DrillDown>state,county,metroArea,city,zipCode,plantName,powWowWow</DrillDown><Usages><Usage present="true"><Name>usageOne</Name></Usage><Usage present="true"><Name>usageThree</Name></Usage><Usage present="false"><Name>usageOther</Name></Usage></Usages></ItemDefinition><Status>OK</Status><Version>#{AMEE::Connection.api_version}.0</Version></Representation>').once
-    connection.should_receive(:v3_put).with("/#{AMEE::Connection.api_version}/definitions/472D78F6584E", :usages => 'usageOther,usageThree,usageOne', :name => 'Power Stations And Stuff').once
+    connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E;full", {}).and_return('<?xml version="1.0" encoding="UTF-8" standalone="no"?><Representation><ItemDefinition created="2009-08-31T12:41:18Z" modified="2010-08-13T14:54:33Z" status="ACTIVE" uid="472D78F6584E"><Name>Power Stations And Stuff</Name><DrillDown>state,county,metroArea,city,zipCode,plantName,powWowWow</DrillDown><Usages><Usage present="true"><Name>usageOne</Name></Usage><Usage present="true"><Name>usageThree</Name></Usage><Usage present="false"><Name>usageOther</Name></Usage></Usages></ItemDefinition><Status>OK</Status><Version>#{AMEE_API_VERSION}.0</Version></Representation>').once
+    connection.should_receive(:v3_put).with("/#{AMEE_API_VERSION}/definitions/472D78F6584E", :usages => 'usageOther,usageThree,usageOne', :name => 'Power Stations And Stuff').once
     @data = AMEE::Admin::ItemDefinition.load(connection,"472D78F6584E")
     @data.usages.should == ['usageOne', 'usageThree', 'usageOther']
     @data.usages.reverse!
@@ -284,7 +282,7 @@ describe AMEE::Admin::ItemDefinitionList do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(2).once
     connection.should_receive(:get).with("/definitions/itemDefinitions",{}).twice.
-      and_return flexmock(:body =>DefinitionsListResponse.first(12))
+      and_return flexmock(:body =>DefinitionsListResponse[0,12])
     connection.should_receive(:expire).with("/definitions/itemDefinitions").twice
     connection.should_receive(:get).with("/definitions/itemDefinitions",{}).once.
       and_return flexmock(:body =>DefinitionsListResponse)
@@ -299,7 +297,7 @@ describe AMEE::Admin::ItemDefinitionList do
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(2).once
     connection.should_receive(:get).with("/definitions/itemDefinitions",{}).times(3).
-      and_return flexmock(:body =>DefinitionsListResponse.first(12))
+      and_return flexmock(:body =>DefinitionsListResponse[0,12])
     connection.should_receive(:expire).with("/definitions/itemDefinitions").times(3)
     lambda {
       AMEE::Admin::ItemDefinitionList.new(connection)

data/spec/v3/item_value_definition_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::Admin::ItemValueDefinition, "with an authenticated XML connection" do
 
@@ -12,14 +12,14 @@ describe AMEE::Admin::ItemValueDefinition, "with an authenticated XML connection
   end
 
   it "should set metadata" do
-    @connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/PQR/values/ABC;wikiDoc;usages").
+    @connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages").
       and_return(<<HERE
 #{XMLPreamble}
 <Representation>
 </Representation>
 HERE
       ).once
-    @connection.should_receive(:v3_put).with("/#{AMEE::Connection.api_version}/definitions/PQR/values/ABC;wikiDoc;usages",
+    @connection.should_receive(:v3_put).with("/#{AMEE_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages",
       :body => <<EOF
 #{XMLPreamble}
 <ItemValueDefinition>
@@ -37,7 +37,7 @@ HERE
 </ItemValueDefinition>
 EOF
 ).once
-    @connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/PQR/values/ABC;wikiDoc;usages").
+    @connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages").
       and_return(<<HERE
 #{XMLPreamble}
 <Representation>
@@ -51,7 +51,7 @@ HERE
   end
 
   it "should get metadata" do
-    @connection.should_receive(:v3_get).with("/#{AMEE::Connection.api_version}/definitions/PQR/values/ABC;wikiDoc;usages").
+    @connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages").
       and_return(<<HERE
 #{XMLPreamble}
 <Representation>
@@ -87,7 +87,7 @@ HERE
     <FromProfile>false</FromProfile>
   </ItemValueDefinition>
   <Status>OK</Status>
-  <Version>#{AMEE::Connection.api_version}.0</Version>
+  <Version>#{AMEE_API_VERSION}.0</Version>
 </Representation>
 HERE
     ).once

data/spec/v3/return_value_definition_spec.rb

@@ -1,7 +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.
 
-require File.dirname(__FILE__) + '/../spec_helper.rb'
+require 'spec_helper.rb'
+
 Testcativduid="5648C049F599"
 Testrvduid="C21026DD57C5"
 describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connection" do
@@ -31,7 +32,7 @@ describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connecti
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(0).once
     connection.should_receive(:v3_get).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues;full", {:resultLimit=>10, :resultStart=>0}).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues;full", {:resultLimit=>10, :resultStart=>0}).
       and_return(fixture('return_value_definition_list.xml')).once
     list=AMEE::Admin::ReturnValueDefinitionList.new(connection,Testcativduid)
     list.should have(3).items
@@ -40,7 +41,7 @@ describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connecti
     connection = flexmock "connection"
     connection.should_receive(:retries).and_return(0).once
     connection.should_receive(:v3_get).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues;full", {:resultLimit=>10, :resultStart=>0}).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues;full", {:resultLimit=>10, :resultStart=>0}).
       and_return(fixture('empty_return_value_definition_list.xml')).once
     list=AMEE::Admin::ReturnValueDefinitionList.new(connection,Testcativduid)
     list.should have(0).items
@@ -48,13 +49,13 @@ describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connecti
   it "should create a return value definition" do
     connection = flexmock "connection"
     connection.should_receive(:v3_get).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
       and_return(fixture('return_value_definition.xml')).once
     connection.should_receive(:v3_post).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues",  
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues",  
       {:type=>"CO2", :valueDefinition=>"45433E48B39F",
         :returnobj=>true, :unit=>"kg", :perUnit=>"month"}).
-      and_return({'Location'=>"///#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid}"}).once
+      and_return({'Location'=>"///#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid}"}).once
     rvd=AMEE::Admin::ReturnValueDefinition.create(connection,Testcativduid,
       :type=>'CO2',:unit=>'kg',:perUnit=>'month')
     
@@ -66,7 +67,7 @@ describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connecti
   it "should read a return value definition" do
     connection = flexmock "connection"
     connection.should_receive(:v3_get).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
       and_return(fixture('return_value_definition.xml')).once
     rvd=AMEE::Admin::ReturnValueDefinition.load(connection,Testcativduid,Testrvduid)
    
@@ -78,10 +79,10 @@ describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connecti
   it "should delete a return value definition" do
     connection = flexmock "connection"
     connection.should_receive(:v3_get).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
       and_return(fixture('return_value_definition.xml')).once
     connection.should_receive(:v3_delete).
-      with("/#{AMEE::Connection.api_version}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid}").once
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid}").once
     connection.should_receive(:timeout=)
      connection.should_receive(:timeout)
     rvd=AMEE::Admin::ReturnValueDefinition.load(connection,Testcativduid,Testrvduid)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 63
   prerelease: 
   segments: 
-  - 3
-  - 2
-  - 1
-  version: 3.2.1
+  - 4
+  - 0
+  - 0
+  version: 4.0.0
 platform: ruby
 authors: 
 - James Smith
@@ -18,28 +18,30 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-16 00:00:00 +00:00
+date: 2011-09-28 00:00:00 +01:00
 default_executable: ameesh
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activesupport
+  type: :runtime
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 19
         segments: 
-        - 2
         - 3
-        - 5
-        version: 2.3.5
-  type: :runtime
-  name: activesupport
-  version_requirements: *id001
+        - 0
+        - 10
+        version: 3.0.10
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: json
+  type: :runtime
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -48,12 +50,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  name: json
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: log4r
+  type: :runtime
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -62,12 +64,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  name: log4r
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: nokogiri
+  type: :runtime
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,12 +81,12 @@ dependencies:
         - 3
         - 1
         version: 1.4.3.1
-  type: :runtime
-  name: nokogiri
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: bundler
+  type: :development
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -95,12 +97,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  name: bundler
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: jeweler
+  type: :development
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -111,74 +113,72 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  type: :development
-  name: jeweler
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rspec
+  type: :development
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
-        - 1
-        - 3
+        - 2
+        - 6
         - 0
-        version: 1.3.0
-  type: :development
-  name: rspec
-  version_requirements: *id007
+        version: 2.6.0
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: flexmock
+  type: :development
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 51
         segments: 
         - 0
-        version: "0"
-  type: :development
-  name: rcov
-  version_requirements: *id008
+        - 8
+        - 6
+        version: 0.8.6
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: memcache-client
+  type: :development
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 3
         segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  type: :development
-  name: rspec_spinner
-  version_requirements: *id009
+        - 0
+        version: "0"
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: rcov
+  type: :development
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
-  type: :development
-  name: activerecord
-  version_requirements: *id010
+        - 0
+        version: "0"
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: rdoc
+  type: :development
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -187,9 +187,23 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id011
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: activerecord
   type: :development
-  name: flexmock
-  version_requirements: *id011
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 0
+        - 10
+        version: 3.0.10
+  requirement: *id012
 description: 
 email: james@floppy.org.uk
 executables: 
@@ -218,12 +232,9 @@ files:
 - examples/view_data_category.rb
 - examples/view_data_item.rb
 - examples/view_profile_item.rb
-- init.rb
 - lib/amee.rb
 - lib/amee/collection.rb
-- lib/amee/config.rb
 - lib/amee/connection.rb
-- lib/amee/core-extensions/hash.rb
 - lib/amee/data_category.rb
 - lib/amee/data_item.rb
 - lib/amee/data_item_value.rb
@@ -253,7 +264,6 @@ files:
 - lib/amee/v3/item_value_definition_list.rb
 - lib/amee/v3/meta_helper.rb
 - lib/amee/v3/return_value_definition.rb
-- rails/init.rb
 - spec/amee_spec.rb
 - spec/cache_spec.rb
 - spec/connection_spec.rb
@@ -283,7 +293,6 @@ files:
 - spec/fixtures/ivdlist.xml
 - spec/fixtures/ivdlist_BD88D30D1214.xml
 - spec/fixtures/parse_test.xml
-- spec/fixtures/rails_config.yml
 - spec/fixtures/return_value_definition.xml
 - spec/fixtures/return_value_definition_list.xml
 - spec/fixtures/v0_data_transport_transport_drill_transportType_Car1.xml
@@ -299,7 +308,6 @@ files:
 - spec/profile_spec.rb
 - spec/rails_spec.rb
 - spec/spec.opts
-- spec/spec_amee_config.rb
 - spec/spec_helper.rb
 - spec/user_spec.rb
 - spec/v3/connection_spec.rb
@@ -336,7 +344,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the AMEE carbon calculator