purchase 1.0.5 → 1.0.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/features/purchase_emissions.feature +2 -0
  2. data/features/step_definitions/purchase_steps.rb +5 -0
  3. data/lib/purchase/carbon_model.rb +1 -1
  4. metadata +42 -56
data/features/purchase_emissions.feature CHANGED
@@ -76,6 +76,8 @@ Feature: Purchase Emissions Calculations
76
76
  And it has "date" of "<date>"
77
77
  When emissions are calculated
78
78
  Then the emission value should be within "0.001" kgs of "<emission>"
79
+ And the "trade_industry_ratios" committee should have used quorum "from industry"
80
+ And the "non_trade_industry_ratios" committee should have used quorum "from industry"
79
81
  Examples:
80
82
  | naics | cost | date | emission |
81
83
  | 111111 | 100.00 | 2010-07-28 | 126.538 |
data/features/step_definitions/purchase_steps.rb CHANGED
@@ -2,3 +2,8 @@ Then /^the conclusion of the committee should have ratios summing to "(.*)"$/ do
2
2
  ratios = @report.conclusion
3
3
  ratios.values.sum.to_f.should == sum.to_f
4
4
  end
5
+
6
+ Then /^the "(.*)" committee should have used quorum "(.*)"$/ do |committee, quorum|
7
+ report = @activity.deliberations[:emission].reports.find { |r| r.committee.name == committee.to_sym }
8
+ report.quorum.name.should == quorum
9
+ end
data/lib/purchase/carbon_model.rb CHANGED
@@ -82,7 +82,7 @@ module BrighterPlanet
82
82
  committee :industry_ratios do
83
83
  quorum 'from non trade industry and industry product ratios', :needs => [:non_trade_industry_ratios, :industry_product_ratios] do |characteristics|
84
84
  combined_ratios = characteristics[:non_trade_industry_ratios].
85
- update(characteristics[:industry_product_ratios]) do |key, non_trade, ip_ratio|
85
+ merge(characteristics[:industry_product_ratios]) do |key, non_trade, ip_ratio|
86
86
  non_trade + ip_ratio
87
87
  end
88
88
  end
metadata CHANGED
@@ -1,13 +1,12 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: purchase
3
3
  version: !ruby/object:Gem::Version
4
- hash: 29
5
4
  prerelease: false
6
5
  segments:
7
6
  - 1
8
7
  - 0
9
- - 5
10
- version: 1.0.5
8
+ - 6
9
+ version: 1.0.6
11
10
  platform: ruby
12
11
  authors:
13
12
  - Andy Rossmeissl
@@ -19,109 +18,100 @@ autorequire:
19
18
  bindir: bin
20
19
  cert_chain: []
21
20
 
22
- date: 2010-10-07 00:00:00 -04:00
21
+ date: 2010-10-08 00:00:00 -04:00
23
22
  default_executable:
24
23
  dependencies:
25
24
  - !ruby/object:Gem::Dependency
26
- type: :development
27
- prerelease: false
28
25
  name: activerecord
29
- version_requirements: &id001 !ruby/object:Gem::Requirement
26
+ requirement: &id001 !ruby/object:Gem::Requirement
30
27
  none: false
31
28
  requirements:
32
29
  - - ~>
33
30
  - !ruby/object:Gem::Version
34
- hash: 7
35
31
  segments:
36
32
  - 3
37
33
  - 0
38
34
  - 0
39
35
  version: 3.0.0
40
- requirement: *id001
41
- - !ruby/object:Gem::Dependency
42
36
  type: :development
43
37
  prerelease: false
38
+ version_requirements: *id001
39
+ - !ruby/object:Gem::Dependency
44
40
  name: bundler
45
- version_requirements: &id002 !ruby/object:Gem::Requirement
41
+ requirement: &id002 !ruby/object:Gem::Requirement
46
42
  none: false
47
43
  requirements:
48
44
  - - ~>
49
45
  - !ruby/object:Gem::Version
50
- hash: 23
51
46
  segments:
52
47
  - 1
53
48
  - 0
54
49
  - 0
55
50
  version: 1.0.0
56
- requirement: *id002
57
- - !ruby/object:Gem::Dependency
58
51
  type: :development
59
52
  prerelease: false
53
+ version_requirements: *id002
54
+ - !ruby/object:Gem::Dependency
60
55
  name: cucumber
61
- version_requirements: &id003 !ruby/object:Gem::Requirement
56
+ requirement: &id003 !ruby/object:Gem::Requirement
62
57
  none: false
63
58
  requirements:
64
59
  - - ">="
65
60
  - !ruby/object:Gem::Version
66
- hash: 3
67
61
  segments:
68
62
  - 0
69
63
  version: "0"
70
- requirement: *id003
71
- - !ruby/object:Gem::Dependency
72
64
  type: :development
73
65
  prerelease: false
66
+ version_requirements: *id003
67
+ - !ruby/object:Gem::Dependency
74
68
  name: jeweler
75
- version_requirements: &id004 !ruby/object:Gem::Requirement
69
+ requirement: &id004 !ruby/object:Gem::Requirement
76
70
  none: false
77
71
  requirements:
78
72
  - - ~>
79
73
  - !ruby/object:Gem::Version
80
- hash: 7
81
74
  segments:
82
75
  - 1
83
76
  - 4
84
77
  - 0
85
78
  version: 1.4.0
86
- requirement: *id004
87
- - !ruby/object:Gem::Dependency
88
79
  type: :development
89
80
  prerelease: false
81
+ version_requirements: *id004
82
+ - !ruby/object:Gem::Dependency
90
83
  name: rake
91
- version_requirements: &id005 !ruby/object:Gem::Requirement
84
+ requirement: &id005 !ruby/object:Gem::Requirement
92
85
  none: false
93
86
  requirements:
94
87
  - - ">="
95
88
  - !ruby/object:Gem::Version
96
- hash: 3
97
89
  segments:
98
90
  - 0
99
91
  version: "0"
100
- requirement: *id005
101
- - !ruby/object:Gem::Dependency
102
92
  type: :development
103
93
  prerelease: false
94
+ version_requirements: *id005
95
+ - !ruby/object:Gem::Dependency
104
96
  name: rdoc
105
- version_requirements: &id006 !ruby/object:Gem::Requirement
97
+ requirement: &id006 !ruby/object:Gem::Requirement
106
98
  none: false
107
99
  requirements:
108
100
  - - ">="
109
101
  - !ruby/object:Gem::Version
110
- hash: 3
111
102
  segments:
112
103
  - 0
113
104
  version: "0"
114
- requirement: *id006
115
- - !ruby/object:Gem::Dependency
116
105
  type: :development
117
106
  prerelease: false
107
+ version_requirements: *id006
108
+ - !ruby/object:Gem::Dependency
118
109
  name: rspec
119
- version_requirements: &id007 !ruby/object:Gem::Requirement
110
+ requirement: &id007 !ruby/object:Gem::Requirement
120
111
  none: false
121
112
  requirements:
122
113
  - - ~>
123
114
  - !ruby/object:Gem::Version
124
- hash: 62196417
125
115
  segments:
126
116
  - 2
127
117
  - 0
@@ -129,87 +119,84 @@ dependencies:
129
119
  - beta
130
120
  - 17
131
121
  version: 2.0.0.beta.17
132
- requirement: *id007
133
- - !ruby/object:Gem::Dependency
134
122
  type: :development
135
123
  prerelease: false
124
+ version_requirements: *id007
125
+ - !ruby/object:Gem::Dependency
136
126
  name: sniff
137
- version_requirements: &id008 !ruby/object:Gem::Requirement
127
+ requirement: &id008 !ruby/object:Gem::Requirement
138
128
  none: false
139
129
  requirements:
140
130
  - - ~>
141
131
  - !ruby/object:Gem::Version
142
- hash: 59
143
132
  segments:
144
133
  - 0
145
134
  - 1
146
135
  - 16
147
136
  version: 0.1.16
148
- requirement: *id008
149
- - !ruby/object:Gem::Dependency
150
- type: :runtime
137
+ type: :development
151
138
  prerelease: false
139
+ version_requirements: *id008
140
+ - !ruby/object:Gem::Dependency
152
141
  name: earth
153
- version_requirements: &id009 !ruby/object:Gem::Requirement
142
+ requirement: &id009 !ruby/object:Gem::Requirement
154
143
  none: false
155
144
  requirements:
156
145
  - - ~>
157
146
  - !ruby/object:Gem::Version
158
- hash: 31
159
147
  segments:
160
148
  - 0
161
149
  - 2
162
150
  - 4
163
151
  version: 0.2.4
164
- requirement: *id009
165
- - !ruby/object:Gem::Dependency
166
152
  type: :runtime
167
153
  prerelease: false
154
+ version_requirements: *id009
155
+ - !ruby/object:Gem::Dependency
168
156
  name: emitter
169
- version_requirements: &id010 !ruby/object:Gem::Requirement
157
+ requirement: &id010 !ruby/object:Gem::Requirement
170
158
  none: false
171
159
  requirements:
172
160
  - - ~>
173
161
  - !ruby/object:Gem::Version
174
- hash: 19
175
162
  segments:
176
163
  - 0
177
164
  - 1
178
165
  - 4
179
166
  version: 0.1.4
180
- requirement: *id010
181
- - !ruby/object:Gem::Dependency
182
167
  type: :runtime
183
168
  prerelease: false
169
+ version_requirements: *id010
170
+ - !ruby/object:Gem::Dependency
184
171
  name: fastercsv
185
- version_requirements: &id011 !ruby/object:Gem::Requirement
172
+ requirement: &id011 !ruby/object:Gem::Requirement
186
173
  none: false
187
174
  requirements:
188
175
  - - ~>
189
176
  - !ruby/object:Gem::Version
190
- hash: 5
191
177
  segments:
192
178
  - 1
193
179
  - 5
194
180
  - 3
195
181
  version: 1.5.3
196
- requirement: *id011
197
- - !ruby/object:Gem::Dependency
198
182
  type: :runtime
199
183
  prerelease: false
184
+ version_requirements: *id011
185
+ - !ruby/object:Gem::Dependency
200
186
  name: slither
201
- version_requirements: &id012 !ruby/object:Gem::Requirement
187
+ requirement: &id012 !ruby/object:Gem::Requirement
202
188
  none: false
203
189
  requirements:
204
190
  - - ~>
205
191
  - !ruby/object:Gem::Version
206
- hash: 405
207
192
  segments:
208
193
  - 0
209
194
  - 99
210
195
  - 3
211
196
  version: 0.99.3
212
- requirement: *id012
197
+ type: :runtime
198
+ prerelease: false
199
+ version_requirements: *id012
213
200
  description: A software model in Ruby for the greenhouse gas emissions of a purchase
214
201
  email: seamus@brighterplanet.com
215
202
  executables: []
@@ -252,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
252
239
  requirements:
253
240
  - - ">="
254
241
  - !ruby/object:Gem::Version
255
- hash: 3
242
+ hash: -1666864844754948878
256
243
  segments:
257
244
  - 0
258
245
  version: "0"
@@ -261,7 +248,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
261
248
  requirements:
262
249
  - - ">="
263
250
  - !ruby/object:Gem::Version
264
- hash: 3
265
251
  segments:
266
252
  - 0
267
253
  version: "0"