oddb2xml 2.4.2 → 2.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e843316fece7832e0a39b9ee486b2e1443a53c5
-  data.tar.gz: afe50f51c3876a86737dda382c68f9f5b736ac6f
+  metadata.gz: f3bb1935034ceac75c20a7a760647779e269cfbd
+  data.tar.gz: c7a68dad6adbf982c83d6ef8b9794bc551f2233b
 SHA512:
-  metadata.gz: f3374d25d048992d8a0dac05eda9a8041c8801049a134110c26dae2acae50aae302d17da71904d95679fd050a3881edf5d8ef65919970db8e8d3ac614460ca0a
-  data.tar.gz: cc42b09f80d81c4d2e39348075c6044b96f17822f277dfbd9d8e5bcdebb6c0a95dfc7bca785941b03139d17359a25be8151303d23a5cf765c8b131f199d86e24
+  metadata.gz: 549c6c25a4e157b3dd463fbae8ab2fea31d26a6ef0eac7c6020acc8a0904ed6c638d4ee29f4bad6e594874686a1c24e3b6ec84fefb0bf6baf0e85381e453f546
+  data.tar.gz: 0dce9a5cf5bb1afc960d524cf2208e27d79c516c0f00b42596783004de39f2b3d949c66874dba7576e2bfd41768bc21bf850c58e7dba91b873ffca1b0e5e9515

data/.travis.yml

@@ -11,16 +11,16 @@ before_install:
 script: bundle exec rspec
 
 rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
   
 matrix:
   allow_failures:
     - rvm: ruby-head
+    - rvm: 2.2.7
+    - rvm: 2.3.4
 
 notifications:
   email:

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.4.3 / 11.09.2017
+
+* Never drop lines with UTF-8 problems while creating XML files
+* Fix some rspec errors
+* Travis runs only for ruby 2.2.7 and newer
+* Do not emit a DEL field for limitations, as it is not specifid in the oddb2xml.xsd
+
 === 2.4.2 / 6.09.2017
 
 * Ignore lines that cannot be converted from UTF-8 to ISO-8859-1

data/lib/oddb2xml/builder.rb

@@ -299,10 +299,14 @@ module Oddb2xml
       _builder = Nokogiri::XML::Builder.new(:encoding => 'utf-8') do |xml|
         xml.doc.tag_suffix = @tag_suffix
         datetime = Time.new.strftime('%FT%T%z')
-        xml.LIMITATION(XML_OPTIONS) {
+        xml.LIMITATION(XML_OPTIONS) do
         nbr_records = 0
         @limitations.each do |lim|
-            xml.LIM('DT' => '') {
+          if lim[:id].empty?
+            puts "Skipping empty id of #{lim}"
+            next
+          end
+            xml.LIM('DT' => '') do
               case lim[:key]
               when :swissmedic_number8
                 xml.SwissmedicNo8 lim[:id]
@@ -319,20 +323,16 @@ module Oddb2xml
               xml.DSCRD      lim[:desc_de]
               xml.DSCRF      lim[:desc_fr]
               xml.VDAT       lim[:vdate]
-              if lim[:del]
-                xml.DEL 3
-              end
               nbr_records += 1
-
-            }
+            end
           end
-          xml.RESULT {
+          xml.RESULT do
             xml.OK_ERROR   'OK'
             xml.NBR_RECORD nbr_records
             xml.ERROR_CODE ''
             xml.MESSAGE    ''
-          }
-        }
+          end
+        end
       end
       Oddb2xml.add_hash(_builder.to_xml)
     end
@@ -642,7 +642,7 @@ module Oddb2xml
           xml.SUBSTANCE_NAME substance.name
           xml.IS_ACTIVE_AGENT substance.is_active_agent if emit_active
           if substance.dose
-            if substance.qty.is_a?(Float) or substance.qty.is_a?(Fixnum)
+            if substance.qty.is_a?(Float) or substance.qty.is_a?(Integer)
               xml.QTY  substance.qty
               xml.UNIT substance.unit
             else

data/lib/oddb2xml/calc.rb

@@ -289,7 +289,7 @@ public
     end
 
     def pkg_size_to_int(pkg_size, skip_last_part = false)
-      return pkg_size if pkg_size.is_a?(Fixnum)
+      return pkg_size if pkg_size.is_a?(Integer)
       return 1 unless pkg_size
       parts = pkg_size.split(/\s*x\s*/i)
       parts = parts[0..-2] if skip_last_part and parts.size > 1
@@ -349,4 +349,4 @@ public
       return nil
     end
   end
-end
+end

data/lib/oddb2xml/cli.rb

@@ -137,12 +137,10 @@ module Oddb2xml
           end
           File.open(File.join(WorkDir, file), 'w:utf-8') do |fh|
             output.split("\n").each do |line|
-              begin
-                # We want to ignore lines which are not really UTF-8 encoded
-                iso_8859_1 = line.encode('ISO-8859-1')
+              if /.xml$/i.match(file)
                 fh.puts(line)
-              rescue => error
-                puts "#{error}: #{file} Ignoring #{line}"
+              else
+                fh.puts(Oddb2xml.convert_to_8859_1(line))
               end
             end
           end

data/lib/oddb2xml/downloader.rb

@@ -228,7 +228,6 @@ module Oddb2xml
         :log_level       => :info,
         :log             => false, # $stdout
         :raise_errors    => true,
-        :ssl_version     => :SSLv3,
         :wsdl            => @url
       }
       @client = Savon::Client.new(config)

data/lib/oddb2xml/extractor.rb

@@ -124,6 +124,10 @@ module Oddb2xml
               key = :swissmedic_number8
               id  = item[:packages][ean][key].to_s
             end
+            if id.empty? && item[:packages][ean][ :swissmedic_number8]
+              key = :swissmedic_number8
+              id  = item[:packages][ean][key].to_s
+            end
             lims.each do |lim|
               limitation = {
                 :it      => item[:it_code],

data/lib/oddb2xml/util.rb

@@ -20,6 +20,27 @@ module Oddb2xml
   @atc_csv_origin = 'https://raw.githubusercontent.com/epha/robot/master/data/manual/swissmedic/atc.csv'
   @atc_csv_content = {}
 
+  def Oddb2xml.convert_to_8859_1(line)
+    begin
+      # We want to ignore lines which are not really UTF-8 encoded
+      return line.encode('ISO-8859-1')
+    rescue => error
+      ausgabe = ''
+      0.upto(line.size-1).each do |idx|
+        begin
+          if line[idx].ord == 8211
+            ausgabe += '-'
+          else
+            ausgabe += line[idx].encode('ISO-8859-1')
+          end
+        rescue => error
+          puts "#{error}: in #{line} at #{idx}"
+        end
+      end
+    end
+    ausgabe.encode('ISO-8859-1')
+  end
+
   def Oddb2xml.add_epha_changes_for_ATC(iksnr, atc_code)
     if @atc_csv_content.size == 0
       open(@atc_csv_origin).readlines.each{

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.4.2"
+  VERSION = "2.4.3"
 end

data/spec/builder_spec.rb

@@ -60,8 +60,8 @@ ARTICLE_COMMON_ELEMENTS =    [
   ['ARTICLE/ART/ARTBAR/BC', Oddb2xml::ORPHAN_GTIN.to_s],
   ['ARTICLE/ART/ARTBAR/BC', Oddb2xml::FRIDGE_GTIN.to_s],
   ['ARTICLE/ART/DSCRD', 'NAROPIN Inj Lös 0.2 % 5 Polybag 100 ml'],
-  ['ARTICLE/ART/DSCRF', 'NAROPIN sol inj 0.2 % 5 polybag 100 ml"'],
-  ['ARTICLE/ART/SORTD', 'NAROPIN INJ LöS 0.2 % 5 POLYBAG 100 ML'],
+  ['ARTICLE/ART/DSCRF', 'NAROPIN sol inj 0.2 % 5 polybag 100 ml'],
+  ['ARTICLE/ART/SORTD', 'NAROPIN INJ LÖS 0.2 % 5 POLYBAG 100 ML'],
   ['ARTICLE/ART/SORTF', 'NAROPIN SOL INJ 0.2 % 5 POLYBAG 100 ML'],
   ['ARTICLE/ART/SYN1D', 'Hirudoid'],
   ['ARTICLE/ART/SYN1F', 'Hirudoid'],
@@ -943,6 +943,14 @@ if RUN_ALL
       IO.readlines(dat_filename).each{ |line| check_article_IGM_format(line, 892, true) }
     end
   end
+  context 'when utf-8 to iso-8859 fails' do
+    it 'should return a correct 8859 line' do
+      lines = IO.readlines(File.join(Oddb2xml::SpecData, 'problems.txt'))
+      out = Oddb2xml.convert_to_8859_1(lines.first)
+      expect(out.encoding.to_s).to eq 'ISO-8859-1'
+      expect(out.chomp).to eq '<NAME_DE>SENSURA Mio 1t Uro 10-33 midi con lig so op 10 Stk</NAME_DE>'
+    end
+  end
+end
 end
 end
-end

data/spec/data/problems.txt

@@ -0,0 +1,4 @@
+<NAME_DE>SENSURA Mio 1t Uro 10–33 midi con lig so op 10 Stk</NAME_DE>
+<NAME_FR>SENSURA Mio 1t Uro 10–33 midi con lig so op 10 pce</NAME_FR>
+<NAME_DE>SENSURA Mio 1t Uro 10–33 maxi con lig so op 10 Stk</NAME_DE>
+<NAME_FR>SENSURA Mio 1t Uro 10–33 maxi con lig so op 10 pce</NAME_FR>

data/spec/downloader_spec.rb

@@ -326,7 +326,7 @@ describe Oddb2xml::EphaDownloader do
       expect(csv.bytes).not_to be nil
     end
     it 'should clean up current directory' do
-      File.exist?('epha_interactions.csv').should eq(false)
+      expect(File.exist?('epha_interactions.csv')).to eq(false)
     end
     it 'should save under download' do
       expect(File.exist?(File.join(Oddb2xml::Downloads, 'epha_interactions.csv'))).to eq(true)
@@ -533,12 +533,10 @@ describe Oddb2xml::MedregbmDownloader do
     context 'download betrieb txt' do
       let(:txt) { @downloader.download }
       it 'should return valid String' do
-        pending 'Should handle SSL issues'
         expect(txt).to be_a String
         expect(txt.bytes).not_to be nil
       end
       it 'should clean up current directory' do
-        pending 'Should handle SSL issues'
         expect { txt }.not_to raise_error
         expect(File.exist?('oddb_company.xls')).to eq(false)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.4.3
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-06 00:00:00.000000000 Z
+date: 2017-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -343,6 +343,7 @@ files:
 - spec/data/oddb2xml_files_bm_update.txt
 - spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb2xml_files_nonpharma.xls
+- spec/data/problems.txt
 - spec/data/swissmedic_fridges.html
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info_2.html
@@ -421,6 +422,7 @@ test_files:
 - spec/data/oddb2xml_files_bm_update.txt
 - spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb2xml_files_nonpharma.xls
+- spec/data/problems.txt
 - spec/data/swissmedic_fridges.html
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info_2.html