amee-analytics 2.1.1 → 2.1.2

data/VERSION

@@ -1 +1 @@
-2.1.1
+2.1.2

data/amee-analytics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-analytics}
-  s.version = "2.1.1"
+  s.version = "2.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["James Hetherington", "Andrew Berkeley", "James Smith", "George Palmer"]
-  s.date = %q{2011-10-21}
+  s.authors = [%q{James Hetherington}, %q{Andrew Berkeley}, %q{James Smith}, %q{George Palmer}]
+  s.date = %q{2011-11-03}
   s.description = %q{Part of the AMEE AppKit, this gem provides the ability to do mathmatical operations over a set of calculations}
   s.email = %q{help@amee.com}
   s.extra_rdoc_files = [
@@ -39,9 +39,9 @@ Gem::Specification.new do |s|
     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/AMEE/amee-analytics}
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.3}
+  s.licenses = [%q{MIT}]
+  s.require_paths = [%q{lib}]
+  s.rubygems_version = %q{1.8.6}
   s.summary = %q{Analytics module for use with AMEE AppKit}
 
   if s.respond_to? :specification_version then

data/lib/amee/analytics/calculation_collection_analytics_support.rb

@@ -102,12 +102,12 @@ module AMEE
       #
       def standardize_units(term,unit=nil,per_unit=nil)
         term = term.to_sym unless term.is_a? Symbol
-        new_calcs = send(term).standardize_units(unit,per_unit).map do |term|
+        send(term).standardize_units(unit,per_unit).map do |term|
           calc = term.parent
           calc.contents[term.label] = term
           calc
         end
-        AMEE::DataAbstraction::CalculationCollection.new(new_calcs)
+        AMEE::DataAbstraction::CalculationCollection.new(self)
       end
 
       # Similar to <tt>#standardize_units</tt> but standardizes units in place,

data/lib/amee/analytics/terms_list_analytics_support.rb

@@ -154,8 +154,8 @@ module AMEE
       #   list.standardize_units(nil, 'BTU')      #=> <TermsList>
       #
       def standardize_units(unit=nil,per_unit=nil)
-        return self if homogeneous? and ((unit.nil? or (first.unit and first.unit.label == unit)) and
-           (per_unit.nil? or (first.per_unit and first.per_unit.label == per_unit)))
+        return self if homogeneous? && ((unit.nil? or (first.unit && first.unit.label == unit)) &&
+           (per_unit.nil? || (first.per_unit && first.per_unit.label == per_unit)))
         unit = predominant_unit if unit.nil?
         per_unit = predominant_per_unit if per_unit.nil?
         new_terms = map { |term| term.convert_unit(:unit => unit, :per_unit => per_unit) }

data/spec/amee/analytics/calculation_collection_spec.rb

@@ -155,6 +155,34 @@ describe CalculationCollection do
     coll.first['co2'].value.should be_within(0.01).of(529109.429243706)
   end
 
+  it "should standardize units in place and retain calcs missing term" do
+    @coll.first['usage'].unit 'J'
+    @coll.first['usage'].value.should eql 500
+    @coll.first['usage'].unit.label.should eql 'J'
+    pp @coll
+    @coll[1].contents.delete(:usage)
+    pp @coll
+    @coll.size.should eql 3
+    @coll.standardize_units!(:usage,:kWh)
+    pp @coll
+    @coll.first['usage'].unit 'kWh'
+    @coll.first['usage'].value.should be_within(0.000001).of(0.000138888888888889)
+    @coll[1].contents['usage'].should eql nil
+    @coll.size.should eql 3
+  end
+
+  it "should standardize units returning new collection" do
+    @coll.first['co2'].value.should eql 240
+    @coll.first['co2'].unit.label.should eql 't'
+    @coll[1].contents.delete(:co2)
+    @coll.size.should eql 3
+    coll = @coll.standardize_units(:co2,:lb)
+    coll.first['co2'].unit 'lb'
+    coll.first['co2'].value.should be_within(0.01).of(529109.429243706)
+    coll[1].contents['co2'].should eql nil
+    coll.size.should eql 3
+  end
+
   it "should handle 'type' as a terms filter" do
     calcs = []
     calcs << add_transport_calc(500,240)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-analytics
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 2
   - 1
-  - 1
-  version: 2.1.1
+  - 2
+  version: 2.1.2
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,12 +18,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-21 00:00:00 +01:00
-default_executable: 
+date: 2011-11-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: amee-data-abstraction
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -33,12 +32,12 @@ dependencies:
         - 2
         - 2
         version: "2.2"
+  version_requirements: *id001
+  name: amee-data-abstraction
   prerelease: false
-  type: :runtime
-  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: amee-data-persistence
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  type: :runtime
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +47,12 @@ dependencies:
         - 2
         - 2
         version: "2.2"
+  version_requirements: *id002
+  name: amee-data-persistence
   prerelease: false
-  type: :runtime
-  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: bundler
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +63,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  version_requirements: *id003
+  name: bundler
   prerelease: false
-  type: :development
-  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +79,12 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  version_requirements: *id004
+  name: jeweler
   prerelease: false
-  type: :development
-  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rails
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -96,12 +95,12 @@ dependencies:
         - 0
         - 10
         version: 3.0.10
+  version_requirements: *id005
+  name: rails
   prerelease: false
-  type: :development
-  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -112,12 +111,12 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  version_requirements: *id006
+  name: rspec
   prerelease: false
-  type: :development
-  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: flexmock
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,12 +127,12 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
+  version_requirements: *id007
+  name: flexmock
   prerelease: false
-  type: :development
-  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: rcov
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -142,12 +141,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id008
+  name: rcov
   prerelease: false
-  type: :development
-  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: rdoc
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  type: :development
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -156,9 +155,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  version_requirements: *id009
+  name: rdoc
   prerelease: false
-  type: :development
-  requirement: *id009
 description: Part of the AMEE AppKit, this gem provides the ability to do mathmatical operations over a set of calculations
 email: help@amee.com
 executables: []
@@ -189,7 +188,6 @@ files:
 - spec/fixtures/config/calculations/calcs.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/AMEE/amee-analytics
 licenses: 
 - MIT
@@ -219,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Analytics module for use with AMEE AppKit