oddb2xml 2.1.0 → 2.1.1

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MWIzODZlNjVlYTgzMzIxNDUwNmQ1NjgwMjdhNGFkNWEwNmI2NjExYQ==
-  data.tar.gz: !binary |-
-    NDYwYWMxMmQ5YjVlNWM4NmNlOTU4NWY0NDU2YjRhZThlNTUzNjhmNw==
+SHA1:
+  metadata.gz: ec7329a09ad1bb1583d274d1d482e453eef3c37f
+  data.tar.gz: 181017c8c0b5508cf2e8951ae9c90184d9cfcf4f
 SHA512:
-  metadata.gz: !binary |-
-    NzQ1OWJlMmVlZDMzM2ZkMDM0M2Q0MzNlNGEyNzYxNGE0YjYxN2FjM2RkNjM0
-    Y2Y0Yjk4YTkxZGY5YTBjODMzYWE2ZjQ3NGZlMzU5YTUxZmI0N2QxZGY5MDQ0
-    YjRjMWIyNWNmZGI1YzYyOTBiODU2MjU1MDFkODU5MjIyOTczYjE=
-  data.tar.gz: !binary |-
-    MjIxZWJkY2JmNzhlOGNhNTljMDUwZmU3YThhODAwYTNiNTYxMTg0MDE3ZDcy
-    MGMzNjA0MGY4ODFlZWJjM2MzYzIxOTU4MTVkOWVhMTUxMzBhOTE4MDQ5OTM3
-    ODY4ZDY0ZWNjZDQ1YzY2NTQ0ZDQyNDI1MjgxYmYwNDkyNzcyMTY=
+  metadata.gz: 7d818fe51aedc2c48e90d081fe21c620e5c311446a0e6c7a9cd62654272f41a0d6ad9df27f13e9beb3bb3ea70569f0957080fb97f9670646e49b4abefad2f8c0
+  data.tar.gz: f1d1a4eccc9ee8c35e3f1d5f42b0d4ec3fd9f089e194ab2b0e7c7bc644b21898a71dd606d4fafb578ebd9125cd159002ab195375dc7804c9e81aff82e243aa79

data/Gemfile.lock

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

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.1 / 13.05.2015
+
+* --calc classifies now all E-xxx nutritional additions
+
 === 2.1.0 / 12.05.2015
 
 * --calc uses now a parser to split Column-C into the preparationname and the galenic-form

data/lib/oddb2xml/calc.rb

@@ -345,8 +345,8 @@ public
         if idx = search_exact_galform(gal_form)
           return idx
         end
-        return nil
       end
+      return nil
     end
   end
 end

data/lib/oddb2xml/extractor.rb

@@ -456,6 +456,7 @@ module Oddb2xml
     # see http://dev.ywesee.com/Bbmb/TransferDat
     def initialize(dat, extended = false)
       @@extended = extended
+      FileUtils.makedirs(WorkDir)
       @@error_file ||= File.open(File.join(WorkDir, "duplicate_ean13_from_zur_rose.txt"), 'wb+:ISO-8859-14')
       @@items_without_ean13s ||= 0
       @@duplicated_ean13s ||= 0

data/lib/oddb2xml/parslet_compositions.rb

@@ -94,6 +94,7 @@ class QtyLit   < Struct.new(:qty)
 end
 
 class CompositionTransformer < Parslet::Transform
+  @@more_info = nil
   def CompositionTransformer.get_ratio(parse_info)
     if parse_info[:ratio]
       if parse_info[:ratio].to_s.length > 0 and parse_info[:ratio].to_s != ', '
@@ -106,6 +107,30 @@ class CompositionTransformer < Parslet::Transform
     end
   end
 
+  def CompositionTransformer.check_e_substance(substance)
+    return unless /^E \d\d\d/.match(substance.name)
+    unless substance.more_info
+      case substance.name[2]
+      when "1"
+        substance.more_info = 'color.'
+      when "2"
+        substance.more_info = 'conserv.'
+      else
+      end
+      substance.more_info ||= @@more_info
+    end
+    @@more_info = substance.more_info
+  end
+
+  def CompositionTransformer.add_excipiens(info)
+    @@more_info           = nil
+    @@excipiens           = ParseSubstance.new(info[:excipiens_description] ? info[:excipiens_description] : 'Excipiens')
+    @@excipiens.dose      = info[:dose] if info[:dose]
+    @@excipiens.more_info = CompositionTransformer.get_ratio(info)
+    @@excipiens.cdose     = info[:dose_corresp] if info[:dose_corresp]
+    @@excipiens.more_info = info[:more_info] if info[:more_info]
+  end
+
   rule(:corresp => simple(:corresp),
        ) {
     |dictionary|
@@ -138,6 +163,7 @@ class CompositionTransformer < Parslet::Transform
         dose = dictionary[:dose].is_a?(ParseDose) ? dictionary[:dose] : nil
         substance = ParseSubstance.new(dictionary[:substance_name].to_s, dose)
         substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, '') if dictionary[:more_info] and dictionary[:more_info].to_s.length > 0
+        CompositionTransformer.check_e_substance(substance)
         @@substances <<  substance
         substance
   }
@@ -148,7 +174,8 @@ class CompositionTransformer < Parslet::Transform
     |dictionary|
       puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
       substance =  ParseSubstance.new("#{dictionary[:lebensmittel_zusatz]} #{dictionary[:digits]}")
-      substance.more_info =  dictionary[:more_info].to_s.sub(/:\s+$/, '').strip if dictionary[:more_info]
+      substance.more_info = dictionary[:more_info].to_s.strip.sub(/:$/, '') if dictionary[:more_info] and dictionary[:more_info].to_s.length > 0
+      CompositionTransformer.check_e_substance(substance)
       @@substances <<  substance
       substance
   }
@@ -162,29 +189,19 @@ class CompositionTransformer < Parslet::Transform
        info[:dose_corresp] or
        info[:more_info] or
        CompositionTransformer.get_ratio(dictionary)
-        @@excipiens           =  ParseSubstance.new(info[:excipiens_description] ? info[:excipiens_description] : 'Excipiens')
-        @@excipiens.dose      = info[:dose] if info[:dose]
-        @@excipiens.more_info = CompositionTransformer.get_ratio(dictionary)
-        @@excipiens.cdose     = info[:dose_corresp] if info[:dose_corresp]
-        @@excipiens.more_info = info[:more_info] if info[:more_info]
+       CompositionTransformer.add_excipiens(info)
       end
       nil
   }
   rule(:composition => subtree(:composition),
        ) {
     |dictionary|
-      puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-      info = dictionary[:composition].is_a?(Hash) ? dictionary[:composition] : dictionary[:composition].first
-      if info.is_a?(Hash)
-        @@excipiens           =  ParseSubstance.new(info[:excipiens_description] ? info[:excipiens_description] : 'Excipiens')
-        @@excipiens.dose      = info[:dose] if info[:dose]
-        @@excipiens.more_info = CompositionTransformer.get_ratio(dictionary)
-        @@excipiens.cdose     = info[:dose_corresp] if info[:dose_corresp]
-        @@excipiens.more_info = info[:more_info] if info[:more_info]
-        binding.pry if dictionary[:dose_2]
-        @@excipiens
+        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+       info = dictionary[:composition].is_a?(Hash) ? dictionary[:composition] : dictionary[:composition].first
+       if info.is_a?(Hash)
+         CompositionTransformer.add_excipiens(info)
        else
-        info
+         info
        end
        }
   rule(:substance => simple(:substance),
@@ -247,9 +264,10 @@ class CompositionTransformer < Parslet::Transform
     dose
   }
 
-@@substances ||= []
+  @@substances ||= []
   @@excipiens  = nil
   def CompositionTransformer.clear_substances
+    @@more_info  = nil
     @@substances = []
     @@excipiens  = nil
     @@corresp    = nil

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/spec/calc_spec.rb

@@ -141,6 +141,28 @@ Corresp. 5300 kJ.",
                                }
                             )
 
+  context 'handle E substances correctly' do
+    e_200_examples =
+        {
+        'Comprimé pelliculé: ondansetronum 4 mg ut ondansetroni hydrochloridum dihydricum, E 200, arom.: vanillinum, color.: E 104, excipiens pro compresso obducto.'  =>
+          'conserv.',
+      'ginkgonis extractum siccum raffinatum et quantificatum 120 mg corresp. flavonglycosida ginkgo 26.4-32.4 mg et terpenlactona ginkgo 6.48-7.92 mg, DER: 35-67:1, antiox.: E 200, excipiens pro compresso obducto.' =>
+        'antiox.',
+      'lamotriginum 100 mg, aromatica, antiox.: E 310, E 320, E 321, conserv.: E 200, excipiens pro compresso.' =>
+        'conserv.',
+        }
+    e_200_examples.each{
+      | txt, e_200_expected_attribut|
+      context txt.split(' ').first do
+        info = ParseUtil.parse_compositions(txt)
+        e_200 =  info.first.substances.find{ |x| x.name.match(/E 200/i) }
+        specify { expect(info.first.excipiens.more_info).to eq  nil }
+        specify { expect(e_200.class).to eq  ParseSubstance }
+        specify { expect(e_200.more_info).to eq  e_200_expected_attribut}
+      end
+    }
+  end
+
 if RunAllTests
   context 'should return correct value for liquid' do
     pkg_size_L = '1 x 5 x 200'
@@ -421,7 +443,7 @@ if RunAllTests
       specify { expect(e_127.unit).to eq  nil}
     end
   end
-end
+
   context 'find correct result for 274 Cardio-Pulmo-Rénal Sérocytol, suppositoire' do
     info = Calc.new(tst_cardio_pumal.name_C, tst_cardio_pumal.package_size_L, tst_cardio_pumal.einheit_M, tst_cardio_pumal.active_substance_0, tst_cardio_pumal.composition_P)
     specify { expect(info.galenic_form.description).to eq 'suppositoire' }
@@ -443,13 +465,14 @@ end
     if e_216
       specify { expect(e_216.name).to eq  'E 216' }
       specify { expect(e_216.unit).to eq  nil}
+      specify { expect(e_216.more_info).to eq 'conserv.'}
     end
     e_218 =  info.compositions.first.substances.find{ |x| x.name.match(/E 218/i) }
     specify { expect(e_218).not_to eq nil}
+    specify { expect(e_218).not_to eq nil}
+    specify { expect(e_218.more_info).to eq 'conserv.'}
   end
 
-if RunAllTests
-
   context 'find correct result compositions for 00613 Pentavac' do
     line_1 = "I) DTPa-IPV-Komponente (Suspension): toxoidum diphtheriae 30 U.I., toxoidum tetani 40 U.I., toxoidum pertussis 25 µg et haemagglutininum filamentosum 25 µg, virus poliomyelitis typus 1 inactivatum (D-Antigen) 40 U., virus poliomyelitis typus 2 inactivatum (D-Antigen) 8 U., virus poliomyelitis typus 3 inactivatum (D-Antigen) 32 U., aluminium ut aluminii hydroxidum hydricum ad adsorptionem, formaldehydum 10 µg, conserv.: phenoxyethanolum 2.5 µl, residui: neomycinum, streptomycinum, polymyxini B sulfas, medium199, aqua q.s. ad suspensionem pro 0.5 ml."
     line_2 = "II) Hib-Komponente (Lyophilisat): haemophilus influenzae Typ B polysaccharida T-conjugatum 10 µg, trometamolum, saccharum, pro praeparatione."

data/spec/extractor_spec.rb

@@ -204,7 +204,6 @@ end
   context 'when parsing examples' do
     subject do
       filename = File.expand_path(File.join(__FILE__, '..', 'data', 'zurrose_transfer.dat'))
-      puts "filename #{filename} #{File.exists?(filename)}"
       Oddb2xml::ZurroseExtractor.new(filename, true)
     end
     it "should set the correct Ethacridin description" do

metadata

@@ -1,209 +1,209 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.5.10
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubyXL
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.3.1
 - !ruby/object:Gem::Dependency
   name: sax-machine
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
@@ -213,9 +213,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - History.txt
@@ -313,17 +313,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: oddb2xml creates xml files.