oddb2xml 1.2.6 → 1.2.9

data/History.txt

@@ -1,3 +1,22 @@
+=== 1.2.9 / 01.02.2013
+
+* Remove ARTLIM and LIMCD
+* Update to use swissINDEX if duplicated nonpharma
+* Merge branch 'master' of ywesee.github.com:zdavatz/oddb2xml
+* Improve Cli#run crearly
+
+=== 1.2.8 / 01.02.2013
+
+* Update SMCAT to use Packungen.xls
+* Merge branch 'master' of ywesee.github.com:zdavatz/oddb2xml
+* Add additional Non-Pharma products
+
+=== 1.2.7 / 31.01.2013
+
+* Update to use lppv for article.xml and oddb.dat
+* Update to use pharmacode if SwissmedicNo5 == '0'
+* Update to include limitations in It-Codes
+
 === 1.2.6 / 30.01.2013
 
 * Update to exclude 14-EAN for oddb_with_migel.dat

data/Manifest.txt

@@ -19,12 +19,17 @@ spec/cli_spec.rb
 spec/compressor_spec.rb
 spec/data/XMLPublications.zip
 spec/data/epha_interactions.csv
+spec/data/oddb2xml_files_bm_update.txt
+spec/data/oddb2xml_files_lppv.txt
 spec/data/oddb_article.xml
 spec/data/oddb_fi.xml
 spec/data/oddb_fi_product.xml
 spec/data/oddb_limitation.xml
 spec/data/oddb_product.xml
 spec/data/oddb_substance.xml
+spec/data/oddb2xml_files_nonpharma.xls
+spec/data/oddb2xml_files_lppv.txt
+spec/data/oddb2xml_files_bm_update.txt
 spec/data/swissindex.xml
 spec/data/swissindex_nonpharma.xml
 spec/data/swissindex_pharma.xml
@@ -38,7 +43,6 @@ spec/data/swissmedic_orphans.xls
 spec/data/wsdl.xml
 spec/data/wsdl_nonpharma.xml
 spec/data/wsdl_pharma.xml
-spec/data/ywesee_bm_update.txt
 spec/downloader_spec.rb
 spec/extractor_spec.rb
 spec/spec_helper.rb

data/README.md

@@ -42,18 +42,21 @@ see `--help`.
 
 ```
 $ oddb2xml --help
-oddb2xml ver.1.2.2
+oddb2xml ver.1.2.7
 Usage:
   oddb2xml [option]
     -a T, --append=T     Additional target. T, only 'nonpharma' is available.
     -c F, --compress=F   Compress format F. {tar.gz|zip}
-    -f dat,              create dat files according to IGM-11 standard.
-    -h,   --help         Show this help message.
-    -o fi,               create fi xml files.
-    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9_]
+    -f F, --format=F     File format F, default is xml. {xml|dat}
+                         If F is given, -o option is ignored.
+    -o O, --optional=O   Optional output. O, only 'fi' is available.
+    -i I, --include=I    Include target option for 'dat' format. only 'ean14' is available.
+                         'xml' format includes always ean14 records.
+    -t S, --tag-suffix=S XML tag suffix S. Default is none. [A-z0-9]
                          If S is given, it is also used as prefix of filename.
-```
+    -h,   --help         Show this help message.
 
+```
 
 ## Option examples
 
@@ -81,6 +84,9 @@ If you need the XSD files, generate them yourself using the javabeans tool:
 
 this will generate you a valid XSD file that can be used to validate against the XML file.
 
+i.e.:
+* /home/zeno/.software/xmlbeans-2.6.0/bin/inst2xsd oddb_article.xml -outPrefix oddb_article
+
 ## XML files
 
 xml files generated are:

data/lib/oddb2xml/builder.rb

@@ -17,18 +17,19 @@ end
 
 module Oddb2xml
   class Builder
-    attr_accessor :subject, :index, :items, :flags,
-                  :actions,
-                  :orphans, :fridges,
-                  :infos, :packs, :ean14,
-                  :tag_suffix
+    attr_accessor :subject, :index, :items, :flags, :lppvs,
+                  :actions, :migel, :orphans, :fridges,
+                  :infos, :packs,
+                  :ean14, :tag_suffix
     def initialize
       @subject    = nil
       @index      = {}
       @items      = {}
       @flags      = {}
+      @lppvs      = {}
       @infos      = {}
       @packs      = {}
+      @migel      = {}
       @actions    = []
       @orphans    = []
       @fridges    = []
@@ -59,14 +60,39 @@ module Oddb2xml
         @articles = [] # base is 'DE'
         @index['DE'].each_pair do |pharmacode, index|
           object = {
-            :de => index,
-            :fr => @index['FR'][pharmacode],
+            :de    => index,
+            :fr    => @index['FR'][pharmacode],
           }
+          if migel = @migel[pharmacode]
+            # delete duplicates
+            @migel[pharmacode] = nil
+          end
           if seq = @items[pharmacode]
             object[:seq] = seq
           end
           @articles << object
         end
+        # add
+        @migel.values.compact.each do |migel|
+          next if migel[:pharmacode].empty?
+          object = {}
+          %w[de fr].each do |lang|
+            pac = {
+              :ean             => migel[:ean],
+              :pharmacode      => migel[:pharmacode],
+              :status          => 'I',
+              :stat_date       => '',
+              :lang            => lang.capitalize,
+              :desc            => migel["desc_#{lang}".intern],
+              :atc_code        => '',
+              :additional_desc => migel[:additional_desc],
+              :company_ean     => migel[:company_ean],
+              :company_name    => migel[:company_name],
+            }
+            object[lang.intern] = pac
+          end
+          @articles << object
+        end
       end
     end
     def prepare_substances
@@ -179,11 +205,11 @@ module Oddb2xml
         ) {
           @limitations.each do |lim|
             xml.LIM('DT' => '') {
-              xml.LIMCD  lim[:key] # swissmedic_number8 or swissmedic_number5
+              xml.LIMCD  lim[:key] # swissmedic_number8, swissmedic_number5 or pharmacode
               xml.IT     lim[:it]
               xml.LIMTYP lim[:type]
               xml.LIMVAL lim[:value]
-              xml.LIMNAMEBAG lim[:code] # LIMCD
+              xml.LIMNAMEBAG lim[:code] # original LIMCD
               xml.LIMNIV lim[:niv]
               xml.DSCRD  lim[:desc_de]
               xml.DSCRF  lim[:desc_fr]
@@ -455,6 +481,11 @@ module Oddb2xml
             if obj[:seq]
               bg_pac = obj[:seq][:packages][de_pac[:pharmacode]]
             end
+            if de_pac[:ean].length == 13
+              num =  de_pac[:ean][4,8].intern # :swissmedic_number5
+            elsif bg_pac
+              num = bg_pac[:swissmedic_number8].intern
+            end
             xml.ART('DT' => '') {
               xml.PHAR  de_pac[:pharmacode] unless de_pac[:pharmacode].empty?
               #xml.GRPCD
@@ -463,8 +494,12 @@ module Oddb2xml
               if obj[:seq]
                 xml.PRDNO obj[:seq][:product_key] unless obj[:seq][:product_key].empty?
               end
-              if bg_pac
+              if bg_pac # bag xml
                 xml.SMCAT bg_pac[:swissmedic_category] unless bg_pac[:swissmedic_category].empty?
+              elsif @packs[num] and @packs[num][:swissmedic_category] # Packungen.xls
+                xml.SMCAT @packs[num][:swissmedic_category]
+              end
+              if bg_pac
                 xml.SMNO  bg_pac[:swissmedic_number8]  unless bg_pac[:swissmedic_number8].empty?
               end
               #xml.HOSPCD
@@ -578,18 +613,16 @@ module Oddb2xml
                 #xml.LINENO
                 #xml.CDVAL
               #}
-              if bg_pac
-                bg_pac[:limitations].each do |lim|
-                  xml.ARTLIM {
-                    xml.LIMCD lim[:code] unless lim[:code].empty?
-                  }
-                end
-              end
-              #xml.ARTINS {
-                #xml.VDAT
-                #xml.INCD
-                #xml.NINCD
+              #xml.ARTLIM {
+              #  xml.LIMCD
               #}
+              if @lppvs[de_pac[:ean]]
+                xml.ARTINS {
+                  #xml.VDAT
+                  #xml.INCD
+                  xml.NINCD 20
+                }
+              end
             }
           end
           xml.RESULT {
@@ -763,7 +796,13 @@ module Oddb2xml
                                           ).to_s[0, DAT_LEN[:ABEZ]].gsub(/"/, '')
           row << "%#{DAT_LEN[:PRMO]}s"  % (pac ? format_price(pac[:prices][:exf_price][:price].to_s) : ('0' * DAT_LEN[:PRMO]))
           row << "%#{DAT_LEN[:PRPU]}s"  % (pac ? format_price(pac[:prices][:pub_price][:price].to_s) : ('0' * DAT_LEN[:PRPU]))
-          row << "%#{DAT_LEN[:CKZL]}s"  % (pac ? '1' : '3') # sl_entry or not
+          row << "%#{DAT_LEN[:CKZL]}s"  % if (@lppvs[de_pac[:ean]])
+                                            '2'
+                                          elsif pac # sl_entry
+                                            '1'
+                                          else
+                                            '3'
+                                          end
           row << "%#{DAT_LEN[:CLAG]}s"  % if ((num && num.to_s =~ /(\d{5})(\d{3})/) and
                                               @fridges.include?($1.to_s))
                                             '1'

data/lib/oddb2xml/cli.rb

@@ -17,94 +17,40 @@ module Oddb2xml
       @mutex = Mutex.new
       @items = {} # Items from Preparations.xml in BAG
       @index = {} # Base index from swissINDEX
-      @flags = {} # narcotics flag from ywesee
+      @flags = {} # narcotics flag files repo
+      @lppvs = {} # lppv.txt from files repo
       @infos = {} # [option] FI from SwissmedicInfo
       @packs = {} # [option] Packungen from Swissmedic for dat
+      @migel   = {} # [addition] additional Non Pharma products from files repo
       @actions = [] # [addition] interactions from epha
       @orphans = [] # [addition] Orphaned drugs from Swissmedic xls
       @fridges = [] # [addition] ReFridge drugs from Swissmedic xls
       LANGUAGES.each do |lang|
         @index[lang] = {}
       end
+      @_message = false
     end
     def run
       threads = []
-      # swissmedic-info
       if @options[:format] != :dat
         if @options[:fi]
-          threads << Thread.new do
-            downloader = SwissmedicInfoDownloader.new
-            xml = downloader.download
-            @mutex.synchronize do
-              hsh = SwissmedicInfoExtractor.new(xml).to_hash
-              @infos = hsh
-            end
-          end
-        end
-        # swissmedic - orphan, fridge
-        [:orphans, :fridges].each do |type|
-          threads << Thread.new do
-            downloader = SwissmedicDownloader.new(type)
-            bin = downloader.download
-            self.instance_variable_set("@#{type.to_s}", SwissmedicExtractor.new(bin, type).to_arry)
-          end
-        end
-        # epha
-        threads << Thread.new do
-          downloader = EphaDownloader.new
-          str = downloader.download
-          @mutex.synchronize do
-            @actions = EphaExtractor.new(str).to_arry
-          end
-        end
-      else # dat
-        # swissmedic - package
-        threads << Thread.new do
-          downloader = SwissmedicDownloader.new(:packages)
-          bin = downloader.download
-          @mutex.synchronize do
-            @packs = SwissmedicExtractor.new(bin, :packages).to_hash
-          end
+          threads << download(:fachinfo) # swissmedic-info
         end
-      end
-      # ywesee
-      threads << Thread.new do
-        downloader = YweseeBMDownloader.new
-        str = downloader.download
-        @mutex.synchronize do
-          @flags = YweseeBMExtractor.new(str).to_hash
+        [:orphan, :fridge].each do |type|
+          threads << download(type) # swissmedic
         end
+        threads << download(:interaction) # epha
       end
-      # bag
-      threads << Thread.new do
-        downloader = BagXmlDownloader.new(@options)
-        xml = downloader.download
-        @mutex.synchronize do
-          hsh = BagXmlExtractor.new(xml).to_hash
-          @items = hsh
-        end
+      if @options[:nonpharma]
+        threads << download(:migel) # oddb2xml_files
       end
-      @_message = false
+      threads << download(:package) # swissmedic
+      threads << download(:bm_update) # oddb2xml_files
+      threads << download(:lppv) # oddb2xml_files
+      threads << download(:bag) # bag.e-mediat
       LANGUAGES.each do |lang|
-        # swissindex
         types.each do |type|
-          threads << Thread.new do
-            downloader = SwissIndexDownloader.new(@options, type, lang)
-            begin
-              xml = downloader.download
-            rescue SystemExit
-              @mutex.synchronize do
-                unless @_message # hook only one exit
-                  @_message = true
-                  exit
-                end
-              end
-            end
-            @mutex.synchronize do
-              hsh = SwissIndexExtractor.new(xml, type).to_hash
-              @index[lang][type] = hsh
-            end
-          end
+          threads << download(:index, type, lang) # swissindex
         end
       end
       begin
@@ -141,15 +87,16 @@ module Oddb2xml
               builder.subject = sbj
             end
             # common sources
-            builder.items   = @items
-            builder.flags   = @flags
-            # additions
-            %w[actions orphans fridges].each do |addition|
-              builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
-            end
-            # optionals
+            builder.items = @items
+            builder.flags = @flags
+            builder.lppvs = @lppvs
+            # optional sources
             builder.infos = @infos
             builder.packs = @packs
+            # additional sources
+            %w[actions orphans fridges migel].each do |addition|
+              builder.send("#{addition}=".intern, self.instance_variable_get("@#{addition}"))
+            end
             builder.tag_suffix = @options[:tag_suffix]
           end
           output = ''
@@ -182,6 +129,93 @@ module Oddb2xml
         raise Interrupt
       end
     end
+    def download(what, type=nil, lang=nil)
+      case what
+      when :fachinfo
+        Thread.new do
+          downloader = SwissmedicInfoDownloader.new
+          xml = downloader.download
+          @mutex.synchronize do
+            hsh = SwissmedicInfoExtractor.new(xml).to_hash
+            @infos = hsh
+          end
+        end
+      when :orphan, :fridge
+        type = (what.to_s + "s").intern
+        Thread.new do
+          downloader = SwissmedicDownloader.new(type)
+          bin = downloader.download
+          self.instance_variable_set("@#{type.to_s}", SwissmedicExtractor.new(bin, type).to_arry)
+        end
+      when :interaction
+        Thread.new do
+          downloader = EphaDownloader.new
+          str = downloader.download
+          @mutex.synchronize do
+            @actions = EphaExtractor.new(str).to_arry
+          end
+        end
+      when :migel
+        Thread.new do
+          downloader = MigelDownloader.new
+          bin = downloader.download
+          @mutex.synchronize do
+            @migel = MigelExtractor.new(bin).to_hash
+          end
+        end
+      when :package
+        Thread.new do
+          downloader = SwissmedicDownloader.new(:packages)
+          bin = downloader.download
+          @mutex.synchronize do
+            @packs = SwissmedicExtractor.new(bin, :packages).to_hash
+          end
+        end
+      when :bm_update
+        Thread.new do
+          downloader = BMUpdateDownloader.new
+          str = downloader.download
+          @mutex.synchronize do
+            @flags = BMUpdateExtractor.new(str).to_hash
+          end
+        end
+      when :lppv
+        Thread.new do
+          downloader = LppvDownloader.new
+          str = downloader.download
+          @mutex.synchronize do
+            @lppvs = LppvExtractor.new(str).to_hash
+          end
+        end
+      when :bag
+        Thread.new do
+          downloader = BagXmlDownloader.new(@options)
+          xml = downloader.download
+          @mutex.synchronize do
+            hsh = BagXmlExtractor.new(xml).to_hash
+            @items = hsh
+          end
+        end
+      when :index
+        Thread.new do
+          downloader = SwissIndexDownloader.new(@options, type, lang)
+          begin
+            xml = downloader.download
+          rescue SystemExit
+            @mutex.synchronize do
+              unless @_message # hook only one exit
+                @_message = true
+                exit
+              end
+            end
+          end
+          @mutex.synchronize do
+            hsh = SwissIndexExtractor.new(xml, type).to_hash
+            @index[lang][type] = hsh
+          end
+        end
+      end
+    end
     def compress
       compressor = Compressor.new(prefix, @options)
       files.values.each do |file|

data/lib/oddb2xml/downloader.rb

@@ -42,7 +42,7 @@ module Oddb2xml
                 xml << bytes
                 bytes = nil
               end
-              io.close
+              io.close if io.respond_to?(:close)
             end
           end
         end
@@ -162,7 +162,30 @@ XML
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        io.close unless io.closed?
+        io.close if io and !io.closed?
+        if File.exists?(file)
+          File.unlink(file)
+        end
+      end
+    end
+  end
+  class MigelDownloader < Downloader
+    def init
+      super
+      @url ||= 'https://github.com/zdavatz/oddb2xml_files/raw/master/NON-Pharma.xls'
+    end
+    def download
+      file = "oddb2xml_files_nonpharma.xls"
+      begin
+        response = @agent.get(@url)
+        response.save_as(file)
+        response = nil # win
+        io = File.open(file, 'rb')
+        return io.read
+      rescue Timeout::Error
+        retrievable? ? retry : raise
+      ensure
+        io.close if io and !io.closed? # win
         if File.exists?(file)
           File.unlink(file)
         end
@@ -228,20 +251,16 @@ XML
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        io.close unless io.closed? # win
+        io.close if io and !io.closed? # win
         if File.exists?(file)
           File.unlink(file)
         end
       end
     end
   end
-  class YweseeBMDownloader < Downloader
-    def init
-      super
-      @url ||= 'http://www.ywesee.com/uploads/Main/BM_Update.txt'
-    end
-    def download
-      file = 'ywesee_bm_update.txt'
+  # txt filse
+  module TxtDownloadMethods
+    def download_as(file)
       begin
         response = @agent.get(@url)
         response.save_as(file)
@@ -251,11 +270,33 @@ XML
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        io.close unless io.closed? # win
+        io.close if io and !io.closed? # win
         if File.exists?(file)
           File.unlink(file)
         end
       end
     end
   end
+  class BMUpdateDownloader < Downloader
+    include TxtDownloadMethods
+    def init
+      super
+      @url ||= 'https://raw.github.com/zdavatz/oddb2xml_files/master/BM_Update.txt'
+    end
+    def download
+      file = 'oddb2xml_files_bm_update.txt'
+      download_as(file)
+    end
+  end
+  class LppvDownloader < Downloader
+    include TxtDownloadMethods
+    def init
+      super
+      @url ||= 'https://raw.github.com/zdavatz/oddb2xml_files/master/LPPV.txt'
+    end
+    def download
+      file = 'oddb2xml_files_lppv.txt'
+      download_as(file)
+    end
+  end
 end

data/lib/oddb2xml/extractor.rb

@@ -70,15 +70,25 @@ module Oddb2xml
                 }
               }
             }
-            # limitations
+            # related all limitations
             item[:packages][phar][:limitations] = []
             limitations = Hash.new{|h,k| h[k] = [] }
-            # seq - level
+            # in seq
             limitations[:seq] = (lims = seq.xpath('.//Limitations/Limitation')) ? lims.to_a : nil
-            # pac - level
+            # 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 |key, lims|
-              key = (key == :pac ? item[:packages][phar][:swissmedic_number8] : item[:swissmedic_number5])
+              key = case key
+                    when :pac
+                      item[:packages][phar][:swissmedic_number8]
+                    when :seq
+                      item[:swissmedic_number5]
+                    when :itc
+                      phar
+                    end
+              key = phar if (key.empty? or key == '0')
               lims.each do |lim|
                 limitation = {
                   :it      => item[:it_code],
@@ -204,6 +214,30 @@ module Oddb2xml
       end
     end
   end
+  class MigelExtractor < Extractor
+    def initialize(bin)
+      io = StringIO.new(bin)
+      book = Spreadsheet.open(io)
+      @sheet = book.worksheet(0)
+    end
+    def to_hash
+      data = {}
+      @sheet.each_with_index do |row, i|
+        next if i == 0
+        phar = row[1].to_s
+        data[phar] = {
+          :ean             => row[0].to_i.to_s,
+          :pharmacode      => phar,
+          :desc_de         => row[3],
+          :desc_fr         => row[4],
+          :additional_desc => row[5], # quantity
+          :company_name    => row[6],
+          :company_ean     => row[7].to_i.to_s,
+        }
+      end
+      data
+    end
+  end
   class SwissmedicInfoExtractor < Extractor
     def to_hash
       data = Hash.new{|h,k| h[k] = [] }
@@ -257,18 +291,25 @@ module Oddb2xml
       data
     end
   end
-  class YweseeBMExtractor < Extractor
+  # txt files
+  module TxtMethods
     def initialize(str)
       @io = StringIO.new(str)
     end
     def to_hash
       data = {}
       while line = @io.gets
-        next if line =~ /\d{13}/
+        next unless line =~ /\d{13}/
         ean = line.chomp.gsub("\"", '')
         data[ean] = true
       end
       data
     end
   end
+  class BMUpdateExtractor < Extractor
+    include TxtMethods
+  end
+  class LppvExtractor < Extractor
+    include TxtMethods
+  end
 end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.2.6"
+  VERSION = "1.2.9"
 end

data/spec/compressor_spec.rb

@@ -35,7 +35,7 @@ describe Oddb2xml::Compressor do
     end
     context "when swiss prefix is given" do
       before(:each) do
-        @compressor = Oddb2xml::Compressor.new('swiss', 'tar.gz')
+        @compressor = Oddb2xml::Compressor.new('swiss', {:compress_ext => 'tar.gz'})
       end
       it 'should have formated filename with datetime' do
         @compressor.instance_variable_get(:@compress_file).
@@ -44,7 +44,7 @@ describe Oddb2xml::Compressor do
     end
     context "when tar.gz ext is given" do
       before(:each) do
-        @compressor = Oddb2xml::Compressor.new('oddb', 'tar.gz')
+        @compressor = Oddb2xml::Compressor.new('oddb', {:compress_ext => 'tar.gz'})
       end
       it 'should have formated filename with datetime' do
         @compressor.instance_variable_get(:@compress_file).
@@ -53,7 +53,7 @@ describe Oddb2xml::Compressor do
     end
     context "when zip ext is given" do
       before(:each) do
-        @compressor = Oddb2xml::Compressor.new('oddb', 'zip')
+        @compressor = Oddb2xml::Compressor.new('oddb', {:compress_ext => 'zip'})
       end
       it 'should have formated filename with datetime' do
         @compressor.instance_variable_get(:@compress_file).
@@ -83,7 +83,7 @@ describe Oddb2xml::Compressor do
       end
       context 'with zip' do
         before(:each) do
-          @compressor = Oddb2xml::Compressor.new('oddb', 'zip')
+          @compressor = Oddb2xml::Compressor.new('oddb', {:compress_ext => 'zip'})
         end
         it_behaves_like 'any compressor'
       end

data/spec/data/oddb2xml_files_lppv.txt

@@ -0,0 +1,4 @@
+7680581420034
+7680581420140
+7680581420157
+7680581420058

data/spec/downloader_spec.rb

@@ -49,7 +49,7 @@ describe Oddb2xml::SwissIndexDownloader do
   end
   context 'Pharma with DE' do
     before(:each) do
-      @downloader = Oddb2xml::SwissIndexDownloader.new(:pharma, 'DE')
+      @downloader = Oddb2xml::SwissIndexDownloader.new({}, :pharma, 'DE')
     end
     it_behaves_like 'any downloader'
     context 'when download_by is called with DE' do
@@ -67,7 +67,7 @@ describe Oddb2xml::SwissIndexDownloader do
   end
   context 'NonPharma with FR' do
     before(:each) do
-      @downloader = Oddb2xml::SwissIndexDownloader.new(:nonpharma, 'FR')
+      @downloader = Oddb2xml::SwissIndexDownloader.new({}, :nonpharma, 'FR')
     end
     it_behaves_like 'any downloader'
     context 'when download_by is called with FR' do
@@ -94,13 +94,13 @@ describe Oddb2xml::SwissmedicDownloader do
     end
     it_behaves_like 'any downloader'
     context 'download_by for orphans xls' do
-      let(:io) { @downloader.download }
-      it 'should return valid IO' do
-        io.should be_a IO
-        io.bytes.should_not nil
+      let(:bin) { @downloader.download }
+      it 'should return valid Binary-String' do
+        bin.should be_a String
+        bin.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        io.should_not raise_error(Timeout::Error)
+        bin.should_not raise_error(Timeout::Error)
         File.exist?('oddb_orphans.xls').should be(false)
       end
     end
@@ -111,13 +111,13 @@ describe Oddb2xml::SwissmedicDownloader do
       @downloader = Oddb2xml::SwissmedicDownloader.new(:fridges)
     end
     context 'download_by for fridges xls' do
-      let(:io) { @downloader.download }
-      it 'should return valid IO' do
-        io.should be_a IO
-        io.bytes.should_not nil
+      let(:bin) { @downloader.download }
+      it 'should return valid Binary-String' do
+        bin.should be_a String
+        bin.bytes.should_not nil
       end
       it 'should clean up current directory' do
-        io.should_not raise_error(Timeout::Error)
+        bin.should_not raise_error(Timeout::Error)
         File.exist?('oddb_fridges.xls').should be(false)
       end
     end
@@ -133,7 +133,7 @@ describe Oddb2xml::SwissmedicInfoDownloader do
   it_behaves_like 'any downloader'
   context 'when download is called' do
     let(:xml) { @downloader.download }
-    it 'should parse zip to string' do
+    it 'should parse zip to String' do
       xml.should be_a String
       xml.length.should_not == 0
     end
@@ -157,34 +157,74 @@ describe Oddb2xml::EphaDownloader do
   end
   it_behaves_like 'any downloader'
   context 'when download is called' do
-    let(:io) { @downloader.download }
-    it 'should read csv to IO Object' do
-      io.should be_a IO
-      io.bytes.should_not nil
+    let(:csv) { @downloader.download }
+    it 'should read csv as String' do
+      csv.should be_a String
+      csv.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      io.should_not raise_error(Timeout::Error)
+      csv.should_not raise_error(Timeout::Error)
       File.exist?('epha_interactions.csv').should be(false)
     end
   end
 end
 
-describe Oddb2xml::YweseeBMDownloader do
+describe Oddb2xml::BMUpdateDownloader do
+  include ServerMockHelper
+  before(:each) do
+    setup_bm_update_server_mock
+    @downloader = Oddb2xml::BMUpdateDownloader.new
+  end
+  it_behaves_like 'any downloader'
+  context 'when download is called' do
+    let(:txt) { @downloader.download }
+    it 'should read txt as String' do
+      txt.should be_a String
+      txt.bytes.should_not nil
+    end
+    it 'should clean up current directory' do
+      txt.should_not raise_error(Timeout::Error)
+      File.exist?('oddb2xml_files_bm_update.txt').should be(false)
+    end
+  end
+end
+
+describe Oddb2xml::LppvDownloader do
+  include ServerMockHelper
+  before(:each) do
+    setup_lppv_server_mock
+    @downloader = Oddb2xml::LppvDownloader.new
+  end
+  it_behaves_like 'any downloader'
+  context 'when download is called' do
+    let(:txt) { @downloader.download }
+    it 'should read txt as String' do
+      txt.should be_a String
+      txt.bytes.should_not nil
+    end
+    it 'should clean up current directory' do
+      txt.should_not raise_error(Timeout::Error)
+      File.exist?('oddb2xml_files_lppv.txt').should be(false)
+    end
+  end
+end
+
+describe Oddb2xml::MigelDownloader do
   include ServerMockHelper
   before(:each) do
-    setup_ywesee_server_mock
-    @downloader = Oddb2xml::YweseeBMDownloader.new
+    setup_migel_server_mock
+    @downloader = Oddb2xml::MigelDownloader.new
   end
   it_behaves_like 'any downloader'
   context 'when download is called' do
-    let(:io) { @downloader.download }
-    it 'should read txt to IO Object' do
-      io.should be_a IO
-      io.bytes.should_not nil
+    let(:bin) { @downloader.download }
+    it 'should read xls as Binary-String' do
+      bin.should be_a String
+      bin.bytes.should_not nil
     end
     it 'should clean up current directory' do
-      io.should_not raise_error(Timeout::Error)
-      File.exist?('ywesee_bm_update.txt').should be(false)
+      bin.should_not raise_error(Timeout::Error)
+      File.exist?('oddb2xml_files_nonpharma.txt').should be(false)
     end
   end
 end

data/spec/spec_helper.rb

@@ -22,7 +22,9 @@ module ServerMockHelper
     setup_swissmedic_server_mock
     setup_swissmedic_info_server_mock
     setup_epha_server_mock
-    setup_ywesee_server_mock
+    setup_bm_update_server_mock
+    setup_lppv_server_mock
+    setup_migel_server_mock
   end
   def setup_bag_xml_server_mock
     # zip
@@ -154,20 +156,48 @@ module ServerMockHelper
         :headers => {'Content-Type' => 'text/csv; charset=utf-8'},
         :body    => stub_response)
   end
-  def setup_ywesee_server_mock
+  def setup_bm_update_server_mock
     # txt
-    stub_txt_url = 'http://www.ywesee.com/uploads/Main/BM_Update.txt'
-    stub_response = File.read(File.expand_path('../data/ywesee_bm_update.txt', __FILE__))
+    stub_txt_url = 'https://raw.github.com/zdavatz/oddb2xml_files/master/BM_Update.txt'
+    stub_response = File.read(File.expand_path('../data/oddb2xml_files_bm_update.txt', __FILE__))
     stub_request(:get, stub_txt_url).
       with(:headers => {
         'Accept' => '*/*',
-        'Host'   => 'www.ywesee.com',
+        'Host'   => 'raw.github.com',
       }).
       to_return(
         :status  => 200,
         :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
         :body    => stub_response)
   end
+  def setup_lppv_server_mock
+    # txt
+    stub_txt_url = 'https://raw.github.com/zdavatz/oddb2xml_files/master/LPPV.txt'
+    stub_response = File.read(File.expand_path('../data/oddb2xml_files_lppv.txt', __FILE__))
+    stub_request(:get, stub_txt_url).
+      with(:headers => {
+        'Accept' => '*/*',
+        'Host'   => 'raw.github.com',
+      }).
+      to_return(
+        :status  => 200,
+        :headers => {'Content-Type' => 'text/plain; charset=utf-8'},
+        :body    => stub_response)
+  end
+  def setup_migel_server_mock
+    # xls
+    stub_xls_url = 'https://github.com/zdavatz/oddb2xml_files/raw/master/NON-Pharma.xls'
+    stub_response = File.read(File.expand_path('../data/oddb2xml_files_nonpharma.xls', __FILE__))
+    stub_request(:get, stub_xls_url).
+      with(:headers => {
+        'Accept' => '*/*',
+        'Host'   => 'github.com',
+      }).
+      to_return(
+        :status  => 200,
+        :headers => {'Content-Type' => 'application/octet-stream; charset=utf-8'},
+        :body    => stub_response)
+  end
 end
 
 RSpec.configure do |config|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-30 00:00:00.000000000 Z
+date: 2013-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &7579920 !ruby/object:Gem::Requirement
+  requirement: &10903560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7579920
+  version_requirements: *10903560
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &7579260 !ruby/object:Gem::Requirement
+  requirement: &10902760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7579260
+  version_requirements: *10902760
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &7578660 !ruby/object:Gem::Requirement
+  requirement: &10901880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7578660
+  version_requirements: *10901880
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &7578060 !ruby/object:Gem::Requirement
+  requirement: &10900980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7578060
+  version_requirements: *10900980
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &7577380 !ruby/object:Gem::Requirement
+  requirement: &10900160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *7577380
+  version_requirements: *10900160
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &7576740 !ruby/object:Gem::Requirement
+  requirement: &10899260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *7576740
+  version_requirements: *10899260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7576020 !ruby/object:Gem::Requirement
+  requirement: &10898260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7576020
+  version_requirements: *10898260
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &7575460 !ruby/object:Gem::Requirement
+  requirement: &10896980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7575460
+  version_requirements: *10896980
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &7574940 !ruby/object:Gem::Requirement
+  requirement: &10895520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7574940
+  version_requirements: *10895520
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7574380 !ruby/object:Gem::Requirement
+  requirement: &10894700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *7574380
+  version_requirements: *10894700
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7573720 !ruby/object:Gem::Requirement
+  requirement: &10893480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7573720
+  version_requirements: *10893480
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &7572680 !ruby/object:Gem::Requirement
+  requirement: &10892260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *7572680
+  version_requirements: *10892260
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &7570120 !ruby/object:Gem::Requirement
+  requirement: &10891580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *7570120
+  version_requirements: *10891580
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables:
@@ -184,12 +184,15 @@ files:
 - spec/compressor_spec.rb
 - spec/data/XMLPublications.zip
 - spec/data/epha_interactions.csv
+- spec/data/oddb2xml_files_bm_update.txt
+- spec/data/oddb2xml_files_lppv.txt
 - spec/data/oddb_article.xml
 - spec/data/oddb_fi.xml
 - spec/data/oddb_fi_product.xml
 - spec/data/oddb_limitation.xml
 - spec/data/oddb_product.xml
 - spec/data/oddb_substance.xml
+- spec/data/oddb2xml_files_nonpharma.xls
 - spec/data/swissindex.xml
 - spec/data/swissindex_nonpharma.xml
 - spec/data/swissindex_pharma.xml
@@ -203,7 +206,6 @@ files:
 - spec/data/wsdl.xml
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml
-- spec/data/ywesee_bm_update.txt
 - spec/downloader_spec.rb
 - spec/extractor_spec.rb
 - spec/spec_helper.rb