oddb2xml 1.6.1 → 1.6.2

data/Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rubyzip'
+gem 'rubyzip', '0.9.9'
 gem 'archive-tar-minitar'
 gem 'mechanize', '~> 2.5.1'
 gem 'nokogiri'

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.6.2 / 09.12.2013
+
+* Read article with no pharmacode from BAG.xml Preparation.xml
+
 === 1.6.1 / 02.12.2013
 
 * Add pub_price from zurRose

data/lib/oddb2xml/extractor.rb

@@ -74,85 +74,86 @@ module Oddb2xml
         item[:pharmacodes] = []
         item[:packages]    = {} # pharmacode => package
         seq.xpath('.//Pack').each do |pac|
-          if phar = pac.attr('Pharmacode')
-            phar = correct_code(phar.to_s, 7)
-            # as common key with swissINDEX
-            item[:pharmacodes] << phar
-            # packages
-            item[:packages][phar] = {
-              :pharmacode          => phar,
-              :ean                 => (ean = pac.at_xpath('.//GTIN')) ? ean.text : '',
-              :swissmedic_category => (cat = pac.at_xpath('.//SwissmedicCategory')) ? cat.text : '',
-              :swissmedic_number8  => (num = pac.at_xpath('.//SwissmedicNo8'))      ? num.text.rjust(8, '0') : '',
-              :narcosis_flag       => (flg = pac.at_xpath('.//FlagNarcosis'))       ? flg.text : '',
-              :prices              => {
-                :exf_price => {
-                  :price      => (exf = pac.at_xpath('.//ExFactoryPrice/Price'))         ? exf.text : '',
-                  :valid_date => (exf = pac.at_xpath('.//ExFactoryPrice/ValidFromDate')) ? exf.text : '',
-                  :price_code => (exf = pac.at_xpath('.//ExFactoryPrice/PriceTypeCode')) ? exf.text : '',
-                },
-                :pub_price => {
-                  :price      => (pub = pac.at_xpath('.//PublicPrice/Price'))         ? pub.text : '',
-                  :valid_date => (pub = pac.at_xpath('.//PublicPrice/ValidFromDate')) ? pub.text : '',
-                  :price_code => (pub = pac.at_xpath('.//PublicPrice/PriceTypeCode')) ? pub.text : '',
-                }
+          phar = pac.attr('Pharmacode')
+          phar = correct_code(phar.to_s, 7)
+          ean = pac.at_xpath('.//GTIN')
+          search_key = phar.to_i != 0 ? phar : ean.text 
+          # as common key with swissINDEX
+          item[:pharmacodes] << phar
+          # packages
+          item[:packages][search_key] = {
+            :pharmacode          => phar,
+            :ean                 => (ean) ? ean.text : '',
+            :swissmedic_category => (cat = pac.at_xpath('.//SwissmedicCategory')) ? cat.text : '',
+            :swissmedic_number8  => (num = pac.at_xpath('.//SwissmedicNo8'))      ? num.text.rjust(8, '0') : '',
+            :narcosis_flag       => (flg = pac.at_xpath('.//FlagNarcosis'))       ? flg.text : '',
+            :prices              => {
+              :exf_price => {
+                :price      => (exf = pac.at_xpath('.//ExFactoryPrice/Price'))         ? exf.text : '',
+                :valid_date => (exf = pac.at_xpath('.//ExFactoryPrice/ValidFromDate')) ? exf.text : '',
+                :price_code => (exf = pac.at_xpath('.//ExFactoryPrice/PriceTypeCode')) ? exf.text : '',
+              },
+              :pub_price => {
+                :price      => (pub = pac.at_xpath('.//PublicPrice/Price'))         ? pub.text : '',
+                :valid_date => (pub = pac.at_xpath('.//PublicPrice/ValidFromDate')) ? pub.text : '',
+                :price_code => (pub = pac.at_xpath('.//PublicPrice/PriceTypeCode')) ? pub.text : '',
               }
             }
-            # related all limitations
-            item[:packages][phar][:limitations] = []
-            limitations = Hash.new{|h,k| h[k] = [] }
-            # in seq
-            limitations[:seq] = (lims = seq.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
-            # in it-codes
-            limitations[:itc] = (lims = seq.xpath('.//ItCodes/ItCode/Limitations/Limitation')) ? lims.to_a : nil
-            # in pac
-            limitations[:pac] = (lims = pac.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
-            limitations.each_pair do |lim_key, lims|
-              key = ''
-              id  = ''
-              case lim_key
-              when :seq, :itc
-                key = :swissmedic_number5
-                id  = item[key].to_s
-              when :pac
-                key = :swissmedic_number8
-                id  = item[:packages][phar][key].to_s
-              end
-              if id.empty? or id == '0'
-                key = :pharmacode
-                id  = phar.to_s
-              end
-              lims.each do |lim|
-                limitation = {
-                  :it      => item[:it_code],
-                  :key     => key,
-                  :id      => id,
-                  :code    => (lic = lim.at_xpath('.//LimitationCode'))   ? lic.text : '',
-                  :type    => (lit = lim.at_xpath('.//LimitationType'))   ? lit.text : '',
-                  :value   => (liv = lim.at_xpath('.//LimitationValue'))  ? liv.text : '',
-                  :niv     => (niv = lim.at_xpath('.//LimitationNiveau')) ? niv.text : '',
-                  :desc_de => (dsc = lim.at_xpath('.//DescriptionDe'))    ? dsc.text : '',
-                  :desc_fr => (dsc = lim.at_xpath('.//DescriptionFr'))    ? dsc.text : '',
-                  :vdate   => (dat = lim.at_xpath('.//ValidFromDate'))    ? dat.text : '',
-                }
-                deleted = false
-                if upto = ((thr = lim.at_xpath('.//ValidThruDate')) ? thr.text : nil) and
-                   upto =~ /\d{2}\.\d{2}\.\d{2}/
-                  begin
-                    deleted = true if Date.strptime(upto, '%d.%m.%y') >= Date.today
-                  rescue ArgumentError
-                  end
+          }
+          # related all limitations
+          item[:packages][search_key][:limitations] = []
+          limitations = Hash.new{|h,k| h[k] = [] }
+          # in seq
+          limitations[:seq] = (lims = seq.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
+          # in it-codes
+          limitations[:itc] = (lims = seq.xpath('.//ItCodes/ItCode/Limitations/Limitation')) ? lims.to_a : nil
+          # in pac
+          limitations[:pac] = (lims = pac.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
+          limitations.each_pair do |lim_key, lims|
+            key = ''
+            id  = ''
+            case lim_key
+            when :seq, :itc
+              key = :swissmedic_number5
+              id  = item[key].to_s
+            when :pac
+              key = :swissmedic_number8
+              id  = item[:packages][search_key][key].to_s
+            end
+            if id.empty? or id == '0'
+              key = :pharmacode
+              id  = phar.to_s
+            end
+            lims.each do |lim|
+              limitation = {
+                :it      => item[:it_code],
+                :key     => key,
+                :id      => id,
+                :code    => (lic = lim.at_xpath('.//LimitationCode'))   ? lic.text : '',
+                :type    => (lit = lim.at_xpath('.//LimitationType'))   ? lit.text : '',
+                :value   => (liv = lim.at_xpath('.//LimitationValue'))  ? liv.text : '',
+                :niv     => (niv = lim.at_xpath('.//LimitationNiveau')) ? niv.text : '',
+                :desc_de => (dsc = lim.at_xpath('.//DescriptionDe'))    ? dsc.text : '',
+                :desc_fr => (dsc = lim.at_xpath('.//DescriptionFr'))    ? dsc.text : '',
+                :vdate   => (dat = lim.at_xpath('.//ValidFromDate'))    ? dat.text : '',
+              }
+              deleted = false
+              if upto = ((thr = lim.at_xpath('.//ValidThruDate')) ? thr.text : nil) and
+                  upto =~ /\d{2}\.\d{2}\.\d{2}/
+                begin
+                  deleted = true if Date.strptime(upto, '%d.%m.%y') >= Date.today
+                rescue ArgumentError
                 end
-                limitation[:del] = deleted
-                item[:packages][phar][:limitations] << limitation
               end
+              limitation[:del] = deleted
+              item[:packages][search_key][:limitations] << limitation
             end
-            # limitation points
-            pts = pac.at_xpath('.//PointLimitations/PointLimitation/Points') # only first points
-            item[:packages][phar][:limitation_points] = pts ? pts.text : ''
-            # pharmacode => seq (same data)
-            data[phar] = item
           end
+          # limitation points
+          pts = pac.at_xpath('.//PointLimitations/PointLimitation/Points') # only first points
+          item[:packages][search_key][:limitation_points] = pts ? pts.text : ''
+          # pharmacode => seq (same data)
+          data[search_key] = item
         end
       end
       data

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.6.1"
+  VERSION = "1.6.2"
 end

data/spec/compressor_spec.rb

@@ -14,7 +14,7 @@ shared_examples_for 'any compressor' do
     @compressor.finalize!.should == true
     compress_file = @compressor.instance_variable_get(:@compress_file)
     File.exists?(compress_file).should == true
-    File.unstub!(:unlink)
+    File.unstub(:unlink)
   end
 end
 

data/spec/downloader_spec.rb

@@ -36,7 +36,7 @@ describe Oddb2xml::BagXmlDownloader do
       xml.should =~ /DescriptionDe/
     end
     it 'should clean up current directory' do
-      xml.should_not raise_error(Timeout::Error)
+      expect { xml }.not_to raise_error
       File.exist?('XMLPublications.zip').should be(false)
     end
   end
@@ -100,7 +100,7 @@ describe Oddb2xml::SwissmedicDownloader do
         bin.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        bin.should_not raise_error(Timeout::Error)
+        expect { bin }.not_to raise_error
         File.exist?('oddb_orphan.xls').should be(false)
       end
     end
@@ -117,7 +117,7 @@ describe Oddb2xml::SwissmedicDownloader do
         bin.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        bin.should_not raise_error(Timeout::Error)
+        expect { bin }.not_to raise_error
         File.exist?('oddb_fridge.xls').should be(false)
       end
     end
@@ -134,7 +134,7 @@ describe Oddb2xml::SwissmedicDownloader do
         bin.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        bin.should_not raise_error(Timeout::Error)
+        expect { bin }.not_to raise_error
         File.exist?('oddb_package.xls').should be(false)
       end
     end
@@ -160,7 +160,7 @@ describe Oddb2xml::SwissmedicInfoDownloader do
       xml.should =~ /content/
     end
     it 'should clean up current directory' do
-      xml.should_not raise_error(Timeout::Error)
+      expect { xml }.not_to raise_error
       File.exist?('swissmedic_info.zip').should be(false)
     end
   end
@@ -180,7 +180,7 @@ describe Oddb2xml::EphaDownloader do
       csv.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      csv.should_not raise_error(Timeout::Error)
+      expect { csv }.not_to raise_error
       File.exist?('epha_interactions.csv').should be(false)
     end
   end
@@ -200,7 +200,7 @@ describe Oddb2xml::BMUpdateDownloader do
       txt.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      txt.should_not raise_error(Timeout::Error)
+      expect { txt }.not_to raise_error
       File.exist?('oddb2xml_files_bm_update.txt').should be(false)
     end
   end
@@ -220,7 +220,7 @@ describe Oddb2xml::LppvDownloader do
       txt.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      txt.should_not raise_error(Timeout::Error)
+      expect { txt }.not_to raise_error
       File.exist?('oddb2xml_files_lppv.txt').should be(false)
     end
   end
@@ -240,7 +240,7 @@ describe Oddb2xml::MigelDownloader do
       bin.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      bin.should_not raise_error(Timeout::Error)
+      expect { bin }.not_to raise_error
       File.exist?('oddb2xml_files_nonpharma.txt').should be(false)
     end
   end
@@ -261,7 +261,7 @@ describe Oddb2xml::MedregbmDownloader do
         txt.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        txt.should_not raise_error(Timeout::Error)
+        expect { txt }.not_to raise_error
         File.exist?('oddb_company.xls').should be(false)
       end
     end
@@ -278,7 +278,7 @@ describe Oddb2xml::MedregbmDownloader do
         txt.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        txt.should_not raise_error(Timeout::Error)
+        expect { txt }.not_to raise_error
         File.exist?('oddb_person.xls').should be(false)
       end
     end
@@ -299,7 +299,7 @@ describe Oddb2xml::ZurroseDownloader do
       dat.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      dat.should_not raise_error(Timeout::Error)
+      expect { dat }.not_to raise_error
       File.exist?('oddb2xml_zurrose_transfer.dat').should be(false)
     end
   end

data/spec/extractor_spec.rb

@@ -6,6 +6,65 @@ describe Oddb2xml::Extractor do
   it "pending"
 end
 
+describe Oddb2xml::TxtExtractorMethods do
+  it "pending"
+end
+
+describe Oddb2xml::BagXmlExtractor do
+  context 'should handle articles with and without pharmacode' do
+    subject do
+      dat = File.read(File.expand_path('../data/Preparation.xml', __FILE__))
+      Oddb2xml::BagXmlExtractor.new(dat).to_hash
+    end
+    it { 
+      @items = subject.to_hash
+      with_pharma = @items['1699947']
+      expect(with_pharma).not_to be_nil
+      expect(with_pharma[:atc_code]).not_to be_nil
+      expect(with_pharma[:pharmacodes]).not_to be_nil
+      expect(with_pharma[:packages].size).to eq(1)
+      expect(with_pharma[:packages].first[0]).to eq('1699947')
+      expect(with_pharma[:packages].first[1][:prices][:pub_price][:price]).to eq('205.3')
+      expect(@items.size).to eq(2)
+      no_pharma = @items['7680620690084']
+      expect(no_pharma).not_to be_nil
+      expect(no_pharma[:atc_code]).not_to be_nil
+      expect(no_pharma[:pharmacodes]).not_to be_nil
+      expect(no_pharma[:packages].size).to eq(1)
+      expect(no_pharma[:packages].first[0]).to eq('7680620690084')
+      expect(no_pharma[:packages].first[1][:prices][:pub_price][:price]).to eq('27.8')
+    }
+  end
+end
+
+describe Oddb2xml::SwissIndexExtractor do
+  it "pending"
+end
+
+describe Oddb2xml::SwissmedicExtractor do
+  it "pending"
+end
+
+describe Oddb2xml::MigelExtractor do
+  it "pending"
+end
+
+describe Oddb2xml::SwissmedicInfoExtractor do
+  it "pending"
+end
+
+describe Oddb2xml::EphaExtractor do
+  it "pending"
+end
+
+describe Oddb2xml::MedregbmExtractor do
+  it "pending"
+end
+
+describe Oddb2xml::ZurroseExtractor do
+  it "pending"
+end
+
 describe Oddb2xml::ZurroseExtractor do
   context 'when transfer.dat is empty' do
     subject { Oddb2xml::ZurroseExtractor.new("") }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip