oddb2xml 1.9.4 → 1.9.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. checksums.yaml +5 -13
  2. data/Gemfile.lock +10 -11
  3. data/History.txt +7 -0
  4. data/README.md +14 -9
  5. data/data/gal_forms.yaml +4704 -0
  6. data/data/gal_groups.yaml +217 -0
  7. data/lib/oddb2xml/builder.rb +73 -1
  8. data/lib/oddb2xml/calc.rb +327 -0
  9. data/lib/oddb2xml/cli.rb +23 -7
  10. data/lib/oddb2xml/downloader.rb +10 -4
  11. data/lib/oddb2xml/extractor.rb +5 -11
  12. data/lib/oddb2xml/options.rb +3 -0
  13. data/lib/oddb2xml/util.rb +12 -1
  14. data/lib/oddb2xml/version.rb +1 -1
  15. data/oddb2xml.xsd +7 -1
  16. data/spec/builder_spec.rb +2 -0
  17. data/spec/calc_spec.rb +324 -0
  18. data/spec/data/swissmedic_package-galenic.xlsx +0 -0
  19. data/spec/options_spec.rb +11 -0
  20. data/spec/spec_helper.rb +3 -3
  21. metadata +41 -34
data/spec/options_spec.rb CHANGED
@@ -26,6 +26,7 @@ describe Oddb2xml::Options do
26
26
  :extended => false,
27
27
  :compress_ext => nil,
28
28
  :format => :xml,
29
+ :calc => false,
29
30
  :tag_suffix => nil,
30
31
  :debug => false,
31
32
  :ean14 => false,
@@ -194,5 +195,15 @@ describe Oddb2xml::Options do
194
195
  specify { expect(options.opts).to eq expected }
195
196
  specify { expect(args).to eq ["nonpharma", "zurrose"] } # will lead to an exit 2 in bin/oddb2xml
196
197
  end
198
+
199
+ context 'when --calc is given' do
200
+ options = Oddb2xml::Options.new
201
+ args = '--calc'.split(' ')
202
+ options.parser.parse!(args) # .should raise
203
+ expected = Default_opts.clone
204
+ expected[:calc] = true
205
+ specify { expect(options.opts).to eq expected }
206
+ specify { expect(args).to eq [] }
207
+ end
197
208
  end
198
209
 
data/spec/spec_helper.rb CHANGED
@@ -106,7 +106,7 @@ module ServerMockHelper
106
106
  :packages => {:html => '/arzneimittel/00156/00221/00222/00230/index.html?lang=de', :xls => '/download'},
107
107
  }.each_pair do |type, urls|
108
108
  # html (dummy)
109
- stub_html_url = "http://#{host}" + urls[:html]
109
+ stub_html_url = "https://#{host}" + urls[:html]
110
110
  filename = File.join(Oddb2xml::SpecData, "swissmedic_#{type.to_s}.html")
111
111
 
112
112
  stub_response = File.read(filename)
@@ -122,10 +122,10 @@ module ServerMockHelper
122
122
  :body => stub_response)
123
123
  # xls
124
124
  if type == :orphans
125
- stub_xls_url = "http://#{host}" + urls[:xls] + "/swissmedic_orphan.xlsx"
125
+ stub_xls_url = "https://#{host}" + urls[:xls] + "/swissmedic_orphan.xlsx"
126
126
  stub_response = File.read(File.join(Oddb2xml::SpecData, "swissmedic_orphan.xlsx"))
127
127
  else
128
- stub_xls_url = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xlsx"
128
+ stub_xls_url = "https://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xlsx"
129
129
  stub_response = 'no_such_file'
130
130
  end
131
131
  stub_request(:get, stub_xls_url).
metadata CHANGED
@@ -1,195 +1,195 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oddb2xml
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.9.4
4
+ version: 1.9.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Yasuhiro Asaka, Zeno R.R. Davatz
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-01-22 00:00:00.000000000 Z
11
+ date: 2015-02-17 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rubyzip
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - ~>
17
+ - - "~>"
18
18
  - !ruby/object:Gem::Version
19
19
  version: 1.1.3
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - ~>
24
+ - - "~>"
25
25
  - !ruby/object:Gem::Version
26
26
  version: 1.1.3
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: archive-tar-minitar
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - ~>
31
+ - - "~>"
32
32
  - !ruby/object:Gem::Version
33
33
  version: 0.5.2
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - ~>
38
+ - - "~>"
39
39
  - !ruby/object:Gem::Version
40
40
  version: 0.5.2
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: mechanize
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ~>
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
47
  version: 2.5.1
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ~>
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
54
  version: 2.5.1
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: nokogiri
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
- - - ~>
59
+ - - "~>"
60
60
  - !ruby/object:Gem::Version
61
61
  version: 1.5.10
62
62
  type: :runtime
63
63
  prerelease: false
64
64
  version_requirements: !ruby/object:Gem::Requirement
65
65
  requirements:
66
- - - ~>
66
+ - - "~>"
67
67
  - !ruby/object:Gem::Version
68
68
  version: 1.5.10
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: savon
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
- - - ~>
73
+ - - "~>"
74
74
  - !ruby/object:Gem::Version
75
75
  version: 2.4.0
76
76
  type: :runtime
77
77
  prerelease: false
78
78
  version_requirements: !ruby/object:Gem::Requirement
79
79
  requirements:
80
- - - ~>
80
+ - - "~>"
81
81
  - !ruby/object:Gem::Version
82
82
  version: 2.4.0
83
83
  - !ruby/object:Gem::Dependency
84
84
  name: spreadsheet
85
85
  requirement: !ruby/object:Gem::Requirement
86
86
  requirements:
87
- - - ~>
87
+ - - "~>"
88
88
  - !ruby/object:Gem::Version
89
89
  version: 1.0.0
90
90
  type: :runtime
91
91
  prerelease: false
92
92
  version_requirements: !ruby/object:Gem::Requirement
93
93
  requirements:
94
- - - ~>
94
+ - - "~>"
95
95
  - !ruby/object:Gem::Version
96
96
  version: 1.0.0
97
97
  - !ruby/object:Gem::Dependency
98
98
  name: rubyXL
99
99
  requirement: !ruby/object:Gem::Requirement
100
100
  requirements:
101
- - - ~>
101
+ - - "~>"
102
102
  - !ruby/object:Gem::Version
103
103
  version: 3.3.1
104
104
  type: :runtime
105
105
  prerelease: false
106
106
  version_requirements: !ruby/object:Gem::Requirement
107
107
  requirements:
108
- - - ~>
108
+ - - "~>"
109
109
  - !ruby/object:Gem::Version
110
110
  version: 3.3.1
111
111
  - !ruby/object:Gem::Dependency
112
112
  name: sax-machine
113
113
  requirement: !ruby/object:Gem::Requirement
114
114
  requirements:
115
- - - ~>
115
+ - - "~>"
116
116
  - !ruby/object:Gem::Version
117
117
  version: 0.1.0
118
118
  type: :runtime
119
119
  prerelease: false
120
120
  version_requirements: !ruby/object:Gem::Requirement
121
121
  requirements:
122
- - - ~>
122
+ - - "~>"
123
123
  - !ruby/object:Gem::Version
124
124
  version: 0.1.0
125
125
  - !ruby/object:Gem::Dependency
126
126
  name: bundler
127
127
  requirement: !ruby/object:Gem::Requirement
128
128
  requirements:
129
- - - ! '>='
129
+ - - ">="
130
130
  - !ruby/object:Gem::Version
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
134
  version_requirements: !ruby/object:Gem::Requirement
135
135
  requirements:
136
- - - ! '>='
136
+ - - ">="
137
137
  - !ruby/object:Gem::Version
138
138
  version: '0'
139
139
  - !ruby/object:Gem::Dependency
140
140
  name: rake
141
141
  requirement: !ruby/object:Gem::Requirement
142
142
  requirements:
143
- - - ! '>='
143
+ - - ">="
144
144
  - !ruby/object:Gem::Version
145
145
  version: '0'
146
146
  type: :development
147
147
  prerelease: false
148
148
  version_requirements: !ruby/object:Gem::Requirement
149
149
  requirements:
150
- - - ! '>='
150
+ - - ">="
151
151
  - !ruby/object:Gem::Version
152
152
  version: '0'
153
153
  - !ruby/object:Gem::Dependency
154
154
  name: rspec
155
155
  requirement: !ruby/object:Gem::Requirement
156
156
  requirements:
157
- - - ! '>='
157
+ - - ">="
158
158
  - !ruby/object:Gem::Version
159
159
  version: '0'
160
160
  type: :development
161
161
  prerelease: false
162
162
  version_requirements: !ruby/object:Gem::Requirement
163
163
  requirements:
164
- - - ! '>='
164
+ - - ">="
165
165
  - !ruby/object:Gem::Version
166
166
  version: '0'
167
167
  - !ruby/object:Gem::Dependency
168
168
  name: webmock
169
169
  requirement: !ruby/object:Gem::Requirement
170
170
  requirements:
171
- - - ! '>='
171
+ - - ">="
172
172
  - !ruby/object:Gem::Version
173
173
  version: '0'
174
174
  type: :development
175
175
  prerelease: false
176
176
  version_requirements: !ruby/object:Gem::Requirement
177
177
  requirements:
178
- - - ! '>='
178
+ - - ">="
179
179
  - !ruby/object:Gem::Version
180
180
  version: '0'
181
181
  - !ruby/object:Gem::Dependency
182
182
  name: rdoc
183
183
  requirement: !ruby/object:Gem::Requirement
184
184
  requirements:
185
- - - ! '>='
185
+ - - ">="
186
186
  - !ruby/object:Gem::Version
187
187
  version: '0'
188
188
  type: :development
189
189
  prerelease: false
190
190
  version_requirements: !ruby/object:Gem::Requirement
191
191
  requirements:
192
- - - ! '>='
192
+ - - ">="
193
193
  - !ruby/object:Gem::Version
194
194
  version: '0'
195
195
  description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
@@ -199,9 +199,9 @@ executables:
199
199
  extensions: []
200
200
  extra_rdoc_files: []
201
201
  files:
202
- - .gitignore
203
- - .rspec
204
- - .travis.yml
202
+ - ".gitignore"
203
+ - ".rspec"
204
+ - ".travis.yml"
205
205
  - Gemfile
206
206
  - Gemfile.lock
207
207
  - History.txt
@@ -211,8 +211,11 @@ files:
211
211
  - README.md
212
212
  - Rakefile
213
213
  - bin/oddb2xml
214
+ - data/gal_forms.yaml
215
+ - data/gal_groups.yaml
214
216
  - lib/oddb2xml.rb
215
217
  - lib/oddb2xml/builder.rb
218
+ - lib/oddb2xml/calc.rb
216
219
  - lib/oddb2xml/cli.rb
217
220
  - lib/oddb2xml/compressor.rb
218
221
  - lib/oddb2xml/downloader.rb
@@ -224,6 +227,7 @@ files:
224
227
  - oddb2xml.gemspec
225
228
  - oddb2xml.xsd
226
229
  - spec/builder_spec.rb
230
+ - spec/calc_spec.rb
227
231
  - spec/cli_spec.rb
228
232
  - spec/compressor_spec.rb
229
233
  - spec/data/GL_Diff_SB.xml
@@ -262,6 +266,7 @@ files:
262
266
  - spec/data/swissmedic_info_2.html
263
267
  - spec/data/swissmedic_orphan.xlsx
264
268
  - spec/data/swissmedic_orphans.html
269
+ - spec/data/swissmedic_package-galenic.xlsx
265
270
  - spec/data/swissmedic_package.xlsx
266
271
  - spec/data/swissmedic_packages.html
267
272
  - spec/data/wsdl_nonpharma.xml
@@ -285,22 +290,23 @@ require_paths:
285
290
  - lib
286
291
  required_ruby_version: !ruby/object:Gem::Requirement
287
292
  requirements:
288
- - - ! '>='
293
+ - - ">="
289
294
  - !ruby/object:Gem::Version
290
295
  version: '0'
291
296
  required_rubygems_version: !ruby/object:Gem::Requirement
292
297
  requirements:
293
- - - ! '>='
298
+ - - ">="
294
299
  - !ruby/object:Gem::Version
295
300
  version: '0'
296
301
  requirements: []
297
302
  rubyforge_project:
298
- rubygems_version: 2.3.0
303
+ rubygems_version: 2.4.5
299
304
  signing_key:
300
305
  specification_version: 4
301
306
  summary: oddb2xml creates xml files.
302
307
  test_files:
303
308
  - spec/builder_spec.rb
309
+ - spec/calc_spec.rb
304
310
  - spec/cli_spec.rb
305
311
  - spec/compressor_spec.rb
306
312
  - spec/data/GL_Diff_SB.xml
@@ -339,6 +345,7 @@ test_files:
339
345
  - spec/data/swissmedic_info_2.html
340
346
  - spec/data/swissmedic_orphan.xlsx
341
347
  - spec/data/swissmedic_orphans.html
348
+ - spec/data/swissmedic_package-galenic.xlsx
342
349
  - spec/data/swissmedic_package.xlsx
343
350
  - spec/data/swissmedic_packages.html
344
351
  - spec/data/wsdl_nonpharma.xml