purchase 1.0.3 → 1.0.4

data/features/purchase_committees.feature

@@ -19,8 +19,16 @@ Feature: Purchase Committee Calculations
   Scenario: Cost committee from default
     Given a purchase emitter
     When the "cost" committee is calculated
+    Then the committee should have used quorum "default"
     Then the conclusion of the committee should be "100"
 
+  Scenario: Adjusted cost committee starting from nothing
+    Given a purchase emitter
+    When the "date" committee is calculated
+    And the "cost" committee is calculated
+    And the "adjusted_cost" committee is calculated
+    Then the conclusion of the committee should be "82.85004"
+
   Scenario Outline: Adjusted cost committee from cost and date
     Given a purchase emitter
     And a characteristic "cost" of "<cost>"
@@ -32,17 +40,24 @@ Feature: Purchase Committee Calculations
       | 831.23 | 2010-08-01 |     688.67439 |
       |  11.00 | 2005-07-14 |       9.11350 |
 
+  Scenario: Merchant category committee from default
+    Given a purchase emitter
+    When the "merchant_category" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should have "mcc" of "5111"
+
   Scenario Outline: Merchant category committee from merchant
     Given a purchase emitter
     And a characteristic "merchant.id" of "<id>"
     When the "merchant_category" committee is calculated
-    Then the conclusion of the committee should have "mcc" of "<mcc>"
+    Then the committee should have used quorum "from merchant"
+    And the conclusion of the committee should have "mcc" of "<mcc>"
     Examples:
       | id | mcc  |
       | 1  | 1111 |
       | 2  | 2222 |
 
-  Scenario Outline: Merchant category industries committee from merchant category
+  Scenario Outline: Merchant category industries committee starting from merchant category
     Given a purchase emitter
     And a characteristic "merchant_category.mcc" of "<mcc>"
     When the "merchant_category_industries" committee is calculated
@@ -68,12 +83,21 @@ Feature: Purchase Committee Calculations
     Given a purchase emitter
     And a characteristic "industry.naics_code" of "<naics>"
     When the "trade_industry_ratios" committee is calculated
-    Then the committee should have used quorum "from naics code"
+    Then the committee should have used quorum "from industry"
     And the conclusion of the committee should include a key of "<naics>" and value "1"
     Examples:
       | naics  |
       | 459000 |
 
+  Scenario: Trade industry ratios from merchant category industries and industry
+    Given a purchase emitter
+    And a characteristic "merchant_category.mcc" of "1111"
+    And a characteristic "industry.naics_code" of "459000"
+    When the "merchant_category_industries" committee is calculated
+    And the "trade_industry_ratios" committee is calculated
+    Then the committee should have used quorum "from industry"
+    And the conclusion of the committee should include a key of "459000" and value "1"
+
   Scenario Outline: Non-trade industry ratios from merchant category industries
     Given a purchase emitter
     And a characteristic "merchant_category.mcc" of "<mcc>"
@@ -90,16 +114,20 @@ Feature: Purchase Committee Calculations
     Given a purchase emitter
     And a characteristic "industry.naics_code" of "<naics>"
     When the "non_trade_industry_ratios" committee is calculated
-    Then the conclusion of the committee should include a key of "<naics>" and value "1"
+    Then the committee should have used quorum "from industry"
+    And the conclusion of the committee should include a key of "<naics>" and value "1"
     Examples:
       | naics  |
       | 111111 |
       | 399900 |
 
-  Scenario Outline: Non-trade industry ratios from default
+  Scenario: Non-trade industry ratios from merchant category industries and industry
     Given a purchase emitter
-    When the "non_trade_industry_ratios" committee is calculated
-    Then the committee should have used quorum "from default"
+    And a characteristic "merchant_category.mcc" of "2222"
+    And a characteristic "industry.naics_code" of "111111"
+    When the "merchant_category_industries" committee is calculated
+    And the "non_trade_industry_ratios" committee is calculated
+    Then the committee should have used quorum "from industry"
     And the conclusion of the committee should include a key of "111111" and value "1"
 
   Scenario Outline: Product line ratios from trade industry ratios
@@ -140,10 +168,10 @@ Feature: Purchase Committee Calculations
     Then the conclusion of the committee should include a key of "<naics>" and value "<ratio>"
     Examples:
       | mcc  | naics  | ratio  |
-      | 2222 | 399100 | 0.1875 |
-      | 2222 | 399200 | 0.0625 |
+      | 2222 | 399100 | 0.375  |
+      | 2222 | 399200 | 0.125  |
 
-  Scenario Outline: Industry ratios committee from non trade industry and industry product ratios 
+  Scenario Outline: Industry ratios committee starting from merchant category
     Given a purchase emitter
     And a characteristic "merchant_category.mcc" of "<mcc>"
     When the "merchant_category_industries" committee is calculated
@@ -157,11 +185,11 @@ Feature: Purchase Committee Calculations
     Examples:
       | mcc  | naics  | ratio  |
       | 1111 | 111111 | 1.0    |
-      | 2222 | 399100 | 0.1875 |
-      | 2222 | 399200 | 0.0625 |
+      | 2222 | 399100 | 0.375  |
+      | 2222 | 399200 | 0.125  |
       | 2222 | 399900 | 0.5    |
 
-  Scenario Outline: Industry ratios committee from industry
+  Scenario Outline: Industry ratios committee starting from industry
     Given a purchase emitter
     And a characteristic "industry.naics_code" of "<naics>"
     When the "non_trade_industry_ratios" committee is calculated
@@ -174,15 +202,14 @@ Feature: Purchase Committee Calculations
     Examples:
       | naics  | new_naics | ratio |
       | 111111 | 111111    | 1.0   |
-      | 459000 | 399100    | 0.375 |
-      | 459000 | 399200    | 0.125 |
-      | 399900 | 399900    | 1.0   |
+      | 399100 | 399100    | 1.0   |
+      | 399200 | 399200    | 1.0   |
+      | 459000 | 399100    | 0.75  |
+      | 459000 | 399200    | 0.25  |
 
-  Scenario Outline: Industry sector ratios committee from merchant category
-    Given a purchase emitter 
+  Scenario Outline: Industry sector ratios committee starting from merchant category
+    Given a purchase emitter
     And a characteristic "merchant_category.mcc" of "<mcc>"
-    And a characteristic "cost" of "100"
-    And a characteristic "date" of "2010-08-01"
     When the "merchant_category_industries" committee is calculated
     And the "non_trade_industry_ratios" committee is calculated
     And the "trade_industry_ratios" committee is calculated
@@ -195,12 +222,29 @@ Feature: Purchase Committee Calculations
     Examples:
       | mcc  | io_code | ratio    |
       | 1111 | 111000  | 1.0      |
-      | 2222 | 3991A0  | 0.140625 |
-      | 2222 | 3991B0  | 0.046875 |
-      | 2222 | 399200  | 0.0625   |
+      | 2222 | 3991A0  | 0.28125  |
+      | 2222 | 3991B0  | 0.09375  |
+      | 2222 | 399200  | 0.125    |
       | 2222 | 399900  | 0.5      |
 
-  Scenario Outline: Industry sector ratios committee from industry
+  Scenario Outline: Industry sector ratios sum check starting from merchant category
+    Given a purchase emitter
+    And a characteristic "merchant_category.mcc" of "<mcc>"
+    When the "merchant_category_industries" committee is calculated
+    And the "non_trade_industry_ratios" committee is calculated
+    And the "trade_industry_ratios" committee is calculated
+    And the "product_line_ratios" committee is calculated
+    And the "product_line_industry_product_ratios" committee is calculated
+    And the "industry_product_ratios" committee is calculated
+    And the "industry_ratios" committee is calculated
+    And the "industry_sector_ratios" committee is calculated
+    Then the conclusion of the committee should have ratios summing to "1.0"
+    Examples:
+      | mcc  |
+      | 1111 |
+      | 2222 |
+
+  Scenario Outline: Industry sector ratios committee starting from industry
     Given a purchase emitter
     And a characteristic "industry.naics_code" of "<naics>"
     When the "non_trade_industry_ratios" committee is calculated
@@ -216,11 +260,29 @@ Feature: Purchase Committee Calculations
       | 111111 | 111000  | 1.0   |
       | 399100 | 3991A0  | 0.75  |
       | 399100 | 3991B0  | 0.25  |
-      | 399200 | 399200  | 1.0   |
-      | 399900 | 399900  | 1.0   |
+      | 459000 | 3991A0  | 0.5625|
+      | 459000 | 3991B0  | 0.1875|
+      | 459000 | 399200  | 0.25  |
+
+  Scenario Outline: Industry sector ratios sum check starting from industry
+    Given a purchase emitter
+    And a characteristic "industry.naics_code" of "<naics>"
+    When the "non_trade_industry_ratios" committee is calculated
+    And the "trade_industry_ratios" committee is calculated
+    And the "product_line_ratios" committee is calculated
+    And the "product_line_industry_product_ratios" committee is calculated
+    And the "industry_product_ratios" committee is calculated
+    And the "industry_ratios" committee is calculated
+    And the "industry_sector_ratios" committee is calculated
+    Then the conclusion of the committee should have ratios summing to "1.0"
+    Examples:
+      | naics  |
+      | 111111 |
+      | 399100 |
+      | 459000 |
 
-  Scenario Outline: Industry sector shares committee from merchant category
-    Given a purchase emitter 
+  Scenario Outline: Industry sector shares committee starting from merchant category
+    Given a purchase emitter
     And a characteristic "merchant_category.mcc" of "<mcc>"
     And a characteristic "adjusted_cost" of "100.00"
     When the "merchant_category_industries" committee is calculated
@@ -236,11 +298,35 @@ Feature: Purchase Committee Calculations
     Examples:
       | mcc  | io_code | share   |
       | 1111 | 111000  | 100.0   |
-      | 2222 | 3991A0  | 14.0625 |
-      | 2222 | 3991B0  | 4.6875  |
-      | 2222 | 399200  | 6.25    |
+      | 2222 | 3991A0  | 28.125  |
+      | 2222 | 3991B0  | 9.375   |
+      | 2222 | 399200  | 12.5    |
       | 2222 | 399900  | 50.0    |
 
+  Scenario Outline: Industry sector shares committee starting from industry
+    Given a purchase emitter
+    And a characteristic "industry.naics_code" of "<naics>"
+    And a characteristic "adjusted_cost" of "100.00"
+    When the "non_trade_industry_ratios" committee is calculated
+    And the "trade_industry_ratios" committee is calculated
+    And the "product_line_ratios" committee is calculated
+    And the "product_line_industry_product_ratios" committee is calculated
+    And the "industry_product_ratios" committee is calculated
+    And the "industry_ratios" committee is calculated
+    And the "industry_sector_ratios" committee is calculated
+    And the "industry_sector_shares" committee is calculated
+    Then the conclusion of the committee should include a key of "<io_code>" and value "<share>"
+    Examples:
+      | naics  | io_code | share |
+      | 111111 | 111000  | 100.0 |
+      | 399100 | 3991A0  | 75.0  |
+      | 399100 | 3991B0  | 25.0  |
+      | 399200 | 399200  | 100.0 |
+      | 399900 | 399900  | 100.0 |
+      | 459000 | 3991A0  | 56.25 |
+      | 459000 | 3991B0  | 18.75 |
+      | 459000 | 399200  | 25.0  |
+
   Scenario Outline: Sector shares committee from industry and product line shares
     Given a purchase emitter
     And a characteristic "merchant_category.mcc" of "<mcc>"
@@ -259,7 +345,7 @@ Feature: Purchase Committee Calculations
     Examples:
       | mcc|111000|3991A0 |3991B0|399200|399900|4A0000|
       |1111|100.00|      0|     0|     0|     0|     0|
-      |2222|     0|14.0625|4.6875|  6.25|  50.0|     0|
+      |2222|     0| 28.125| 9.375|  12.5|  50.0|     0|
 
   Scenario: Sector direct requirements committee
     Given a purchase emitter
@@ -311,4 +397,4 @@ Feature: Purchase Committee Calculations
     Examples:
       |mcc |111000  |3991A0  |3991B0  |399200  |399900   |4A0000  |
       |1111|90.44460| 6.83919| 5.58981| 18.5568|19.91952 |11.38220|
-      |2222|28.14742|26.31519|16.92866|58.00083|105.81262|31.07553|
+      |2222|34.95823|38.38879|22.27460|77.55067|119.05953|38.64496|

data/features/purchase_emissions.feature

@@ -23,7 +23,7 @@ Feature: Purchase Emissions Calculations
     Examples:
       | id  | emission |
       | 1   |  126.538 |
-      | 2   |  220.613 |
+      | 2   |  274.131 |
 
   Scenario Outline: Calculations starting from a merchant with purchase amount
     Given a purchase has "merchant.id" of "<id>"
@@ -33,7 +33,7 @@ Feature: Purchase Emissions Calculations
     Examples:
       | id  | amount | emission |
       | 1   | 107.11 |  126.538 |
-      | 2   | 107.11 |  220.613 |
+      | 2   | 107.11 |  274.131 |
   
   Scenario Outline: Calculations starting from a merchant with purchase amount and date
     Given a purchase has "merchant.id" of "<id>"
@@ -44,7 +44,7 @@ Feature: Purchase Emissions Calculations
     Examples:
       | id  | amount | date       | emission |
       | 1   | 107.11 | 2010-07-28 |  126.538 |
-      | 2   | 107.11 | 2010-07-28 |  220.613 |
+      | 2   | 107.11 | 2010-07-28 |  274.131 |
 
   Scenario Outline: Calculations starting from a merchant with purchase amount, date, and tax
     Given a purchase has "merchant.id" of "<id>"
@@ -56,7 +56,7 @@ Feature: Purchase Emissions Calculations
     Examples:
       | id  | amount | tax  | date       | emission |
       | 1   | 108.00 | 8.00 | 2010-07-28 |  126.538 |
-      | 2   | 108.00 | 8.00 | 2010-07-28 |  220.613 |
+      | 2   | 108.00 | 8.00 | 2010-07-28 |  274.131 |
   
   Scenario Outline: Calculations starting from a merchant category
     Given a purchase has "merchant_category.mcc" of "<mcc>"
@@ -67,7 +67,7 @@ Feature: Purchase Emissions Calculations
     Examples:
       | mcc  | cost   | date       | emission |
       | 1111 | 100.00 | 2010-07-28 |  126.538 |
-      | 2222 | 100.00 | 2010-07-28 |  220.613 |
+      | 2222 | 100.00 | 2010-07-28 |  274.131 |
       | 5111 | 100.00 | 2010-07-28 |  126.538 |
 
   Scenario Outline: Calculations starting from industry
@@ -80,4 +80,4 @@ Feature: Purchase Emissions Calculations
       | naics  | cost   | date       | emission |
       | 111111 | 100.00 | 2010-07-28 |  126.538 |
       | 399900 | 100.00 | 2010-07-28 |  334.190 |
-      | 459000 | 100.00 | 2010-07-28 |  107.036 |
+      | 459000 | 100.00 | 2010-07-28 |  214.072 |

data/lib/purchase/carbon_model.rb

@@ -57,7 +57,8 @@ module BrighterPlanet
           committee :industry_sector_shares do
             quorum 'from industry sector ratios', :needs => [:industry_sector_ratios, :adjusted_cost] do |characteristics|
               characteristics[:industry_sector_ratios].inject({}) do |new_ratios, (io_code, ratio)|
-                new_ratios[io_code] = ratio * characteristics[:adjusted_cost]
+                new_ratios[io_code] ||= 0
+                new_ratios[io_code] += ratio * characteristics[:adjusted_cost]
                 new_ratios
               end
             end
@@ -67,8 +68,9 @@ module BrighterPlanet
             quorum 'from industry ratios', :needs => :industry_ratios do |characteristics|
               characteristics[:industry_ratios].inject({}) do |new_ratios, (naics_code, ratio)|
                 IndustrySector.where(:naics_code => naics_code).each do |industry_sector|
+                  new_ratios[industry_sector.io_code] ||= 0
                   new_ratio = ratio * industry_sector.ratio
-                  new_ratios[industry_sector.io_code] = new_ratio
+                  new_ratios[industry_sector.io_code] += new_ratio
                 end
                 new_ratios
               end
@@ -80,7 +82,9 @@ module BrighterPlanet
           committee :industry_ratios do
             quorum 'from non trade industry and industry product ratios', :needs => [:non_trade_industry_ratios, :industry_product_ratios] do |characteristics|
               combined_ratios = characteristics[:non_trade_industry_ratios].
-                merge characteristics[:industry_product_ratios]
+                update(characteristics[:industry_product_ratios]) do |key, non_trade, ip_ratio|
+                  non_trade + ip_ratio
+                end
             end
           end
 
@@ -88,7 +92,8 @@ module BrighterPlanet
             quorum 'from product line industry product ratios', :needs => :product_line_industry_product_ratios do |characteristics|
               characteristics[:product_line_industry_product_ratios].inject({}) do |new_ratios, (naics_product_code, ratio)|
                 IndustryProduct.where(:naics_product_code => naics_product_code).each do |industry_product|
-                  new_ratios[industry_product.naics_code] = ratio
+                  new_ratios[industry_product.naics_code] ||= 0
+                  new_ratios[industry_product.naics_code] += ratio
                 end
                 new_ratios
               end
@@ -99,8 +104,9 @@ module BrighterPlanet
             quorum 'from product line ratios', :needs => :product_line_ratios do |characteristics|
               characteristics[:product_line_ratios].inject({}) do |new_ratios, (ps_code, ratio)|
                 ProductLineIndustryProduct.where(:ps_code => ps_code).each do |plip|
+                  new_ratios[plip.naics_product_code] ||= 0
                   new_ratio = ratio * plip.ratio
-                  new_ratios[plip.naics_product_code] = new_ratio
+                  new_ratios[plip.naics_product_code] += new_ratio
                 end
                 new_ratios
               end
@@ -111,8 +117,9 @@ module BrighterPlanet
             quorum 'from trade industry ratios', :needs => :trade_industry_ratios do |characteristics|
               characteristics[:trade_industry_ratios].inject({}) do |new_ratios, (naics, ratio)|
                 IndustryProductLine.where(:naics_code => naics).each do |industry_product_line|
+                  new_ratios[industry_product_line.ps_code] ||= 0
                   new_ratio = ratio * industry_product_line.ratio
-                  new_ratios[industry_product_line.ps_code] = new_ratio
+                  new_ratios[industry_product_line.ps_code] += new_ratio
                 end
                 new_ratios
               end
@@ -120,15 +127,6 @@ module BrighterPlanet
           end
 
           committee :non_trade_industry_ratios do
-            quorum 'from merchant category industries', :needs => :merchant_category_industries do |characteristics|
-              characteristics[:merchant_category_industries].inject({}) do |hash, merchant_category_industry|
-                unless merchant_category_industry.industry.trade_industry?
-                  hash[merchant_category_industry.naics_code] = merchant_category_industry.ratio
-                end
-                hash
-              end
-            end
-
             quorum 'from industry', :needs => :industry do |characteristics|
               if characteristics[:industry].trade_industry?
                 {}
@@ -137,23 +135,19 @@ module BrighterPlanet
               end
             end
 
-            quorum 'default' do
-              mci = MerchantCategoryIndustry.where(:mcc => 5111).first
-              { mci.naics_code.to_s => mci.ratio }
-            end
-          end
-
-          committee :trade_industry_ratios do
             quorum 'from merchant category industries', :needs => :merchant_category_industries do |characteristics|
               characteristics[:merchant_category_industries].inject({}) do |hash, merchant_category_industry|
-                if merchant_category_industry.industry.trade_industry?
-                  hash[merchant_category_industry.naics_code] = merchant_category_industry.ratio
+                unless merchant_category_industry.industry.trade_industry?
+                  hash[merchant_category_industry.naics_code] ||= 0
+                  hash[merchant_category_industry.naics_code] += merchant_category_industry.ratio
                 end
                 hash
               end
             end
+          end
 
-            quorum 'from naics code', :needs => :industry do |characteristics|
+          committee :trade_industry_ratios do
+            quorum 'from industry', :needs => :industry do |characteristics|
               if characteristics[:industry].trade_industry?
                 { characteristics[:industry].naics_code.to_s => 1 }
               else
@@ -161,8 +155,14 @@ module BrighterPlanet
               end
             end
 
-            quorum 'default' do
-              {}
+            quorum 'from merchant category industries', :needs => :merchant_category_industries do |characteristics|
+              characteristics[:merchant_category_industries].inject({}) do |hash, merchant_category_industry|
+                if merchant_category_industry.industry.trade_industry?
+                  hash[merchant_category_industry.naics_code] ||= 0
+                  hash[merchant_category_industry.naics_code] += merchant_category_industry.ratio
+                end
+                hash
+              end
             end
           end
 
@@ -177,6 +177,10 @@ module BrighterPlanet
             quorum 'from merchant', :needs => [:merchant] do |characteristics|
               characteristics[:merchant].merchant_category
             end
+            
+            quorum 'default' do
+              MerchantCategory.find_by_mcc 5111
+            end
           end
           
           committee :adjusted_cost do
@@ -204,7 +208,7 @@ module BrighterPlanet
               characteristics[:purchase_amount].to_f / 1.0711
             end
             
-            quorum 'from default' do
+            quorum 'default' do
               # FIXME TODO research real average purchase amount
               100
             end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: purchase
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,14 +19,13 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -04:00
+date: 2010-10-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
   name: activerecord
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -37,12 +36,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: bundler
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -53,28 +52,26 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: cucumber
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 3
         segments: 
         - 0
-        - 9
-        - 0
-        version: 0.9.0
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+        version: "0"
   type: :development
-  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: jeweler
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -85,12 +82,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rake
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -99,12 +96,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -113,12 +110,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: rspec
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -131,12 +128,12 @@ dependencies:
         - beta
         - 17
         version: 2.0.0.beta.17
-  requirement: *id007
-- !ruby/object:Gem::Dependency 
   type: :development
-  prerelease: false
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: sniff
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -147,12 +144,12 @@ dependencies:
         - 1
         - 16
         version: 0.1.16
-  requirement: *id008
+  type: :development
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
   name: earth
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -163,12 +160,12 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  requirement: *id009
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: emitter
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -179,12 +176,12 @@ dependencies:
         - 1
         - 4
         version: 0.1.4
-  requirement: *id010
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: fastercsv
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -195,12 +192,12 @@ dependencies:
         - 5
         - 3
         version: 1.5.3
-  requirement: *id011
-- !ruby/object:Gem::Dependency 
   type: :runtime
-  prerelease: false
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
   name: slither
-  version_requirements: &id012 !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -211,7 +208,132 @@ dependencies:
         - 99
         - 3
         version: 0.99.3
-  requirement: *id012
+  type: :runtime
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: activerecord
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id013
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id014 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id014
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id015 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id015
+- !ruby/object:Gem::Dependency 
+  name: jeweler
+  prerelease: false
+  requirement: &id016 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :development
+  version_requirements: *id016
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id017 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: rdoc
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id018
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id019 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 62196417
+        segments: 
+        - 2
+        - 0
+        - 0
+        - beta
+        - 17
+        version: 2.0.0.beta.17
+  type: :development
+  version_requirements: *id019
+- !ruby/object:Gem::Dependency 
+  name: sniff
+  prerelease: false
+  requirement: &id020 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 0
+        - 1
+        - 16
+        version: 0.1.16
+  type: :development
+  version_requirements: *id020
 description: A software model in Ruby for the greenhouse gas emissions of a purchase
 email: seamus@brighterplanet.com
 executables: []
@@ -234,11 +356,10 @@ files:
 - lib/test_support/purchase_record.rb
 - lib/test_support/test_impact_vectors_adapter.rb
 - lib/test_support/test_sector_direct_requirements_adapter.rb
-- features/step_definitions/matrix.rb
-- features/support/env.rb
-- features/support/matrix_ext.rb
 - features/purchase_committees.feature
 - features/purchase_emissions.feature
+- features/support/env.rb
+- features/support/matrix_ext.rb
 has_rdoc: true
 homepage: http://github.com/brighterplanet/purchase
 licenses: []
@@ -274,11 +395,10 @@ signing_key:
 specification_version: 3
 summary: A carbon model
 test_files: 
-- features/step_definitions/matrix.rb
-- features/support/env.rb
-- features/support/matrix_ext.rb
 - features/purchase_committees.feature
 - features/purchase_emissions.feature
+- features/support/env.rb
+- features/support/matrix_ext.rb
 - lib/test_support/db/schema.rb
 - lib/test_support/purchase_record.rb
 - lib/test_support/test_impact_vectors_adapter.rb

data/features/step_definitions/matrix.rb

@@ -1,24 +0,0 @@
-Then /^the conclusion of the committee should be a vector with "(.*)" items$/ do |count|
-  vector = @report.conclusion
-  vector.size.should == count.to_i
-end
-
-Then /^the conclusion of the committee should be a vector with value "(.*)" and position for key "(.*)"$/ do |value, key|
-  vector = @report.conclusion
-  position = BrighterPlanet::Purchase.key_map.index key
-  compare_values vector[position], value
-end
-
-Then /^the conclusion of the committee should be a square matrix with "(\d+)" rows and columns$/ do |num|
-  matrix = @report.conclusion
-  matrix.row_size.should == num.to_i
-  matrix.should be_square
-end
-
-Then /^the conclusion of the committee should be a vector with values "(.*)"$/ do |column_values|
-  column_values = column_values.split(/,/).map(&:to_f)
-  vector = @report.conclusion
-  vector = vector.row(0) if vector.is_a? Matrix  #some vectors are single-row matrices
-
-  vector.should have_column_values(column_values)
-end