amee-analytics 2.0.1 → 2.1.0

data/Gemfile

@@ -1,8 +1,8 @@
 source "http://rubygems.org"
 
 # Dependencies
-gem "amee-data-abstraction","~> 2.0"
-gem "amee-data-persistence","~> 2.0"
+gem "amee-data-abstraction","~> 2.2"
+gem "amee-data-persistence","~> 2.1"
 
 group :development do
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -28,18 +28,18 @@ GEM
       activemodel (= 3.0.10)
       activesupport (= 3.0.10)
     activesupport (3.0.10)
-    amee (4.0.0)
+    amee (4.1.5)
       activesupport (~> 3.0.10)
       json
       log4r
-      nokogiri (~> 1.4.3.1)
-    amee-data-abstraction (2.0.0)
-      amee (~> 4.0)
+      nokogiri (~> 1.4.4)
+    amee-data-abstraction (2.2.0)
+      amee (~> 4.1.5)
       quantify (~> 2.0.0)
       uuidtools (= 2.1.2)
-    amee-data-persistence (2.0.0)
+    amee-data-persistence (2.1.0)
       activerecord (~> 3.0.10)
-      amee-data-abstraction (~> 2.0)
+      amee-data-abstraction (~> 2.2.0)
     arel (2.0.10)
     builder (2.1.2)
     diff-lcs (1.1.3)
@@ -60,9 +60,9 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.16)
-    nokogiri (1.4.3.1)
+    nokogiri (1.4.7)
     polyglot (0.3.2)
-    quantify (2.0.0)
+    quantify (2.0.1)
       activesupport (~> 3.0.10)
       i18n
     rack (1.2.4)
@@ -85,8 +85,9 @@ GEM
       rdoc (~> 3.4)
       thor (~> 0.14.4)
     rake (0.9.2)
-    rcov (0.9.10)
-    rdoc (3.9.4)
+    rcov (0.9.11)
+    rdoc (3.11)
+      json (~> 1.4)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
@@ -99,15 +100,15 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.29)
+    tzinfo (0.3.30)
     uuidtools (2.1.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  amee-data-abstraction (~> 2.0)
-  amee-data-persistence (~> 2.0)
+  amee-data-abstraction (~> 2.2)
+  amee-data-persistence (~> 2.1)
   bundler (~> 1.0.0)
   flexmock (~> 0.9.0)
   jeweler (~> 1.6.4)

data/VERSION

@@ -1 +1 @@
-2.0.1
+2.1.0

data/amee-analytics.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{amee-analytics}
-  s.version = "2.0.1"
+  s.version = "2.1.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-09-29}
+  s.authors = [%q{James Hetherington}, %q{Andrew Berkeley}, %q{James Smith}, %q{George Palmer}]
+  s.date = %q{2011-10-19}
   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 = [
@@ -34,21 +34,22 @@ Gem::Specification.new do |s|
     "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.6.2}
+  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
     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>, ["~> 2.0"])
-      s.add_runtime_dependency(%q<amee-data-persistence>, ["~> 2.0"])
+      s.add_runtime_dependency(%q<amee-data-abstraction>, ["~> 2.2"])
+      s.add_runtime_dependency(%q<amee-data-persistence>, ["~> 2.1"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rails>, ["~> 3.0.10"])
@@ -57,8 +58,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
-      s.add_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
-      s.add_dependency(%q<amee-data-persistence>, ["~> 2.0"])
+      s.add_dependency(%q<amee-data-abstraction>, ["~> 2.2"])
+      s.add_dependency(%q<amee-data-persistence>, ["~> 2.1"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rails>, ["~> 3.0.10"])
@@ -68,8 +69,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
-    s.add_dependency(%q<amee-data-abstraction>, ["~> 2.0"])
-    s.add_dependency(%q<amee-data-persistence>, ["~> 2.0"])
+    s.add_dependency(%q<amee-data-abstraction>, ["~> 2.2"])
+    s.add_dependency(%q<amee-data-persistence>, ["~> 2.1"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
     s.add_dependency(%q<rails>, ["~> 3.0.10"])

data/lib/amee/analytics/terms_list_analytics_support.rb

@@ -250,6 +250,28 @@ 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 indicated by
       # <tt>attr</tt>, returning <tt>self</tt>.
       #

data/spec/amee/analytics/calculation_collection_spec.rb

@@ -5,7 +5,6 @@ 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)

data/spec/amee/analytics/terms_list_spec.rb

@@ -5,7 +5,6 @@ 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)
@@ -369,6 +368,56 @@ 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/fixtures/config/calculations/calcs.rb

@@ -0,0 +1,57 @@
+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
+  }
+}

data/spec/spec_helper.rb

@@ -2,80 +2,25 @@ require 'rubygems'
 require 'rspec'
 require 'amee-analytics'
 
-RAILS_ROOT = '.'
+class Rails
+  def self.root
+    File.dirname(__FILE__) + '/fixtures'
+  end
+end
 
 RSpec.configure do |config|
   config.mock_with :flexmock
 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 = Calculations[:electricity].begin_calculation
+  calc = CalculationSet.find("calcs")[:electricity].begin_calculation
   calc['usage'].value act
   calc['co2'].value res
   return calc
 end
 
 def add_transport_calc(act,res)
-  calc = Calculations[:transport].begin_calculation
+  calc = CalculationSet.find("calcs")[: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: 13
+  hash: 11
   prerelease: 
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - James Hetherington
@@ -18,41 +18,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 +01:00
-default_executable: 
+date: 2011-10-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  prerelease: false
   type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 7
         segments: 
         - 2
-        - 0
-        version: "2.0"
-  name: amee-data-abstraction
+        - 2
+        version: "2.2"
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  name: amee-data-abstraction
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :runtime
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 1
         segments: 
         - 2
-        - 0
-        version: "2.0"
-  name: amee-data-persistence
+        - 1
+        version: "2.1"
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  name: amee-data-persistence
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -65,10 +63,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  name: bundler
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  name: bundler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -81,10 +79,10 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
-  name: jeweler
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  name: jeweler
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -97,10 +95,10 @@ dependencies:
         - 0
         - 10
         version: 3.0.10
-  name: rails
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  name: rails
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -113,10 +111,10 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
-  name: rspec
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  name: rspec
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -129,10 +127,10 @@ dependencies:
         - 9
         - 0
         version: 0.9.0
-  name: flexmock
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  name: flexmock
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -143,10 +141,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rcov
   version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  name: rcov
   prerelease: false
+- !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -157,8 +155,9 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rdoc
   version_requirements: *id009
+  name: rdoc
+  prerelease: false
 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: []
@@ -186,9 +185,9 @@ files:
 - 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
 homepage: http://github.com/AMEE/amee-analytics
 licenses: 
 - MIT
@@ -218,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Analytics module for use with AMEE AppKit