oddb2xml 1.1.7 → 1.1.8

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.1.8 / 17.01.2013
+
+* Improve File reading on Windows
+* Update ssl connection handling and information
+
 === 1.1.7 / 15.01.2013
 
 * Updated Manifest.text

data/Manifest.txt

@@ -14,7 +14,6 @@ lib/oddb2xml/compressor.rb
 lib/oddb2xml/downloader.rb
 lib/oddb2xml/extractor.rb
 lib/oddb2xml/version.rb
-set.bat
 spec/builder_spec.rb
 spec/cli_spec.rb
 spec/compressor_spec.rb
@@ -43,4 +42,6 @@ spec/data/ywesee_bm_update.txt
 spec/downloader_spec.rb
 spec/extractor_spec.rb
 spec/spec_helper.rb
-win_fetch_cacerts.rb
+tools/cacert.pem
+tools/set.bat
+tools/win_fetch_cacerts.rb

data/README.md

@@ -160,3 +160,21 @@ product.xml has relation to substance as `<SUBNO>`.
   </RESULT>
 </SUBSTANCE>
 ```
+
+## About SSLv3 cert
+
+Some websites need SSLv3 connection.  
+If you don't have these root CA files (x509), Please install these Certificates before running.  
+Please confirm wit `ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`.
+
+see [cURL Website](http://curl.haxx.se/ca/)
+
+
+### Windows User
+
+1. Download this [cacert.pem](http://curl.haxx.se/ca/cacert.pem) (cURL) into your HOME directory.
+1. Then Choose Menu "Control Panel" > "System" > "Advanced system settings" (This open "System Properties" Window.)
+2. Click "Advanced" Tab.
+3. Click "Environment Variables" button.
+4. Add set variable entry "SSL\_CERT\_FILE=%HOMEPATH%\cacert.pem" (Variable name: SSL\_CCERT\_FILE, Variable value: %HOMEPATH%\cacert.pem) with "New..." button into upper are "User variables for xxx"
+5. (Please do not remove this cacert.pem. All SSLv3 connections use this file.)

data/lib/oddb2xml/cli.rb

@@ -72,19 +72,37 @@ module Oddb2xml
           @flags = YweseeBMExtractor.new(str).to_hash
         end
       end
+      ssl = true
+      catch :ssl do
       LANGUAGES.each do |lang|
-        # swissindex
-        types.each do |type|
-          threads << Thread.new do
-            downloader = SwissIndexDownloader.new(type, lang)
-            xml = downloader.download
-            @mutex.synchronize do
-              hsh = SwissIndexExtractor.new(xml, type).to_hash
-              @index[lang][type] = hsh
+          # swissindex
+          types.each do |type|
+            begin
+              thread = thread.new do
+                downloader = SwissIndexDownloader.new(type, lang)
+                xml = downloader.download
+                @mutex.synchronize do
+                  hsh = SwissIndexExtractor.new(xml, type).to_hash
+                  @index[lang][type] = hsh
+                end
+              end
+              thread.abort_on_exception = true
+              threads << thread
+            rescue Exception
+              ssl = false
+              throw :ssl
             end
           end
         end
       end
+      unless ssl
+        puts
+        puts "(Aborted)"
+        puts "Please install SSLv3 CA certificates on your machine."
+        puts "You can check with `ruby -ropenssl -e 'p OpenSSL::X509::DEFAULT_CERT_FILE'`."
+        puts "See README."
+        exit
+      end
       threads.map(&:join)
       build
       compress if @options[:compress_ext]

data/lib/oddb2xml/downloader.rb

@@ -31,14 +31,16 @@ module Oddb2xml
     end
     def read_xml_form_zip(target, zipfile)
       xml = ''
-      if RUBY_PLATFORM =~ /mswin/i # for memory error
+      if RUBY_PLATFORM =~ /mswin|mingw|bccwin|cygwin/i # for memory error
         Zip::ZipFile.foreach(zipfile) do |entry|
           if entry.name =~ target
-            entry.get_input_stream do |io|
-              while line = io.gets
-                xml << line
-              end
+            io = entry.get_input_stream
+            until io.eof?
+              bytes = io.read(1024)
+              xml << bytes
+              bytes = nil
             end
+            io.close
           end
         end
       else
@@ -61,7 +63,7 @@ module Oddb2xml
       begin
         response = @agent.get(@url)
         response.save_as(file)
-        response = nil # mswin
+        response = nil # win
         return read_xml_form_zip(/^Preparation/iu, file)
       rescue Timeout::Error
         retrievable? ? retry : raise
@@ -102,7 +104,7 @@ XML
         response = @client.call(:download_all, :xml => soap)
         if response.success?
           if xml = response.to_xml
-            response = nil # mswin
+            response = nil # win
             return xml
           else
             # received broken data or internal error
@@ -112,11 +114,7 @@ XML
           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
+        raise Exception # catch me in Cli class
       rescue Timeout::Error
         retrievable? ? retry : raise
       end
@@ -144,7 +142,7 @@ XML
           link = Mechanize::Page::Link.new(link_node, @agent, page)
           response = link.click
           response.save_as(file)
-          response = nil # mswin
+          response = nil # win
         end
         io = File.open(file, 'rb')
         return io.read
@@ -203,13 +201,13 @@ XML
       begin
         response = @agent.get(@url)
         response.save_as(file)
-        response = nil # mswin
+        response = nil # win
         io = File.open(file, 'r')
         return io.read
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        io.close unless io.closed? # mswin
+        io.close unless io.closed? # win
         if File.exists?(file)
           File.unlink(file)
         end
@@ -226,13 +224,13 @@ XML
       begin
         response = @agent.get(@url)
         response.save_as(file)
-        response = nil # mswin
+        response = nil # win
         io = File.open(file, 'r')
         return io.read
       rescue Timeout::Error
         retrievable? ? retry : raise
       ensure
-        io.close unless io.closed? # mswin
+        io.close unless io.closed? # win
         if File.exists?(file)
           File.unlink(file)
         end

data/lib/oddb2xml/version.rb

@@ -1,3 +1,3 @@
 module Oddb2xml
-  VERSION = "1.1.7"
+  VERSION = "1.1.8"
 end