oddb2xml 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ec7329a09ad1bb1583d274d1d482e453eef3c37f
-  data.tar.gz: 181017c8c0b5508cf2e8951ae9c90184d9cfcf4f
+  metadata.gz: fcd2bcecb959ae01393d121cc9df70f8f6edacea
+  data.tar.gz: c7c703884fd6a15a85482e121f9bb754f7798b2e
 SHA512:
-  metadata.gz: 7d818fe51aedc2c48e90d081fe21c620e5c311446a0e6c7a9cd62654272f41a0d6ad9df27f13e9beb3bb3ea70569f0957080fb97f9670646e49b4abefad2f8c0
-  data.tar.gz: f1d1a4eccc9ee8c35e3f1d5f42b0d4ec3fd9f089e194ab2b0e7c7bc644b21898a71dd606d4fafb578ebd9125cd159002ab195375dc7804c9e81aff82e243aa79
+  metadata.gz: 29158f982e6bb02096eaad7c05fb1928338df4d7aef0db02336baca454486d661c062caf4e15338cf0ee8ddb559d9886255999dd0b87a44da068d551bb372720
+  data.tar.gz: b55dcb60e96a34f0c8bd8911fb27b20d035d2299c4fe2d2f4ad1eed042fcadeabeb646934c49af8db8516d184c95392dedb4d2c577db56060430699e39465774

data/History.txt

@@ -1,3 +1,7 @@
+=== 2.1.2 / 13.05.2015
+
+* Fix parslet_spec.rb
+
 === 2.1.1 / 13.05.2015
 
 * --calc classifies now all E-xxx nutritional additions

data/lib/oddb2xml/parslet_compositions.rb

@@ -190,19 +190,17 @@ class CompositionTransformer < Parslet::Transform
        info[:more_info] or
        CompositionTransformer.get_ratio(dictionary)
        CompositionTransformer.add_excipiens(info)
+       info
       end
       nil
   }
   rule(:composition => subtree(:composition),
        ) {
     |dictionary|
-        puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
+       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
-       end
+       CompositionTransformer.add_excipiens(info) if info.is_a?(Hash)
+       info
        }
   rule(:substance => simple(:substance),
        :chemical_substance => simple(:chemical_substance),
@@ -453,7 +451,6 @@ class GalenicFormTransformer < CompositionTransformer
       ) {
     |dictionary|
         puts "#{File.basename(__FILE__)}:#{__LINE__}: dictionary #{dictionary}" if VERBOSE_MESSAGES
-      binding.pry
         name = dictionary[:preparation_name] ? dictionary[:preparation_name].to_s : nil
         form = dictionary[:galenic_form] ? dictionary[:galenic_form].to_s : nil
         # name, form

data/lib/oddb2xml/version.rb

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

data/spec/parslet_spec.rb

@@ -26,7 +26,7 @@ to_add = %(
 
   context "should handle failed" do
   strings = [
-  ]
+    ]
     strings.each{ |string|
       composition = ParseComposition.from_string(string)
       binding.pry if composition.substances.size == 0
@@ -196,10 +196,10 @@ describe ParseComposition do
   end
 
   context 'find unit for aqua q.s. ad emulsionem pro 250 ml' do
-    string = "q.s. ad emulsionem pro 250 ml."
+    string = "natrii oleas, aqua q.s. ad emulsionem pro 250 ml."
     composition = ParseComposition.from_string(string)
     specify { expect(composition.source).to eq string}
-    specify { expect(composition.substances.size).to eq  0}
+    specify { expect(composition.substances.size).to eq  1}
     specify { expect( composition.excipiens.dose.to_s).to eq "250 ml" }
     specify { expect( composition.excipiens.name).to match /emulsionem/i }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Yasuhiro Asaka, Zeno R.R. Davatz