oddb2xml 1.6.8 → 1.6.9

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.6.9 / 07.01.2013
+
+* Updated Rakefile for rubyzip ~> 0.9.9
+* Remove *.xls/x-Files after extraction
+
 === 1.6.8 / 07.01.2013
 
 * Updated Rakefile to include rubyXL

data/Manifest.txt

@@ -45,17 +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_fridges.xlsx
 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/swissmedic_packages.xlsx
 spec/data/wsdl.xml
 spec/data/wsdl_nonpharma.xml
 spec/data/wsdl_pharma.xml

data/Rakefile

@@ -19,7 +19,7 @@ Hoe.spec 'oddb2xml' do
   self.urls        = ["https://github.com/zdavatz/oddb2xml"] # gem.homepage
 
   # gem.add_runtime_dependency
-  self.extra_deps << ['rubyzip']
+  self.extra_deps << ['rubyzip', '~> 0.9.9']
   self.extra_deps << ['archive-tar-minitar']
   self.extra_deps << ['mechanize', '~> 2.5.1']
   self.extra_deps << ['nokogiri']

data/lib/oddb2xml/downloader.rb

@@ -30,6 +30,7 @@ module Oddb2xml
     end
   end
   class Downloader
+    attr_reader :type
     def initialize(options={}, url=nil)
       @options     = options
       @url         = url

data/lib/oddb2xml/extractor.rb

@@ -3,6 +3,7 @@
 require 'nokogiri'
 require 'spreadsheet'
 require 'stringio'
+require 'rubyXL'
 
 module Oddb2xml
   module TxtExtractorMethods
@@ -197,6 +198,7 @@ module Oddb2xml
   end
   class SwissmedicExtractor < Extractor
     def initialize(filename, type)
+      @filename = filename
       @type  = type
       if type == :orphan
         book = Spreadsheet.open(filename, 'rb')
@@ -224,6 +226,7 @@ module Oddb2xml
           end
         end
       end
+      cleanup_file
       data.uniq
     end
     def to_hash # Packungen.xls
@@ -261,24 +264,17 @@ module Oddb2xml
           end
         end
       end
+      cleanup_file
       data
     end
     private
-    def extract_number(row, i, ptrn=/^\d{5}$/)
+    def cleanup_file
       begin
-        return nil unless row[i]
-        row[i] = row[i].to_i if row[i].is_a? Float
-        number = row[i].to_s.gsub(/[^0-9]/, '')
-        number = number.rjust(5, '0') if ptrn == /^\d{5}$/
-        if number =~ ptrn
-          return number
-        else
-          nil
-        end
-      rescue NoMethodError
-        nil
-      end
+        File.unlink(@filename) if File.exists?(@filename)
+        rescue Errno::EACCES # Permission Denied on Windows      
+      end unless defined?(RSpec)
     end
+
     def calc_checksum(str)
       str = str.strip
       sum = 0

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.6.8"
+  VERSION = "1.6.9"
 end

data/spec/extractor_spec.rb

@@ -63,9 +63,9 @@ describe Oddb2xml::SwissmedicInfoExtractor do
     subject { Oddb2xml::SwissmedicInfoExtractor.new("") }
     it { expect(subject.to_hash).to be_empty }
   end
-  context 'can parse swissmedic_package.xlsx' do
+  context 'can parse swissmedic_packages.xlsx' do
     it {
-        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_package.xlsx')
+        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_packages.xlsx')
         @packs = Oddb2xml::SwissmedicExtractor.new(filename, :package).to_hash
         expect(@packs.size).to eq(14)
         first = @packs.first[1]
@@ -77,18 +77,19 @@ describe Oddb2xml::SwissmedicInfoExtractor do
         expect(@packs.first[0].to_s).to eq('00274001')
       }
   end
-  context 'can parse swissmedic_fridge.xlsx' do
+  context 'can parse swissmedic_fridges.xlsx' do
     it {
-        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_fridge.xlsx')
+        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_fridges.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
+  context 'can parse swissmedic_orphans.xls' do
     it {
-        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_orphan.xls')
+        filename = File.join(File.dirname(__FILE__), 'data/swissmedic_orphans.xls')
+        expect(File.exists?(filename)).to eq(true), "File #{filename} must exists"
         @packs = Oddb2xml::SwissmedicExtractor.new(filename, :orphan).to_arry
         expect(@packs.size).to eq(72)
         expect(@packs.first).to eq("62132")

data/spec/spec_helper.rb

@@ -72,26 +72,29 @@ module ServerMockHelper
   end
   def setup_swissmedic_server_mock
     host = 'www.swissmedic.ch'
-    {
-      :orphans  => {:html => '/daten/00081/index.html?lang=de',       :xls => '/download'},
-      :fridges  => {:html => '/daten/00080/00254/index.html?lang=de', :xls => '/download'},
-      :packages => {:html => '/daten/00080/00251/index.html?lang=de', :xls => '/download'},
+    {    
+      :orphans  => {:html => '/arzneimittel/00156/00221/00222/00223/00224/00227/00228/index.html?lang=de',       :xls => '/download'},
+      :fridges  => {:html => '/arzneimittel/00156/00221/00222/00235/index.html?lang=de', :xls => '/download'},
+      :packages => {:html => '/arzneimittel/00156/00221/00222/00230/index.html?lang=de', :xls => '/download'},
     }.each_pair do |type, urls|
       # html (dummy)
       stub_html_url = "http://#{host}" + urls[:html]
-      stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.html", __FILE__))
+      filename = File.expand_path("../data/swissmedic_#{type.to_s}.html", __FILE__)
+      stub_response = File.read(filename)
       stub_request(:get, stub_html_url).
-        with(:headers => {
-          'Accept' => '*/*',
-          'Host'   => host,
-        }).
+         with(:headers => {'Accept'=>'*/*', 'Accept-Charset'=>'ISO-8859-1,utf-8;q=0.7,*;q=0.7', 'Accept-Encoding'=>'gzip,deflate,identity', 'Accept-Language'=>'en-us,en;q=0.5', 'Connection'=>'keep-alive', 'Host'=> host, 'Keep-Alive'=>'300', 'User-Agent'=>'Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20100101 Firefox/16.0'}).
         to_return(
           :status  => 200,
           :headers => {'Content-Type' => 'text/html; charset=utf-8'},
           :body    => stub_response)
       # xls
-      stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xls"
-      stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.xls", __FILE__))
+      if type == :orphans
+        stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xls"
+        stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.xls", __FILE__))
+      else
+        stub_xls_url  = "http://#{host}" + urls[:xls] + "/swissmedic_#{type.to_s}.xlsx"
+        stub_response = File.read(File.expand_path("../data/swissmedic_#{type.to_s}.xlsx", __FILE__))
+      end
       stub_request(:get, stub_xls_url).
         with(:headers => {
           'Accept'          => '*/*',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -16,17 +16,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.9.9
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
   requirement: !ruby/object:Gem::Requirement
@@ -245,17 +245,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_fridges.xlsx
 - 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/swissmedic_packages.xlsx
 - spec/data/wsdl.xml
 - spec/data/wsdl_nonpharma.xml
 - spec/data/wsdl_pharma.xml