amee-analytics 1.1.0 → 2.0.0

data/Gemfile

@@ -1,16 +1,15 @@
 source "http://rubygems.org"
 
 # Dependencies
-gem "amee-data-abstraction","~> 1.3"
-gem "amee-data-persistence","~> 1.2"
+gem "amee-data-abstraction","~> 2.0"
+gem "amee-data-persistence","~> 2.0"
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "bundler", "~> 1.0.0"
   gem "jeweler", "~> 1.6.4"
-  gem 'rspec', '1.3.0'
+  gem "rails", "~> 3.0.10"
+  gem 'rspec', '2.6.0'
+  gem 'flexmock', '~> 0.9.0'
   gem 'rcov'
-  gem 'rspec_spinner', '1.1.3'
-  gem 'flexmock', '> 0.8.6'
-  gem 'activerecord', '~> 2.3.5'
+  gem 'rdoc'
 end

data/Gemfile.lock

@@ -0,0 +1,117 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.10)
+      actionpack (= 3.0.10)
+      mail (~> 2.2.19)
+    actionpack (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.5.0)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.14)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+    activesupport (3.0.10)
+    amee (3.0.1)
+      activesupport (~> 3.0.10)
+      json
+      log4r
+      nokogiri (~> 1.4.3.1)
+    amee-data-abstraction (2.0.0)
+      amee (~> 3.0)
+      quantify (~> 2.0.0)
+      uuidtools (= 2.1.2)
+    amee-data-persistence (2.0.0)
+      activerecord (~> 3.0.10)
+      amee-data-abstraction (~> 2.0)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.3)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    flexmock (0.9.0)
+    git (1.2.5)
+    i18n (0.5.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
+      git (>= 1.2.5)
+      rake
+    json (1.6.1)
+    log4r (1.1.9)
+    mail (2.2.19)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.4.3.1)
+    polyglot (0.3.2)
+    quantify (2.0.0)
+      activesupport (~> 3.0.10)
+      i18n
+    rack (1.2.4)
+    rack-mount (0.6.14)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.10)
+      actionmailer (= 3.0.10)
+      actionpack (= 3.0.10)
+      activerecord (= 3.0.10)
+      activeresource (= 3.0.10)
+      activesupport (= 3.0.10)
+      bundler (~> 1.0)
+      railties (= 3.0.10)
+    railties (3.0.10)
+      actionpack (= 3.0.10)
+      activesupport (= 3.0.10)
+      rake (>= 0.8.7)
+      rdoc (~> 3.4)
+      thor (~> 0.14.4)
+    rake (0.9.2)
+    rcov (0.9.10)
+    rdoc (3.9.4)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    thor (0.14.6)
+    treetop (1.4.10)
+      polyglot
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.29)
+    uuidtools (2.1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  amee-data-abstraction (~> 2.0)
+  amee-data-persistence (~> 2.0)
+  bundler (~> 1.0.0)
+  flexmock (~> 0.9.0)
+  jeweler (~> 1.6.4)
+  rails (~> 3.0.10)
+  rcov
+  rdoc
+  rspec (= 2.6.0)

data/Rakefile

@@ -10,16 +10,14 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
-require 'spec'
-require 'spec/rake/spectask'
+require 'rspec'
+require 'rspec/core/rake_task'
 
 task :default => [:spec]
 
-Spec::Rake::SpecTask.new do |t|
-  t.spec_opts = ['--options', "spec/spec.opts"]
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec,/*ruby*,/*gems*']
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  # Put spec opts in a file named .rspec in root
 end
 
 require 'jeweler'
@@ -71,29 +69,17 @@ Jeweler::Tasks.new do |gem|
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-end
-
 require 'rcov/rcovtask'
-Rcov::RcovTask.new do |test|
-  test.libs << 'test'
-  test.pattern = 'test/**/test_*.rb'
-  test.verbose = true
-  test.rcov_opts << '--exclude "gems/*"'
+desc "Generate code coverage"
+RSpec::Core::RakeTask.new(:coverage) do |t|
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
 end
 
-task :default => :test
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "amee-analytics #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+require 'rdoc/task'
+RDoc::Task.new do |rd|
+  rd.title = "AMEE Analytics"
+  rd.rdoc_dir = 'doc'
+  rd.main = "README"
+  rd.rdoc_files.include("README", "lib/**/*.rb")
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+2.0.0

data/amee-analytics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-analytics}
-  s.version = "1.1.0"
+  s.version = "2.0.0"
 
   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-18}
+  s.date = %q{2011-09-28}
   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 = [
@@ -20,62 +20,63 @@ Gem::Specification.new do |s|
     ".rvmrc",
     "CHANGELOG.txt",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "README.txt",
     "Rakefile",
     "VERSION",
     "amee-analytics.gemspec",
-    "init.rb",
     "lib/amee-analytics.rb",
-    "lib/amee/data_abstraction/calculation_collection_analytics_support.rb",
-    "lib/amee/data_abstraction/result.rb",
-    "lib/amee/data_abstraction/term_analytics_support.rb",
-    "lib/amee/data_abstraction/terms_list_analytics_support.rb",
-    "rails/init.rb",
+    "lib/amee/analytics/calculation_collection_analytics_support.rb",
+    "lib/amee/analytics/result.rb",
+    "lib/amee/analytics/term_analytics_support.rb",
+    "lib/amee/analytics/terms_list_analytics_support.rb",
     "spec/amee/analytics/calculation_collection_spec.rb",
     "spec/amee/analytics/term_spec.rb",
     "spec/amee/analytics/terms_list_spec.rb",
-    "spec/fixtures/config/calculations/calcs.rb",
     "spec/spec.opts",
     "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.rubygems_version = %q{1.4.2}
   s.summary = %q{Analytics module for use with AMEE AppKit}
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 1.3"])
-      s.add_runtime_dependency(%q<amee-data-persistence>, ["~> 1.2"])
+      s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<amee-data-persistence>, ["~> 2.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_development_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.0.10"])
+      s.add_development_dependency(%q<rspec>, ["= 2.6.0"])
+      s.add_development_dependency(%q<flexmock>, ["~> 0.9.0"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<rspec_spinner>, ["= 1.1.3"])
-      s.add_development_dependency(%q<flexmock>, ["> 0.8.6"])
-      s.add_development_dependency(%q<activerecord>, ["~> 2.3.5"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
-      s.add_dependency(%q<amee-data-abstraction>, ["~> 1.3"])
-      s.add_dependency(%q<amee-data-persistence>, ["~> 1.2"])
+      s.add_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
+      s.add_dependency(%q<amee-data-persistence>, ["~> 2.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-      s.add_dependency(%q<rspec>, ["= 1.3.0"])
+      s.add_dependency(%q<rails>, ["~> 3.0.10"])
+      s.add_dependency(%q<rspec>, ["= 2.6.0"])
+      s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
       s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<rspec_spinner>, ["= 1.1.3"])
-      s.add_dependency(%q<flexmock>, ["> 0.8.6"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.5"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
-    s.add_dependency(%q<amee-data-abstraction>, ["~> 1.3"])
-    s.add_dependency(%q<amee-data-persistence>, ["~> 1.2"])
+    s.add_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
+    s.add_dependency(%q<amee-data-persistence>, ["~> 2.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
-    s.add_dependency(%q<rspec>, ["= 1.3.0"])
+    s.add_dependency(%q<rails>, ["~> 3.0.10"])
+    s.add_dependency(%q<rspec>, ["= 2.6.0"])
+    s.add_dependency(%q<flexmock>, ["~> 0.9.0"])
     s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<rspec_spinner>, ["= 1.1.3"])
-    s.add_dependency(%q<flexmock>, ["> 0.8.6"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.5"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end
 

data/lib/amee-analytics.rb

@@ -2,7 +2,13 @@
 # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
 
 require 'rubygems'
-gem 'amee-data-abstraction'
 require 'amee-data-abstraction'
+require 'amee-data-persistence'
+require 'amee/analytics/result'
+require 'amee/analytics/calculation_collection_analytics_support'
+require 'amee/analytics/terms_list_analytics_support'
+require 'amee/analytics/term_analytics_support'
 
-require 'amee/data_abstraction/result'
+::AMEE::DataAbstraction::CalculationCollection.send :include, AMEE::Analytics::CalculationCollectionAnalyticsSupport
+::AMEE::DataAbstraction::TermsList.send :include, AMEE::Analytics::TermsListAnalyticsSupport
+::AMEE::DataAbstraction::Term.send :include, AMEE::Analytics::TermAnalyticsSupport

data/lib/amee/{data_abstraction → analytics}/calculation_collection_analytics_support.rb

@@ -4,7 +4,7 @@
 # :title: Module: AMEE::DataAbstraction::CalculationCollectionAnalyticsSupport
 
 module AMEE
-  module DataAbstraction
+  module Analytics
 
     # Mixin module for the <i>AMEE::DataAbstraction::CalculationCollection</i>
     # class, providing methods for handling collections of calculations.
@@ -53,7 +53,7 @@ module AMEE
       #
       def sort_by(term)
         term = term.to_sym unless term.is_a? Symbol
-        CalculationCollection.new(send(term).sort_by(:value).map(&:parent))
+        AMEE::DataAbstraction::CalculationCollection.new(send(term).sort_by(:value).map(&:parent))
       end
 
       # Sorts the calculation collection in place according to the values on the
@@ -107,7 +107,7 @@ module AMEE
           calc.contents[term.label] = term
           calc
         end
-        CalculationCollection.new(new_calcs)
+        AMEE::DataAbstraction::CalculationCollection.new(new_calcs)
       end
 
       # Similar to <tt>#standardize_units</tt> but standardizes units in place,
@@ -122,14 +122,14 @@ module AMEE
       # sums of all outputs represented within the collection
       #
       def sum_all_outputs
-        TermsList.new(terms.outputs.visible.labels.uniq.map { |o| send(o).sum })
+        AMEE::DataAbstraction::TermsList.new(terms.outputs.visible.labels.uniq.map { |o| send(o).sum })
       end
 
       # Returns a new instance of the class <tt>TermsList</tt> representing either
       # CO2 or CO2e outputs from each calculation
       #
       def co2_or_co2e_outputs
-        terms = TermsList.new
+        terms = AMEE::DataAbstraction::TermsList.new
         each do |calculation|
           if calculation['co2e']
             terms << calculation['co2e']
@@ -158,10 +158,10 @@ module AMEE
       # <tt>self</tt>.
       #
       def terms
-        TermsList.new( (self.map { |calc| calc.terms.map { |term| term } }).flatten )
+        AMEE::DataAbstraction::TermsList.new( (self.map { |calc| calc.terms.map { |term| term } }).flatten )
       end
 
-      TermsList::Selectors.each do |sel|
+      AMEE::DataAbstraction::TermsList::Selectors.each do |sel|
         delegate sel,:to=>:terms
       end
 

data/lib/amee/{data_abstraction → analytics}/result.rb

@@ -4,12 +4,12 @@
 # :title: Class AMEE::DataAbstraction::Result
 
 module AMEE
-  module DataAbstraction
+  module Analytics
 
     # Subclass of <tt>Term</tt> providing methods and attributes appropriate for
     # representing the results of cross calculation operations specifically
     #
-    class Result < Term
+    class Result < AMEE::DataAbstraction::Term
 
     end
   end

data/lib/amee/{data_abstraction → analytics}/term_analytics_support.rb

@@ -5,7 +5,7 @@
 # :title: Module: AMEE::DataAbstraction::TermAnalyticsSupport
 
 module AMEE
-  module DataAbstraction
+  module Analytics
     
     # Mixin module for the <i>AMEE::DataAbstraction::Term</i> class, providing
     # methods for handling collections of calculations.
@@ -17,7 +17,7 @@ module AMEE
       #
       def to_result
         result_term = Result.new
-        TermsList::TermProperties.each do |attr|
+        AMEE::DataAbstraction::TermsList::TermProperties.each do |attr|
           result_term.send(attr, self.send(attr))
         end
         return result_term

data/lib/amee/{data_abstraction → analytics}/terms_list_analytics_support.rb

@@ -5,7 +5,7 @@
 # :title: Module: AMEE::DataAbstraction::TermsListAnalyticsSupport
 
 module AMEE
-  module DataAbstraction
+  module Analytics
 
     # Mixin module for the <i>AMEE::DataAbstraction::Term</i> class, providing
     # methods for handling collections of calculations.
@@ -84,7 +84,7 @@ module AMEE
       def first_of_each_type
         labels = self.labels.uniq
         terms = labels.map {|label| find { |term| term.label == label } }
-        TermsList.new(terms)
+        AMEE::DataAbstraction::TermsList.new(terms)
       end
 
       # Returns the label of the unit which is predominantly used across all terms
@@ -133,7 +133,7 @@ module AMEE
       # operations on
       #
       def numeric_terms
-        TermsList.new select { |term| term.has_numeric_value? }
+        AMEE::DataAbstraction::TermsList.new select { |term| term.has_numeric_value? }
       end
 
       # Returns a new instance of <i>TermsList</i> with all units standardized and
@@ -159,7 +159,7 @@ module AMEE
         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) }
-        TermsList.new new_terms
+        AMEE::DataAbstraction::TermsList.new new_terms
       end
 
       # Returns a new instance of <i>Result</i> which represents the sum of all
@@ -217,7 +217,7 @@ module AMEE
         if max_groups.size == 1
           max_groups.first.first.to_result
         else
-          TermsList.new max_groups.map { |group| group.first.to_result }
+          AMEE::DataAbstraction::TermsList.new max_groups.map { |group| group.first.to_result }
         end
       end
 
@@ -250,31 +250,12 @@ module AMEE
         Result.new { label label; value value; unit unit; per_unit per_unit }
       end
 
-      # Move an individual term to a specified location (index) within the list.
-      # The specific term is selected on the basis of one of it's attributes values,
-      # with the attribute to use (e.g. :value, :unit) given by <tt>attr</attr>
-      # and value by <tt>value</tt>. The location within the list to move the term
-      # is given as an index integer value as the final argument.
-      #
-      def move_by(attr,value,index)
-        if attr == :unit || attr == :per_unit
-          value = Unit.for value
-        end
-        term = find {|t| t.send(attr) == value }
-        return if term.nil?
-        delete(term)
-        insert(index, term)
-      end
-
-      # Rotate the list terms by one element - shifts the first-placed term to the
-      # end of the list, advancing all terms forward by one place.
-      def rotate
-        push(self.shift)
-      end
-
-      # Sorts the terms list in place according to the term attribute indiated by
+      # Sorts the terms list in place according to the term attribute indicated by
       # <tt>attr</tt>, returning <tt>self</tt>.
       #
+      # If differences in units exist between terms, sorting occur based on the
+      # absolute quantities implied.
+      #
       #   my_terms_list.sort_by! :value
       #
       #                   #=> <AMEE::DataAbstraction::TermsList ... >
@@ -293,9 +274,9 @@ module AMEE
       #
       # E.g.
       #
-      # my_terms_list.sort_by :value
+      #   my_terms_list.sort_by :value
       #
-      # #=> <AMEE::DataAbstraction::TermsList ... >
+      #                   #=> <AMEE::DataAbstraction::TermsList ... >
       #
       def sort_by(attr)
         # 1. Remove unset terms before sort and append at end
@@ -325,7 +306,7 @@ module AMEE
       # dynamically retrieving a subset of terms according their labels.
       #
       def type
-        TermsList.new select{ |x| x.label == :type }
+        AMEE::DataAbstraction::TermsList.new select{ |x| x.label == :type }
       end
 
       def respond_to?(method)
@@ -372,7 +353,7 @@ module AMEE
       #
       def method_missing(method, *args, &block)
         if labels.include? method
-          TermsList.new select{ |x| x.label == method }
+          AMEE::DataAbstraction::TermsList.new select{ |x| x.label == method }
         elsif method.to_s =~ /sort_by_(.*)!/ and self.class::TermProperties.include? $1.to_sym
           sort_by! $1.to_sym
         elsif method.to_s =~ /sort_by_(.*)/ and self.class::TermProperties.include? $1.to_sym

data/spec/amee/analytics/calculation_collection_spec.rb

@@ -5,6 +5,7 @@ include AMEE::DataAbstraction
 describe CalculationCollection do
 
   before(:each) do
+    initialize_calculation_set
     @calcs = []
     @calcs << add_elec_calc(500,240)
     @calcs << add_elec_calc(1000,480)
@@ -144,7 +145,7 @@ describe CalculationCollection do
     @coll.first['usage'].unit.label.should eql 'J'
     @coll.standardize_units!(:usage,:kWh)
     @coll.first['usage'].unit 'kWh'
-    @coll.first['usage'].value.should be_close 0.000138888888888889,0.000001
+    @coll.first['usage'].value.should be_within(0.000001).of(0.000138888888888889)
   end
 
   it "should standardize units returning new collection" do
@@ -152,7 +153,7 @@ describe CalculationCollection do
     @coll.first['co2'].unit.label.should eql 't'
     coll = @coll.standardize_units(:co2,:lb)
     coll.first['co2'].unit 'lb'
-    coll.first['co2'].value.should be_close 529109.429243706,0.01
+    coll.first['co2'].value.should be_within(0.01).of(529109.429243706)
   end
 
   it "should handle 'type' as a terms filter" do
@@ -201,11 +202,11 @@ describe CalculationCollection do
 
   it "should add to calculation collection using += syntax" do
     @coll = CalculationCollection.new
-    @coll += add_transport_calc(500,240)
+    @coll += [add_transport_calc(500,240)]
     @coll.should be_a CalculationCollection
-    @coll += add_transport_calc(1000,480)
+    @coll += [add_transport_calc(1000,480)]
     @coll.should be_a CalculationCollection
-    @coll += add_transport_calc(1234,600)
+    @coll += [add_transport_calc(1234,600)]
     @coll.should be_a CalculationCollection
     @coll.size.should eql 3
   end

data/spec/amee/analytics/terms_list_spec.rb

@@ -5,6 +5,7 @@ include AMEE::DataAbstraction
 describe TermsList do
 
   before(:each) do
+    initialize_calculation_set
     calcs = []
     calcs << add_elec_calc(500,240)
     calcs << add_elec_calc(1000,480)
@@ -65,7 +66,7 @@ describe TermsList do
     list.should be_homogeneous
     list.should be_homogeneous_units
     list.first.unit.label.should eql 't'
-    list.first.value.should be_close 0.1088621688,0.001
+    list.first.value.should be_within(0.001).of(0.1088621688)
   end
 
   it "should standardize term per units with predominant per units and convert values appropriately if no per unit specified" do
@@ -78,7 +79,7 @@ describe TermsList do
     list.should be_homogeneous
     list.should be_homogeneous_per_units
     list.first.per_unit.label.should eql 'h'
-    list.first.value.should be_close 14400,0.001
+    list.first.value.should be_within(0.001).of(14400)
   end
 
   it "should standardize term units AND per units with predominant units and convert values appropriately if no units specified" do
@@ -95,7 +96,7 @@ describe TermsList do
     list.should be_homogeneous_per_units
     list.first.unit.label.should eql 't'
     list.first.per_unit.label.should eql 'h'
-    list.first.value.should be_close 6.531730128,0.001
+    list.first.value.should be_within(0.001).of(6.531730128)
   end
 
   it "should standardize term units with specfied units and convert values appropriately" do
@@ -110,7 +111,7 @@ describe TermsList do
     list.first.unit.label.should eql 'lb'
     list[1].unit.label.should eql 'lb'
     list.first.value.should eql 240.0
-    list[1].value.should be_close 1058218.85848741,0.001
+    list[1].value.should be_within(0.001).of(1058218.85848741)
   end
 
   it "should standardize term per units with specfied per units and convert values appropriately" do
@@ -126,7 +127,7 @@ describe TermsList do
     list.first.per_unit.label.should eql 'min'
     list[1].per_unit.label.should eql 'min'
     list.first.value.should eql 240.0
-    list[1].value.should be_close 8,0.001
+    list[1].value.should be_within(0.001).of(8)
   end
 
   it "should standardize term units AND per units with specfied units AND per units and convert values appropriately" do
@@ -147,7 +148,7 @@ describe TermsList do
     list[1].unit.label.should eql 'lb'
     list[1].per_unit.label.should eql 'min'
     list.first.value.should eql 240.0
-    list[1].value.should be_close 17636.9809747902,0.001
+    list[1].value.should be_within(0.001).of(17636.9809747902)
   end
 
   it "should sum terms" do
@@ -368,56 +369,6 @@ describe TermsList do
     list.last.to_s.should eql'Zambia'
   end
 
-  it "should move a term on the basis of value" do
-    @list=@list.co2
-    @list.first.to_s.should eql "240.0 t"
-    @list[1].to_s.should eql "480.0 t"
-    @list.last.to_s.should eql "600.0 t"
-    @list.move_by(:value, 600.0,0)
-    @list.first.to_s.should eql "600.0 t"
-    @list[1].to_s.should eql "240.0 t"
-    @list.last.to_s.should eql "480.0 t"
-  end
-
-  it "should move a term on the basis of unit object" do
-    @list=@list.co2
-    @list.first.unit 't'
-    @list[1].unit 'lb'
-    @list.last.unit 'kg'
-    @list.first.to_s.should eql "240.0 t"
-    @list[1].to_s.should eql "480.0 lb"
-    @list.last.to_s.should eql "600.0 kg"
-    @list.move_by(:unit, Unit.kg,1)
-    @list.first.to_s.should eql "240.0 t"
-    @list[1].to_s.should eql "600.0 kg"
-    @list.last.to_s.should eql "480.0 lb"
-  end
-
-  it "should move a term on the basis of unit label" do
-    @list=@list.co2
-    @list.first.unit 't'
-    @list[1].unit 'lb'
-    @list.last.unit 'kg'
-    @list.first.to_s.should eql "240.0 t"
-    @list[1].to_s.should eql "480.0 lb"
-    @list.last.to_s.should eql "600.0 kg"
-    @list.move_by(:unit, :t,-1)
-    @list.first.to_s.should eql "480.0 lb"
-    @list[1].to_s.should eql "600.0 kg"
-    @list.last.to_s.should eql "240.0 t"
-  end
-
-  it "should rotate terms" do
-    @list=@list.co2
-    @list.first.to_s.should eql "240.0 t"
-    @list[1].to_s.should eql "480.0 t"
-    @list.last.to_s.should eql "600.0 t"
-    @list.rotate
-    @list.first.to_s.should eql "480.0 t"
-    @list[1].to_s.should eql "600.0 t"
-    @list.last.to_s.should eql "240.0 t"
-  end
-
   it "should return a new TermList for numeric only terms" do
     @list=@list.co2.numeric_terms.should be_a TermsList
   end

data/spec/spec_helper.rb

@@ -1,45 +1,81 @@
 require 'rubygems'
-require 'spec'
-
+require 'rspec'
 require 'amee-analytics'
-require 'amee-data-persistence'
-require 'amee/data_abstraction/ongoing_calculation_persistence_support.rb'
-require 'amee/data_abstraction/calculation_collection_analytics_support'
-require 'amee/data_abstraction/terms_list_analytics_support'
-require 'amee/data_abstraction/term_analytics_support'
 
-AMEE::DataAbstraction::OngoingCalculation.class_eval {
-  include AMEE::DataAbstraction::PersistenceSupport
-}
-AMEE::DataAbstraction::CalculationCollection.class_eval { include AMEE::DataAbstraction::CalculationCollectionAnalyticsSupport }
-AMEE::DataAbstraction::TermsList.class_eval { include AMEE::DataAbstraction::TermsListAnalyticsSupport }
-AMEE::DataAbstraction::Term.class_eval { include AMEE::DataAbstraction::TermAnalyticsSupport }
+RAILS_ROOT = '.'
 
-class Rails
-  def self.root
-    File.dirname(__FILE__) + '/fixtures'
-  end
-  def self.logger
-    nil
-  end
+RSpec.configure do |config|
+  config.mock_with :flexmock
 end
 
-Spec::Runner.configure do |config|
-  config.mock_with :flexmock
-  config.before(:all) do
-    CalculationSet.find("calcs")
-  end
+def initialize_calculation_set
+  eval "Calculations = AMEE::DataAbstraction::CalculationSet.new {
+      calculation{
+        name 'Electricity'
+        label :electricity
+        path '/business/energy/electricity/grid'
+        drill {
+          label :country
+          path 'country'
+          value 'Argentina'
+        }
+        profile {
+          label :usage
+          name 'Electricity Used'
+          path 'energyPerTime'
+          default_unit :kWh
+        }
+        output {
+          label :co2
+          name 'Carbon Dioxide'
+          path :default
+          default_unit :t
+        }
+      }
+      calculation{
+        name 'Transport'
+        label :transport
+        path '/transport/defra/vehicle'
+        drill {
+          label :type
+          path 'type'
+          name 'Type'
+        }
+        drill {
+          label :size
+          path 'size'
+          name 'Size'
+        }
+        drill {
+          label :fuel
+          path 'fuel'
+          name 'Fuel'
+        }
+        profile {
+          label :distance
+          name 'distance'
+          path 'distance'
+          default_unit :km
+        }
+        output {
+          label :co2
+          name 'Carbon Dioxide'
+          path :default
+          default_unit :t
+        }
+      }
+    }"
 end
 
 def add_elec_calc(act,res)
-  calc = CalculationSet.find("calcs")[:electricity].begin_calculation
+  calc = Calculations[:electricity].begin_calculation
   calc['usage'].value act
   calc['co2'].value res
   return calc
 end
 
 def add_transport_calc(act,res)
-  calc = CalculationSet.find("calcs")[:transport].begin_calculation
+  calc = Calculations[:transport].begin_calculation
   calc['distance'].value act
   calc['co2'].value res
   return calc

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee-analytics
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
-  - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  - 0
+  version: 2.0.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,133 +18,147 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-18 00:00:00 +01:00
+date: 2011-09-28 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: amee-data-abstraction
+  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 1
-        - 3
-        version: "1.3"
-  prerelease: false
-  type: :runtime
+        - 2
+        - 0
+        version: "2.0"
   requirement: *id001
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: amee-data-persistence
+  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 11
+        hash: 3
         segments: 
-        - 1
         - 2
-        version: "1.2"
-  prerelease: false
-  type: :runtime
+        - 0
+        version: "2.0"
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  prerelease: false
+  name: bundler
+  type: :development
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 23
         segments: 
         - 1
-        - 6
-        - 4
-        version: 1.6.4
-  prerelease: false
-  type: :development
+        - 0
+        - 0
+        version: 1.0.0
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  prerelease: false
+  name: jeweler
+  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 7
         segments: 
         - 1
-        - 3
-        - 0
-        version: 1.3.0
-  prerelease: false
-  type: :development
+        - 6
+        - 4
+        version: 1.6.4
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  prerelease: false
+  name: rails
+  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 19
         segments: 
+        - 3
         - 0
-        version: "0"
-  prerelease: false
-  type: :development
+        - 10
+        version: 3.0.10
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec_spinner
+  prerelease: false
+  name: rspec
+  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 21
+        hash: 23
         segments: 
-        - 1
-        - 1
-        - 3
-        version: 1.1.3
-  prerelease: false
-  type: :development
+        - 2
+        - 6
+        - 0
+        version: 2.6.0
   requirement: *id006
 - !ruby/object:Gem::Dependency 
+  prerelease: false
   name: flexmock
+  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">"
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 51
+        hash: 59
         segments: 
         - 0
-        - 8
-        - 6
-        version: 0.8.6
-  prerelease: false
-  type: :development
+        - 9
+        - 0
+        version: 0.9.0
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  prerelease: false
+  name: rcov
+  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
-        - 2
-        - 3
-        - 5
-        version: 2.3.5
+        - 0
+        version: "0"
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
   prerelease: false
+  name: rdoc
   type: :development
-  requirement: *id008
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  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: []
@@ -158,22 +172,20 @@ files:
 - .rvmrc
 - CHANGELOG.txt
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.txt
 - Rakefile
 - VERSION
 - amee-analytics.gemspec
-- init.rb
 - lib/amee-analytics.rb
-- lib/amee/data_abstraction/calculation_collection_analytics_support.rb
-- lib/amee/data_abstraction/result.rb
-- lib/amee/data_abstraction/term_analytics_support.rb
-- lib/amee/data_abstraction/terms_list_analytics_support.rb
-- rails/init.rb
+- lib/amee/analytics/calculation_collection_analytics_support.rb
+- lib/amee/analytics/result.rb
+- lib/amee/analytics/term_analytics_support.rb
+- lib/amee/analytics/terms_list_analytics_support.rb
 - spec/amee/analytics/calculation_collection_spec.rb
 - spec/amee/analytics/term_spec.rb
 - spec/amee/analytics/terms_list_spec.rb
-- spec/fixtures/config/calculations/calcs.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -206,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.4.2
 signing_key: 
 specification_version: 3
 summary: Analytics module for use with AMEE AppKit

data/init.rb

@@ -1,4 +0,0 @@
-# Copyright (C) 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__) + "/rails/init"

data/rails/init.rb

@@ -1,9 +0,0 @@
-
-# Copyright (C) 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 'amee-data-abstraction'
-
-::AMEE::DataAbstraction::CalculationCollection.class_eval { include AMEE::DataAbstraction::CalculationCollectionAnalyticsSupport }
-::AMEE::DataAbstraction::TermsList.class_eval { include AMEE::DataAbstraction::TermsListAnalyticsSupport }
-::AMEE::DataAbstraction::Term.class_eval { include AMEE::DataAbstraction::TermAnalyticsSupport }

data/spec/fixtures/config/calculations/calcs.rb

@@ -1,55 +0,0 @@
-calculation{
-  name 'Electricity'
-  label :electricity
-  path '/business/energy/electricity/grid'
-  drill {
-    label :country
-    path 'country'
-    value 'Argentina'
-  }
-  profile {
-    label :usage
-    name 'Electricity Used'
-    path 'energyPerTime'
-    default_unit :kWh
-  }
-  output {
-    label :co2
-    name 'Carbon Dioxide'
-    path 'default'
-    default_unit :t
-  }
-}
-
-calculation{
-  name 'Transport'
-  label :transport
-  path '/transport/defra/vehicle'
-  drill {
-    label :type
-    path 'type'
-    name 'Type'
-  }
-  drill {
-    label :size
-    path 'size'
-    name 'Size'
-  }
-  drill {
-    label :fuel
-    path 'fuel'
-    name 'Fuel'
-  }
-  profile {
-    label :distance
-    name 'distance'
-    path 'distance'
-    default_unit :km
-  }
-  output {
-    label :co2
-    name 'Carbon Dioxide'
-    path 'default'
-    default_unit :t
-  }
-}