amee 4.1.1 → 4.1.2

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/VERSION +1 -1
  2. data/amee.gemspec +8 -7
  3. data/lib/amee/rails.rb +9 -9
  4. metadata +33 -31
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.1.1
1
+ 4.1.2
data/amee.gemspec CHANGED
@@ -4,13 +4,14 @@
4
4
  # -*- encoding: utf-8 -*-
5
5
 
6
6
  Gem::Specification.new do |s|
7
- s.name = "amee"
8
- s.version = "4.1.1"
7
+ s.name = %q{amee}
8
+ s.version = "4.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["James Smith", "James Hetherington", "Andrew Hill", "Andrew Berkeley"]
12
- s.date = "2011-09-29"
13
- s.email = "james@floppy.org.uk"
12
+ s.date = %q{2011-09-30}
13
+ s.default_executable = %q{ameesh}
14
+ s.email = %q{james@floppy.org.uk}
14
15
  s.executables = ["ameesh"]
15
16
  s.extra_rdoc_files = [
16
17
  "LICENSE.txt",
@@ -122,11 +123,11 @@ Gem::Specification.new do |s|
122
123
  "spec/v3/item_value_definition_spec.rb",
123
124
  "spec/v3/return_value_definition_spec.rb"
124
125
  ]
125
- s.homepage = "http://github.com/AMEE/amee-ruby"
126
+ s.homepage = %q{http://github.com/AMEE/amee-ruby}
126
127
  s.licenses = ["BSD 3-Clause"]
127
128
  s.require_paths = ["lib"]
128
- s.rubygems_version = "1.8.10"
129
- s.summary = "Ruby interface to the AMEE carbon calculator"
129
+ s.rubygems_version = %q{1.6.2}
130
+ s.summary = %q{Ruby interface to the AMEE carbon calculator}
130
131
 
131
132
  if s.respond_to? :specification_version then
132
133
  s.specification_version = 3
data/lib/amee/rails.rb CHANGED
@@ -12,23 +12,23 @@ module AMEE
12
12
  def self.global(options = {})
13
13
  unless @connection
14
14
  $AMEE_CONFIG ||= {} # Make default values nil
15
- if $AMEE_CONFIG['ssl'] == false
15
+ if $AMEE_CONFIG[:ssl] == false
16
16
  options.merge! :ssl => false
17
17
  end
18
- if $AMEE_CONFIG['retries']
19
- options.merge! :retries => $AMEE_CONFIG['retries'].to_i
18
+ if $AMEE_CONFIG[:retries]
19
+ options.merge! :retries => $AMEE_CONFIG[:retries].to_i
20
20
  end
21
- if $AMEE_CONFIG['timeout']
22
- options.merge! :timeout => $AMEE_CONFIG['timeout'].to_i
21
+ if $AMEE_CONFIG[:timeout]
22
+ options.merge! :timeout => $AMEE_CONFIG[:timeout].to_i
23
23
  end
24
- if $AMEE_CONFIG['cache'] == 'rails'
24
+ if $AMEE_CONFIG[:cache] == 'rails'
25
25
  # Pass in the rails cache store
26
26
  options[:cache_store] = ActionController::Base.cache_store
27
27
  else
28
- options[:cache] ||= $AMEE_CONFIG['cache'] if $AMEE_CONFIG['cache'].present?
28
+ options[:cache] ||= $AMEE_CONFIG[:cache] if $AMEE_CONFIG[:cache].present?
29
29
  end
30
- options[:enable_debug] ||= $AMEE_CONFIG['debug'] if $AMEE_CONFIG['debug'].present?
31
- @connection = self.connect($AMEE_CONFIG['server'], $AMEE_CONFIG['username'], $AMEE_CONFIG['password'], options)
30
+ options[:enable_debug] ||= $AMEE_CONFIG[:debug] if $AMEE_CONFIG[:debug].present?
31
+ @connection = self.connect($AMEE_CONFIG[:server], $AMEE_CONFIG[:username], $AMEE_CONFIG[:password], options)
32
32
  # Also store as $amee for backwards compatibility, though this is now deprecated
33
33
  $amee = @connection
34
34
  end
metadata CHANGED
@@ -1,13 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amee
3
3
  version: !ruby/object:Gem::Version
4
- hash: 57
4
+ hash: 63
5
5
  prerelease:
6
6
  segments:
7
7
  - 4
8
8
  - 1
9
- - 1
10
- version: 4.1.1
9
+ - 2
10
+ version: 4.1.2
11
11
  platform: ruby
12
12
  authors:
13
13
  - James Smith
@@ -18,9 +18,12 @@ autorequire:
18
18
  bindir: bin
19
19
  cert_chain: []
20
20
 
21
- date: 2011-09-29 00:00:00 Z
21
+ date: 2011-09-30 00:00:00 +01:00
22
+ default_executable: ameesh
22
23
  dependencies:
23
24
  - !ruby/object:Gem::Dependency
25
+ prerelease: false
26
+ type: :runtime
24
27
  requirement: &id001 !ruby/object:Gem::Requirement
25
28
  none: false
26
29
  requirements:
@@ -32,11 +35,11 @@ dependencies:
32
35
  - 0
33
36
  - 10
34
37
  version: 3.0.10
35
- version_requirements: *id001
36
38
  name: activesupport
39
+ version_requirements: *id001
40
+ - !ruby/object:Gem::Dependency
37
41
  prerelease: false
38
42
  type: :runtime
39
- - !ruby/object:Gem::Dependency
40
43
  requirement: &id002 !ruby/object:Gem::Requirement
41
44
  none: false
42
45
  requirements:
@@ -46,11 +49,11 @@ dependencies:
46
49
  segments:
47
50
  - 0
48
51
  version: "0"
49
- version_requirements: *id002
50
52
  name: json
53
+ version_requirements: *id002
54
+ - !ruby/object:Gem::Dependency
51
55
  prerelease: false
52
56
  type: :runtime
53
- - !ruby/object:Gem::Dependency
54
57
  requirement: &id003 !ruby/object:Gem::Requirement
55
58
  none: false
56
59
  requirements:
@@ -60,11 +63,11 @@ dependencies:
60
63
  segments:
61
64
  - 0
62
65
  version: "0"
63
- version_requirements: *id003
64
66
  name: log4r
67
+ version_requirements: *id003
68
+ - !ruby/object:Gem::Dependency
65
69
  prerelease: false
66
70
  type: :runtime
67
- - !ruby/object:Gem::Dependency
68
71
  requirement: &id004 !ruby/object:Gem::Requirement
69
72
  none: false
70
73
  requirements:
@@ -77,11 +80,11 @@ dependencies:
77
80
  - 3
78
81
  - 1
79
82
  version: 1.4.3.1
80
- version_requirements: *id004
81
83
  name: nokogiri
82
- prerelease: false
83
- type: :runtime
84
+ version_requirements: *id004
84
85
  - !ruby/object:Gem::Dependency
86
+ prerelease: false
87
+ type: :development
85
88
  requirement: &id005 !ruby/object:Gem::Requirement
86
89
  none: false
87
90
  requirements:
@@ -93,11 +96,11 @@ dependencies:
93
96
  - 0
94
97
  - 0
95
98
  version: 1.0.0
96
- version_requirements: *id005
97
99
  name: bundler
100
+ version_requirements: *id005
101
+ - !ruby/object:Gem::Dependency
98
102
  prerelease: false
99
103
  type: :development
100
- - !ruby/object:Gem::Dependency
101
104
  requirement: &id006 !ruby/object:Gem::Requirement
102
105
  none: false
103
106
  requirements:
@@ -109,11 +112,11 @@ dependencies:
109
112
  - 6
110
113
  - 4
111
114
  version: 1.6.4
112
- version_requirements: *id006
113
115
  name: jeweler
116
+ version_requirements: *id006
117
+ - !ruby/object:Gem::Dependency
114
118
  prerelease: false
115
119
  type: :development
116
- - !ruby/object:Gem::Dependency
117
120
  requirement: &id007 !ruby/object:Gem::Requirement
118
121
  none: false
119
122
  requirements:
@@ -125,11 +128,11 @@ dependencies:
125
128
  - 6
126
129
  - 0
127
130
  version: 2.6.0
128
- version_requirements: *id007
129
131
  name: rspec
132
+ version_requirements: *id007
133
+ - !ruby/object:Gem::Dependency
130
134
  prerelease: false
131
135
  type: :development
132
- - !ruby/object:Gem::Dependency
133
136
  requirement: &id008 !ruby/object:Gem::Requirement
134
137
  none: false
135
138
  requirements:
@@ -141,11 +144,11 @@ dependencies:
141
144
  - 8
142
145
  - 6
143
146
  version: 0.8.6
144
- version_requirements: *id008
145
147
  name: flexmock
148
+ version_requirements: *id008
149
+ - !ruby/object:Gem::Dependency
146
150
  prerelease: false
147
151
  type: :development
148
- - !ruby/object:Gem::Dependency
149
152
  requirement: &id009 !ruby/object:Gem::Requirement
150
153
  none: false
151
154
  requirements:
@@ -155,11 +158,11 @@ dependencies:
155
158
  segments:
156
159
  - 0
157
160
  version: "0"
158
- version_requirements: *id009
159
161
  name: memcache-client
162
+ version_requirements: *id009
163
+ - !ruby/object:Gem::Dependency
160
164
  prerelease: false
161
165
  type: :development
162
- - !ruby/object:Gem::Dependency
163
166
  requirement: &id010 !ruby/object:Gem::Requirement
164
167
  none: false
165
168
  requirements:
@@ -169,11 +172,11 @@ dependencies:
169
172
  segments:
170
173
  - 0
171
174
  version: "0"
172
- version_requirements: *id010
173
175
  name: rcov
176
+ version_requirements: *id010
177
+ - !ruby/object:Gem::Dependency
174
178
  prerelease: false
175
179
  type: :development
176
- - !ruby/object:Gem::Dependency
177
180
  requirement: &id011 !ruby/object:Gem::Requirement
178
181
  none: false
179
182
  requirements:
@@ -183,11 +186,11 @@ dependencies:
183
186
  segments:
184
187
  - 0
185
188
  version: "0"
186
- version_requirements: *id011
187
189
  name: rdoc
190
+ version_requirements: *id011
191
+ - !ruby/object:Gem::Dependency
188
192
  prerelease: false
189
193
  type: :development
190
- - !ruby/object:Gem::Dependency
191
194
  requirement: &id012 !ruby/object:Gem::Requirement
192
195
  none: false
193
196
  requirements:
@@ -199,10 +202,8 @@ dependencies:
199
202
  - 0
200
203
  - 10
201
204
  version: 3.0.10
202
- version_requirements: *id012
203
205
  name: activerecord
204
- prerelease: false
205
- type: :development
206
+ version_requirements: *id012
206
207
  description:
207
208
  email: james@floppy.org.uk
208
209
  executables:
@@ -317,6 +318,7 @@ files:
317
318
  - spec/v3/item_definition_spec.rb
318
319
  - spec/v3/item_value_definition_spec.rb
319
320
  - spec/v3/return_value_definition_spec.rb
321
+ has_rdoc: true
320
322
  homepage: http://github.com/AMEE/amee-ruby
321
323
  licenses:
322
324
  - BSD 3-Clause
@@ -346,7 +348,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
346
348
  requirements: []
347
349
 
348
350
  rubyforge_project:
349
- rubygems_version: 1.8.10
351
+ rubygems_version: 1.6.2
350
352
  signing_key:
351
353
  specification_version: 3
352
354
  summary: Ruby interface to the AMEE carbon calculator