purchase 1.0.9 → 1.0.10

data/features/purchase_characterization.feature

@@ -1,33 +1,85 @@
 Feature: Purchase Characterizations
   The purchase model should be characterized
 
+  Scenario: Merchant characteristic
+    Given a purchase has "merchant.id" of "2"
+    When emissions are calculated
+    Then the "merchant" characteristic should be displayed as "Derek's Fantasy-Mart"
+
   Scenario: Merchant category characteristic
     Given a purchase has "merchant_category.mcc" of "2222"
-    And it has "cost" of "100"
     When emissions are calculated
     Then the "merchant_category" characteristic should be displayed as "Fantasy creature product shops"
 
   Scenario: Merchant category industries characteristic
     Given a purchase has "merchant_category.mcc" of "2222"
-    And it has "cost" of "100"
     When emissions are calculated
     Then the "merchant_category_industries" characteristic should be displayed as "2 merchant categories"
 
+  Scenario: Industry characteristic
+    Given a purchase has "industry.naics_code" of "111111"
+    When emissions are calculated
+    Then the "industry" characteristic should be displayed as "A simple industry"
+
   Scenario: Trade industry ratios characteristic
     Given a purchase has "merchant_category.mcc" of "2222"
-    And it has "cost" of "100"
     When emissions are calculated
     Then the "trade_industry_ratios" characteristic should be displayed as "1 trade industry ratio"
 
   Scenario: Non-trade industry ratios characteristic
     Given a purchase has "merchant_category.mcc" of "2222"
-    And it has "cost" of "100"
     When emissions are calculated
     Then the "non_trade_industry_ratios" characteristic should be displayed as "1 non-trade industry ratio"
 
+  Scenario: Product line ratios characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "product_line_ratios" characteristic should be displayed as "2 product line ratios"
+
+  Scenario: Product line industry product ratios characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "product_line_industry_product_ratios" characteristic should be displayed as "4 product line industry product ratios"
+
+  Scenario: Industry product ratios characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "industry_product_ratios" characteristic should be displayed as "2 industry product ratios"
+
+  Scenario: Industry ratios characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "industry_ratios" characteristic should be displayed as "3 industry ratios"
+
+  Scenario: Industry sector ratios characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "industry_sector_ratios" characteristic should be displayed as "4 industry sector ratios"
+
+  Scenario: Industry sector shares characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "industry_sector_shares" characteristic should be displayed as "4 industry sector shares"
+
+  Scenario: Sector shares characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "sector_shares" characteristic should be displayed as "6-element sector shares vector"
+
   Scenario: Sector direct requirements characteristic
     Given a purchase has "merchant_category.mcc" of "2222"
-    And it has "cost" of "100"
     When emissions are calculated
     Then the "sector_direct_requirements" characteristic should be displayed as "6x6 sector direct requirements matrix"
 
+  Scenario: Economic flows characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "economic_flows" characteristic should be displayed as "6-element economic flows vector"
+
+  Scenario: Impact vector characteristic
+    Pending a proper test for impact vector
+
+  Scenario: Impacts characteristic
+    Given a purchase has "merchant_category.mcc" of "2222"
+    When emissions are calculated
+    Then the "impacts" characteristic should be displayed as "6-element impacts vector"

data/features/purchase_committees.feature

@@ -6,7 +6,7 @@ Feature: Purchase Committee Calculations
     And a characteristic "purchase_amount" of "107.11"
     When the "cost" committee is calculated
     Then the committee should have used quorum "from purchase amount"
-    And the conclusion of the committee should be "100"
+    And the conclusion of the committee should be "100.00"
 
   Scenario: Cost committee from purchase amount and tax
     Given a purchase emitter
@@ -20,14 +20,14 @@ Feature: Purchase Committee Calculations
     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"
+    Then the conclusion of the committee should be "624.00"
 
   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"
+    Then the conclusion of the committee should be "516.98426"
 
   Scenario Outline: Adjusted cost committee from cost and date
     Given a purchase emitter
@@ -40,12 +40,6 @@ 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>"
@@ -68,26 +62,26 @@ Feature: Purchase Committee Calculations
       | 2222 | 399900 | 0.5   |
       | 2222 | 459000 | 0.5   |
 
-  Scenario Outline: Trade industry ratios from merchant category industries
+  Scenario: Trade industry ratios from default
     Given a purchase emitter
-    And a characteristic "merchant_category.mcc" of "<mcc>"
+    When the "trade_industry_ratios" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should include a key of "" and value ""
+
+  Scenario: Trade industry ratios from merchant category industries
+    Given a purchase emitter
+    And a characteristic "merchant_category.mcc" of "2222"
     When the "merchant_category_industries" committee is calculated
     And the "trade_industry_ratios" committee is calculated
     Then the committee should have used quorum "from merchant category industries"
-    And the conclusion of the committee should include a key of "<naics>" and value "<ratio>"
-    Examples:
-      | mcc  | naics  | ratio |
-      | 2222 | 459000 | 0.5   |
+    And the conclusion of the committee should include a key of "459000" and value "0.5"
 
-  Scenario Outline: Trade industry ratios from industry
+  Scenario: Trade industry ratios from industry
     Given a purchase emitter
-    And a characteristic "industry.naics_code" of "<naics>"
+    And a characteristic "industry.naics_code" of "459000"
     When 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 "<naics>" and value "1"
-    Examples:
-      | naics  |
-      | 459000 |
+    And the conclusion of the committee should include a key of "459000" and value "1"
 
   Scenario: Trade industry ratios from merchant category industries and industry
     Given a purchase emitter
@@ -98,6 +92,12 @@ Feature: Purchase Committee Calculations
     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: Non-trade industry ratios from default
+    Given a purchase emitter
+    When the "non_trade_industry_ratios" committee is calculated
+    Then the committee should have used quorum "default"
+    And the conclusion of the committee should include a key of "339991" 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>"
@@ -202,6 +202,7 @@ Feature: Purchase Committee Calculations
     Examples:
       | naics  | new_naics | ratio |
       | 111111 | 111111    | 1.0   |
+      | 339991 | 339991    | 1.0   |
       | 399100 | 399100    | 1.0   |
       | 399200 | 399200    | 1.0   |
       | 459000 | 399100    | 0.75  |
@@ -258,6 +259,7 @@ Feature: Purchase Committee Calculations
     Examples:
       | naics  | io_code | ratio |
       | 111111 | 111000  | 1.0   |
+      | 339991 | 111000  | 1.0   |
       | 399100 | 3991A0  | 0.75  |
       | 399100 | 3991B0  | 0.25  |
       | 459000 | 3991A0  | 0.5625|
@@ -278,6 +280,7 @@ Feature: Purchase Committee Calculations
     Examples:
       | naics  |
       | 111111 |
+      | 339991 |
       | 399100 |
       | 459000 |
 
@@ -319,6 +322,7 @@ Feature: Purchase Committee Calculations
     Examples:
       | naics  | io_code | share |
       | 111111 | 111000  | 100.0 |
+      | 339991 | 111000  | 100.0 |
       | 399100 | 3991A0  | 75.0  |
       | 399100 | 3991B0  | 25.0  |
       | 399200 | 399200  | 100.0 |

data/features/purchase_emissions.feature

@@ -4,7 +4,7 @@ Feature: Purchase Emissions Calculations
   Scenario: Calculations starting from nothing
     Given a purchase has nothing
     When emissions are calculated
-    Then the emission value should be within "0.001" kgs of "126.538"
+    Then the emission value should be within "0.001" kgs of "789.601"
 
   Scenario: Calculations starting from purchase amount
     Given a purchase has "purchase_amount" of "107.11"
@@ -14,7 +14,7 @@ Feature: Purchase Emissions Calculations
   Scenario: Calculations starting from date
     Given a purchase has "date" of "2010-07-28"
     When emissions are calculated
-    Then the emission value should be within "0.001" kgs of "126.538"
+    Then the emission value should be within "0.001" kgs of "789.601"
 
   Scenario Outline: Calculations starting from a merchant
     Given a purchase has "merchant.id" of "<id>"
@@ -22,8 +22,8 @@ Feature: Purchase Emissions Calculations
     Then the emission value should be within "0.001" kgs of "<emission>"
     Examples:
       | id  | emission |
-      | 1   |  126.538 |
-      | 2   |  274.131 |
+      | 1   |  789.601 |
+      | 2   | 1710.581 |
 
   Scenario Outline: Calculations starting from a merchant with purchase amount
     Given a purchase has "merchant.id" of "<id>"
@@ -68,7 +68,6 @@ Feature: Purchase Emissions Calculations
       | mcc  | cost   | date       | emission |
       | 1111 | 100.00 | 2010-07-28 |  126.538 |
       | 2222 | 100.00 | 2010-07-28 |  274.131 |
-      | 5111 | 100.00 | 2010-07-28 |  126.538 |
 
   Scenario Outline: Calculations starting from industry
     Given a purchase has "industry.naics_code" of "<naics>"

data/lib/purchase/carbon_model.rb

@@ -161,6 +161,13 @@ module BrighterPlanet
                   ntir
               end
             end
+            
+            # FIXME TODO 11/15/2010
+            # NAICS 339991 chosen because it's emissions intensity is close to the average of the entire U.S. economy
+            # (calculated by multiplying each sector's emissions intensity by it's share of total 2002 value)
+            quorum 'default' do
+              { '339991' => 1 }
+            end
           end
 
           committee :trade_industry_ratios do
@@ -180,6 +187,10 @@ module BrighterPlanet
                   tir
               end
             end
+            
+            quorum 'default' do
+              {}
+            end
           end
 
           # a dictionary to go from merchant categories to industries
@@ -193,18 +204,11 @@ module BrighterPlanet
             quorum 'from merchant', :needs => [:merchant] do |characteristics|
               characteristics[:merchant].merchant_category
             end
-            
-            quorum 'default' do
-              MerchantCategory.
-                joins(:merchant_category_industries).
-                where(:mcc => 5111).
-                first
-            end
           end
           
           committee :adjusted_cost do
             quorum 'from cost and date', :needs => [:cost, :date] do |characteristics|
-              # TODO: Come up with a way to fetch real CPI conversions
+              # FIXME TODO: Import CPI conversions
               @cpi_lookup ||= { 
                 2009 => 1.189, 2010 => 1.207, 2011 => 1.225, 2012 => 1.245, 
                 2013 => 1.265 }
@@ -222,14 +226,16 @@ module BrighterPlanet
               characteristics[:purchase_amount].to_f - characteristics[:tax].to_f
             end
             
+            # Based on http://www.thestc.com/STrates.stm weighted by US Census 2010 projected state population (exclude samoa, guam, pr)
             quorum 'from purchase amount', :needs => :purchase_amount do |characteristics|
-              # tax based on http://www.thestc.com/STrates.stm weighted by US Census 2010 projected state population (exclude samoa, guam, pr)
               characteristics[:purchase_amount].to_f / 1.0711
             end
             
+            # FIXME TODO 11/15/2010
+            # This is the average federal government purchase card transaction in 2003, converted to 2010 dollars, with tax taken out
+            # See http://www.sba.gov/advo/research/rs226tot.pdf
             quorum 'default' do
-              # FIXME TODO research real average purchase amount
-              100
+              624
             end
           end
 

data/lib/purchase/characterization.rb

@@ -13,15 +13,18 @@ module BrighterPlanet
           has :purchase_amount # full purchase amount, including tax
           has :tax             # tax portion of purchase
           has :date
-          has :merchant
-          has :industry
-
+          has :merchant do
+            displays { |m| m.name }
+          end
           has :merchant_category do
-            displays { |mc| mc.name }
+            displays { |mc| mc.description }
           end
           has :merchant_category_industries do
             displays { |mci| pluralize(mci.count, 'merchant category') }
           end
+          has :industry do
+            displays { |ind| ind.description }
+          end
           has :trade_industry_ratios do
             displays { |tir| pluralize(tir.count, 'trade industry ratio') }
           end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: purchase
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 1
   - 0
-  - 9
-  version: 1.0.9
+  - 10
+  version: 1.0.10
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -18,100 +19,108 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 -04:00
+date: 2010-11-16 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 3
         - 0
         - 0
         version: 3.0.0
   type: :development
-  prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: bundler
+  prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
   type: :development
-  prerelease: false
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: cucumber
+  prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: jeweler
+  prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 4
         - 0
         version: 1.4.0
   type: :development
-  prerelease: false
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
+  prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: rdoc
+  prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
-  prerelease: false
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rspec
+  prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 62196417
         segments: 
         - 2
         - 0
@@ -120,97 +129,102 @@ dependencies:
         - 17
         version: 2.0.0.beta.17
   type: :development
-  prerelease: false
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: sniff
+  prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 17
         segments: 
         - 0
         - 2
         - 3
         version: 0.2.3
   type: :development
-  prerelease: false
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: actionpack
+  prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 3
         - 0
         - 1
         version: 3.0.1
   type: :runtime
-  prerelease: false
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: earth
+  prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 31
         segments: 
         - 0
         - 2
         - 4
         version: 0.2.4
   type: :runtime
-  prerelease: false
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: emitter
+  prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 0
         - 1
         - 9
         version: 0.1.9
   type: :runtime
-  prerelease: false
   version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: fastercsv
+  prerelease: false
   requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 5
         segments: 
         - 1
         - 5
         - 3
         version: 1.5.3
   type: :runtime
-  prerelease: false
   version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: slither
+  prerelease: false
   requirement: &id013 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 405
         segments: 
         - 0
         - 99
         - 3
         version: 0.99.3
   type: :runtime
-  prerelease: false
   version_requirements: *id013
 description: A software model in Ruby for the greenhouse gas emissions of a purchase
 email: seamus@brighterplanet.com
@@ -234,11 +248,11 @@ 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/support/matrix_ext.rb
-- features/support/env.rb
+- features/step_definitions/characteristic_steps.rb
 - features/step_definitions/matrix_steps.rb
 - features/step_definitions/purchase_steps.rb
-- features/step_definitions/characteristic_steps.rb
+- features/support/env.rb
+- features/support/matrix_ext.rb
 - features/purchase_characterization.feature
 - features/purchase_committees.feature
 - features/purchase_emissions.feature
@@ -256,7 +270,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1011847695
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -265,6 +279,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -276,15 +291,15 @@ signing_key:
 specification_version: 3
 summary: A carbon model
 test_files: 
-- features/support/matrix_ext.rb
-- features/support/env.rb
+- features/step_definitions/characteristic_steps.rb
 - features/step_definitions/matrix_steps.rb
 - features/step_definitions/purchase_steps.rb
-- features/step_definitions/characteristic_steps.rb
+- features/support/env.rb
+- features/support/matrix_ext.rb
 - features/purchase_characterization.feature
 - features/purchase_committees.feature
 - features/purchase_emissions.feature
-- lib/test_support/test_sector_direct_requirements_adapter.rb
 - lib/test_support/db/schema.rb
 - lib/test_support/purchase_record.rb
 - lib/test_support/test_impact_vectors_adapter.rb
+- lib/test_support/test_sector_direct_requirements_adapter.rb