RubyGems - amee-data-abstraction - Versions diffs - 2.1.1 → 2.2.0 - Mend

amee-data-abstraction 2.1.1 → 2.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

data/CHANGELOG.txt +3 -0
data/README.txt +26 -14
data/VERSION +1 -1
data/amee-data-abstraction.gemspec +7 -6
data/lib/amee-data-abstraction/calculation.rb +1 -1
data/lib/amee-data-abstraction/calculation_set.rb +152 -10
data/lib/amee-data-abstraction/input.rb +10 -0
data/lib/amee-data-abstraction/ongoing_calculation.rb +1 -1
data/lib/amee-data-abstraction/term.rb +31 -13
data/spec/amee-data-abstraction/calculation_set_spec.rb +247 -9
data/spec/amee-data-abstraction/calculation_spec.rb +24 -19
data/spec/amee-data-abstraction/drill_spec.rb +14 -9
data/spec/amee-data-abstraction/input_spec.rb +113 -73
data/spec/amee-data-abstraction/metadatum_spec.rb +1 -1
data/spec/amee-data-abstraction/ongoing_calculation_spec.rb +38 -30
data/spec/amee-data-abstraction/profile_spec.rb +4 -2
data/spec/amee-data-abstraction/prototype_calculation_spec.rb +13 -8
data/spec/amee-data-abstraction/term_spec.rb +45 -4
data/spec/amee-data-abstraction/terms_list_spec.rb +23 -12
data/spec/config/amee_units_spec.rb +1 -2
data/spec/core-extensions/class_spec.rb +18 -18
data/spec/core-extensions/hash_spec.rb +1 -2
data/spec/core-extensions/ordered_hash_spec.rb +1 -2
data/spec/core-extensions/proc_spec.rb +1 -1
data/spec/fixtures/config/calculations/electricity.rb +35 -0
data/spec/fixtures/config/calculations/electricity_and_transport.rb +53 -0
data/spec/fixtures/{transport.rb → config/calculations/transport.rb} +2 -2
data/spec/fixtures/{electricity.rb → config/electricity.rb} +1 -1
data/spec/spec_helper.rb +30 -2
metadata +28 -27
data/spec/fixtures/electricity_and_transport.rb +0 -55

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: amee-data-abstraction
 version: !ruby/object:Gem::Version
-  hash: 9
+  hash: 7
   prerelease:
   segments:
   - 2
-  - 1
-  - 1
-  version: 2.1.1
+  - 2
+  - 0
+  version: 2.2.0
 platform: ruby
 authors:
 - James Hetherington
@@ -18,13 +18,11 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00 +01:00
+date: 2011-10-18 00:00:00 +01:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: amee
-  type: :runtime
   version_requirements: &id001 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -36,11 +34,11 @@ dependencies:
         - 1
         - 5
         version: 4.1.5
+  prerelease: false
+  type: :runtime
   requirement: *id001
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: uuidtools
-  type: :runtime
   version_requirements: &id002 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -52,11 +50,11 @@ dependencies:
         - 1
         - 2
         version: 2.1.2
+  prerelease: false
+  type: :runtime
   requirement: *id002
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: quantify
-  type: :runtime
   version_requirements: &id003 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -68,11 +66,11 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
+  prerelease: false
+  type: :runtime
   requirement: *id003
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: bundler
-  type: :development
   version_requirements: &id004 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -84,11 +82,11 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  prerelease: false
+  type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: jeweler
-  type: :development
   version_requirements: &id005 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -100,11 +98,11 @@ dependencies:
         - 6
         - 4
         version: 1.6.4
+  prerelease: false
+  type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rspec
-  type: :development
   version_requirements: &id006 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -116,11 +114,11 @@ dependencies:
         - 6
         - 0
         version: 2.6.0
+  prerelease: false
+  type: :development
   requirement: *id006
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: flexmock
-  type: :development
   version_requirements: &id007 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -132,11 +130,11 @@ dependencies:
         - 8
         - 6
         version: 0.8.6
+  prerelease: false
+  type: :development
   requirement: *id007
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rcov
-  type: :development
   version_requirements: &id008 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -146,11 +144,11 @@ dependencies:
         segments:
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id008
 - !ruby/object:Gem::Dependency
-  prerelease: false
   name: rdoc
-  type: :development
   version_requirements: &id009 !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -160,6 +158,8 @@ dependencies:
         segments:
         - 0
         version: "0"
+  prerelease: false
+  type: :development
   requirement: *id009
 description: Part of the AMEEappkit this gem provides a data abstraction layer, decreasing the amount and detail of development required
 email: help@amee.com
@@ -216,9 +216,10 @@ files:
 - spec/core-extensions/hash_spec.rb
 - spec/core-extensions/ordered_hash_spec.rb
 - spec/core-extensions/proc_spec.rb
-- spec/fixtures/electricity.rb
-- spec/fixtures/electricity_and_transport.rb
-- spec/fixtures/transport.rb
+- spec/fixtures/config/calculations/electricity.rb
+- spec/fixtures/config/calculations/electricity_and_transport.rb
+- spec/fixtures/config/calculations/transport.rb
+- spec/fixtures/config/electricity.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubyforge_project:
-rubygems_version: 1.4.2
+rubygems_version: 1.5.3
 signing_key:
 specification_version: 3
 summary: Calculation and form building tool hiding details of AMEEconnect

data/spec/fixtures/electricity_and_transport.rb DELETED

@@ -1,55 +0,0 @@
-ElectricityAndTransport=AMEE::DataAbstraction::CalculationSet.new {
-  all_calculations {
-    metadatum {
-      label :department
-      choices %w{stuff things more_stuff meta_things}
-    }
-  }
-  calculation{
-    name 'electricity'
-    label :electricity
-    path '/business/energy/electricity/grid'
-    profile {
-      label :usage
-      name 'Electricity Used'
-      path 'energyPerTime'
-    }
-    drill {
-      label :country
-      path 'country'
-      fixed 'Argentina'
-    }
-    output {
-      label :co2
-      path :default
-    }
-  }
-  calculation {
-    name 'transport'
-    label :transport
-    path '/transport/car/generic'
-    drill {
-      path 'fuel'
-      label :fuel
-      name 'Fuel Type'
-    }
-    drill {
-      path 'size'
-      label :size
-      name 'Vehicle Size'
-    }
-    profile {
-      path 'distance'
-      label :distance
-      name 'Distance Driven'
-    }
-    output {
-      label :co2
-      path :default
-      name 'Carbon Dioxide'
-    }
-  }
-}