purchase 1.0.4 → 1.0.5

data/features/step_definitions/matrix_steps.rb

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

data/features/step_definitions/purchase_steps.rb

@@ -0,0 +1,4 @@
+Then /^the conclusion of the committee should have ratios summing to "(.*)"$/ do |sum|
+  ratios = @report.conclusion
+  ratios.values.sum.to_f.should == sum.to_f
+end

data/lib/purchase/carbon_model.rb

@@ -136,12 +136,11 @@ module BrighterPlanet
             end
 
             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] ||= 0
-                  hash[merchant_category_industry.naics_code] += merchant_category_industry.ratio
-                end
-                hash
+              characteristics[:merchant_category_industries].
+                reject { |mci| mci.industry.trade_industry? }.inject({}) do |ntir, merchant_category_industry|
+                  ntir[merchant_category_industry.naics_code] ||= 0
+                  ntir[merchant_category_industry.naics_code] += merchant_category_industry.ratio
+                  ntir
               end
             end
           end
@@ -156,12 +155,11 @@ module BrighterPlanet
             end
 
             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
+              characteristics[:merchant_category_industries].
+                select { |mci| mci.industry.trade_industry? }.inject({}) do |tir, merchant_category_industry|
+                  tir[merchant_category_industry.naics_code] ||= 0
+                  tir[merchant_category_industry.naics_code] += merchant_category_industry.ratio
+                  tir
               end
             end
           end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: purchase
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 1
   - 0
-  - 4
-  version: 1.0.4
+  - 5
+  version: 1.0.5
 platform: ruby
 authors: 
 - Andy Rossmeissl
@@ -23,9 +23,10 @@ date: 2010-10-07 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activerecord
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  name: activerecord
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -36,12 +37,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :development
-  version_requirements: *id001
+  requirement: *id001
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: bundler
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -52,12 +53,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
-  type: :development
-  version_requirements: *id002
+  requirement: *id002
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  type: :development
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  name: cucumber
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -66,12 +67,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id003
+  requirement: *id003
 - !ruby/object:Gem::Dependency 
-  name: jeweler
+  type: :development
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  name: jeweler
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,12 +83,12 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  type: :development
-  version_requirements: *id004
+  requirement: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  name: rake
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -96,12 +97,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id005
+  requirement: *id005
 - !ruby/object:Gem::Dependency 
-  name: rdoc
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  name: rdoc
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -110,12 +111,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id006
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  type: :development
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  name: rspec
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -128,12 +129,12 @@ dependencies:
         - beta
         - 17
         version: 2.0.0.beta.17
-  type: :development
-  version_requirements: *id007
+  requirement: *id007
 - !ruby/object:Gem::Dependency 
-  name: sniff
+  type: :development
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  name: sniff
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -144,12 +145,12 @@ dependencies:
         - 1
         - 16
         version: 0.1.16
-  type: :development
-  version_requirements: *id008
+  requirement: *id008
 - !ruby/object:Gem::Dependency 
-  name: earth
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  name: earth
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -160,12 +161,12 @@ dependencies:
         - 2
         - 4
         version: 0.2.4
-  type: :runtime
-  version_requirements: *id009
+  requirement: *id009
 - !ruby/object:Gem::Dependency 
-  name: emitter
+  type: :runtime
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  name: emitter
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -176,12 +177,12 @@ dependencies:
         - 1
         - 4
         version: 0.1.4
-  type: :runtime
-  version_requirements: *id010
+  requirement: *id010
 - !ruby/object:Gem::Dependency 
-  name: fastercsv
+  type: :runtime
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  name: fastercsv
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -192,12 +193,12 @@ dependencies:
         - 5
         - 3
         version: 1.5.3
-  type: :runtime
-  version_requirements: *id011
+  requirement: *id011
 - !ruby/object:Gem::Dependency 
-  name: slither
+  type: :runtime
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  name: slither
+  version_requirements: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -208,132 +209,7 @@ dependencies:
         - 99
         - 3
         version: 0.99.3
-  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
+  requirement: *id012
 description: A software model in Ruby for the greenhouse gas emissions of a purchase
 email: seamus@brighterplanet.com
 executables: []
@@ -356,10 +232,12 @@ 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/purchase_committees.feature
-- features/purchase_emissions.feature
+- features/step_definitions/matrix_steps.rb
+- features/step_definitions/purchase_steps.rb
 - features/support/env.rb
 - features/support/matrix_ext.rb
+- features/purchase_committees.feature
+- features/purchase_emissions.feature
 has_rdoc: true
 homepage: http://github.com/brighterplanet/purchase
 licenses: []
@@ -395,10 +273,12 @@ signing_key:
 specification_version: 3
 summary: A carbon model
 test_files: 
-- features/purchase_committees.feature
-- features/purchase_emissions.feature
+- features/step_definitions/matrix_steps.rb
+- features/step_definitions/purchase_steps.rb
 - features/support/env.rb
 - features/support/matrix_ext.rb
+- features/purchase_committees.feature
+- features/purchase_emissions.feature
 - lib/test_support/db/schema.rb
 - lib/test_support/purchase_record.rb
 - lib/test_support/test_impact_vectors_adapter.rb