oddb2xml 1.6.6 → 1.6.7

data/Gemfile

@@ -6,6 +6,7 @@ gem 'mechanize', '~> 2.5.1'
 gem 'nokogiri'
 gem 'savon', '>= 2.0'
 gem 'spreadsheet'
+gem 'rubyXL'
 
 group :development do
   gem 'rspec'

data/Gemfile.lock

@@ -71,6 +71,7 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     ruby-ole (1.2.11.7)
+    rubyXL (1.2.10)
     rubyntlm (0.3.4)
     rubyzip (0.9.9)
     safe_yaml (0.9.7)
@@ -111,6 +112,7 @@ DEPENDENCIES
   pry-debugger
   rdoc
   rspec
+  rubyXL
   rubyzip (= 0.9.9)
   savon (>= 2.0)
   spreadsheet

data/History.txt

@@ -1,3 +1,7 @@
+=== 1.6.7 / 07.01.2013
+
+*  Adapted to swissmedic xlsx files
+
 === 1.6.6 / 12.12.2013
 
 * Added spec for generating *.dat file

data/Manifest.txt

@@ -45,15 +45,17 @@ spec/data/oddb_substance.xml
 spec/data/swissindex.xml
 spec/data/swissindex_nonpharma.xml
 spec/data/swissindex_pharma.xml
+spec/data/swissmedic_fridge.xlsx
 spec/data/swissmedic_fridges.html
 spec/data/swissmedic_fridges.xls
 spec/data/swissmedic_info.html
 spec/data/swissmedic_info.zip
 spec/data/swissmedic_info_2.html
+spec/data/swissmedic_orphan.xls
 spec/data/swissmedic_orphans.html
 spec/data/swissmedic_orphans.xls
+spec/data/swissmedic_package.xlsx
 spec/data/swissmedic_packages.html
-spec/data/swissmedic_packages.xls
 spec/data/wsdl.xml
 spec/data/wsdl_nonpharma.xml
 spec/data/wsdl_pharma.xml

data/lib/oddb2xml/cli.rb

@@ -6,6 +6,7 @@ require 'oddb2xml/downloader'
 require 'oddb2xml/extractor'
 require 'oddb2xml/compressor'
 require 'oddb2xml/util'
+require 'rubyXL'
 
 module Oddb2xml
   class Cli

data/lib/oddb2xml/downloader.rb

@@ -229,20 +229,20 @@ XML
       @type = type
       case @type
       when :orphan
-        action = "daten/00081/index.html?lang=de"
-        @xpath = "//div[@id='sprungmarke0_4']//a[@title='Humanarzneimittel']"
+        action = "arzneimittel/00156/00221/00222/00223/00224/00227/00228/index.html?lang=de"
+        @xpath = "//div[@id='sprungmarke10_3']//a[@title='Humanarzneimittel']"
       when :fridge
-        action = "daten/00080/00254/index.html?lang=de"
-        @xpath = "//table[@class='swmTableFlex']//a[@title='B3.1.35-d.xls']"
+        action = "arzneimittel/00156/00221/00222/00235/index.html?lang=de"
+        @xpath = "//div[@id='sprungmarke10_2']//a[@title='Excel-Version']"
       when :package
-        action = "daten/00080/00251/index.html?lang=de"
-        @xpath = "//div[@id='sprungmarke0_7']//a[@title='Excel-Version Zugelassene Verpackungen*']"
+        action = "arzneimittel/00156/00221/00222/00230/index.html?lang=de"
+        @xpath = "//div[@id='sprungmarke10_7']//a[@title='Excel-Version Zugelassene Verpackungen*']"
       end
       url = "http://www.swissmedic.ch/#{action}"
       super({}, url)
     end
     def download
-      file = "swissmedic_#{@type}.xls"
+      @type == :orphan ? file = "swissmedic_#{@type}.xls" :  file = "swissmedic_#{@type}.xlsx"
       begin
         page = @agent.get(@url)
         if link_node = page.search(@xpath).first
@@ -253,13 +253,11 @@ XML
             response = nil # win
           end
         end
-        io = File.open(file, 'rb')
-        return io.read
+        return File.expand_path(file)
       rescue Timeout::Error, Errno::ETIMEDOUT
         retrievable? ? retry : raise
       ensure
-        io.close if io and !io.closed?
-        Oddb2xml.download_finished(file)
+        Oddb2xml.download_finished(file, false)
       end
     end
   end

data/lib/oddb2xml/extractor.rb

@@ -196,11 +196,14 @@ module Oddb2xml
     end
   end
   class SwissmedicExtractor < Extractor
-    def initialize(bin, type)
-      io = StringIO.new(bin)
-      book = Spreadsheet.open(io, 'rb')
-      @sheet = book.worksheet(0)
+    def initialize(filename, type)
       @type  = type
+      if type == :orphan
+        book = Spreadsheet.open(filename, 'rb')
+        @sheet = book.worksheet(0)
+      else
+        @sheet = RubyXL::Parser.parse(File.expand_path(filename)).worksheets[0]
+      end
     end
     def to_arry
       data = []
@@ -208,15 +211,16 @@ module Oddb2xml
       when :orphan
         i = 1
         @sheet.each do |row|
-          if number = extract_number(row, i)
-            data << number.to_s
+          number = row[1].to_i
+          if number != 0
+            data << sprintf("%05d", number)
           end
         end
       when :fridge
         i,c = 1,7
         @sheet.each do |row|
-          if number = extract_number(row, i) and row[c] and row[c].to_s == 'x'
-            data << row[i].to_s
+          if row[i] and number = row[i].value and row[c] and row[c].value.to_s.downcase == 'x'
+            data << sprintf("%05d", number)
           end
         end
       end
@@ -237,20 +241,21 @@ module Oddb2xml
         sub       = 14   # :substance_swissmedic
         @sheet.each_with_index do |row, i|
           next if (i <= 1)
-          no8 = sprintf('%05d',row[i_5].to_i) + sprintf('%03d',row[i_3].to_i)
-          prodno = sprintf('%05d',row[i_5].to_i) + row[p_1_2].to_i.to_s
+          next unless row[i_5] and row[i_3]
+          no8 = sprintf('%05d',row[i_5].value.to_i) + sprintf('%03d',row[i_3].value.to_i)
+          prodno = sprintf('%05d',row[i_5].value.to_i) + row[p_1_2].value.to_i.to_s
           unless no8.empty?
             next if no8.to_i == 0
             ean_base12 = "7680#{no8}"
             data[no8.intern] = {
               :ean                  => (ean_base12.ljust(12, '0') + calc_checksum(ean_base12)),
-              :prodno               => prodno,
-              :ith_swissmedic       => row[ith].to_s,
-              :swissmedic_category  => row[cat].to_s,
-              :atc_code             => row[atc].to_s,
-              :package_size         => row[siz].to_s,
-              :einheit_swissmedic   => row[eht].to_s,
-              :substance_swissmedic => row[sub].to_s,
+              :prodno               => prodno ? prodno : '',
+              :ith_swissmedic       => row[ith] ? row[ith].value.to_s : '',
+              :swissmedic_category  => row[cat].value.to_s,
+              :atc_code             => row[atc] ? row[atc].value.to_s : '',
+              :package_size         => row[siz] ? row[siz].value.to_s : '',
+              :einheit_swissmedic   => row[eht] ? row[eht].value.to_s : '',
+              :substance_swissmedic => row[sub] ? row[sub].value.to_s : '',
               :is_tier              => (row[typ] == 'Tierarzneimittel' ? true : false),
             }
           end

data/lib/oddb2xml/util.rb

@@ -16,14 +16,14 @@ module Oddb2xml
     false
   end
   
-  def Oddb2xml.download_finished(file)
+  def Oddb2xml.download_finished(file, remove_file = true)
     dest = "#{Backup}/#{File.basename(file)}"
     if @options[:skip_download]
       FileUtils.makedirs(Backup)
       FileUtils.cp(file, dest, :verbose => false)
     end
     begin
-      File.unlink(file) if File.exists?(file)
+      File.unlink(file) if File.exists?(file) and remove_file
     rescue Errno::EACCES # Permission Denied on Windows      
     end
   end                            

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.6.6"
+  VERSION = "1.6.7"
 end

data/spec/extractor_spec.rb

@@ -63,13 +63,37 @@ describe Oddb2xml::SwissmedicInfoExtractor do
     subject { Oddb2xml::SwissmedicInfoExtractor.new("") }
     it { expect(subject.to_hash).to be_empty }
   end
-  context 'can parse swissmedic_packages.xls' do
+  context 'can parse swissmedic_package.xlsx' do
     it {
-        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_packages.xls')
-        bin = IO.read(filename)
-        @packs = Oddb2xml::SwissmedicExtractor.new(bin, :package).to_hash
-        expect(@packs.size).to eq(14) 
-       }
+        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_package.xlsx')
+        @packs = Oddb2xml::SwissmedicExtractor.new(filename, :package).to_hash
+        expect(@packs.size).to eq(14)
+        first = @packs.first[1]
+        expect(first[:atc_code]).to eq('J06AA')
+        expect(first[:swissmedic_category]).to eq('B')
+        expect(first[:package_size]).to eq('3')
+        expect(first[:einheit_swissmedic]).to eq('Suppositorien')
+        expect(first[:substance_swissmedic]).to eq('globulina equina (immunisé avec coeur, tissu pulmonaire, reins de porcins)')
+        expect(@packs.first[0].to_s).to eq('00274001')
+      }
+  end
+  context 'can parse swissmedic_fridge.xlsx' do
+    it {
+        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_fridge.xlsx')
+        @packs = Oddb2xml::SwissmedicExtractor.new(filename, :fridge).to_arry
+        expect(@packs.size).to eq(17)
+        expect(@packs[0]).to eq("58618")
+        expect(@packs[1]).to eq("00696")
+      }
+  end
+  context 'can parse swissmedic_orphan.xls' do
+    it {
+        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_orphan.xls')
+        @packs = Oddb2xml::SwissmedicExtractor.new(filename, :orphan).to_arry
+        expect(@packs.size).to eq(72)
+        expect(@packs.first).to eq("62132")
+        expect(@packs[7]).to eq("00687")
+      }
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.6.6
+  version: 1.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-12 00:00:00.000000000 Z
+date: 2014-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -229,15 +229,17 @@ files:
 - spec/data/swissindex.xml
 - spec/data/swissindex_nonpharma.xml
 - spec/data/swissindex_pharma.xml
+- spec/data/swissmedic_fridge.xlsx
 - spec/data/swissmedic_fridges.html
 - spec/data/swissmedic_fridges.xls
 - spec/data/swissmedic_info.html
 - spec/data/swissmedic_info.zip
 - spec/data/swissmedic_info_2.html
+- spec/data/swissmedic_orphan.xls
 - spec/data/swissmedic_orphans.html
 - spec/data/swissmedic_orphans.xls
+- spec/data/swissmedic_package.xlsx
 - spec/data/swissmedic_packages.html
-- spec/data/swissmedic_packages.xls
 - spec/data/wsdl.xml
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml