oddb2xml 1.1.1 → 1.1.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (21) hide show
  1. data/Gemfile +13 -3
  2. data/History.txt +8 -0
  3. data/Manifest.txt +12 -1
  4. data/lib/oddb2xml/builder.rb +1 -1
  5. data/lib/oddb2xml/cli.rb +1 -1
  6. data/lib/oddb2xml/extractor.rb +1 -1
  7. data/lib/oddb2xml/version.rb +1 -1
  8. data/spec/data/oddb_limitation.xml +0 -0
  9. data/spec/data/oddb_substance.xml +0 -0
  10. data/spec/data/swissindex_nonpharma.xml +53 -0
  11. data/spec/data/swissindex_pharma.xml +56 -0
  12. data/spec/data/swissmedic_fridges.html +17 -0
  13. data/spec/data/swissmedic_fridges.xls +0 -0
  14. data/spec/data/swissmedic_info.html +10 -0
  15. data/spec/data/swissmedic_info.zip +0 -0
  16. data/spec/data/swissmedic_orphans.html +12 -0
  17. data/spec/data/swissmedic_orphans.xls +0 -0
  18. data/spec/data/wsdl_nonpharma.xml +55 -0
  19. data/spec/data/wsdl_pharma.xml +55 -0
  20. metadata +18 -7
  21. data/oddb2xml.gemspec +0 -30
data/Gemfile CHANGED
@@ -1,4 +1,14 @@
1
- source 'https://rubygems.org'
1
+ source :rubygems
2
2
 
3
- # Specify your gem's dependencies in oddb2xml.gemspec
4
- gemspec
3
+ gem 'rubyzip'
4
+ gem 'archive-tar-minitar'
5
+ gem 'mechanize'
6
+ gem 'nokogiri'
7
+ gem 'savon', '>= 2.0'
8
+ gem 'spreadsheet'
9
+
10
+ group :development do
11
+ gem 'rspec'
12
+ gem 'webmock'
13
+ gem 'ZenTest'
14
+ end
data/History.txt CHANGED
@@ -1,3 +1,11 @@
1
+ === 1.1.2 / 08.01.2013
2
+
3
+ * Update Gemfile for development
4
+ * Fix oddb_fi.xml tag name
5
+ * Update to be suitable for release with Hoe
6
+ * Add missing files
7
+ * Remove white spaces
8
+
1
9
  === 1.1.1 / 07.01.2013
2
10
 
3
11
  * Create oddb_fi.xml file with using swissmedicinfo
data/Manifest.txt CHANGED
@@ -14,15 +14,26 @@ lib/oddb2xml/compressor.rb
14
14
  lib/oddb2xml/downloader.rb
15
15
  lib/oddb2xml/extractor.rb
16
16
  lib/oddb2xml/version.rb
17
- oddb2xml.gemspec
18
17
  spec/builder_spec.rb
19
18
  spec/cli_spec.rb
20
19
  spec/compressor_spec.rb
21
20
  spec/data/XMLPublications.zip
22
21
  spec/data/oddb_article.xml
22
+ spec/data/oddb_limitation.xml
23
23
  spec/data/oddb_product.xml
24
+ spec/data/oddb_substance.xml
24
25
  spec/data/swissindex.xml
26
+ spec/data/swissindex_nonpharma.xml
27
+ spec/data/swissindex_pharma.xml
28
+ spec/data/swissmedic_fridges.html
29
+ spec/data/swissmedic_fridges.xls
30
+ spec/data/swissmedic_info.html
31
+ spec/data/swissmedic_info.zip
32
+ spec/data/swissmedic_orphans.html
33
+ spec/data/swissmedic_orphans.xls
25
34
  spec/data/wsdl.xml
35
+ spec/data/wsdl_nonpharma.xml
36
+ spec/data/wsdl_pharma.xml
26
37
  spec/downloader_spec.rb
27
38
  spec/extractor_spec.rb
28
39
  spec/spec_helper.rb
data/lib/oddb2xml/builder.rb CHANGED
@@ -464,7 +464,7 @@ module Oddb2xml
464
464
  %w[de fr].each do |lang|
465
465
  length += @infos[lang].length
466
466
  @infos[lang].each_with_index do |info, i|
467
- xml.ART(
467
+ xml.KMP(
468
468
  'MONTYPE' => 'fi', # only
469
469
  'LANG' => lang.upcase,
470
470
  'DT' => '',
data/lib/oddb2xml/cli.rb CHANGED
@@ -141,7 +141,7 @@ module Oddb2xml
141
141
  puts lines.join("\n")
142
142
  end
143
143
  def types # swissindex
144
- @_types ||=
144
+ @_types ||=
145
145
  if @options[:nonpharma]
146
146
  [:pharma, :nonpharma]
147
147
  else
data/lib/oddb2xml/extractor.rb CHANGED
@@ -188,7 +188,7 @@ module Oddb2xml
188
188
  item[:paragraph] = "<title><p>#{item[:name]}</p></title>" +
189
189
  ((paragraph = html.xpath("///div[@class='paragraph']")) ? paragraph.to_s : '')
190
190
  if text = html.xpath("///div[@id='Section7750']/p").text
191
- if text =~ /(\d{5})[,\s]*(\d{5})?/
191
+ if text =~ /(\d{5})[,\s]*(\d{5})?/
192
192
  [$1, $2].compact.each do |n|
193
193
  item[:monid] = n
194
194
  data[lang] << item
data/lib/oddb2xml/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Oddb2xml
2
- VERSION = "1.1.1"
2
+ VERSION = "1.1.2"
3
3
  end
data/spec/data/oddb_limitation.xml ADDED
File without changes
data/spec/data/oddb_substance.xml ADDED
File without changes
data/spec/data/swissindex_nonpharma.xml ADDED
@@ -0,0 +1,53 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <soap:Envelope
3
+ xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
4
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
6
+ <soap:Body>
7
+ <NONPHARMA
8
+ CREATION_DATETIME="2012-10-18T06:31:19.4687619+02:00"
9
+ xmlns="http://example.com/test">
10
+ <ITEM DT="2012-10-18T00:00:00">
11
+ <GTIN>0000000000000</GTIN>
12
+ <PHAR>00000</PHAR>
13
+ <STATUS>A</STATUS>
14
+ <STDATE>2002-05-23T00:00:00</STDATE>
15
+ <LANG>DE</LANG>
16
+ <DSCR>Foo 1000 mg</DSCR>
17
+ <ADDSCR>Amp</ADDSCR>
18
+ <COMP>
19
+ <NAME>EXAMPLE.COM AG</NAME>
20
+ <GLN>0000000000000</GLN>
21
+ </COMP>
22
+ </ITEM>
23
+ <ITEM DT="2012-10-18T00:00:00">
24
+ <GTIN>0000000000001</GTIN>
25
+ <PHAR>00001</PHAR>
26
+ <STATUS>A</STATUS>
27
+ <STDATE>2002-05-23T00:00:00</STDATE>
28
+ <LANG>DE</LANG>
29
+ <DSCR>Bar 10 Stk</DSCR>
30
+ <ADDSCR>10 Stk</ADDSCR>
31
+ <COMP>
32
+ <NAME>EXAMPLE.ORG AG</NAME>
33
+ </COMP>
34
+ </ITEM>
35
+ <ITEM DT="2012-10-18T00:00:00">
36
+ <GTIN>0000000000002</GTIN>
37
+ <PHAR>00002</PHAR>
38
+ <STATUS>A</STATUS>
39
+ <STDATE>2002-05-23T00:00:00</STDATE>
40
+ <LANG>DE</LANG>
41
+ <DSCR>Baz 10 Tablet</DSCR>
42
+ <ADDSCR>5 Stk</ADDSCR>
43
+ <COMP>
44
+ <NAME>EXAMPLE.AC AG</NAME>
45
+ </COMP>
46
+ </ITEM>
47
+ <RESULT>
48
+ <OK_ERROR>OK</OK_ERROR>
49
+ <NBR_RECORD>3</NBR_RECORD>
50
+ </RESULT>
51
+ </NONPHARMA>
52
+ </soap:Body>
53
+ </soap:Envelope>
data/spec/data/swissindex_pharma.xml ADDED
@@ -0,0 +1,56 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <soap:Envelope
3
+ xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
4
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema">
6
+ <soap:Body>
7
+ <PHARMA
8
+ CREATION_DATETIME="2012-10-18T06:31:19.4687619+02:00"
9
+ xmlns="http://example.com/test">
10
+ <ITEM DT="2012-10-18T00:00:00">
11
+ <GTIN>0000000000000</GTIN>
12
+ <PHAR>00000</PHAR>
13
+ <STATUS>A</STATUS>
14
+ <STDATE>2002-05-23T00:00:00</STDATE>
15
+ <LANG>DE</LANG>
16
+ <DSCR>Foo 1000 mg</DSCR>
17
+ <ADDSCR>Amp</ADDSCR>
18
+ <ATC>A00AA00</ATC>
19
+ <COMP>
20
+ <NAME>EXAMPLE.COM AG</NAME>
21
+ <GLN>0000000000000</GLN>
22
+ </COMP>
23
+ </ITEM>
24
+ <ITEM DT="2012-10-18T00:00:00">
25
+ <GTIN>0000000000001</GTIN>
26
+ <PHAR>00001</PHAR>
27
+ <STATUS>A</STATUS>
28
+ <STDATE>2002-05-23T00:00:00</STDATE>
29
+ <LANG>DE</LANG>
30
+ <DSCR>Bar 10 Stk</DSCR>
31
+ <ADDSCR>10 Stk</ADDSCR>
32
+ <ATC>A02AA02</ATC>
33
+ <COMP>
34
+ <NAME>EXAMPLE.ORG AG</NAME>
35
+ </COMP>
36
+ </ITEM>
37
+ <ITEM DT="2012-10-18T00:00:00">
38
+ <GTIN>0000000000002</GTIN>
39
+ <PHAR>00002</PHAR>
40
+ <STATUS>A</STATUS>
41
+ <STDATE>2002-05-23T00:00:00</STDATE>
42
+ <LANG>DE</LANG>
43
+ <DSCR>Baz 10 Tablet</DSCR>
44
+ <ADDSCR>5 Stk</ADDSCR>
45
+ <ATC>A03AA03</ATC>
46
+ <COMP>
47
+ <NAME>EXAMPLE.AC AG</NAME>
48
+ </COMP>
49
+ </ITEM>
50
+ <RESULT>
51
+ <OK_ERROR>OK</OK_ERROR>
52
+ <NBR_RECORD>3</NBR_RECORD>
53
+ </RESULT>
54
+ </PHARMA>
55
+ </soap:Body>
56
+ </soap:Envelope>
data/spec/data/swissmedic_fridges.html ADDED
@@ -0,0 +1,17 @@
1
+ <!DOCTYPE HTML>
2
+ <html lang="utf-8">
3
+ <head>
4
+ <meta charset="UTF-8">
5
+ <title></title>
6
+ </head>
7
+ <body>
8
+ <table class="swmTableFlex">
9
+ <tr>
10
+ <td>
11
+ <a title="B3.1.35-d.xls" href="/download/swissmedic_fridges.xls">xls</a>
12
+ </td>
13
+ </tr>
14
+ </table>
15
+ </body>
16
+ </html>
17
+
data/spec/data/swissmedic_fridges.xls ADDED
Binary file
data/spec/data/swissmedic_info.html ADDED
@@ -0,0 +1,10 @@
1
+ <!DOCTYPE HTML>
2
+ <html lang="utf-8">
3
+ <head>
4
+ <meta charset="UTF-8">
5
+ <title></title>
6
+ </head>
7
+ <body>
8
+ </body>
9
+ </html>
10
+
data/spec/data/swissmedic_info.zip ADDED
Binary file
data/spec/data/swissmedic_orphans.html ADDED
@@ -0,0 +1,12 @@
1
+ <!DOCTYPE HTML>
2
+ <html lang="utf-8">
3
+ <head>
4
+ <meta charset="UTF-8">
5
+ <title></title>
6
+ </head>
7
+ <body>
8
+ <div id="sprungmarke0_4">
9
+ <a title="Humanarzneimittel" href="/download/swissmedic_orphans.xls"></a>
10
+ </div>
11
+ </body>
12
+ </html>
data/spec/data/swissmedic_orphans.xls ADDED
Binary file
data/spec/data/wsdl_nonpharma.xml ADDED
@@ -0,0 +1,55 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <wsdl:definitions
3
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
4
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
5
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
6
+ xmlns:tns="http://example.com/test"
7
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
8
+ xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
9
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
10
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
11
+ targetNamespace="http://example.com/test"
12
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
13
+ <wsdl:types>
14
+ <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/test">
15
+ </s:schema>
16
+ </wsdl:types>
17
+ <wsdl:message name="DownloadAllSoapIn">
18
+ <wsdl:part name="lang" element="tns:lang" />
19
+ </wsdl:message>
20
+ <wsdl:message name="DownloadAllSoapOut">
21
+ <wsdl:part name="DownloadAllResult" element="tns:NONPHARMA" />
22
+ </wsdl:message>
23
+ <wsdl:binding name="ws_NonPharma_V101Soap" type="tns:ws_NonPharma_V101Soap">
24
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
25
+ <wsdl:operation name="DownloadAll">
26
+ <soap:operation soapAction="http://example.com/DownloadAll" style="document" />
27
+ <wsdl:input>
28
+ <soap:body use="literal" />
29
+ </wsdl:input>
30
+ <wsdl:output>
31
+ <soap:body use="literal" />
32
+ </wsdl:output>
33
+ </wsdl:operation>
34
+ </wsdl:binding>
35
+ <wsdl:binding name="ws_NonPharma_V101Soap12" type="tns:ws_NonPharma_V101Soap">
36
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
37
+ <wsdl:operation name="DownloadAll">
38
+ <soap12:operation soapAction="http://example.com/DownloadAll" style="document" />
39
+ <wsdl:input>
40
+ <soap12:body use="literal" />
41
+ </wsdl:input>
42
+ <wsdl:output>
43
+ <soap12:body use="literal" />
44
+ </wsdl:output>
45
+ </wsdl:operation>
46
+ </wsdl:binding>
47
+ <wsdl:service name="ws_NonPharma_V101">
48
+ <wsdl:port name="ws_NonPharma_V101Soap" binding="tns:ws_NonPharma_V101Soap">
49
+ <soap:address location="https://example.com/test" />
50
+ </wsdl:port>
51
+ <wsdl:port name="ws_NonPharma_V101Soap12" binding="tns:ws_NonPharma_V101Soap12">
52
+ <soap12:address location="https://example.com/test" />
53
+ </wsdl:port>
54
+ </wsdl:service>
55
+ </wsdl:definitions>
data/spec/data/wsdl_pharma.xml ADDED
@@ -0,0 +1,55 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <wsdl:definitions
3
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
4
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
5
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
6
+ xmlns:tns="http://example.com/test"
7
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
8
+ xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
9
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
10
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
11
+ targetNamespace="http://example.com/test"
12
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
13
+ <wsdl:types>
14
+ <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/test">
15
+ </s:schema>
16
+ </wsdl:types>
17
+ <wsdl:message name="DownloadAllSoapIn">
18
+ <wsdl:part name="lang" element="tns:lang" />
19
+ </wsdl:message>
20
+ <wsdl:message name="DownloadAllSoapOut">
21
+ <wsdl:part name="DownloadAllResult" element="tns:PHARMA" />
22
+ </wsdl:message>
23
+ <wsdl:binding name="ws_Pharma_V101Soap" type="tns:ws_Pharma_V101Soap">
24
+ <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
25
+ <wsdl:operation name="DownloadAll">
26
+ <soap:operation soapAction="http://example.com/DownloadAll" style="document" />
27
+ <wsdl:input>
28
+ <soap:body use="literal" />
29
+ </wsdl:input>
30
+ <wsdl:output>
31
+ <soap:body use="literal" />
32
+ </wsdl:output>
33
+ </wsdl:operation>
34
+ </wsdl:binding>
35
+ <wsdl:binding name="ws_Pharma_V101Soap12" type="tns:ws_Pharma_V101Soap">
36
+ <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
37
+ <wsdl:operation name="DownloadAll">
38
+ <soap12:operation soapAction="http://example.com/DownloadAll" style="document" />
39
+ <wsdl:input>
40
+ <soap12:body use="literal" />
41
+ </wsdl:input>
42
+ <wsdl:output>
43
+ <soap12:body use="literal" />
44
+ </wsdl:output>
45
+ </wsdl:operation>
46
+ </wsdl:binding>
47
+ <wsdl:service name="ws_Pharma_V101">
48
+ <wsdl:port name="ws_Pharma_V101Soap" binding="tns:ws_Pharma_V101Soap">
49
+ <soap:address location="https://example.com/test" />
50
+ </wsdl:port>
51
+ <wsdl:port name="ws_Pharma_V101Soap12" binding="tns:ws_Pharma_V101Soap12">
52
+ <soap12:address location="https://example.com/test" />
53
+ </wsdl:port>
54
+ </wsdl:service>
55
+ </wsdl:definitions>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: oddb2xml
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.1
4
+ version: 1.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-07 00:00:00.000000000 Z
12
+ date: 2013-01-08 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rdoc
16
- requirement: &18836140 !ruby/object:Gem::Requirement
16
+ requirement: &9807060 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3.10'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *18836140
24
+ version_requirements: *9807060
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: hoe
27
- requirement: &18834840 !ruby/object:Gem::Requirement
27
+ requirement: &9806460 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,7 +32,7 @@ dependencies:
32
32
  version: '2.13'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *18834840
35
+ version_requirements: *9806460
36
36
  description: ''
37
37
  email:
38
38
  - yasaka@ywesee.com, zdavatz@ywesee.com
@@ -59,15 +59,26 @@ files:
59
59
  - lib/oddb2xml/downloader.rb
60
60
  - lib/oddb2xml/extractor.rb
61
61
  - lib/oddb2xml/version.rb
62
- - oddb2xml.gemspec
63
62
  - spec/builder_spec.rb
64
63
  - spec/cli_spec.rb
65
64
  - spec/compressor_spec.rb
66
65
  - spec/data/XMLPublications.zip
67
66
  - spec/data/oddb_article.xml
67
+ - spec/data/oddb_limitation.xml
68
68
  - spec/data/oddb_product.xml
69
+ - spec/data/oddb_substance.xml
69
70
  - spec/data/swissindex.xml
71
+ - spec/data/swissindex_nonpharma.xml
72
+ - spec/data/swissindex_pharma.xml
73
+ - spec/data/swissmedic_fridges.html
74
+ - spec/data/swissmedic_fridges.xls
75
+ - spec/data/swissmedic_info.html
76
+ - spec/data/swissmedic_info.zip
77
+ - spec/data/swissmedic_orphans.html
78
+ - spec/data/swissmedic_orphans.xls
70
79
  - spec/data/wsdl.xml
80
+ - spec/data/wsdl_nonpharma.xml
81
+ - spec/data/wsdl_pharma.xml
71
82
  - spec/downloader_spec.rb
72
83
  - spec/extractor_spec.rb
73
84
  - spec/spec_helper.rb
data/oddb2xml.gemspec DELETED
@@ -1,30 +0,0 @@
1
- # encoding: utf-8
2
- lib = File.expand_path('../lib', __FILE__)
3
- $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
- require 'oddb2xml/version'
5
-
6
- Gem::Specification.new do |gem|
7
- gem.name = "oddb2xml"
8
- gem.version = Oddb2xml::VERSION
9
- gem.authors = [""]
10
- gem.email = [""]
11
- gem.description = %q{TODO: Write a gem description}
12
- gem.summary = %q{TODO: Write a gem summary}
13
- gem.homepage = ""
14
-
15
- gem.files = `git ls-files`.split($/)
16
- gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
17
- gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
18
- gem.require_paths = ["lib"]
19
-
20
- gem.add_dependency 'rubyzip'
21
- gem.add_dependency 'archive-tar-minitar'
22
- gem.add_dependency 'mechanize'
23
- gem.add_dependency 'nokogiri'
24
- gem.add_dependency 'savon', '>= 2.0'
25
- gem.add_dependency 'spreadsheet'
26
-
27
- gem.add_development_dependency 'rspec'
28
- gem.add_development_dependency 'webmock'
29
- gem.add_development_dependency 'ZenTest'
30
- end