purchase 1.0.10 → 1.0.11

data/features/purchase_committees.feature

@@ -16,25 +16,19 @@ Feature: Purchase Committee Calculations
     Then the committee should have used quorum "from purchase amount and tax"
     And the conclusion of the committee should be "9.00"
 
-  Scenario: Cost committee from default
+  Scenario: Adjusted cost committee from default
     Given a purchase emitter
-    When the "cost" committee is calculated
+    When the "adjusted_cost" committee is calculated
     Then the committee should have used quorum "default"
-    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 "516.98426"
+    And the conclusion of the committee should be "517.00"
 
   Scenario Outline: Adjusted cost committee from cost and date
     Given a purchase emitter
     And a characteristic "cost" of "<cost>"
     And characteristic "date" of "<date>"
     When the "adjusted_cost" committee is calculated
-    Then the conclusion of the committee should be "<adjusted_cost>"
+    Then the committee should have used quorum "from cost and date"
+    And the conclusion of the committee should be "<adjusted_cost>"
     Examples:
       | cost   | date       | adjusted_cost |
       | 831.23 | 2010-08-01 |     688.67439 |

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 "789.601"
+    Then the emission value should be within "0.001" kgs of "789.625"
 
   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 "789.601"
+    Then the emission value should be within "0.001" kgs of "789.625"
 
   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   |  789.601 |
-      | 2   | 1710.581 |
+      | 1   |  789.625 |
+      | 2   | 1710.633 |
 
   Scenario Outline: Calculations starting from a merchant with purchase amount
     Given a purchase has "merchant.id" of "<id>"

data/lib/purchase/carbon_model.rb

@@ -162,7 +162,6 @@ module BrighterPlanet
               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
@@ -219,6 +218,12 @@ module BrighterPlanet
 
               characteristics[:cost].to_f / conversion_factor
             end
+            
+            # This is the average federal government purchase card transaction in 2003, converted to 2002 dollars, with tax taken out
+            # See http://www.sba.gov/advo/research/rs226tot.pdf
+            quorum 'default' do
+              517
+            end
           end
             
           committee :cost do
@@ -230,13 +235,6 @@ module BrighterPlanet
             quorum 'from purchase amount', :needs => :purchase_amount do |characteristics|
               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
-              624
-            end
           end
 
           committee :date do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: purchase
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 1
   - 0
-  - 10
-  version: 1.0.10
+  - 11
+  version: 1.0.11
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -19,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-16 00:00:00 -08:00
+date: 2010-11-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency