tronprint 1.1.2 → 1.1.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/tronprint/version.rb +1 -1
  2. data/lib/tronprint.rb +3 -1
  3. data/spec/tronprint_spec.rb +9 -0
  4. metadata +25 -25
data/lib/tronprint/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tronprint
2
- VERSION = "1.1.2"
2
+ VERSION = "1.1.3"
3
3
  end
data/lib/tronprint.rb CHANGED
@@ -35,7 +35,9 @@ module Tronprint
35
35
  if @aggregator_options.nil?
36
36
  @aggregator_options = config[:aggregator_options]
37
37
  if env
38
- @aggregator_options = @aggregator_options[env] || default_config[:aggregator_options]
38
+ @aggregator_options = @aggregator_options[env]
39
+ @aggregator_options ||= config[:aggregator_options] if config[:aggregator_options].keys.include?(:adapter)
40
+ @aggregator_options ||= default_config[:aggregator_options]
39
41
  end
40
42
  end
41
43
  @aggregator_options
data/spec/tronprint_spec.rb CHANGED
@@ -127,5 +127,14 @@ describe Tronprint do
127
127
  }
128
128
  Tronprint.aggregator_options.should == Tronprint.default_config[:aggregator_options]
129
129
  end
130
+ it 'loads regular options if an environment is given but not configured' do
131
+ Tronprint.config = {
132
+ :aggregator_options => {
133
+ :adapter => :memory
134
+ }
135
+ }
136
+ Tronprint.stub!(:env).and_return('development')
137
+ Tronprint.aggregator_options[:adapter].should == :memory
138
+ end
130
139
  end
131
140
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tronprint
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.2
4
+ version: 1.1.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-06-22 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: actionpack
16
- requirement: &2154899500 !ruby/object:Gem::Requirement
16
+ requirement: &2159708260 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *2154899500
24
+ version_requirements: *2159708260
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: activesupport
27
- requirement: &2154899000 !ruby/object:Gem::Requirement
27
+ requirement: &2159774040 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '3'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2154899000
35
+ version_requirements: *2159774040
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: cucumber
38
- requirement: &2154898620 !ruby/object:Gem::Requirement
38
+ requirement: &2159773660 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2154898620
46
+ version_requirements: *2159773660
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: bueller
49
- requirement: &2154898080 !ruby/object:Gem::Requirement
49
+ requirement: &2159773120 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: 0.0.2
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *2154898080
57
+ version_requirements: *2159773120
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rake
60
- requirement: &2154897660 !ruby/object:Gem::Requirement
60
+ requirement: &2159772700 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2154897660
68
+ version_requirements: *2159772700
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rspec
71
- requirement: &2154897120 !ruby/object:Gem::Requirement
71
+ requirement: &2159772160 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '2.0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2154897120
79
+ version_requirements: *2159772160
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: sandbox
82
- requirement: &2154896700 !ruby/object:Gem::Requirement
82
+ requirement: &2159771740 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *2154896700
90
+ version_requirements: *2159771740
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: timecop
93
- requirement: &2154896240 !ruby/object:Gem::Requirement
93
+ requirement: &2159771280 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2154896240
101
+ version_requirements: *2159771280
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: carbon
104
- requirement: &2154895740 !ruby/object:Gem::Requirement
104
+ requirement: &2159770780 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ~>
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: 1.1.1
110
110
  type: :runtime
111
111
  prerelease: false
112
- version_requirements: *2154895740
112
+ version_requirements: *2159770780
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: i18n
115
- requirement: &2154943180 !ruby/object:Gem::Requirement
115
+ requirement: &2159770360 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :runtime
122
122
  prerelease: false
123
- version_requirements: *2154943180
123
+ version_requirements: *2159770360
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: dkastner-moneta
126
- requirement: &2154942640 !ruby/object:Gem::Requirement
126
+ requirement: &2159769820 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ~>
@@ -131,7 +131,7 @@ dependencies:
131
131
  version: 1.1.0
132
132
  type: :runtime
133
133
  prerelease: false
134
- version_requirements: *2154942640
134
+ version_requirements: *2159769820
135
135
  description: A gem for monitoring the carbon footprint of your ruby app
136
136
  email: dkastner@gmail.com
137
137
  executables: []
@@ -188,7 +188,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
188
188
  version: '0'
189
189
  segments:
190
190
  - 0
191
- hash: -3719771868977979478
191
+ hash: 1377517098180526085
192
192
  required_rubygems_version: !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
197
197
  version: '0'
198
198
  segments:
199
199
  - 0
200
- hash: -3719771868977979478
200
+ hash: 1377517098180526085
201
201
  requirements: []
202
202
  rubyforge_project:
203
203
  rubygems_version: 1.8.5