RubyGems - oddb2xml - Versions diffs - 1.8.6 → 1.8.7 - Mend

oddb2xml 1.8.6 → 1.8.7

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 (15) hide show

data/.travis.yml +1 -1
data/Gemfile.lock +1 -1
data/History.txt +4 -0
data/lib/oddb2xml/builder.rb +3 -2
data/lib/oddb2xml/version.rb +1 -1
data/oddb2xml.xsd +13 -0
data/spec/builder_spec.rb +19 -10
data/spec/data/swissindex_NonPharma_DE.xml +65 -0
data/spec/data/swissindex_NonPharma_FR.xml +65 -0
data/spec/data/swissindex_Pharma_DE.xml +82 -0
data/spec/data/swissindex_Pharma_FR.xml +82 -0
data/spec/spec_helper.rb +24 -25
data/test_options.rb +1 -1
metadata +10 -4
data/spec/data/wsdl.xml +0 -55

data/.travis.yml CHANGED

@@ -6,7 +6,7 @@ before_install:
   - gem update --system 2.1.11
   - gem --version
-script: bundle exec rake test
+script: bundle exec rspec
 rvm:
   - 1.9.3

data/Gemfile.lock CHANGED

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (1.8.6)
+    oddb2xml (1.8.7)
       archive-tar-minitar (~> 0.5.2)
       mechanize (~> 2.5.1)
       nokogiri (~> 1.5.10)

data/History.txt CHANGED

@@ -1,3 +1,7 @@
+=== 1.8.7 / 05.08.2014
+* Documented meaning of SALECD field oddb2xml.xsd
 === 1.8.6 / 04.08.2014
 * Always fetch additionals (price) information from ZurRose

data/lib/oddb2xml/builder.rb CHANGED

@@ -632,7 +632,8 @@ module Oddb2xml
                   xml.VAT info_zur_rose[:vat]
                 end
-                xml.SALECD( (info_zur_rose && info_zur_rose[:cmut] != '3') ? 'A' : 'I') # XML_OPTIONS
+                nincd = detect_nincd(de_idx)
+                (nincd and nincd == 13) ? xml.SALECD('A') : xml.SALECD( (info_zur_rose && info_zur_rose[:cmut] != '3') ? 'A' : 'I') # XML_OPTIONS
                 if pac and pac[:limitation_points]
                   #xml.INSLIM
                   xml.LIMPTS pac[:limitation_points] unless pac[:limitation_points].empty?
@@ -750,7 +751,7 @@ module Oddb2xml
                 #xml.ARTLIM {
                 #  xml.LIMCD
                 #}
-                if nincd = detect_nincd(de_idx)
+                if nincd
                   xml.ARTINS {
                     #xml.VDAT
                     #xml.INCD

data/lib/oddb2xml/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.8.6"
+  VERSION = "1.8.7"
 end

data/oddb2xml.xsd CHANGED

@@ -158,6 +158,14 @@
   </xs:element>
   <xs:element name="SALECD">
     <xs:simpleType>
+      <xs:annotation>
+        <xs:documentation xml:lang="de">
+           Bedeutung ist 'A' = Aktiv,'I' = inaktiv == Ausser Handel
+        </xs:documentation>
+        <xs:documentation xml:lang="en">
+           meaning is 'A' = active,'I' = inactive == out of trade
+        </xs:documentation>
+      </xs:annotation>
       <xs:restriction base="xs:string">
         <xs:enumeration value="A" />
         <xs:enumeration value="I" />
@@ -257,6 +265,11 @@
   </xs:element>
   <xs:element name="NINCD">
     <xs:simpleType>
+      <xs:annotation>
+        <xs:documentation xml:lang="en">
+          possible values are 10 => BAG-XML (SL/LS), 13 -> MiGel, 20 => (LPPV) Limitation, empty => NonPharma)
+        </xs:documentation>
+      </xs:annotation>
       <xs:restriction base="xs:byte">
         <xs:enumeration value="10" />
         <xs:enumeration value="20" />

data/spec/builder_spec.rb CHANGED

@@ -25,25 +25,26 @@ def check_validation_via_xsd
   xsd = Nokogiri::XML::Schema(File.read(@oddb2xml_xsd))
   files.each{
     |file|
-    doc = Nokogiri::XML(File.read(@article_xml))
+    $stderr.puts "Validating file #{file} with #{File.size(file)} bytes" if $VERBOSE
+    doc = Nokogiri::XML(File.read(file))
     xsd.validate(doc).each do |error|  error.message.should be_nil  end
   }
 end
 describe Oddb2xml::Builder do
-  NrExtendedArticles = 71
-  NrPharmaAndNonPharmaArticles = 62
+  NrExtendedArticles = 73
+  NrPharmaAndNonPharmaArticles = 60
   NrPharmaArticles = 5
   include ServerMockHelper
   before(:each) do
     @savedDir = Dir.pwd
     cleanup_directories_before_run
     setup_server_mocks
-    setup_swiss_index_server_mock(types =  ['NonPharma', 'Pharma'])
     Dir.chdir Oddb2xml::WorkDir
   end
   after(:each) do
     Dir.chdir @savedDir if @savedDir and File.directory?(@savedDir)
   end
   context 'XSD-generation: ' do
     let(:cli) do
         opts = {}
@@ -53,7 +54,7 @@ describe Oddb2xml::Builder do
         Oddb2xml::Cli.new(opts)
     end
-    it 'should return true when validating oddb_article.xml against oddb_article.xsd' do
+    it 'should return true when validating xml against oddb2xml.xsd' do
       res = buildr_capture(:stdout){ cli.run }
       File.exists?(@article_xml).should be_true
       File.exists?(@product_xml).should be_true
@@ -127,7 +128,6 @@ describe Oddb2xml::Builder do
     end
     it 'should contain the correct values fo CMUT from zurrose_transfer.dat' do
-      puts Oddb2xml::WorkDir
       res = buildr_capture(:stdout){ cli.run }
       res.should match(/products/)
       dat_filename = File.join(Oddb2xml::WorkDir, 'oddb.dat')
@@ -188,14 +188,14 @@ describe Oddb2xml::Builder do
       smno    =  article.elements['SMNO'] ? article.elements['SMNO'].text : 'nil'
       puts "checking doc for pharmacode #{pharmacode} isRefdata #{isRefdata} == #{refdata}. SMNO: #{smno} #{name}" if $VERBOSE
       article.elements['REF_DATA'].text.should == isRefdata.to_s
     end
     it 'should generate the flag non-refdata' do
       res = buildr_capture(:stdout){ cli.run }
       @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      puts @article_xml
       File.exists?(@article_xml).should be_true
-      FileUtils.cp(@article_xml, '/opt/src/oddb2xml/tst.xml', :verbose => true)
+      FileUtils.cp(@article_xml, File.join(Oddb2xml::WorkDir, 'tst-non-refdata.xml'))
       article_xml = IO.read(@article_xml)
       doc = REXML::Document.new File.new(@article_xml)
       XPath.match( doc, "//REF_DATA" ).size.should > 0
@@ -205,6 +205,16 @@ describe Oddb2xml::Builder do
       checkItemForRefdata(doc, "5366964", 1) # 1-DAY ACUVUE moist jour
     end
+    it 'should generate SALECD A for migel (NINCD 13)' do
+      res = buildr_capture(:stdout){ cli.run }
+      @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
+      doc = REXML::Document.new File.new(@article_xml)
+      article = XPath.match( doc, "//ART[ARTINS/NINCD=13]").first
+      article = XPath.match( doc, "//ART[PHAR=5366964]").first
+      article.elements['SALECD'].text.should == 'A'
+      article.elements['ARTINS/NINCD'].text.should == '13'
+    end
     it 'should pass validating via oddb2xml.xsd' do
       check_validation_via_xsd
     end
@@ -360,9 +370,8 @@ describe Oddb2xml::Builder do
     it 'should generate the flag SALECD' do
       res = buildr_capture(:stdout){ cli.run }
       @article_xml = File.expand_path(File.join(Oddb2xml::WorkDir, 'oddb_article.xml'))
-      puts @article_xml
       File.exists?(@article_xml).should be_true
-      FileUtils.cp(@article_xml, '/opt/src/oddb2xml/tst.xml', :verbose => true)
+      FileUtils.cp(@article_xml, File.join(Oddb2xml::WorkDir, 'tst-SALECD.xml'))
       article_xml = IO.read(@article_xml)
       doc = REXML::Document.new File.new(@article_xml)
       XPath.match( doc, "//REF_DATA" ).size.should > 0

data/spec/data/swissindex_NonPharma_DE.xml ADDED

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope
+  xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <soap:Body>
+    <NONPHARMA
+      CREATION_DATETIME="2012-10-18T06:31:19.4687619+02:00"
+      xmlns="http://example.com/test">
+        <ITEM DT="2013-06-22T00:00:00">
+          <GTIN>733905577161</GTIN>
+          <PHAR>5366964</PHAR>
+          <STATUS>A</STATUS>
+          <STDATE>2012-08-22T00:00:00</STDATE>
+          <LANG>FR</LANG>
+          <DSCR>1-DAY ACUVUE moist jour -2.00dpt BC 8.5</DSCR>
+          <ADDSCR>30 pce</ADDSCR>
+          <COMP>
+            <NAME>Johnson &amp; Johnson Consumer (Health Care / OTC)</NAME>
+          </COMP>
+        </ITEM>
+        <ITEM DT="2012-10-18T00:00:00">
+        <GTIN>0000000000000</GTIN>
+        <PHAR>00000</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-05-23T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>Foo 1000 mg</DSCR>
+        <ADDSCR>Amp</ADDSCR>
+        <COMP>
+          <NAME>EXAMPLE.COM AG</NAME>
+          <GLN>0000000000000</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2012-10-18T00:00:00">
+        <GTIN>0000000000001</GTIN>
+        <PHAR>00001</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-05-23T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>Bar 10 Stk</DSCR>
+        <ADDSCR>10 Stk</ADDSCR>
+        <COMP>
+          <NAME>EXAMPLE.ORG AG</NAME>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2012-10-18T00:00:00">
+        <GTIN>0000000000002</GTIN>
+        <PHAR>00002</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-05-23T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>Baz 10 Tablet</DSCR>
+        <ADDSCR>5 Stk</ADDSCR>
+        <COMP>
+          <NAME>EXAMPLE.AC AG</NAME>
+        </COMP>
+      </ITEM>
+      <RESULT>
+        <OK_ERROR>OK</OK_ERROR>
+        <NBR_RECORD>3</NBR_RECORD>
+      </RESULT>
+    </NONPHARMA>
+  </soap:Body>
+</soap:Envelope>

data/spec/data/swissindex_NonPharma_FR.xml ADDED

@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope
+  xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <soap:Body>
+    <NONPHARMA
+      CREATION_DATETIME="2012-10-18T06:31:19.4687619+02:00"
+      xmlns="http://example.com/test">
+        <ITEM DT="2013-06-22T00:00:00">
+          <GTIN>733905577161</GTIN>
+          <PHAR>5366964</PHAR>
+          <STATUS>A</STATUS>
+          <STDATE>2012-08-22T00:00:00</STDATE>
+          <LANG>FR</LANG>
+          <DSCR>1-DAY ACUVUE moist jour -2.00dpt BC 8.5</DSCR>
+          <ADDSCR>30 pce</ADDSCR>
+          <COMP>
+            <NAME>Johnson &amp; Johnson Consumer (Health Care / OTC)</NAME>
+          </COMP>
+        </ITEM>
+        <ITEM DT="2012-10-18T00:00:00">
+        <GTIN>0000000000000</GTIN>
+        <PHAR>00000</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-05-23T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>Foo 1000 mg</DSCR>
+        <ADDSCR>Amp</ADDSCR>
+        <COMP>
+          <NAME>EXAMPLE.COM AG</NAME>
+          <GLN>0000000000000</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2012-10-18T00:00:00">
+        <GTIN>0000000000001</GTIN>
+        <PHAR>00001</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-05-23T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>Bar 10 Stk</DSCR>
+        <ADDSCR>10 Stk</ADDSCR>
+        <COMP>
+          <NAME>EXAMPLE.ORG AG</NAME>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2012-10-18T00:00:00">
+        <GTIN>0000000000002</GTIN>
+        <PHAR>00002</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-05-23T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>Baz 10 Tablet</DSCR>
+        <ADDSCR>5 Stk</ADDSCR>
+        <COMP>
+          <NAME>EXAMPLE.AC AG</NAME>
+        </COMP>
+      </ITEM>
+      <RESULT>
+        <OK_ERROR>OK</OK_ERROR>
+        <NBR_RECORD>3</NBR_RECORD>
+      </RESULT>
+    </NONPHARMA>
+  </soap:Body>
+</soap:Envelope>

data/spec/data/swissindex_Pharma_DE.xml ADDED

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <soap:Body>
+    <PHARMA xmlns="http://swissindex.e-mediat.net/SwissindexPharma_out_V101" CREATION_DATETIME="2013-12-10T10:09:26.8198427+01:00">
+      <!-- spec/data/swissindex_pharma.xml. Values for spec/builder_spec.rb -->
+      CREATION_DATETIME="2012-10-18T06:31:19.4687619+02:00"
+      xmlns="http://example.com/test">
+        <ITEM DT="2013-06-22T00:00:00">
+          <GTIN>733905577161</GTIN>
+          <PHAR>5366964</PHAR>
+          <STATUS>A</STATUS>
+          <STDATE>2012-08-22T00:00:00</STDATE>
+          <LANG>FR</LANG>
+          <DSCR>1-DAY ACUVUE moist jour -2.00dpt BC 8.5</DSCR>
+          <ADDSCR>30 pce</ADDSCR>
+          <COMP>
+            <NAME>Johnson &amp; Johnson Consumer (Health Care / OTC)</NAME>
+          </COMP>
+      </ITEM>
+      <ITEM DT="2013-06-22T00:00:00">
+        <GTIN>7680536620137</GTIN>
+        <PHAR>1699947</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>1996-03-20T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>3TC Filmtabl 150 mg</DSCR>
+        <ADDSCR>60 Stk</ADDSCR>
+        <ATC>J05AF05</ATC>
+        <COMP>
+          <NAME>ViiV Healthcare GmbH</NAME>
+          <GLN>7601001392175</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2013-12-06T00:00:00">
+        <GTIN>7680620690084</GTIN>
+        <PHAR>5819012</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2013-10-26T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>LEVETIRACETAM DESITIN Filmtabl 250 mg</DSCR>
+        <ADDSCR>30 Stk</ADDSCR>
+        <ATC>N03AX14</ATC>
+        <COMP>
+          <NAME>Desitin Pharma GmbH</NAME>
+          <GLN>7601001320451</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2013-06-22T00:00:00">
+        <GTIN>7680555580054</GTIN>
+        <PHAR>2465312</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-01-16T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>ZYVOXID Filmtabl 600 mg</DSCR>
+        <ADDSCR>10 Stk</ADDSCR>
+        <ATC>J01XX08</ATC>
+        <COMP>
+          <NAME>Pfizer AG</NAME>
+          <GLN>7601001010604</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2013-12-06T00:00:00">
+        <GTIN>7680316950157</GTIN>
+        <PHAR>598003</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2012-04-13T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>SOFRADEX Gtt Auric</DSCR>
+        <ADDSCR>8 ml</ADDSCR>
+        <ATC>S02CA06</ATC>
+        <COMP>
+          <NAME>Sanofi-Aventis (Suisse) SA</NAME>
+          <GLN>7601001002340</GLN>
+        </COMP>
+      </ITEM>
+       <RESULT>
+        <OK_ERROR>OK</OK_ERROR>
+        <NBR_RECORD>2</NBR_RECORD>
+      </RESULT>
+    </PHARMA>
+  </soap:Body>
+</soap:Envelope>

data/spec/data/swissindex_Pharma_FR.xml ADDED

@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  <soap:Body>
+    <PHARMA xmlns="http://swissindex.e-mediat.net/SwissindexPharma_out_V101" CREATION_DATETIME="2013-12-10T10:09:26.8198427+01:00">
+      <!-- spec/data/swissindex_pharma.xml. Values for spec/builder_spec.rb -->
+      CREATION_DATETIME="2012-10-18T06:31:19.4687619+02:00"
+      xmlns="http://example.com/test">
+        <ITEM DT="2013-06-22T00:00:00">
+          <GTIN>733905577161</GTIN>
+          <PHAR>5366964</PHAR>
+          <STATUS>A</STATUS>
+          <STDATE>2012-08-22T00:00:00</STDATE>
+          <LANG>FR</LANG>
+          <DSCR>1-DAY ACUVUE moist jour -2.00dpt BC 8.5</DSCR>
+          <ADDSCR>30 pce</ADDSCR>
+          <COMP>
+            <NAME>Johnson &amp; Johnson Consumer (Health Care / OTC)</NAME>
+          </COMP>
+      </ITEM>
+      <ITEM DT="2013-06-22T00:00:00">
+        <GTIN>7680536620137</GTIN>
+        <PHAR>1699947</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>1996-03-20T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>3TC Filmtabl 150 mg</DSCR>
+        <ADDSCR>60 Stk</ADDSCR>
+        <ATC>J05AF05</ATC>
+        <COMP>
+          <NAME>ViiV Healthcare GmbH</NAME>
+          <GLN>7601001392175</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2013-12-06T00:00:00">
+        <GTIN>7680620690084</GTIN>
+        <PHAR>5819012</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2013-10-26T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>LEVETIRACETAM DESITIN Filmtabl 250 mg</DSCR>
+        <ADDSCR>30 Stk</ADDSCR>
+        <ATC>N03AX14</ATC>
+        <COMP>
+          <NAME>Desitin Pharma GmbH</NAME>
+          <GLN>7601001320451</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2013-06-22T00:00:00">
+        <GTIN>7680555580054</GTIN>
+        <PHAR>2465312</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2002-01-16T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>ZYVOXID Filmtabl 600 mg</DSCR>
+        <ADDSCR>10 Stk</ADDSCR>
+        <ATC>J01XX08</ATC>
+        <COMP>
+          <NAME>Pfizer AG</NAME>
+          <GLN>7601001010604</GLN>
+        </COMP>
+      </ITEM>
+      <ITEM DT="2013-12-06T00:00:00">
+        <GTIN>7680316950157</GTIN>
+        <PHAR>598003</PHAR>
+        <STATUS>A</STATUS>
+        <STDATE>2012-04-13T00:00:00</STDATE>
+        <LANG>DE</LANG>
+        <DSCR>SOFRADEX Gtt Auric</DSCR>
+        <ADDSCR>8 ml</ADDSCR>
+        <ATC>S02CA06</ATC>
+        <COMP>
+          <NAME>Sanofi-Aventis (Suisse) SA</NAME>
+          <GLN>7601001002340</GLN>
+        </COMP>
+      </ITEM>
+       <RESULT>
+        <OK_ERROR>OK</OK_ERROR>
+        <NBR_RECORD>2</NBR_RECORD>
+      </RESULT>
+    </PHARMA>
+  </soap:Body>
+</soap:Envelope>

data/spec/spec_helper.rb CHANGED

@@ -71,34 +71,33 @@ module ServerMockHelper
         :headers => {'Content-Type' => 'application/zip; charset=utf-8'},
         :body    => stub_response)
   end
-  def setup_swiss_index_server_mock(types =  ['Pharma', 'NonPharma'])
+  def setup_swiss_index_server_mock(types =['NonPharma', 'Pharma'], languages=['DE', 'FR'])
     types.each do |type|
-      # wsdl
-      stub_wsdl_url = "https://index.ws.e-mediat.net/Swissindex/#{type}/ws_#{type}_V101.asmx?WSDL"
-      stub_response = File.read(File.join(Oddb2xml::SpecData, "wsdl_#{type.downcase}.xml"))
-      stub_request(:get, stub_wsdl_url).
-        with(:headers => {
-          'Accept' => '*/*',
-          #'Host'   => 'ws.e-mediat.net'
-        }).
-        to_return(
-          :status  => 200,
-          :headers => {'Content-Type' => 'text/xml; charset=utf-8'},
-          :body    => stub_response)
-      # soap (dummy)
-      stub_soap_url = 'https://example.com/test'
-      stub_response = File.read(File.join(Oddb2xml::SpecData, "swissindex_#{type.downcase}.xml"))
-      stub_request(:post, stub_soap_url).
-        with(:headers => {
-          'Accept' => '*/*',
-          #'Host'   => 'example.com'
-        }).
-        to_return(
-          :status  => 200,
-          :headers => {'Content-Type' => 'text/xml; chaprset=utf-8'},
-          :body    => stub_response)
+      languages.each do |language|
+        # wsdl
+        stub_wsdl_url = "https://index.ws.e-mediat.net/Swissindex/#{type}/ws_#{type}_V101.asmx?WSDL"
+        first_file = File.join(Oddb2xml::SpecData, "wsdl_#{type.downcase}.xml")
+        stub_response_wsdl = File.read(File.join(Oddb2xml::SpecData, "wsdl_#{type.downcase}.xml"))
+        stub_request(:get, stub_wsdl_url).
+          with(:headers => {
+            'Accept' => '*/*',
+          }).
+          to_return(
+            :status  => 200,
+            :headers => {'Content-Type' => 'text/xml; charset=utf-8'},
+            :body    => stub_response_wsdl)
+        # soap (dummy)
+        stub_soap_url = 'https://example.com/test'
+        stub_file = File.join(Oddb2xml::SpecData, "swissindex_#{type}_#{language}.xml")
+        stub_response = File.read(stub_file)
+        stub_request(:post, "https://example.com/test").
+          with(:body => "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n<soap:Envelope xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:soap=\"http://schemas.xmlsoap.org/soap/envelope/\">\n<soap:Body>\n  <lang xmlns=\"http://swissindex.e-mediat.net/Swissindex#{type}_out_V101\">#{language}</lang>\n</soap:Body>\n</soap:Envelope>\n",
+                :headers => {'Accept'=>'*/*', 'Content-Type'=>'text/xml;charset=UTF-8', 'Soapaction'=>'"http://example.com/DownloadAll"', 'User-Agent'=>'Ruby'}).
+          to_return(:status => 200, :body => stub_response, :headers => {})
+      end
     end
   end
   def setup_swissmedic_server_mock
     host = 'www.swissmedic.ch'
     {

data/test_options.rb CHANGED

@@ -54,6 +54,6 @@ unless 'localhost.localdomain'.eql?(Socket.gethostbyname(Socket.gethostname).fir
 end
 test_one_call('oddb2xml -t md -c tar.gz')
 test_one_call('oddb2xml -f xml')
-test_one_call('oddb2xml -x address')
 test_one_call('oddb2xml -f dat')
 test_one_call('oddb2xml -t md')
+test_one_call('oddb2xml -x address')

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.8.6
+  version: 1.8.7
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-04 00:00:00.000000000 Z
+date: 2014-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -275,6 +275,10 @@ files:
 - spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/swissindex.xml
+- spec/data/swissindex_NonPharma_DE.xml
+- spec/data/swissindex_NonPharma_FR.xml
+- spec/data/swissindex_Pharma_DE.xml
+- spec/data/swissindex_Pharma_FR.xml
 - spec/data/swissindex_nonpharma.xml
 - spec/data/swissindex_pharma.xml
 - spec/data/swissmedic_fridge.xlsx
@@ -286,7 +290,6 @@ files:
 - spec/data/swissmedic_orphans.html
 - spec/data/swissmedic_package.xlsx
 - spec/data/swissmedic_packages.html
-- spec/data/wsdl.xml
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml
 - spec/data/zurrose_transfer.dat
@@ -349,6 +352,10 @@ test_files:
 - spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/swissindex.xml
+- spec/data/swissindex_NonPharma_DE.xml
+- spec/data/swissindex_NonPharma_FR.xml
+- spec/data/swissindex_Pharma_DE.xml
+- spec/data/swissindex_Pharma_FR.xml
 - spec/data/swissindex_nonpharma.xml
 - spec/data/swissindex_pharma.xml
 - spec/data/swissmedic_fridge.xlsx
@@ -360,7 +367,6 @@ test_files:
 - spec/data/swissmedic_orphans.html
 - spec/data/swissmedic_package.xlsx
 - spec/data/swissmedic_packages.html
-- spec/data/wsdl.xml
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml
 - spec/data/zurrose_transfer.dat

data/spec/data/wsdl.xml DELETED

@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<wsdl:definitions
-  xmlns:s="http://www.w3.org/2001/XMLSchema"
-  xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/"
-  xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
-  xmlns:tns="http://example.com/test"
-  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-  xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
-  xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
-  xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
-  targetNamespace="http://example.com/test"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <s:schema elementFormDefault="qualified" targetNamespace="http://example.com/test">
-    </s:schema>
-  </wsdl:types>
-  <wsdl:message name="DownloadAllSoapIn">
-    <wsdl:part name="lang" element="tns:lang" />
-  </wsdl:message>
-  <wsdl:message name="DownloadAllSoapOut">
-    <wsdl:part name="DownloadAllResult" element="tns:PHARMA" />
-  </wsdl:message>
-  <wsdl:binding name="ws_Pharma_V101Soap" type="tns:ws_Pharma_V101Soap">
-    <soap:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="DownloadAll">
-      <soap:operation soapAction="http://example.com/DownloadAll" style="document" />
-      <wsdl:input>
-        <soap:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:binding name="ws_Pharma_V101Soap12" type="tns:ws_Pharma_V101Soap">
-    <soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
-    <wsdl:operation name="DownloadAll">
-      <soap12:operation soapAction="http://example.com/DownloadAll" style="document" />
-      <wsdl:input>
-        <soap12:body use="literal" />
-      </wsdl:input>
-      <wsdl:output>
-        <soap12:body use="literal" />
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="ws_Pharma_V101">
-    <wsdl:port name="ws_Pharma_V101Soap" binding="tns:ws_Pharma_V101Soap">
-      <soap:address location="https://example.com/test" />
-    </wsdl:port>
-    <wsdl:port name="ws_Pharma_V101Soap12" binding="tns:ws_Pharma_V101Soap12">
-      <soap12:address location="https://example.com/test" />
-    </wsdl:port>
-  </wsdl:service>
-</wsdl:definitions>