From a2cfbeb152d843e6002a22cd710dcd039fbf147a Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Mon, 23 Sep 2013 16:32:33 +0200 Subject: [PATCH] Fix errors under Ruby 1.8.7. Use Ja/Nein instead of false/true --- lib/brand2csv.rb | 4 ++-- spec/csv_spec.rb | 2 +- spec/swissreg_spec.rb | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/brand2csv.rb b/lib/brand2csv.rb index b9f0f4d..1872fe0 100644 --- a/lib/brand2csv.rb +++ b/lib/brand2csv.rb @@ -313,7 +313,7 @@ def Swissreg::getMarkenInfoFromDetail(doc) bezeichnung = nil inhaber = nil hinterlegungsdatum = nil - hatVertreter = false + hatVertreter = 'Nein' doc.xpath("//html/body/form/div/div/fieldset/div/table/tbody/tr").each{ |x| if x.children.first.text.eql?('Marke') @@ -330,7 +330,7 @@ def Swissreg::getMarkenInfoFromDetail(doc) end if x.children.first.text.eql?('Vertreter/in') - hatVertreter = true if x.children[1].text.length > 0 + hatVertreter = 'Ja' if x.children[1].text.length > 0 end hinterlegungsdatum = x.children[1].text if x.children.first.text.eql?('Hinterlegungsdatum') number = x.children[1].text if x.children.first.text.eql?('Gesuch Nr.') diff --git a/spec/csv_spec.rb b/spec/csv_spec.rb index c65a13b..bf1200a 100644 --- a/spec/csv_spec.rb +++ b/spec/csv_spec.rb @@ -20,7 +20,7 @@ Swissreg::emitCsv(results, file.path) inhalte = IO.readlines(file.path) inhalte[0].chomp.should == 'name;markennummer;inhaber;land;hatVertreter;hinterlegungsdatum;zeile_1;zeile_2;zeile_3;zeile_4;zeile_5;plz;ort' - inhalte[1].chomp.should == 'https://www.swissreg.ch/srclient/images/loadImage?Action=LoadImg&ItemType=tm&ImageType=print&ImageHash=F431E13A9D8F363BD06604796634142A18A5BA7C.jpeg;00135/2013;Peter Löcker Bauart, Trollstrasse 20, 8400 Winterthur;Schweiz;false;13.03.2013;Peter Löcker Bauart;Trollstrasse 20;;;;8400;Winterthur' + inhalte[1].chomp.should == 'https://www.swissreg.ch/srclient/images/loadImage?Action=LoadImg&ItemType=tm&ImageType=print&ImageHash=F431E13A9D8F363BD06604796634142A18A5BA7C.jpeg;00135/2013;Peter Löcker Bauart, Trollstrasse 20, 8400 Winterthur;Schweiz;Nein;13.03.2013;Peter Löcker Bauart;Trollstrasse 20;;;;8400;Winterthur' inhalte[2].should == nil end diff --git a/spec/swissreg_spec.rb b/spec/swissreg_spec.rb index 70cb584..b5f4724 100644 --- a/spec/swissreg_spec.rb +++ b/spec/swissreg_spec.rb @@ -18,9 +18,9 @@ results[0].ort.should == 'Zürich' csv = "#{timespan}.csv" csv_lines = IO.readlines(csv) - csv_lines[1].split(';')[HasVertreterPos].should == "true" - csv_lines[2].split(';')[HasVertreterPos].should == "true" - csv_lines[3].split(';')[HasVertreterPos].should == "false" + csv_lines[1].split(';')[HasVertreterPos].should == "Ja" + csv_lines[2].split(';')[HasVertreterPos].should == "Ja" + csv_lines[3].split(';')[HasVertreterPos].should == "Nein" end it "should get correct results from swissreg when owner has two postal addresses" do @@ -38,7 +38,7 @@ csv = "#{timespan}.csv" csv_lines = IO.readlines(csv) csv_lines[1].split(';')[2].should == 'Philipp Arnold, Seestrasse 37a, 6454 Flüelen' - csv_lines[1].split(';')[HasVertreterPos].should == "true" + csv_lines[1].split(';')[HasVertreterPos].should == "Ja" end end