amee 4.1.6 → 4.1.7

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. data/CHANGELOG.txt +3 -0
  2. data/VERSION +1 -1
  3. data/amee.gemspec +1 -1
  4. data/lib/amee/config.rb +3 -1
  5. data/lib/amee/core-extensions/hash.rb +0 -11
  6. data/lib/amee/drill_down.rb +1 -1
  7. data/spec/v3/item_value_definition_spec.rb +4 -4
  8. metadata +38 -94
data/CHANGELOG.txt CHANGED
@@ -1,5 +1,8 @@
1
1
  = Changelog
2
2
 
3
+ == 4.1.7
4
+ * Compatibility with Ruby 1.9.2
5
+
3
6
  == 4.1.6
4
7
  * Compatibility with Rails 3.1 (dependency specs only)
5
8
 
data/VERSION CHANGED
@@ -1 +1 @@
1
- 4.1.6
1
+ 4.1.7
data/amee.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{amee}
8
- s.version = "4.1.6"
8
+ s.version = "4.1.7"
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"]
data/lib/amee/config.rb CHANGED
@@ -1,6 +1,8 @@
1
1
  # Copyright (C) 2008-2011 AMEE UK Ltd. - http://www.amee.com
2
2
  # Released as Open Source Software under the BSD 3-Clause license. See LICENSE.txt for details.
3
3
 
4
+ require 'yaml'
5
+
4
6
  module AMEE
5
7
 
6
8
  class Config
@@ -17,7 +19,7 @@ module AMEE
17
19
  config = yaml_config[environment]
18
20
 
19
21
  # make config[:username] possible instead of just config['username']
20
- config.recursive_symbolize_keys!
22
+ config = config.recursive_symbolize_keys
21
23
  else
22
24
  config = {}
23
25
  end
data/lib/amee/core-extensions/hash.rb CHANGED
@@ -16,17 +16,6 @@ class Hash
16
16
  new_hash
17
17
  end
18
18
 
19
- # Modify <tt>self</tt> in place, transforming all keys - including those of
20
- # sub-hashes - in to symbols
21
- #
22
- def recursive_symbolize_keys!
23
- self.each_pair do |k,v|
24
- value = delete(k)
25
- self[k.to_sym] = value_or_symbolize_value(value)
26
- end
27
- self
28
- end
29
-
30
19
  private
31
20
 
32
21
  # Symbolize any hash key or sub-hash key containing within <tt>value</tt>.
data/lib/amee/drill_down.rb CHANGED
@@ -71,7 +71,7 @@ module AMEE
71
71
  data[:choices] = [x('Choices/Choices/Choice/Value') || x('Choices/Choice/value')].flatten
72
72
  names = x('Selections/Choice/Name') || x('Selections/Choice/name')
73
73
  values = x('Selections/Choice/Value') || x('Selections/Choice/value')
74
- data[:selections] = names && values ? Hash[*(names.zip(values)).flatten] : {}
74
+ data[:selections] = names && values ? Hash[*([names].flatten.zip([values].flatten)).flatten] : {}
75
75
  # Create object
76
76
  DrillDown.new(data)
77
77
  rescue Exception
data/spec/v3/item_value_definition_spec.rb CHANGED
@@ -25,14 +25,14 @@ HERE
25
25
  <ItemValueDefinition>
26
26
  <WikiDoc>Mass of carbon per distance</WikiDoc>
27
27
  <Usages>
28
- <Usage>
29
- <Name>usageTwo</Name>
30
- <Type>IGNORED</Type>
31
- </Usage>
32
28
  <Usage>
33
29
  <Name>usageOne</Name>
34
30
  <Type>FORBIDDEN</Type>
35
31
  </Usage>
32
+ <Usage>
33
+ <Name>usageTwo</Name>
34
+ <Type>IGNORED</Type>
35
+ </Usage>
36
36
  </Usages>
37
37
  </ItemValueDefinition>
38
38
  EOF
metadata CHANGED
@@ -1,13 +1,8 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: amee
3
3
  version: !ruby/object:Gem::Version
4
- hash: 55
5
4
  prerelease:
6
- segments:
7
- - 4
8
- - 1
9
- - 6
10
- version: 4.1.6
5
+ version: 4.1.7
11
6
  platform: ruby
12
7
  authors:
13
8
  - James Smith
@@ -22,184 +17,136 @@ date: 2011-10-28 00:00:00 +01:00
22
17
  default_executable: ameesh
23
18
  dependencies:
24
19
  - !ruby/object:Gem::Dependency
25
- prerelease: false
26
- type: :runtime
20
+ name: activesupport
27
21
  requirement: &id001 !ruby/object:Gem::Requirement
28
22
  none: false
29
23
  requirements:
30
24
  - - ~>
31
25
  - !ruby/object:Gem::Version
32
- hash: 7
33
- segments:
34
- - 3
35
- - 0
36
26
  version: "3.0"
37
- name: activesupport
27
+ type: :runtime
28
+ prerelease: false
38
29
  version_requirements: *id001
39
30
  - !ruby/object:Gem::Dependency
40
- prerelease: false
41
- type: :runtime
31
+ name: json
42
32
  requirement: &id002 !ruby/object:Gem::Requirement
43
33
  none: false
44
34
  requirements:
45
35
  - - ">="
46
36
  - !ruby/object:Gem::Version
47
- hash: 3
48
- segments:
49
- - 0
50
37
  version: "0"
51
- name: json
38
+ type: :runtime
39
+ prerelease: false
52
40
  version_requirements: *id002
53
41
  - !ruby/object:Gem::Dependency
54
- prerelease: false
55
- type: :runtime
42
+ name: log4r
56
43
  requirement: &id003 !ruby/object:Gem::Requirement
57
44
  none: false
58
45
  requirements:
59
46
  - - ">="
60
47
  - !ruby/object:Gem::Version
61
- hash: 3
62
- segments:
63
- - 0
64
48
  version: "0"
65
- name: log4r
49
+ type: :runtime
50
+ prerelease: false
66
51
  version_requirements: *id003
67
52
  - !ruby/object:Gem::Dependency
68
- prerelease: false
69
- type: :runtime
53
+ name: nokogiri
70
54
  requirement: &id004 !ruby/object:Gem::Requirement
71
55
  none: false
72
56
  requirements:
73
57
  - - ~>
74
58
  - !ruby/object:Gem::Version
75
- hash: 15
76
- segments:
77
- - 1
78
- - 4
79
- - 4
80
59
  version: 1.4.4
81
- name: nokogiri
60
+ type: :runtime
61
+ prerelease: false
82
62
  version_requirements: *id004
83
63
  - !ruby/object:Gem::Dependency
84
- prerelease: false
85
- type: :development
64
+ name: bundler
86
65
  requirement: &id005 !ruby/object:Gem::Requirement
87
66
  none: false
88
67
  requirements:
89
68
  - - ~>
90
69
  - !ruby/object:Gem::Version
91
- hash: 23
92
- segments:
93
- - 1
94
- - 0
95
- - 0
96
70
  version: 1.0.0
97
- name: bundler
71
+ type: :development
72
+ prerelease: false
98
73
  version_requirements: *id005
99
74
  - !ruby/object:Gem::Dependency
100
- prerelease: false
101
- type: :development
75
+ name: jeweler
102
76
  requirement: &id006 !ruby/object:Gem::Requirement
103
77
  none: false
104
78
  requirements:
105
79
  - - ~>
106
80
  - !ruby/object:Gem::Version
107
- hash: 7
108
- segments:
109
- - 1
110
- - 6
111
- - 4
112
81
  version: 1.6.4
113
- name: jeweler
82
+ type: :development
83
+ prerelease: false
114
84
  version_requirements: *id006
115
85
  - !ruby/object:Gem::Dependency
116
- prerelease: false
117
- type: :development
86
+ name: rspec
118
87
  requirement: &id007 !ruby/object:Gem::Requirement
119
88
  none: false
120
89
  requirements:
121
90
  - - "="
122
91
  - !ruby/object:Gem::Version
123
- hash: 23
124
- segments:
125
- - 2
126
- - 6
127
- - 0
128
92
  version: 2.6.0
129
- name: rspec
93
+ type: :development
94
+ prerelease: false
130
95
  version_requirements: *id007
131
96
  - !ruby/object:Gem::Dependency
132
- prerelease: false
133
- type: :development
97
+ name: flexmock
134
98
  requirement: &id008 !ruby/object:Gem::Requirement
135
99
  none: false
136
100
  requirements:
137
101
  - - ">"
138
102
  - !ruby/object:Gem::Version
139
- hash: 51
140
- segments:
141
- - 0
142
- - 8
143
- - 6
144
103
  version: 0.8.6
145
- name: flexmock
104
+ type: :development
105
+ prerelease: false
146
106
  version_requirements: *id008
147
107
  - !ruby/object:Gem::Dependency
148
- prerelease: false
149
- type: :development
108
+ name: memcache-client
150
109
  requirement: &id009 !ruby/object:Gem::Requirement
151
110
  none: false
152
111
  requirements:
153
112
  - - ">="
154
113
  - !ruby/object:Gem::Version
155
- hash: 3
156
- segments:
157
- - 0
158
114
  version: "0"
159
- name: memcache-client
115
+ type: :development
116
+ prerelease: false
160
117
  version_requirements: *id009
161
118
  - !ruby/object:Gem::Dependency
162
- prerelease: false
163
- type: :development
119
+ name: rcov
164
120
  requirement: &id010 !ruby/object:Gem::Requirement
165
121
  none: false
166
122
  requirements:
167
123
  - - ">="
168
124
  - !ruby/object:Gem::Version
169
- hash: 3
170
- segments:
171
- - 0
172
125
  version: "0"
173
- name: rcov
126
+ type: :development
127
+ prerelease: false
174
128
  version_requirements: *id010
175
129
  - !ruby/object:Gem::Dependency
176
- prerelease: false
177
- type: :development
130
+ name: rdoc
178
131
  requirement: &id011 !ruby/object:Gem::Requirement
179
132
  none: false
180
133
  requirements:
181
134
  - - ">="
182
135
  - !ruby/object:Gem::Version
183
- hash: 3
184
- segments:
185
- - 0
186
136
  version: "0"
187
- name: rdoc
137
+ type: :development
138
+ prerelease: false
188
139
  version_requirements: *id011
189
140
  - !ruby/object:Gem::Dependency
190
- prerelease: false
191
- type: :development
141
+ name: activerecord
192
142
  requirement: &id012 !ruby/object:Gem::Requirement
193
143
  none: false
194
144
  requirements:
195
145
  - - ~>
196
146
  - !ruby/object:Gem::Version
197
- hash: 7
198
- segments:
199
- - 3
200
- - 0
201
147
  version: "3.0"
202
- name: activerecord
148
+ type: :development
149
+ prerelease: false
203
150
  version_requirements: *id012
204
151
  description:
205
152
  email: james@floppy.org.uk
@@ -329,7 +276,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
329
276
  requirements:
330
277
  - - ">="
331
278
  - !ruby/object:Gem::Version
332
- hash: 3
279
+ hash: -2334678358035228211
333
280
  segments:
334
281
  - 0
335
282
  version: "0"
@@ -338,9 +285,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
338
285
  requirements:
339
286
  - - ">="
340
287
  - !ruby/object:Gem::Version
341
- hash: 3
342
- segments:
343
- - 0
344
288
  version: "0"
345
289
  requirements: []
346
290