ginjo-rfm 3.0.11 → 3.0.12

Sign up to get free protection for your applications and to get access to all the features.
Files changed (8) hide show
  1. checksums.yaml +5 -13
  2. data/CHANGELOG.md +34 -23
  3. data/README.md +364 -364
  4. data/lib/rfm/VERSION +1 -1
  5. data/lib/rfm/metadata/field.rb +6 -1
  6. data/lib/rfm/utilities/config.rb +1 -0
  7. data/lib/rfm/utilities/sax/fmpxml_minimal.yml +27 -27
  8. metadata +32 -33
data/lib/rfm/VERSION CHANGED
@@ -1 +1 @@
1
- 3.0.11
1
+ 3.0.12
data/lib/rfm/metadata/field.rb CHANGED
@@ -88,7 +88,12 @@ module Rfm
88
88
 
89
89
  case result
90
90
  when "text" then value
91
- when "number" then BigDecimal.new(value.to_s)
91
+ when "number" then
92
+ # FileMaker uses local number format of the server. It stores input as text.
93
+ # So on european servers a number value of '1.200,50' is considered valid and interpreted as 1200.5
94
+ # To support this, :decimal_separator can be configured and any other characters than digits and the separator are ignored
95
+ sep = layout_object.state[:decimal_separator] || '.'
96
+ BigDecimal.new(value.to_s.gsub(/[^-^\d#{Regexp.quote(sep)}]/,'').tr(sep,'.'))
92
97
  when "date" then Date.strptime(value, resultset_meta.date_format)
93
98
  when "time" then DateTime.strptime("1/1/-4712 #{value}", "%m/%d/%Y #{resultset_meta.time_format}")
94
99
  when "timestamp" then DateTime.strptime(value, resultset_meta.timestamp_format)
data/lib/rfm/utilities/config.rb CHANGED
@@ -38,6 +38,7 @@ module Rfm
38
38
  field_mapping
39
39
  capture_strings_with
40
40
  logger
41
+ decimal_separator
41
42
  )
42
43
 
43
44
  CONFIG_DONT_STORE = %w(strings using parents symbols objects) #capture_strings_with)
data/lib/rfm/utilities/sax/fmpxml_minimal.yml CHANGED
@@ -1,33 +1,33 @@
1
1
  #!/usr/bin/env ruby
2
2
  # Database names from fmpxmlresult #
3
3
  #
4
- # <?xml version="1.0" encoding="UTF-8" standalone="no"?>
5
- # <!DOCTYPE FMPXMLRESULT PUBLIC "-//FMI//DTD FMPXMLRESULT//EN" "/fmi/xml/FMPXMLRESULT.dtd">
6
- # <FMPXMLRESULT xmlns="http://www.filemaker.com/fmpxmlresult">
7
- # <ERRORCODE>0</ERRORCODE>
8
- # <PRODUCT BUILD="03/02/2011" NAME="FileMaker Web Publishing Engine" VERSION="11.0.3.302"/>
9
- # <DATABASE DATEFORMAT="" LAYOUT="" NAME="DBNAMES" RECORDS="3" TIMEFORMAT=""/>
10
- # <METADATA>
11
- # <FIELD EMPTYOK="NO" MAXREPEAT="1" NAME="DATABASE_NAME" TYPE="TEXT"/>
12
- # </METADATA>
13
- # <RESULTSET FOUND="3">
14
- # <ROW MODID="0" RECORDID="0">
15
- # <COL>
16
- # <DATA>SDS</DATA>
17
- # </COL>
18
- # </ROW>
19
- # <ROW MODID="0" RECORDID="0">
20
- # <COL>
21
- # <DATA>SevenDev</DATA>
22
- # </COL>
23
- # </ROW>
24
- # <ROW MODID="0" RECORDID="0">
25
- # <COL>
26
- # <DATA>SevenGables</DATA>
27
- # </COL>
28
- # </ROW>
29
- # </RESULTSET>
30
- # </FMPXMLRESULT>
4
+ # <?xml version="1.0" encoding="UTF-8" standalone="no"?>
5
+ # <!DOCTYPE FMPXMLRESULT PUBLIC "-//FMI//DTD FMPXMLRESULT//EN" "/fmi/xml/FMPXMLRESULT.dtd">
6
+ # <FMPXMLRESULT xmlns="http://www.filemaker.com/fmpxmlresult">
7
+ # <ERRORCODE>0</ERRORCODE>
8
+ # <PRODUCT BUILD="03/02/2011" NAME="FileMaker Web Publishing Engine" VERSION="11.0.3.302"/>
9
+ # <DATABASE DATEFORMAT="" LAYOUT="" NAME="DBNAMES" RECORDS="3" TIMEFORMAT=""/>
10
+ # <METADATA>
11
+ # <FIELD EMPTYOK="NO" MAXREPEAT="1" NAME="DATABASE_NAME" TYPE="TEXT"/>
12
+ # </METADATA>
13
+ # <RESULTSET FOUND="3">
14
+ # <ROW MODID="0" RECORDID="0">
15
+ # <COL>
16
+ # <DATA>SDS</DATA>
17
+ # </COL>
18
+ # </ROW>
19
+ # <ROW MODID="0" RECORDID="0">
20
+ # <COL>
21
+ # <DATA>SevenDev</DATA>
22
+ # </COL>
23
+ # </ROW>
24
+ # <ROW MODID="0" RECORDID="0">
25
+ # <COL>
26
+ # <DATA>SevenGables</DATA>
27
+ # </COL>
28
+ # </ROW>
29
+ # </RESULTSET>
30
+ # </FMPXMLRESULT>
31
31
  #
32
32
  # The top level represents the initial object, a basic hash in this case.
33
33
  ---
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: ginjo-rfm
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.11
4
+ version: 3.0.12
5
5
  platform: ruby
6
6
  authors:
7
7
  - Bill Richardson
@@ -12,174 +12,174 @@ authors:
12
12
  autorequire:
13
13
  bindir: bin
14
14
  cert_chain: []
15
- date: 2015-09-17 00:00:00.000000000 Z
15
+ date: 2017-12-15 00:00:00.000000000 Z
16
16
  dependencies:
17
17
  - !ruby/object:Gem::Dependency
18
18
  name: activemodel
19
19
  requirement: !ruby/object:Gem::Requirement
20
20
  requirements:
21
- - - ! '>='
21
+ - - ">="
22
22
  - !ruby/object:Gem::Version
23
23
  version: '0'
24
24
  type: :development
25
25
  prerelease: false
26
26
  version_requirements: !ruby/object:Gem::Requirement
27
27
  requirements:
28
- - - ! '>='
28
+ - - ">="
29
29
  - !ruby/object:Gem::Version
30
30
  version: '0'
31
31
  - !ruby/object:Gem::Dependency
32
32
  name: rake
33
33
  requirement: !ruby/object:Gem::Requirement
34
34
  requirements:
35
- - - ! '>='
35
+ - - ">="
36
36
  - !ruby/object:Gem::Version
37
37
  version: '0'
38
38
  type: :development
39
39
  prerelease: false
40
40
  version_requirements: !ruby/object:Gem::Requirement
41
41
  requirements:
42
- - - ! '>='
42
+ - - ">="
43
43
  - !ruby/object:Gem::Version
44
44
  version: '0'
45
45
  - !ruby/object:Gem::Dependency
46
46
  name: rdoc
47
47
  requirement: !ruby/object:Gem::Requirement
48
48
  requirements:
49
- - - ! '>='
49
+ - - ">="
50
50
  - !ruby/object:Gem::Version
51
51
  version: '0'
52
52
  type: :development
53
53
  prerelease: false
54
54
  version_requirements: !ruby/object:Gem::Requirement
55
55
  requirements:
56
- - - ! '>='
56
+ - - ">="
57
57
  - !ruby/object:Gem::Version
58
58
  version: '0'
59
59
  - !ruby/object:Gem::Dependency
60
60
  name: rspec
61
61
  requirement: !ruby/object:Gem::Requirement
62
62
  requirements:
63
- - - ~>
63
+ - - ">="
64
64
  - !ruby/object:Gem::Version
65
65
  version: '2'
66
66
  type: :development
67
67
  prerelease: false
68
68
  version_requirements: !ruby/object:Gem::Requirement
69
69
  requirements:
70
- - - ~>
70
+ - - ">="
71
71
  - !ruby/object:Gem::Version
72
72
  version: '2'
73
73
  - !ruby/object:Gem::Dependency
74
74
  name: minitest
75
75
  requirement: !ruby/object:Gem::Requirement
76
76
  requirements:
77
- - - ! '>='
77
+ - - ">="
78
78
  - !ruby/object:Gem::Version
79
79
  version: '0'
80
80
  type: :development
81
81
  prerelease: false
82
82
  version_requirements: !ruby/object:Gem::Requirement
83
83
  requirements:
84
- - - ! '>='
84
+ - - ">="
85
85
  - !ruby/object:Gem::Version
86
86
  version: '0'
87
87
  - !ruby/object:Gem::Dependency
88
88
  name: diff-lcs
89
89
  requirement: !ruby/object:Gem::Requirement
90
90
  requirements:
91
- - - ! '>='
91
+ - - ">="
92
92
  - !ruby/object:Gem::Version
93
93
  version: '0'
94
94
  type: :development
95
95
  prerelease: false
96
96
  version_requirements: !ruby/object:Gem::Requirement
97
97
  requirements:
98
- - - ! '>='
98
+ - - ">="
99
99
  - !ruby/object:Gem::Version
100
100
  version: '0'
101
101
  - !ruby/object:Gem::Dependency
102
102
  name: yard
103
103
  requirement: !ruby/object:Gem::Requirement
104
104
  requirements:
105
- - - ! '>='
105
+ - - ">="
106
106
  - !ruby/object:Gem::Version
107
107
  version: '0'
108
108
  type: :development
109
109
  prerelease: false
110
110
  version_requirements: !ruby/object:Gem::Requirement
111
111
  requirements:
112
- - - ! '>='
112
+ - - ">="
113
113
  - !ruby/object:Gem::Version
114
114
  version: '0'
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: redcarpet
117
117
  requirement: !ruby/object:Gem::Requirement
118
118
  requirements:
119
- - - ! '>='
119
+ - - ">="
120
120
  - !ruby/object:Gem::Version
121
121
  version: '0'
122
122
  type: :development
123
123
  prerelease: false
124
124
  version_requirements: !ruby/object:Gem::Requirement
125
125
  requirements:
126
- - - ! '>='
126
+ - - ">="
127
127
  - !ruby/object:Gem::Version
128
128
  version: '0'
129
129
  - !ruby/object:Gem::Dependency
130
130
  name: ruby-prof
131
131
  requirement: !ruby/object:Gem::Requirement
132
132
  requirements:
133
- - - ! '>='
133
+ - - ">="
134
134
  - !ruby/object:Gem::Version
135
135
  version: '0'
136
136
  type: :development
137
137
  prerelease: false
138
138
  version_requirements: !ruby/object:Gem::Requirement
139
139
  requirements:
140
- - - ! '>='
140
+ - - ">="
141
141
  - !ruby/object:Gem::Version
142
142
  version: '0'
143
143
  - !ruby/object:Gem::Dependency
144
144
  name: libxml-ruby
145
145
  requirement: !ruby/object:Gem::Requirement
146
146
  requirements:
147
- - - ! '>='
147
+ - - ">="
148
148
  - !ruby/object:Gem::Version
149
149
  version: '0'
150
150
  type: :development
151
151
  prerelease: false
152
152
  version_requirements: !ruby/object:Gem::Requirement
153
153
  requirements:
154
- - - ! '>='
154
+ - - ">="
155
155
  - !ruby/object:Gem::Version
156
156
  version: '0'
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: ox
159
159
  requirement: !ruby/object:Gem::Requirement
160
160
  requirements:
161
- - - ! '>='
161
+ - - ">="
162
162
  - !ruby/object:Gem::Version
163
163
  version: '0'
164
164
  type: :development
165
165
  prerelease: false
166
166
  version_requirements: !ruby/object:Gem::Requirement
167
167
  requirements:
168
- - - ! '>='
168
+ - - ">="
169
169
  - !ruby/object:Gem::Version
170
170
  version: '0'
171
171
  - !ruby/object:Gem::Dependency
172
172
  name: nokogiri
173
173
  requirement: !ruby/object:Gem::Requirement
174
174
  requirements:
175
- - - ! '>='
175
+ - - ">="
176
176
  - !ruby/object:Gem::Version
177
177
  version: '0'
178
178
  type: :development
179
179
  prerelease: false
180
180
  version_requirements: !ruby/object:Gem::Requirement
181
181
  requirements:
182
- - - ! '>='
182
+ - - ">="
183
183
  - !ruby/object:Gem::Version
184
184
  version: '0'
185
185
  description: Rfm is a standalone database adapter for Filemaker server. Ginjo-rfm
@@ -194,7 +194,7 @@ extra_rdoc_files:
194
194
  - CHANGELOG.md
195
195
  - lib/rfm/VERSION
196
196
  files:
197
- - .yardopts
197
+ - ".yardopts"
198
198
  - CHANGELOG.md
199
199
  - LICENSE
200
200
  - README.md
@@ -232,26 +232,25 @@ licenses: []
232
232
  metadata: {}
233
233
  post_install_message:
234
234
  rdoc_options:
235
- - --line-numbers
236
- - --main
235
+ - "--line-numbers"
236
+ - "--main"
237
237
  - README.md
238
238
  require_paths:
239
239
  - lib
240
240
  required_ruby_version: !ruby/object:Gem::Requirement
241
241
  requirements:
242
- - - ! '>='
242
+ - - ">="
243
243
  - !ruby/object:Gem::Version
244
244
  version: '0'
245
245
  required_rubygems_version: !ruby/object:Gem::Requirement
246
246
  requirements:
247
- - - ! '>'
247
+ - - ">"
248
248
  - !ruby/object:Gem::Version
249
249
  version: 1.3.1
250
250
  requirements: []
251
251
  rubyforge_project:
252
- rubygems_version: 2.4.5
252
+ rubygems_version: 2.6.14
253
253
  signing_key:
254
254
  specification_version: 4
255
255
  summary: Ruby Filemaker adapter
256
256
  test_files: []
257
- has_rdoc: