oddb2xml 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ee7a2f5a9b16cb824676ba720cfc37bf14f293d
-  data.tar.gz: 3e75b9996fe29533d5479899630fa5b3e48a05f4
+  metadata.gz: 3e9bbe51b5e926b39ac2d60f3131cf854703eac9
+  data.tar.gz: 27cd61843652cc26ce542615055bd39cd41a0cb3
 SHA512:
-  metadata.gz: 2f8d17701b4cd24180ceb9ad11350ffe23b821e39bab8cde731f1e008a49eb52face6cc760c6dfcb76dbdc003260cb5eefbc0557ec68b0cd93b8b9d2443d54a6
-  data.tar.gz: 6157bec8affd1492a2858368bf454dca7e247cfa7bf157e6236a863eba3dcb342968c2376eb1e9f6ff2d1efcd4359c018e61a1b103e94ee584db99d3fb358ffa
+  metadata.gz: 2b0b479e5d411f4606bb6ce812d08fa772c35b768c1917cccc1eb2efb00eddb5ab1e8cb00757793bf7a1eb1ca9327810185b2a5d13cdfb422783e6ad8693889e
+  data.tar.gz: 4e98bd8c9dac033feca963ce14a9259d4cddde04952a69ff600262ebde59f6583862f44b8c2bf152af0508c814adbbf77b2a1eee218b7bbfc23ac46eb5f8cc5e

data/lib/oddb2xml/parslet_compositions.rb

@@ -68,18 +68,21 @@ module ParseUtil
     active_agents = active_agents_string ? active_agents_string.downcase.split(/,\s+/) : []
     comps = []
     lines = composition_text.gsub(/\r\n?/u, "\n").split(/\n/u)
-    lines.select {
+    lines.select do
       |line|
       composition =  ParseComposition.from_string(line)
       if composition.is_a?(ParseComposition)
-        composition.substances.each {
+        composition.substances.each do
           |substance_item|
           substance_item.is_active_agent = (active_agents.find {|x| x.downcase.eql?(substance_item.name.downcase) } != nil)
           substance_item.is_active_agent = true if substance_item.chemical_substance and active_agents.find {|x| x.downcase.eql?(substance_item.chemical_substance.name.downcase) }
-         }
+          # next line is an ugly hack for 24 entries with names containing commas between brackets, eg.
+          # globulina equina (immunisé avec coeur, tissu pulmonaire, reins de porcins)
+          substance_item.is_active_agent = true if /globulina equina/.match(substance_item.name.downcase)
+         end
         comps << composition
       end
-    }
+    end
     comps << ParseComposition.new(composition_text.split(/,|:|\(/)[0]) if comps.size == 0
     comps
   end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "2.4.0"
+  VERSION = "2.4.1"
 end

data/oddb2xml.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.description = "oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic."
   spec.summary     = "oddb2xml creates xml files."
   spec.homepage    = "https://github.com/zdavatz/oddb2xml"
-  spec.license       = "GPL-v2"
+  spec.license       = "GPL-3.0"
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})

data/spec/downloader_spec.rb

@@ -558,12 +558,10 @@ describe Oddb2xml::MedregbmDownloader do
         @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_person.xls')).to eq(false)
       end

data/spec/parslet_spec.rb

@@ -709,11 +709,24 @@ describe ParseComposition do
 
     context "should parse a complex composition" do
       string = 'globulina equina (immunisé avec coeur) 8 mg'
+      composition = ParseUtil.parse_compositions(string).first
+      specify { expect(composition.substances.size).to eq 1 }
+      globulina = composition.substances.find{ |x| /globulina/i.match(x.name) }
+      specify { expect(globulina.name).to eq 'Globulina Equina (immunisé Avec Coeur)' }
+      specify { expect(globulina.is_active_agent).to eq true }
+      specify { expect(globulina.qty).to eq 8 }
+      specify { expect(globulina.unit).to eq 'mg' }
+    end
+
+    context "should parse globulina equina (immunise" do
       string = 'globulina equina (immunisé avec coeur, tissu pulmonaire, reins de porcins) 8 mg'
-      composition = ParseComposition.from_string(string)
+      composition = ParseUtil.parse_compositions(string).first
       specify { expect(composition.substances.size).to eq 1 }
       globulina = composition.substances.find{ |x| /globulina/i.match(x.name) }
       specify { expect(globulina.name).to eq 'Globulina Equina (immunisé Avec Coeur, Tissu Pulmonaire, Reins De Porcins)' }
+      specify { expect(globulina.is_active_agent).to eq true }
+      specify { expect(globulina.qty).to eq 8 }
+      specify { expect(globulina.unit).to eq 'mg' }
     end
 
      context "should return correct composition for containing '(acarus siro)" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz, Niklaus Giger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-25 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -368,7 +368,7 @@ files:
 - tools/win_fetch_cacerts.rb
 homepage: https://github.com/zdavatz/oddb2xml
 licenses:
-- GPL-v2
+- GPL-3.0
 metadata: {}
 post_install_message: 
 rdoc_options: []