@@ -1,7 +1,7 @@ Gem::Specification.new do |s| s.name = "amee" - s.version = "2.0.25" - s.date = "2009-10-01" + s.version = "2.0.27" + s.date = "2009-10-16" s.summary = "Ruby interface to the AMEE carbon calculator" s.email = "james@floppy.org.uk" s.homepage = "http://github.com/Floppy/amee-ruby" amee-ruby.gemspec @@ -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 = {} lib/amee/data_category.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 \ No newline at end of file +end lib/amee/pager.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 = {} lib/amee/profile_category.rb @@ -7,7 +7,8 @@ module AMEE class Connection def self.global(options = {}) - unless @connection + unless @connection + $AMEE_CONFIG ||= {} # Make default values nil @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 lib/amee/rails.rb @@ -3,7 +3,7 @@ module AMEE module VERSION #:nodoc: MAJOR = 2 MINOR = 0 - TINY = 22 + TINY = 27 STRING = [MAJOR, MINOR, TINY].join('.') end lib/amee/version.rb @@ -46,6 +46,7 @@ describe AMEE::Data::Category, "accessing AMEE V0" do @root.uid.should == "63EA08D29C63" @root.created.should == DateTime.new(2007,4,16,17,50,43) @root.modified.should == DateTime.new(2007,4,16,17,50,43) + @root.pager.should be_nil @root.children.size.should be(3) @root.children[0][:uid].should == "5376F191D80E" @root.children[0][:name].should == "Metadata" @@ -62,6 +63,7 @@ describe AMEE::Data::Category, "accessing AMEE V0" do @data.items[0][:label].should == "Biodiesel" @data.items[0][:path].should == "9DC114F06AB2" @data.items[0][:fuelKgCO2PerLitre].should == "2.5" + @data.pager.should be_nil end end @@ -82,6 +84,7 @@ describe AMEE::Data::Category, "with an authenticated XML connection" do @root.children[0][:uid].should == "BBA3AC3E795E" @root.children[0][:name].should == "Home" @root.children[0][:path].should == "home" + @root.pager.should be_nil end it "should provide access to child objects" do @@ -94,6 +97,7 @@ describe AMEE::Data::Category, "with an authenticated XML connection" do @transport.full_path.should == "/data/transport" @transport.uid.should == "263FC0186834" @transport.children.size.should be(7) + @transport.pager.should be_nil end it "should parse data items" do @@ -106,6 +110,7 @@ describe AMEE::Data::Category, "with an authenticated XML connection" do @data.items[0][:label].should == "domestic" @data.items[0][:path].should == "AD63A83B4D41" @data.items[0][:source].should == "DfT INAS Division, 29 March 2007" + @data.pager.should_not be_nil end it "should fail gracefully with incorrect data" do @@ -143,6 +148,7 @@ describe AMEE::Data::Category, "with an authenticated JSON connection" do @root.children[0][:uid].should == "BBA3AC3E795E" @root.children[0][:name].should == "Home" @root.children[0][:path].should == "home" + @root.pager.should be_nil end it "should provide access to child objects" do @@ -155,6 +161,7 @@ describe AMEE::Data::Category, "with an authenticated JSON connection" do @transport.full_path.should == "/data/transport" @transport.uid.should == "263FC0186834" @transport.children.size.should be(7) + @transport.pager.should be_nil end it "should parse data items" do @@ -167,6 +174,7 @@ describe AMEE::Data::Category, "with an authenticated JSON connection" do @data.items[0][:label].should == "domestic" @data.items[0][:path].should == "AD63A83B4D41" @data.items[0][:source].should == "DfT INAS Division, 29 March 2007" + @data.pager.should_not be_nil end it "should fail gracefully with incorrect data" do @@ -186,4 +194,4 @@ describe AMEE::Data::Category, "with an authenticated connection" do lambda{AMEE::Data::Category.get(connection, "/data")}.should raise_error(AMEE::BadData, "Couldn't load DataCategory. Check that your URL is correct.\n") end -end \ No newline at end of file +end spec/data_category_spec.rb @@ -55,6 +55,7 @@ describe AMEE::Profile::Category, "accessing AMEE V0" do @cat.children[0][:uid].should == "3A72CC3F2AC9" @cat.children[0][:name].should == "Television" @cat.children[0][:path].should == "television" + @cat.pager.should be_nil end it "should parse data items" do @@ -76,6 +77,7 @@ describe AMEE::Profile::Category, "accessing AMEE V0" do @cat.items[0][:values].size.should be(8) @cat.items[0][:values][:transportNumberOfJourneys].should == "0.0833333333333333" @cat.items[0][:values][:transportEcoDriving].should == "false" + @cat.pager.should be_nil end end @@ -96,6 +98,7 @@ describe AMEE::Profile::Category, "with an authenticated XML connection" do @cat.children[0][:uid].should == "427DFCC65E52" @cat.children[0][:name].should == "Appliances" @cat.children[0][:path].should == "appliances" + @cat.pager.should be_nil end it "should provide access to child objects" do @@ -108,6 +111,7 @@ describe AMEE::Profile::Category, "with an authenticated XML connection" do @child.path.should == "/home/appliances" @child.full_path.should == "/profiles/E54C5525AA3E/home/appliances" @child.children.size.should be(5) + @child.pager.should be_nil end it "should parse data items" do @@ -130,6 +134,7 @@ describe AMEE::Profile::Category, "with an authenticated XML connection" do @cat.items[0][:values][:kWhPerMonth].should == "12" @cat.items[0][:values][:kgPerMonth].should == "0" @cat.items[0][:values][:litresPerMonth].should == "0" + @cat.pager.should_not be_nil end it "should fail gracefully with incorrect data" do @@ -161,6 +166,7 @@ describe AMEE::Profile::Category, "with an authenticated XML connection" do cat.children[1][:items][0][:dataItemUid].should == "4F6CBCEE95F7" cat.children[1][:items][0][:values][:airconTypical].should == "true" cat.children[1][:items][0][:uid].should == "8450D6D97D2D" + cat.pager.should be_nil end end @@ -180,6 +186,7 @@ describe AMEE::Profile::Category, "with an authenticated version 2 XML connectio @cat.children[0][:uid].should == "427DFCC65E52" @cat.children[0][:name].should == "Appliances" @cat.children[0][:path].should == "appliances" + @cat.pager.should be_nil end it "should parse data items" do @@ -205,6 +212,7 @@ describe AMEE::Profile::Category, "with an authenticated version 2 XML connectio @cat.items[0][:values][:energyConsumption][:per_unit].should == "month" @cat.items[0][:values][:massPerTime][:value].should == "0" @cat.items[0][:values][:volumePerTime][:value].should == "0" + @cat.pager.should_not be_nil end it "should fail gracefully with incorrect data" do @@ -331,6 +339,7 @@ describe AMEE::Profile::Category, "with an authenticated JSON connection" do @cat.children[0][:uid].should == "427DFCC65E52" @cat.children[0][:name].should == "Appliances" @cat.children[0][:path].should == "appliances" + @cat.pager.should be_nil end it "should provide access to child objects" do @@ -343,6 +352,7 @@ describe AMEE::Profile::Category, "with an authenticated JSON connection" do @child.path.should == "/home/appliances" @child.full_path.should == "/profiles/E54C5525AA3E/home/appliances" @child.children.size.should be(5) + @child.pager.should be_nil end it "should parse data items" do @@ -365,7 +375,8 @@ describe AMEE::Profile::Category, "with an authenticated JSON connection" do @cat.items[0][:values][:kWhPerMonth].should == "12" @cat.items[0][:values][:kgPerMonth].should == "0" @cat.items[0][:values][:litresPerMonth].should == "0" - end + @cat.pager.should_not be_nil + end it "should fail gracefully with incorrect data" do connection = flexmock "connection" @@ -395,6 +406,7 @@ describe AMEE::Profile::Category, "with an authenticated JSON connection" do cat.children[1][:items][0][:dataItemUid].should == "4F6CBCEE95F7" cat.children[1][:items][0][:values][:airconTypical].should == "true" cat.children[1][:items][0][:uid].should == "8450D6D97D2D" + cat.pager.should be_nil end end @@ -414,6 +426,7 @@ describe AMEE::Profile::Category, "with an authenticated V2 JSON connection" do @cat.children[0][:uid].should == "427DFCC65E52" @cat.children[0][:name].should == "Appliances" @cat.children[0][:path].should == "appliances" + @cat.pager.should be_nil end it "should provide access to child objects" do @@ -426,6 +439,7 @@ describe AMEE::Profile::Category, "with an authenticated V2 JSON connection" do @child.path.should == "/home/appliances" @child.full_path.should == "/profiles/447C40EB29FB/home/appliances" @child.children.size.should be(5) + @child.pager.should be_nil end it "should parse data items" do @@ -451,6 +465,7 @@ describe AMEE::Profile::Category, "with an authenticated V2 JSON connection" do @cat.items[0][:values][:energyConsumption][:per_unit].should == "month" @cat.items[0][:values][:massPerTime][:value].should == "0" @cat.items[0][:values][:volumePerTime][:value].should == "0" + @cat.pager.should_not be_nil end # spec/profile_category_spec.rb d7b36e6f0243eda881d758ece4588fe92307a192 3fe9067613a949c71798c7d11a4a2828c4b31b48 steve matthew steve@steve-mbp.local http://github.com/Floppy/amee-ruby/commit/66e361b76f5bfe61fdcb940835ba3fdb40d3e4cc 66e361b76f5bfe61fdcb940835ba3fdb40d3e4cc 2009-10-23T08:31:57-07:00 2009-10-23T08:31:57-07:00 Merge branch 'master' of git@github.com:Floppy/amee-ruby 2d5e2266ad63fbe36d10e557cace046f0a77df11 steve matthew steve@steve-mbp.local