amee 2.7.0 → 3.0.1

data/spec/v3/item_definition_spec.rb

@@ -0,0 +1,328 @@
+# 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'
+
+describe AMEE::Admin::ItemDefinition do
+
+  before(:each) do
+    @item_definition = AMEE::Admin::ItemDefinition.new
+  end
+
+  it "should provide a usages array" do
+    @item_definition.usages.should == []
+  end
+
+end
+
+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_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)
+    @data.modified.should == DateTime.new(2010,8,13,14,54,33)
+    @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']
+  end
+
+  it "should parse XML correctly if there are no usages" do
+    connection = flexmock "connection"
+    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 == []
+  end
+
+  it "should parse XML correctly if there is just one usage" do
+    connection = flexmock "connection"
+    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_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_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
+    @list.length.should==29
+    @list.first.uid.should=='C531CA64DD72'
+    @list.first.name.should eql 'Past carbon intensity'
+    @list.first.path.should eql 'pastIntensity'
+    @list.first.meta.wikidoc.should eql 'wikidoc'
+    @list.first.valuetype.should eql 'DECIMAL'
+    @list.first.compulsory?('usageOne').should be_true
+    @list.first.forbidden?('usageTwo').should be_true
+    @list.first.default.should eql 42.0
+    @list.first.choices.should eql ['foo','bar']
+    @list.first.unit.should == 'kg'
+    @list.first.perunit.should == 'MWh'
+    @list.first.profile?.should be_false
+    @list.first.drill?.should be_false
+    @list.first.data?.should be_true
+    @list.first.versions.should == ['1.0', '2.0']
+    @list.second.versions.should == ['2.0']
+    @list.second.optional?('usageOne').should be_true
+    @list.second.ignored?('usageTwo').should be_true
+    @list.second.default.should be_nil
+    @list.last.uid.should=='2B0A0E540D4C'
+  end
+
+  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_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_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_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!
+    @data.save!
+  end
+
+end
+
+# Following is copied here to make sure that v2 list fetch still work when v3 stuff is added.
+# Copied wholesale from v2 version
+
+DefinitionsListResponse=<<HERE
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Resources>
+<ItemDefinitionsResource>
+  <ItemDefinitions>
+    <ItemDefinition uid="2169991DE821">
+      <Name>AAA Car Generic</Name>
+      <DrillDown>fuel,size</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="18CB59F9EC2D">
+      <Name>AAA Units test</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="76C56F7DF49A">
+      <Name>AAAA1234Test</Name>
+      <DrillDown/>
+    </ItemDefinition>
+    <ItemDefinition uid="CF344E20E9AC">
+      <Name>AAATipTest</Name>
+      <DrillDown>question</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="70BCD634D0A4">
+      <Name>ActOnCO2 Action</Name>
+      <DrillDown>type</DrillDown></ItemDefinition>
+    <ItemDefinition uid="62058B6FD778">
+      <Name>ActOnCO2 Metadata</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="D3351CDC11C8">
+      <Name>ADigTest</Name>
+      <DrillDown/></ItemDefinition>
+    <ItemDefinition uid="A02807E44CA3">
+      <Name>Adipic Acid N2O emissions</Name>
+      <DrillDown>abatementTechnology</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="B910141B00DB">
+      <Name>AJC ID TEST</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="4660BD4FCF97">
+      <Name>Aluminium Production: Alternative (no anode data)</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition></ItemDefinitions>
+    <Pager>
+        <Start>0</Start>
+        <From>1</From>
+        <To>10</To>
+        <Items>10</Items>
+        <CurrentPage>1</CurrentPage>
+        <RequestedPage>1</RequestedPage>
+        <NextPage>-1</NextPage>
+        <PreviousPage>-1</PreviousPage>
+        <LastPage>1</LastPage>
+        <ItemsPerPage>10</ItemsPerPage>
+        <ItemsFound>10</ItemsFound>
+    </Pager>
+  </ItemDefinitionsResource>
+</Resources>
+HERE
+
+DefinitionsListResponsePage1=<<HERE
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Resources>
+<ItemDefinitionsResource>
+  <ItemDefinitions>
+    <ItemDefinition uid="2169991DE821">
+      <Name>AAA Car Generic</Name>
+      <DrillDown>fuel,size</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="18CB59F9EC2D">
+      <Name>AAA Units test</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="76C56F7DF49A">
+      <Name>AAAA1234Test</Name>
+      <DrillDown/>
+    </ItemDefinition>
+    <ItemDefinition uid="CF344E20E9AC">
+      <Name>AAATipTest</Name>
+      <DrillDown>question</DrillDown>
+    </ItemDefinition></ItemDefinitions>
+    <Pager>
+        <Start>0</Start>
+        <From>1</From>
+        <To>4</To>
+        <Items>10</Items>
+        <CurrentPage>1</CurrentPage>
+        <RequestedPage>1</RequestedPage>
+        <NextPage>2</NextPage>
+        <PreviousPage>-1</PreviousPage>
+        <LastPage>3</LastPage>
+        <ItemsPerPage>4</ItemsPerPage>
+        <ItemsFound>4</ItemsFound>
+    </Pager>
+  </ItemDefinitionsResource>
+</Resources>
+HERE
+DefinitionsListResponsePage2=<<HERE
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Resources>
+<ItemDefinitionsResource>
+  <ItemDefinitions>
+    <ItemDefinition uid="70BCD634D0A4">
+      <Name>ActOnCO2 Action</Name>
+      <DrillDown>type</DrillDown></ItemDefinition>
+    <ItemDefinition uid="62058B6FD778">
+      <Name>ActOnCO2 Metadata</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="D3351CDC11C8">
+      <Name>ADigTest</Name>
+      <DrillDown/></ItemDefinition>
+    <ItemDefinition uid="A02807E44CA3">
+      <Name>Adipic Acid N2O emissions</Name>
+      <DrillDown>abatementTechnology</DrillDown>
+    </ItemDefinition></ItemDefinitions>
+    <Pager>
+        <Start>4</Start>
+        <From>5</From>
+        <To>8</To>
+        <Items>10</Items>
+        <CurrentPage>2</CurrentPage>
+        <RequestedPage>2</RequestedPage>
+        <NextPage>3</NextPage>
+        <PreviousPage>1</PreviousPage>
+        <LastPage>3</LastPage>
+        <ItemsPerPage>4</ItemsPerPage>
+        <ItemsFound>4</ItemsFound>
+    </Pager>
+  </ItemDefinitionsResource>
+</Resources>
+HERE
+DefinitionsListResponsePage3=<<HERE
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<Resources>
+<ItemDefinitionsResource>
+  <ItemDefinitions>
+    <ItemDefinition uid="B910141B00DB">
+      <Name>AJC ID TEST</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    <ItemDefinition uid="4660BD4FCF97">
+      <Name>Aluminium Production: Alternative (no anode data)</Name>
+      <DrillDown>type</DrillDown>
+    </ItemDefinition>
+    </ItemDefinitions>
+    <Pager>
+        <Start>8</Start>
+        <From>9</From>
+        <To>10</To>
+        <Items>10</Items>
+        <CurrentPage>3</CurrentPage>
+        <RequestedPage>3</RequestedPage>
+        <NextPage>-1</NextPage>
+        <PreviousPage>2</PreviousPage>
+        <LastPage>3</LastPage>
+        <ItemsPerPage>4</ItemsPerPage>
+        <ItemsFound>2</ItemsFound>
+    </Pager>
+  </ItemDefinitionsResource>
+</Resources>
+HERE
+
+describe AMEE::Admin::ItemDefinitionList do
+  it "Should parse a single page" do
+    connection = flexmock "connection"
+    connection.should_receive(:retries).and_return(0).once
+    connection.should_receive(:get).with("/definitions/itemDefinitions",{}).once.
+      and_return flexmock(:body =>DefinitionsListResponse)
+    @list=AMEE::Admin::ItemDefinitionList.new(connection)
+    @list.first.should be_a AMEE::Admin::ItemDefinition
+    @list.first.uid.should == "2169991DE821"
+    @list.first.name.should == "AAA Car Generic"
+    @list.size.should==10
+  end
+
+  it "Should retry on parse failures" 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))
+    connection.should_receive(:expire).with("/definitions/itemDefinitions").twice
+    connection.should_receive(:get).with("/definitions/itemDefinitions",{}).once.
+      and_return flexmock(:body =>DefinitionsListResponse)
+    @list=AMEE::Admin::ItemDefinitionList.new(connection)
+    @list.first.should be_a AMEE::Admin::ItemDefinition
+    @list.first.uid.should == "2169991DE821"
+    @list.first.name.should == "AAA Car Generic"
+    @list.size.should==10
+  end
+
+  it "Should retry on parse failures and bubble up failure if never successful" 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))
+    connection.should_receive(:expire).with("/definitions/itemDefinitions").times(3)
+    lambda {
+      AMEE::Admin::ItemDefinitionList.new(connection)
+    }.should raise_error(Nokogiri::XML::SyntaxError)
+  end
+
+  it "Should parse multiple pages" do
+    connection = flexmock "connection"
+    connection.should_receive(:retries).and_return(0).times(3)
+    connection.should_receive(:get).with("/definitions/itemDefinitions",{}).
+      once.
+      and_return flexmock(:body =>DefinitionsListResponsePage1)
+    connection.should_receive(:get).with("/definitions/itemDefinitions",
+      {:page=>2}).once.
+      and_return flexmock(:body =>DefinitionsListResponsePage2)
+    connection.should_receive(:get).with("/definitions/itemDefinitions",
+      {:page=>3}).once.
+      and_return flexmock(:body =>DefinitionsListResponsePage3)
+    @list=AMEE::Admin::ItemDefinitionList.new(connection)
+    @list.first.should be_a AMEE::Admin::ItemDefinition
+    @list.first.uid.should == "2169991DE821"
+    @list.first.name.should == "AAA Car Generic"
+    @list[4].should be_a AMEE::Admin::ItemDefinition
+    @list[4].uid.should == "70BCD634D0A4"
+    @list[4].name.should == "ActOnCO2 Action"
+    @list.size.should==10
+  end
+end

data/spec/v3/item_value_definition_spec.rb

@@ -0,0 +1,116 @@
+# 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'
+
+describe AMEE::Admin::ItemValueDefinition, "with an authenticated XML connection" do
+
+  before :each do
+    @connection = flexmock "connection"
+    @ivd=AMEE::Admin::ItemValueDefinition.new(:connection=> @connection,
+      :uid=>'ABC',:itemdefuid=>'PQR')
+  end
+
+  it "should set metadata" do
+    @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_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages",
+      :body => <<EOF
+#{XMLPreamble}
+<ItemValueDefinition>
+  <WikiDoc>Mass of carbon per distance</WikiDoc>
+  <Usages>
+    <Usage>
+      <Name>usageTwo</Name>
+      <Type>IGNORED</Type>
+    </Usage>
+    <Usage>
+      <Name>usageOne</Name>
+      <Type>FORBIDDEN</Type>
+    </Usage>
+  </Usages>
+</ItemValueDefinition>
+EOF
+).once
+    @connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages").
+      and_return(<<HERE
+#{XMLPreamble}
+<Representation>
+</Representation>
+HERE
+      ).once
+    @ivd.meta.wikidoc = "Mass of carbon per distance"
+    @ivd.set_usage_type('usageOne', :forbidden)
+    @ivd.set_usage_type('usageTwo', :ignored)
+    @ivd.putmeta
+  end
+
+  it "should get metadata" do
+    @connection.should_receive(:v3_get).with("/#{AMEE_API_VERSION}/definitions/PQR/values/ABC;wikiDoc;usages").
+      and_return(<<HERE
+#{XMLPreamble}
+<Representation>
+  <ItemValueDefinition>
+    <Name>Test</Name>
+    <Path>test</Path>
+    <Value>42</Value>
+    <WikiDoc>Mass of carbon per distance</WikiDoc>
+    <ItemDefinition uid="PQR">
+      <Name>Itemdef</Name>
+    </ItemDefinition>
+    <Usages>
+      <Usage>
+        <Name>usageTwo</Name>
+        <Type>FORBIDDEN</Type>
+      </Usage>
+      <Usage>
+        <Name>usageThree</Name>
+        <Type>IGNORED</Type>
+      </Usage>
+      <Usage>
+        <Name>usageFour</Name>
+        <Type>OPTIONAL</Type>
+      </Usage>
+      <Usage>
+        <Name>usageOne</Name>
+        <Type>COMPULSORY</Type>
+      </Usage>
+    </Usages>
+    <Choices>true=true,false=false</Choices>
+    <DrillDown>false</DrillDown>
+    <FromData>true</FromData>
+    <FromProfile>false</FromProfile>
+  </ItemValueDefinition>
+  <Status>OK</Status>
+  <Version>#{AMEE_API_VERSION}.0</Version>
+</Representation>
+HERE
+    ).once
+#    @ivd.name.should eql "Test"
+#    @ivd.path.should eql "test"
+#    @ivd.default.should eql 42
+    @ivd.meta.wikidoc.should eql "Mass of carbon per distance"
+    result_map = {
+      'usageOne' => :compulsory,
+      'usageTwo' => :forbidden,
+      'usageThree' => :ignored,
+      'usageFour' => :optional,
+    }
+    types = [:optional, :compulsory, :forbidden, :ignored]
+    result_map.each_pair do |usage, type|
+      @ivd.usage_type(usage).should eql type
+      types.each do |test_type|
+        @ivd.send("#{test_type.to_s}?", usage).should eql(test_type == type)
+      end
+    end
+    @ivd.usage_type('unknownUsage').should == :optional
+#    @ivd.choices.should == ['true', 'false']
+#    @ivd.type.should == 'data'
+  end
+
+end

data/spec/v3/return_value_definition_spec.rb

@@ -0,0 +1,90 @@
+# 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'
+Testcativduid="5648C049F599"
+Testrvduid="C21026DD57C5"
+describe AMEE::Admin::ReturnValueDefinition, "with an authenticated XML connection" do
+
+  #  # find UID for test/jh/ameem/preexistent
+  #  it "should work" do
+  #    connection=AMEE::Connection.new('platform-science.amee.com','admin','r41n80w')
+  #    testcativduid="#{Testcativduid}"
+  #  # get the current list of RVDs
+  #    list=AMEE::Admin::ReturnValueDefinitionList.new(connection,testcativduid)
+  #    pp list
+  #  # add an RVD
+  #    AMEE::Admin::ReturnValueDefinition.create(connection,testcativduid,
+  #      :type=>'CO2',:unit=>'kg',:perUnit=>'month',:valueDefinition=>'45433E48B39F')
+  #  # re-get the list of RVDs
+  #    list=AMEE::Admin::ReturnValueDefinitionList.new(connection,testcativduid)
+  #    pp list
+  #  # delete the RVDs
+  #    list.each do |rvd|
+  #      AMEE::Admin::ReturnValueDefinition.delete(connection,testcativduid,rvd)
+  #    end
+  #  end
+
+
+
+  it "should index a list of return value definitions" do
+    connection = flexmock "connection"
+    connection.should_receive(:retries).and_return(0).once
+    connection.should_receive(:v3_get).
+      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
+  end
+  it "should return an empty list when there are no return value definitions" do    
+    connection = flexmock "connection"
+    connection.should_receive(:retries).and_return(0).once
+    connection.should_receive(:v3_get).
+      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
+  end
+  it "should create a return value definition" do
+    connection = flexmock "connection"
+    connection.should_receive(:v3_get).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
+      and_return(fixture('return_value_definition.xml')).once
+    connection.should_receive(:v3_post).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues",  
+      {:type=>"CO2", :valueDefinition=>"45433E48B39F",
+        :returnobj=>true, :unit=>"kg", :perUnit=>"month"}).
+      and_return({'Location'=>"///#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid}"}).once
+    rvd=AMEE::Admin::ReturnValueDefinition.create(connection,Testcativduid,
+      :type=>'CO2',:unit=>'kg',:perUnit=>'month')
+    
+    rvd.uid.should eql Testrvduid
+    rvd.unit.should eql 'kg'
+    rvd.perunit.should eql 'month'
+    rvd.type.should eql 'CO2'
+  end
+  it "should read a return value definition" do
+    connection = flexmock "connection"
+    connection.should_receive(:v3_get).
+      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)
+   
+    rvd.uid.should eql Testrvduid
+    rvd.unit.should eql 'kg'
+    rvd.perunit.should eql 'month'
+    rvd.type.should eql 'CO2'
+  end
+  it "should delete a return value definition" do
+    connection = flexmock "connection"
+    connection.should_receive(:v3_get).
+      with("/#{AMEE_API_VERSION}/definitions/#{Testcativduid}/returnvalues/#{Testrvduid};full", {}).
+      and_return(fixture('return_value_definition.xml')).once
+    connection.should_receive(:v3_delete).
+      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)
+    AMEE::Admin::ReturnValueDefinition.delete(connection,Testcativduid,rvd)
+  end
+end

metadata

@@ -1,21 +1,24 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 5
   prerelease: 
   segments: 
-  - 2
-  - 7
+  - 3
   - 0
-  version: 2.7.0
+  - 1
+  version: 3.0.1
 platform: ruby
 authors: 
 - James Smith
+- James Hetherington
+- Andrew Hill
+- Andrew Berkeley
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-09 00:00:00 +01:00
+date: 2011-08-11 00:00:00 +01:00
 default_executable: ameesh
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -194,16 +197,19 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- README
+- LICENSE.txt
+- README.txt
 files: 
-- CHANGELOG
-- COPYING
+- CHANGELOG.txt
 - Gemfile
-- README
+- Gemfile.lock
+- LICENSE.txt
+- README.txt
 - Rakefile
 - VERSION
 - amee-ruby.gemspec
 - amee.example.yml
+- amee.gemspec
 - bin/ameesh
 - cacert.pem
 - examples/create_profile.rb
@@ -237,6 +243,14 @@ files:
 - lib/amee/rails.rb
 - lib/amee/shell.rb
 - lib/amee/user.rb
+- lib/amee/v3.rb
+- lib/amee/v3/collection.rb
+- lib/amee/v3/connection.rb
+- lib/amee/v3/item_definition.rb
+- lib/amee/v3/item_value_definition.rb
+- 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
@@ -249,6 +263,7 @@ files:
 - spec/drill_down_spec.rb
 - spec/fixtures/AD63A83B4D41.json
 - spec/fixtures/AD63A83B4D41.xml
+- spec/fixtures/BD88D30D1214.xml
 - spec/fixtures/create_item.json
 - spec/fixtures/create_item.xml
 - spec/fixtures/data.json
@@ -258,7 +273,16 @@ files:
 - spec/fixtures/data_transport_car_generic_drill_fuel_diesel.xml
 - spec/fixtures/empty.json
 - spec/fixtures/empty.xml
+- spec/fixtures/empty_return_value_definition_list.xml
+- spec/fixtures/itemdef.xml
+- spec/fixtures/itemdef_441BF4BEA15B.xml
+- spec/fixtures/itemdef_no_usages.xml
+- spec/fixtures/itemdef_one_usage.xml
+- spec/fixtures/ivdlist.xml
+- spec/fixtures/ivdlist_BD88D30D1214.xml
 - spec/fixtures/parse_test.xml
+- spec/fixtures/return_value_definition.xml
+- spec/fixtures/return_value_definition_list.xml
 - spec/fixtures/v0_data_transport_transport_drill_transportType_Car1.xml
 - spec/item_definition_spec.rb
 - spec/item_value_definition_spec.rb
@@ -274,10 +298,14 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/user_spec.rb
+- spec/v3/connection_spec.rb
+- spec/v3/item_definition_spec.rb
+- spec/v3/item_value_definition_spec.rb
+- spec/v3/return_value_definition_spec.rb
 has_rdoc: true
 homepage: http://github.com/AMEE/amee-ruby
 licenses: 
-- MIT
+- BSD 3-Clause
 post_install_message: 
 rdoc_options: []
 

data/COPYING

@@ -1,19 +0,0 @@
-Copyright (c) 2008 James Smith (james@floppy.org.uk)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.