oddb2xml 1.1.5 → 1.1.6

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.1.6 / 13.01.2013
+
+* Update message for SSLv3 Error
+* mswin mswin mswin :(
+* enable SSL with SSLv3 cert at soap request
+
 === 1.1.5 / 11.01.2013
 
 * Add BG tags into article.xml from ywesee BM.txt

data/README.md

@@ -2,6 +2,16 @@
 
 oddb2xml, creates xml files using swissINDEX, BAG-XML and Swissmedic.
 
+The following additional data is in the files:
+
+* Wirkstoffe
+* Kühlkette (gemäss Swissmedic)
+* Orphan Drugs (gemäss Swissmedic)
+* FI (de und fr)
+* Limitation-Texte (gemäss BAG XML)
+* Interaktionen (EPha.ch)
+* Betäubungsmittel und psychotrope Stoffe (gemäss Swissmedic)
+* Non-Pharma from Refdata and Suppliers
 
 ## usage
 

data/lib/oddb2xml/cli.rb

@@ -43,16 +43,16 @@ module Oddb2xml
       [:orphans, :fridges].each do |type|
         threads << Thread.new do
           downloader = SwissmedicDownloader.new(type)
-          io = downloader.download
-          self.instance_variable_set("@#{type.to_s}", SwissmedicExtractor.new(io, type).to_arry)
+          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
-        io = downloader.download
+        str = downloader.download
         @mutex.synchronize do
-          @actions = EphaExtractor.new(io).to_arry
+          @actions = EphaExtractor.new(str).to_arry
         end
       end
       # bag
@@ -67,9 +67,9 @@ module Oddb2xml
       # ywesee
       threads << Thread.new do
         downloader = YweseeBMDownloader.new
-        io = downloader.download
+        str = downloader.download
         @mutex.synchronize do
-          @flags = YweseeBMExtractor.new(io).to_hash
+          @flags = YweseeBMExtractor.new(str).to_hash
         end
       end
       LANGUAGES.each do |lang|

data/lib/oddb2xml/downloader.rb

@@ -60,13 +60,14 @@ module Oddb2xml
       file = 'XMLPublications.zip'
       begin
         response = @agent.get(@url)
-        response.save_as file
+        response.save_as(file)
+        response = nil # mswin
         return read_xml_form_zip(/^Preparation/iu, file)
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        if File.exists? file
-          File.unlink file
+        if File.exists?(file)
+          File.unlink(file)
         end
       end
     end
@@ -83,7 +84,7 @@ module Oddb2xml
         :log_level       => :info,
         :log             => false, # $stdout
         :raise_errors    => true,
-        :ssl_verify_mode => :none,
+        :ssl_version     => :SSLv3,
         :wsdl            => @url
       }
       @client = Savon::Client.new(config)
@@ -101,6 +102,7 @@ XML
         response = @client.call(:download_all, :xml => soap)
         if response.success?
           if xml = response.to_xml
+            response = nil # mswin
             return xml
           else
             # received broken data or internal error
@@ -109,6 +111,12 @@ XML
         else
           raise Timeout::Error
         end
+      rescue HTTPI::SSLError
+        puts
+        puts "Please install SSLv3 cert on your machine."
+        puts "You can check location of cert file with `ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`."
+        puts "Or confirm SSL_CERT_FILE environment."
+        exit
       rescue Timeout::Error
         retrievable? ? retry : raise
       end
@@ -135,14 +143,17 @@ XML
         if link_node = page.search(@xpath).first
           link = Mechanize::Page::Link.new(link_node, @agent, page)
           response = link.click
-          response.save_as file
+          response.save_as(file)
+          response = nil # mswin
         end
-        return File.open(file, 'rb')
+        io = File.open(file, 'rb')
+        return io.read
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        if File.exists? file
-          File.unlink file
+        io.close unless io.closed?
+        if File.exists?(file)
+          File.unlink(file)
         end
       end
     end
@@ -167,7 +178,8 @@ XML
           end
         end
         if response
-          response.save_as file
+          response.save_as(file)
+          response = nil # msmin
         end
         return read_xml_form_zip(/^AipsDownload_/iu, file)
       rescue Timeout::Error
@@ -175,8 +187,8 @@ XML
       rescue NoMethodError => e
         # pass
       ensure
-        if File.exists? file
-          File.unlink file
+        if File.exists?(file)
+          File.unlink(file)
         end
       end
     end
@@ -190,13 +202,16 @@ XML
       file = "epha_interactions.csv"
       begin
         response = @agent.get(@url)
-        response.save_as file
-        return File.open(file, 'r')
+        response.save_as(file)
+        response = nil # mswin
+        io = File.open(file, 'r')
+        return io.read
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        if File.exists? file
-          File.unlink file
+        io.close unless io.closed? # mswin
+        if File.exists?(file)
+          File.unlink(file)
         end
       end
     end
@@ -210,13 +225,16 @@ XML
       file = 'ywesee_bm_update.txt'
       begin
         response = @agent.get(@url)
-        response.save_as file
-        return File.open(file, 'r')
+        response.save_as(file)
+        response = nil # mswin
+        io = File.open(file, 'r')
+        return io.read
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        if File.exists? file
-          File.unlink file
+        io.close unless io.closed? # mswin
+        if File.exists?(file)
+          File.unlink(file)
         end
       end
     end

data/lib/oddb2xml/extractor.rb

@@ -2,6 +2,7 @@
 
 require 'nokogiri'
 require 'spreadsheet'
+require 'stringio'
 
 module Oddb2xml
   class Extractor
@@ -134,7 +135,8 @@ module Oddb2xml
     end
   end
   class SwissmedicExtractor < Extractor
-    def initialize(io, type)
+    def initialize(bin, type)
+      io = StringIO.new(bin)
       book = Spreadsheet.open(io)
       @sheet = book.worksheet(0)
       @type  = type
@@ -201,8 +203,8 @@ module Oddb2xml
     end
   end
   class EphaExtractor < Extractor
-    def initialize(io)
-      @io = io
+    def initialize(str)
+      @io = StringIO.new(str)
     end
     def to_arry
       data = []
@@ -226,8 +228,8 @@ module Oddb2xml
     end
   end
   class YweseeBMExtractor < Extractor
-    def initialize(io)
-      @io = io
+    def initialize(str)
+      @io = StringIO.new(str)
     end
     def to_hash
       data = {}

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oddb2xml
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &21104340 !ruby/object:Gem::Requirement
+  requirement: &12310580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21104340
+  version_requirements: *12310580
 - !ruby/object:Gem::Dependency
   name: archive-tar-minitar
-  requirement: &21103620 !ruby/object:Gem::Requirement
+  requirement: &12310080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21103620
+  version_requirements: *12310080
 - !ruby/object:Gem::Dependency
   name: mechanize
-  requirement: &21103000 !ruby/object:Gem::Requirement
+  requirement: &12309600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21103000
+  version_requirements: *12309600
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &21102480 !ruby/object:Gem::Requirement
+  requirement: &12325460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21102480
+  version_requirements: *12325460
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &21101700 !ruby/object:Gem::Requirement
+  requirement: &12324940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *21101700
+  version_requirements: *12324940
 - !ruby/object:Gem::Dependency
   name: spreadsheet
-  requirement: &21101060 !ruby/object:Gem::Requirement
+  requirement: &12324500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21101060
+  version_requirements: *12324500
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &21100460 !ruby/object:Gem::Requirement
+  requirement: &12323920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21100460
+  version_requirements: *12323920
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &21099960 !ruby/object:Gem::Requirement
+  requirement: &12323500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21099960
+  version_requirements: *12323500
 - !ruby/object:Gem::Dependency
   name: ZenTest
-  requirement: &21099480 !ruby/object:Gem::Requirement
+  requirement: &12323020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21099480
+  version_requirements: *12323020
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21098920 !ruby/object:Gem::Requirement
+  requirement: &12322500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '3.4'
   type: :development
   prerelease: false
-  version_requirements: *21098920
+  version_requirements: *12322500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21098500 !ruby/object:Gem::Requirement
+  requirement: &12321900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *21098500
+  version_requirements: *12321900
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &21097920 !ruby/object:Gem::Requirement
+  requirement: &12321240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *21097920
+  version_requirements: *12321240
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &21097400 !ruby/object:Gem::Requirement
+  requirement: &12320800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,7 +153,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *21097400
+  version_requirements: *12320800
 description: oddb2xml creates xml files using swissINDEX, BAG-XML and Swissmedic.
 email: yasaka@ywesee.com, zdavatz@ywesee.com
 executables: