oddb2xml 2.2.1 → 2.2.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 19cb17a6ab16e748a03ab65af4bba16aede568fb
+  data.tar.gz: 2f8b5df5bcd40691b9bd4f7dfe2814fc241e5700
+SHA512:
+  metadata.gz: aa81cf96680ecc7abf8c5cb6979afb47413d3d47663bbfdf1f629a8624bd990def9dcfec0302c5254c49d959293faca2deb18759fabcb68c592e195e0b54b949
+  data.tar.gz: 44b68d9f40dffae84a6289f9c40679c6eacde7cdf70a60016c0b18cb5856097ebcddb74eda98d089f052f2f16fd4ee8df760b05caeaec3d0be698dde5b18ee0e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oddb2xml (2.2.1)
+    oddb2xml (2.2.2)
       archive-tar-minitar
       httpi (>= 2.4.1)
       mechanize
@@ -25,16 +25,12 @@ GEM
     archive-tar-minitar (0.5.2)
     blankslate (3.1.3)
     builder (3.2.2)
+    byebug (4.0.5)
+      columnize (= 0.9.0)
     coderay (1.1.0)
     columnize (0.9.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
-    debugger (1.6.8)
-      columnize (>= 0.3.1)
-      debugger-linecache (~> 1.2.0)
-      debugger-ruby_core_source (~> 1.3.5)
-    debugger-linecache (1.2.0)
-    debugger-ruby_core_source (1.3.8)
     diff-lcs (1.2.5)
     domain_name (0.5.24)
       unf (>= 0.0.5, < 1.0.0)
@@ -70,9 +66,12 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    pry-debugger (0.2.3)
-      debugger (~> 1.3)
-      pry (>= 0.9.10, < 0.11.0)
+    pry-byebug (3.1.0)
+      byebug (~> 4.0)
+      pry (~> 0.10)
+    pry-doc (0.8.0)
+      pry (~> 0.9)
+      yard (~> 0.8)
     rack (1.6.4)
     rake (10.4.2)
     rdoc (4.2.0)
@@ -91,7 +90,7 @@ GEM
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
     ruby-ole (1.2.11.8)
-    rubyXL (3.3.9)
+    rubyXL (3.3.10)
       nokogiri (>= 1.4.4)
       rubyzip (>= 1.1.6)
     rubyntlm (0.5.1)
@@ -121,6 +120,7 @@ GEM
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
     webrobots (0.1.1)
+    yard (0.8.7.6)
 
 PLATFORMS
   ruby
@@ -128,7 +128,8 @@ PLATFORMS
 DEPENDENCIES
   bundler
   oddb2xml!
-  pry-debugger
+  pry-byebug
+  pry-doc
   rake
   rdoc
   rspec

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.2.1 / 04.07.2015
+
+* Adapt to new version of swissmedic Packungen.xlsx
+
 === 2.2.1 / 01.07.2015
 
 * Add a require 'mechanize' in bin/oddb2xml to avoid 'Invalid version of rubyntlm'

data/lib/oddb2xml/builder.rb

@@ -669,14 +669,26 @@ module Oddb2xml
                 puts "#{Time.now}: At row #{row_nr} iksnr #{iksnr}";
                 $stdout.flush
             end
-            no8                 = sprintf('%05d',row.cells[0].value.to_i) + sprintf('%03d',row.cells[10].value.to_i)
-            name                = row.cells[2]  ? row.cells[2].value  : nil
-            atc_code            = row.cells[5]  ? row.cells[5].value  : nil
-            list_code           = row.cells[6]  ? row.cells[6].value  : nil
-            package_size        = row.cells[11] ? row.cells[11].value : nil
-            unit                = row.cells[12] ? row.cells[12].value : nil
-            active_substance    = row.cells[14] ? row.cells[14].value : nil
-            composition         = row.cells[15] ? row.cells[15].value : nil
+            ith       = COLUMNS_JULY_2015.keys.index(:index_therapeuticus)
+            seq_name  = COLUMNS_JULY_2015.keys.index(:name_base)
+            i_3       = COLUMNS_JULY_2015.keys.index(:ikscd)
+            p_1_2     = COLUMNS_JULY_2015.keys.index(:seqnr)
+            cat       = COLUMNS_JULY_2015.keys.index(:ikscat)
+            siz       = COLUMNS_JULY_2015.keys.index(:size)
+            atc       = COLUMNS_JULY_2015.keys.index(:atc_class)
+            list_code = COLUMNS_JULY_2015.keys.index(:production_science)
+            unit      = COLUMNS_JULY_2015.keys.index(:unit)
+            sub       = COLUMNS_JULY_2015.keys.index(:substances)
+            comp      = COLUMNS_JULY_2015.keys.index(:composition)
+
+            no8                 = iksnr + sprintf('%03d',row.cells[i_3].value.to_i)
+            name                = row.cells[seq_name]  ? row.cells[seq_name].value  : nil
+            atc_code            = row.cells[atc]  ? row.cells[atc].value  : nil
+            list_code           = row.cells[list_code]  ? row.cells[list_code].value  : nil
+            package_size        = row.cells[siz] ? row.cells[siz].value : nil
+            unit                = row.cells[unit] ? row.cells[unit].value : nil
+            active_substance    = row.cells[sub] ? row.cells[sub].value : nil
+            composition         = row.cells[comp] ? row.cells[comp].value : nil
 
             # skip veterinary product
             next if atc_code  and /^Q/i.match(atc_code)

data/lib/oddb2xml/cli.rb

@@ -187,7 +187,7 @@ module Oddb2xml
         begin # instead of Thread.new do
           downloader = SwissmedicDownloader.new(what)
           bin = downloader.download
-          Oddb2xml.log("SwissmedicDownloader #{var} bin #{bin.size} bytes")
+          Oddb2xml.log("SwissmedicDownloader #{var} #{bin} #{File.size(bin)} bytes")
           self.instance_variable_set(
             "@#{var}".intern,
             items = SwissmedicExtractor.new(bin, what).to_arry
@@ -221,7 +221,7 @@ module Oddb2xml
         begin # instead of Thread.new do
           downloader = SwissmedicDownloader.new(:package, @options)
           bin = downloader.download
-          Oddb2xml.log("SwissmedicDownloader bin #{bin.size} bytes")
+          Oddb2xml.log("SwissmedicDownloader package #{bin} #{File.size(bin)} bytes")
           @mutex.synchronize do
             @packs = SwissmedicExtractor.new(bin, :package).to_hash
             Oddb2xml.log("SwissmedicExtractor added #{@packs.size} packs from #{bin}")

data/lib/oddb2xml/extractor.rb

@@ -217,6 +217,7 @@ module Oddb2xml
       when :orphan
         i = 1
         @sheet.each do |row|
+          next unless row[1]
           number = row[1].value.to_i
           if number != 0
             data << sprintf("%05d", number)
@@ -233,19 +234,27 @@ module Oddb2xml
       cleanup_file
       data.uniq
     end
-    def to_hash # Packungen.xls
+
+    def to_hash # Packungen.xlsx COLUMNS_JULY_2015
       data = {}
       return data unless @sheet
       case @type
       when :package
-        typ = 6 # Heilmittelcode
-        i_5,i_3   = 0,10 # :swissmedic_numbers
-        p_5,p_1_2 = 0,1  # :prodno
-        cat       = 13   # :swissmedic_category
-        seq_name  = 2
-        ith       = 4    # :ith_swissmedic IT-Code (swissmedic-diff)
-        atc       = 5    # :atc_code
-        list_code = 6    #  Heilmittelcode, possible values are
+        Oddb2xml.check_column_indices(@sheet)
+        ith       = COLUMNS_JULY_2015.keys.index(:index_therapeuticus)
+        i_5       = COLUMNS_JULY_2015.keys.index(:iksnr)
+        seq_name  = COLUMNS_JULY_2015.keys.index(:name_base)
+        i_3       = COLUMNS_JULY_2015.keys.index(:ikscd)
+        p_1_2     = COLUMNS_JULY_2015.keys.index(:seqnr)
+        cat       = COLUMNS_JULY_2015.keys.index(:ikscat)
+        siz       = COLUMNS_JULY_2015.keys.index(:size)
+        atc       = COLUMNS_JULY_2015.keys.index(:atc_class)
+        list_code = COLUMNS_JULY_2015.keys.index(:production_science)
+        eht       = COLUMNS_JULY_2015.keys.index(:unit)
+        sub       = COLUMNS_JULY_2015.keys.index(:substances)
+        comp      = COLUMNS_JULY_2015.keys.index(:composition)
+
+        # production_science Heilmittelcode, possible values are
         # Allergene
         # Anthroposophika
         # ayurvedische Arzneimittel
@@ -262,14 +271,10 @@ module Oddb2xml
         # tibetische Arzneimittel
         # Tierarzneimittel
         # Transplantat: Gewebeprodukt
-        siz       = 11   # :package_size
-        eht       = 12   # :einheit_swissmedic
-        sub       = 14   # :substance_swissmedic
-        comp      = 15   # :composition_swissmedic
         @sheet.each_with_index do |row, i|
 
           next if (i <= 1)
-          next unless row[i_5] and row[i_3]
+          next unless row and row[i_5] and row[i_3]
           no8 = sprintf('%05d',row[i_5].value.to_i) + sprintf('%03d',row[i_3].value.to_i)
           prodno = sprintf('%05d',row[i_5].value.to_i) + row[p_1_2].value.to_i.to_s
           unless no8.empty?
@@ -287,7 +292,7 @@ module Oddb2xml
               :substance_swissmedic => row[sub] ? row[sub].value.to_s : '',
               :composition_swissmedic => row[comp] ? row[comp].value.to_s : '',
               :sequence_name        => row[seq_name] ? row[seq_name].value.to_s : '',
-              :is_tier              => (row[typ] == 'Tierarzneimittel' ? true : false),
+              :is_tier              => (row[list_code] == 'Tierarzneimittel' ? true : false),
             }
           end
         end

data/lib/oddb2xml/util.rb

@@ -65,5 +65,49 @@ module Oddb2xml
     return if File.expand_path(file).eql?(dest)
     FileUtils.cp(src, dest, :verbose => false)
     Oddb2xml.log("download_finished saved as #{dest} #{File.size(dest)} bytes.")
-  end                            
+  end
+
+  # please keep this constant in sync between (GEM) swissmedic-diff/lib/swissmedic-diff.rb and (GEM) oddb2xml/lib/oddb2xml/extractor.rb
+  def Oddb2xml.check_column_indices(sheet)
+    row = sheet[4] # Headers are found at row 4
+
+    error_2015 = nil
+    COLUMNS_JULY_2015.each{
+      |key, value|
+      header_name = row[COLUMNS_JULY_2015.keys.index(key)].value
+      unless value.match(header_name)
+        puts "#{__LINE__}: #{key} ->  #{COLUMNS_JULY_2015.keys.index(key)} #{value}\nbut was  #{header_name}" if $VERBOSE
+        error_2015 = "Packungen.xlslx_has_unexpected_column_#{COLUMNS_JULY_2015.keys.index(key)}_#{key}_#{value.to_s}_but_was_#{header_name}"
+        break
+      end
+    }
+    raise "#{error_2015}" if error_2015
+  end
+
+  # please keep this constant in sync between (GEM) swissmedic-diff/lib/swissmedic-diff.rb and (GEM) oddb2xml/lib/oddb2xml/extractor.rb
+  COLUMNS_JULY_2015 = {
+      :iksnr => /Zulassungs-Nummer/i,                  # column-nr: 0
+      :seqnr => /Dosisstärke-nummer/i,
+      :name_base => /Präparatebezeichnung/i,
+      :company => /Zulassungsinhaberin/i,
+      :production_science => /Heilmittelcode/i,
+      :index_therapeuticus => /IT-Nummer/i,            # column-nr: 5
+      :atc_class => /ATC-Code/i,
+      :registration_date => /Erstzulassungs-datum./i,
+      :sequence_date => /Zul.datum Dosisstärke/i,
+      :expiry_date => /Gültigkeitsdauer der Zulassung/i,
+      :ikscd => /Packungscode/i,                 # column-nr: 10
+      :size => /Packungsgrösse/i,
+      :unit => /Einheit/i,
+      :ikscat => /Abgabekategorie Packung/i,
+      :ikscat_seq => /Abgabekategorie Dosisstärke/i,
+      :ikscat_preparation => /Abgabekategorie Präparat/i, # column-nr: 15
+      :substances => /Wirkstoff/i,
+      :composition => /Zusammensetzung/i,
+      :indication_registration => /Anwendungsgebiet Präparat/i,
+      :indication_sequence => /Anwendungsgebiet Dosisstärke/i,
+      :gen_production => /Gentechnisch hergestellte Wirkstoffe/i, # column-nr 20
+      :insulin_category => /Kategorie bei Insulinen/i,
+      :drug_index       => /Verz. bei betäubunsmittel-haltigen Präparaten/i,
+  }
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.2.1"
+  VERSION = "2.2.2"
 end

metadata

@@ -1,164 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.2.1
-  prerelease: 
+  version: 2.2.2
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-01 00:00:00.000000000 Z
+date: 2015-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyntlm
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -166,7 +146,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -174,145 +153,127 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.4.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
@@ -322,9 +283,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -408,33 +369,26 @@ files:
 homepage: https://github.com/zdavatz/oddb2xml
 licenses:
 - GPL-v2
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3609153870223994777
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3609153870223994777
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: oddb2xml creates xml files.
 test_files:
 - spec/builder_spec.rb
@@ -485,3 +439,4 @@ test_files:
 - spec/options_spec.rb
 - spec/parslet_spec.rb
 - spec/spec_helper.rb
+has_rdoc: