ginjo-rfm 2.1.3 → 2.1.4

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/CHANGELOG.md +4 -0
  2. data/lib/rfm/VERSION +1 -1
  3. data/lib/rfm/layout.rb +4 -4
  4. metadata +177 -171
data/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # Changelog
2
2
 
3
+ ## Ginjo-Rfm 2.1.4
4
+
5
+ * Fixed bug where nil value list would raise exception.
6
+
3
7
  ## Ginjo-Rfm 2.1.3
4
8
 
5
9
  * Fixed bug when loading layout metadata where value lists or field controls with only 1 item would throw an error.
data/lib/rfm/VERSION CHANGED
@@ -1 +1 @@
1
- 2.1.3
1
+ 2.1.4
data/lib/rfm/layout.rb CHANGED
@@ -397,8 +397,8 @@ module Rfm
397
397
  raise Rfm::Error::FileMakerError.getError(error) if error != 0
398
398
 
399
399
  # process valuelists
400
- vlists = [doc['FMPXMLLAYOUT']['VALUELISTS']['VALUELIST']].flatten
401
- if !vlists.nil? #root.elements['VALUELISTS'].size > 0
400
+ vlists = [doc['FMPXMLLAYOUT']['VALUELISTS']['VALUELIST']].flatten.compact
401
+ if !vlists.blank? #root.elements['VALUELISTS'].size > 0
402
402
  vlists.each {|valuelist|
403
403
  name = valuelist['NAME']
404
404
  @value_lists[name] = [valuelist['VALUE']].flatten.collect{|value|
@@ -409,12 +409,12 @@ module Rfm
409
409
  end
410
410
 
411
411
  # process field controls
412
- [doc['FMPXMLLAYOUT']['LAYOUT']['FIELD']].flatten.each {|field|
412
+ [doc['FMPXMLLAYOUT']['LAYOUT']['FIELD']].flatten.compact.each {|field|
413
413
  name = field_mapping[field['NAME']] || field['NAME']
414
414
  style = field['STYLE']
415
415
  type = style['TYPE']
416
416
  value_list_name = style['VALUELIST']
417
- value_list = @value_lists[value_list_name] if value_list_name != ''
417
+ value_list = @value_lists[value_list_name] if !value_list_name.blank?
418
418
  field_control = Rfm::Metadata::FieldControl.new(name, type, value_list_name, value_list)
419
419
  existing = @field_controls[name]
420
420
  if existing
metadata CHANGED
@@ -1,15 +1,10 @@
1
- --- !ruby/object:Gem::Specification
1
+ --- !ruby/object:Gem::Specification
2
2
  name: ginjo-rfm
3
- version: !ruby/object:Gem::Version
4
- hash: 13
3
+ version: !ruby/object:Gem::Version
4
+ version: 2.1.4
5
5
  prerelease:
6
- segments:
7
- - 2
8
- - 1
9
- - 3
10
- version: 2.1.3
11
6
  platform: ruby
12
- authors:
7
+ authors:
13
8
  - Geoff Coffey
14
9
  - Mufaddal Khumri
15
10
  - Atsushi Matsuo
@@ -18,193 +13,212 @@ authors:
18
13
  autorequire:
19
14
  bindir: bin
20
15
  cert_chain: []
21
-
22
- date: 2013-04-01 00:00:00 Z
23
- dependencies:
24
- - !ruby/object:Gem::Dependency
16
+ date: 2013-04-04 00:00:00.000000000 Z
17
+ dependencies:
18
+ - !ruby/object:Gem::Dependency
25
19
  name: activesupport
26
- prerelease: false
27
- requirement: &id001 !ruby/object:Gem::Requirement
20
+ requirement: !ruby/object:Gem::Requirement
28
21
  none: false
29
- requirements:
30
- - - ">="
31
- - !ruby/object:Gem::Version
32
- hash: 9
33
- segments:
34
- - 2
35
- - 3
36
- - 5
22
+ requirements:
23
+ - - ! '>='
24
+ - !ruby/object:Gem::Version
37
25
  version: 2.3.5
38
26
  type: :runtime
39
- version_requirements: *id001
40
- - !ruby/object:Gem::Dependency
41
- name: activemodel
42
27
  prerelease: false
43
- requirement: &id002 !ruby/object:Gem::Requirement
28
+ version_requirements: !ruby/object:Gem::Requirement
29
+ none: false
30
+ requirements:
31
+ - - ! '>='
32
+ - !ruby/object:Gem::Version
33
+ version: 2.3.5
34
+ - !ruby/object:Gem::Dependency
35
+ name: activemodel
36
+ requirement: !ruby/object:Gem::Requirement
44
37
  none: false
45
- requirements:
46
- - - ">="
47
- - !ruby/object:Gem::Version
48
- hash: 3
49
- segments:
50
- - 0
51
- version: "0"
38
+ requirements:
39
+ - - ! '>='
40
+ - !ruby/object:Gem::Version
41
+ version: '0'
52
42
  type: :development
53
- version_requirements: *id002
54
- - !ruby/object:Gem::Dependency
55
- name: rake
56
43
  prerelease: false
57
- requirement: &id003 !ruby/object:Gem::Requirement
44
+ version_requirements: !ruby/object:Gem::Requirement
45
+ none: false
46
+ requirements:
47
+ - - ! '>='
48
+ - !ruby/object:Gem::Version
49
+ version: '0'
50
+ - !ruby/object:Gem::Dependency
51
+ name: rake
52
+ requirement: !ruby/object:Gem::Requirement
58
53
  none: false
59
- requirements:
60
- - - ">="
61
- - !ruby/object:Gem::Version
62
- hash: 3
63
- segments:
64
- - 0
65
- version: "0"
54
+ requirements:
55
+ - - ! '>='
56
+ - !ruby/object:Gem::Version
57
+ version: '0'
66
58
  type: :development
67
- version_requirements: *id003
68
- - !ruby/object:Gem::Dependency
69
- name: rdoc
70
59
  prerelease: false
71
- requirement: &id004 !ruby/object:Gem::Requirement
60
+ version_requirements: !ruby/object:Gem::Requirement
61
+ none: false
62
+ requirements:
63
+ - - ! '>='
64
+ - !ruby/object:Gem::Version
65
+ version: '0'
66
+ - !ruby/object:Gem::Dependency
67
+ name: rdoc
68
+ requirement: !ruby/object:Gem::Requirement
72
69
  none: false
73
- requirements:
74
- - - ">="
75
- - !ruby/object:Gem::Version
76
- hash: 3
77
- segments:
78
- - 0
79
- version: "0"
70
+ requirements:
71
+ - - ! '>='
72
+ - !ruby/object:Gem::Version
73
+ version: '0'
80
74
  type: :development
81
- version_requirements: *id004
82
- - !ruby/object:Gem::Dependency
83
- name: rspec
84
75
  prerelease: false
85
- requirement: &id005 !ruby/object:Gem::Requirement
76
+ version_requirements: !ruby/object:Gem::Requirement
86
77
  none: false
87
- requirements:
78
+ requirements:
79
+ - - ! '>='
80
+ - !ruby/object:Gem::Version
81
+ version: '0'
82
+ - !ruby/object:Gem::Dependency
83
+ name: rspec
84
+ requirement: !ruby/object:Gem::Requirement
85
+ none: false
86
+ requirements:
88
87
  - - ~>
89
- - !ruby/object:Gem::Version
90
- hash: 27
91
- segments:
92
- - 1
93
- - 3
94
- - 0
88
+ - !ruby/object:Gem::Version
95
89
  version: 1.3.0
96
90
  type: :development
97
- version_requirements: *id005
98
- - !ruby/object:Gem::Dependency
99
- name: diff-lcs
100
91
  prerelease: false
101
- requirement: &id006 !ruby/object:Gem::Requirement
92
+ version_requirements: !ruby/object:Gem::Requirement
102
93
  none: false
103
- requirements:
104
- - - ">="
105
- - !ruby/object:Gem::Version
106
- hash: 3
107
- segments:
108
- - 0
109
- version: "0"
94
+ requirements:
95
+ - - ~>
96
+ - !ruby/object:Gem::Version
97
+ version: 1.3.0
98
+ - !ruby/object:Gem::Dependency
99
+ name: diff-lcs
100
+ requirement: !ruby/object:Gem::Requirement
101
+ none: false
102
+ requirements:
103
+ - - ! '>='
104
+ - !ruby/object:Gem::Version
105
+ version: '0'
110
106
  type: :development
111
- version_requirements: *id006
112
- - !ruby/object:Gem::Dependency
113
- name: yard
114
107
  prerelease: false
115
- requirement: &id007 !ruby/object:Gem::Requirement
108
+ version_requirements: !ruby/object:Gem::Requirement
116
109
  none: false
117
- requirements:
118
- - - ">="
119
- - !ruby/object:Gem::Version
120
- hash: 3
121
- segments:
122
- - 0
123
- version: "0"
110
+ requirements:
111
+ - - ! '>='
112
+ - !ruby/object:Gem::Version
113
+ version: '0'
114
+ - !ruby/object:Gem::Dependency
115
+ name: yard
116
+ requirement: !ruby/object:Gem::Requirement
117
+ none: false
118
+ requirements:
119
+ - - ! '>='
120
+ - !ruby/object:Gem::Version
121
+ version: '0'
124
122
  type: :development
125
- version_requirements: *id007
126
- - !ruby/object:Gem::Dependency
127
- name: redcarpet
128
123
  prerelease: false
129
- requirement: &id008 !ruby/object:Gem::Requirement
124
+ version_requirements: !ruby/object:Gem::Requirement
125
+ none: false
126
+ requirements:
127
+ - - ! '>='
128
+ - !ruby/object:Gem::Version
129
+ version: '0'
130
+ - !ruby/object:Gem::Dependency
131
+ name: redcarpet
132
+ requirement: !ruby/object:Gem::Requirement
130
133
  none: false
131
- requirements:
132
- - - ">="
133
- - !ruby/object:Gem::Version
134
- hash: 3
135
- segments:
136
- - 0
137
- version: "0"
134
+ requirements:
135
+ - - ! '>='
136
+ - !ruby/object:Gem::Version
137
+ version: '0'
138
138
  type: :development
139
- version_requirements: *id008
140
- - !ruby/object:Gem::Dependency
141
- name: libxml-ruby
142
139
  prerelease: false
143
- requirement: &id009 !ruby/object:Gem::Requirement
140
+ version_requirements: !ruby/object:Gem::Requirement
141
+ none: false
142
+ requirements:
143
+ - - ! '>='
144
+ - !ruby/object:Gem::Version
145
+ version: '0'
146
+ - !ruby/object:Gem::Dependency
147
+ name: libxml-ruby
148
+ requirement: !ruby/object:Gem::Requirement
144
149
  none: false
145
- requirements:
146
- - - ">="
147
- - !ruby/object:Gem::Version
148
- hash: 3
149
- segments:
150
- - 0
151
- version: "0"
150
+ requirements:
151
+ - - ! '>='
152
+ - !ruby/object:Gem::Version
153
+ version: '0'
152
154
  type: :development
153
- version_requirements: *id009
154
- - !ruby/object:Gem::Dependency
155
- name: nokogiri
156
155
  prerelease: false
157
- requirement: &id010 !ruby/object:Gem::Requirement
156
+ version_requirements: !ruby/object:Gem::Requirement
158
157
  none: false
159
- requirements:
160
- - - ">="
161
- - !ruby/object:Gem::Version
162
- hash: 3
163
- segments:
164
- - 0
165
- version: "0"
158
+ requirements:
159
+ - - ! '>='
160
+ - !ruby/object:Gem::Version
161
+ version: '0'
162
+ - !ruby/object:Gem::Dependency
163
+ name: nokogiri
164
+ requirement: !ruby/object:Gem::Requirement
165
+ none: false
166
+ requirements:
167
+ - - ! '>='
168
+ - !ruby/object:Gem::Version
169
+ version: '0'
166
170
  type: :development
167
- version_requirements: *id010
168
- - !ruby/object:Gem::Dependency
169
- name: hpricot
170
171
  prerelease: false
171
- requirement: &id011 !ruby/object:Gem::Requirement
172
+ version_requirements: !ruby/object:Gem::Requirement
172
173
  none: false
173
- requirements:
174
- - - ">="
175
- - !ruby/object:Gem::Version
176
- hash: 3
177
- segments:
178
- - 0
179
- version: "0"
174
+ requirements:
175
+ - - ! '>='
176
+ - !ruby/object:Gem::Version
177
+ version: '0'
178
+ - !ruby/object:Gem::Dependency
179
+ name: hpricot
180
+ requirement: !ruby/object:Gem::Requirement
181
+ none: false
182
+ requirements:
183
+ - - ! '>='
184
+ - !ruby/object:Gem::Version
185
+ version: '0'
180
186
  type: :development
181
- version_requirements: *id011
182
- - !ruby/object:Gem::Dependency
183
- name: ox
184
187
  prerelease: false
185
- requirement: &id012 !ruby/object:Gem::Requirement
188
+ version_requirements: !ruby/object:Gem::Requirement
186
189
  none: false
187
- requirements:
188
- - - ">="
189
- - !ruby/object:Gem::Version
190
- hash: 3
191
- segments:
192
- - 0
193
- version: "0"
190
+ requirements:
191
+ - - ! '>='
192
+ - !ruby/object:Gem::Version
193
+ version: '0'
194
+ - !ruby/object:Gem::Dependency
195
+ name: ox
196
+ requirement: !ruby/object:Gem::Requirement
197
+ none: false
198
+ requirements:
199
+ - - ! '>='
200
+ - !ruby/object:Gem::Version
201
+ version: '0'
194
202
  type: :development
195
- version_requirements: *id012
196
- description: Rfm lets your Ruby scripts and Rails applications talk directly to your Filemaker server. Ginjo-rfm includes ActiveModel compatibility, multiple XML parsers, compound Filemaker find requests, and a configuration API.
203
+ prerelease: false
204
+ version_requirements: !ruby/object:Gem::Requirement
205
+ none: false
206
+ requirements:
207
+ - - ! '>='
208
+ - !ruby/object:Gem::Version
209
+ version: '0'
210
+ description: Rfm lets your Ruby scripts and Rails applications talk directly to your
211
+ Filemaker server. Ginjo-rfm includes ActiveModel compatibility, multiple XML parsers,
212
+ compound Filemaker find requests, and a configuration API.
197
213
  email: http://groups.google.com/group/rfmcommunity
198
214
  executables: []
199
-
200
215
  extensions: []
201
-
202
- extra_rdoc_files:
216
+ extra_rdoc_files:
203
217
  - LICENSE
204
218
  - README.md
205
219
  - CHANGELOG.md
206
220
  - lib/rfm/VERSION
207
- files:
221
+ files:
208
222
  - lib/rfm/base.rb
209
223
  - lib/rfm/database.rb
210
224
  - lib/rfm/error.rb
@@ -236,41 +250,33 @@ files:
236
250
  - CHANGELOG.md
237
251
  homepage: https://rubygems.org/gems/ginjo-rfm
238
252
  licenses: []
239
-
240
253
  post_install_message:
241
- rdoc_options:
254
+ rdoc_options:
242
255
  - --line-numbers
243
256
  - --main
244
257
  - README.md
245
- require_paths:
258
+ require_paths:
246
259
  - lib
247
- required_ruby_version: !ruby/object:Gem::Requirement
260
+ required_ruby_version: !ruby/object:Gem::Requirement
248
261
  none: false
249
- requirements:
250
- - - ">="
251
- - !ruby/object:Gem::Version
252
- hash: 3
253
- segments:
262
+ requirements:
263
+ - - ! '>='
264
+ - !ruby/object:Gem::Version
265
+ version: '0'
266
+ segments:
254
267
  - 0
255
- version: "0"
256
- required_rubygems_version: !ruby/object:Gem::Requirement
268
+ hash: -2515295562877348572
269
+ required_rubygems_version: !ruby/object:Gem::Requirement
257
270
  none: false
258
- requirements:
259
- - - ">"
260
- - !ruby/object:Gem::Version
261
- hash: 25
262
- segments:
263
- - 1
264
- - 3
265
- - 1
271
+ requirements:
272
+ - - ! '>'
273
+ - !ruby/object:Gem::Version
266
274
  version: 1.3.1
267
275
  requirements: []
268
-
269
276
  rubyforge_project:
270
277
  rubygems_version: 1.8.25
271
278
  signing_key:
272
279
  specification_version: 3
273
280
  summary: Ruby to Filemaker adapter
274
281
  test_files: []
275
-
276
282
  has_rdoc: