brand2csv 0.1.6 → 0.1.7

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.1.7 27.05.2013
+
+* Avoid force_encoding if ruby version 1.8.*
+* Retry up to three times for failures
+* Make rspec spec pass under Ruby 1.8.*
+
 === 0.1.6 27.05.2013
 
 * Added support for parsing results up to 10'000 hits

data/lib/brand2csv.rb

@@ -440,7 +440,9 @@ module Brand2csv
                                }
             ausgabe.puts s.chop
         }        
+        ausgabe.close
       else
+        
         CSV.open(filename,  'w', :headers=>results[0].members,
                                   :write_headers => true,
                                   :col_sep => ';'
@@ -517,7 +519,7 @@ module Brand2csv
         doc = Nokogiri::Slop(File.open(filename))        
       else
         body = @agent.page.body
-        body.force_encoding('utf-8')
+        body.force_encoding('utf-8') unless /^1\.8/.match(RUBY_VERSION)
         doc = Nokogiri::Slop(body)
         filename = "#{LogDir}/vereinfachte_#{pageNr}.html"
         writeResponse(filename)
@@ -538,7 +540,18 @@ module Brand2csv
         nextId   = einfach.firstHit.to_i - 1 + position.to_i
         data3 = einfach.getPostDataForDetail(nextId, id)
         Swissreg::setAllInputValue(@agent.page.forms.first, data3)
-        @agent.page.forms.first.submit
+        nrTries = 1
+        while true
+          begin 
+            @agent.page.forms.first.submit
+            break
+          rescue
+            puts "Rescue in submit. nrTries is #{nrTries}"
+            nrTries += 1
+            sleep 1
+            exit 1 if nrTries > 3
+          end
+        end
         filename = "#{LogDir}/vereinfachte_detail_#{einfach.firstHit + position}.html"
         writeResponse(filename)
         matchResult = @agent.page.search('h1').text
@@ -567,7 +580,7 @@ module Brand2csv
         doc = Nokogiri::Slop(File.open(filename))        
       else
         body = @agent.page.body
-        body.force_encoding('utf-8')
+        body.force_encoding('utf-8') unless /^1\.8/.match(RUBY_VERSION)
         doc = Nokogiri::Slop(body)
         writeResponse(filename)
       end

data/lib/brand2csv/version.rb

@@ -1,3 +1,3 @@
 module Brand2csv
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brand2csv
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors: