brand2csv 0.3.1 → 0.3.2

data/spec/detail_spec.rb

@@ -0,0 +1,28 @@
+#encoding : utf-8
+require 'spec_helper'
+
+include Brand2csv
+
+describe 'Detail' do
+  before :each do
+    dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data'))
+    session = Swissreg.new("01.01.1990", 'Branding')
+    filename = "#{dataDir}/vereinfachte_detail_33.html"
+    expect(File.exists?(filename)).to be_truthy
+    doc = Nokogiri::Slop(File.open(filename))
+    @marke = Swissreg::getMarkenInfoFromDetail(doc)
+  end
+  
+  it "collected trademark information must be correct" do
+    expect(@marke).not_to be_nil
+    expect(@marke.zeile_1).to eq("Peter Löcker Bauart")
+    expect(@marke.zeile_2).to eq("Trollstrasse 20")
+    expect(@marke.zeile_3).to be_nil
+    expect(@marke.plz).to eq('8400')
+    expect(@marke.ort).to eq('Winterthur')
+    expect(@marke.markennummer).to eq('00135/2013')
+    expect(@marke.inhaber).to eq("Peter Löcker Bauart, Trollstrasse 20, 8400 Winterthur")
+    expect(@marke.name).to eq('https://www.swissreg.ch/srclient/images/loadImage?Action=LoadImg&ItemType=tm&ImageType=print&ImageHash=F431E13A9D8F363BD06604796634142A18A5BA7C.jpeg')
+  end
+
+end

data/spec/short_spec.rb

@@ -0,0 +1,55 @@
+require 'spec_helper'
+
+include Brand2csv
+
+describe 'Short (e.g. corvatsch*)' do
+  TrademarkSearch = 'TRADEMARK REGISTER SEARCH TIMES: QUERY=[10] SELECT=[70] SERVER=[80] DELEGATE=[93] (HITS=[9])'
+  before :each do
+    dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data'))
+    session = Swissreg.new("01.01.1990", 'Branding')
+    filename = "#{dataDir}/result_short.html"
+    expect(File.exists?(filename)).to be_truthy
+    doc = Nokogiri::Slop(File.open(filename))
+    @einfach = Swissreg::Vereinfachte.new(doc)
+  end
+  
+  it "short search must return info about trademark search" do
+    expect(Swissreg::inputValue(@einfach.inputData, 'id_swissreg:mainContent:vivian')).to eq(TrademarkSearch)
+  end
+  
+  it "short search must return hit information" do
+    expect(@einfach.firstHit).to eq(1)
+    expect(@einfach.nrHits).to eq(9)
+  end
+
+  it "short search must return details" do
+    expect(@einfach.links2details).not_to be_nil
+    expect(@einfach.links2details.size).to eq(9)
+    expect(@einfach.links2details.index(901614)).not_to be_nil
+  end
+
+  it "short search must return information about (sub-)pages" do
+    expect(@einfach.pageNr).to eq(1)
+    expect(@einfach.nrSubPages).to eq(1)
+  end
+
+  it "short search getPostDataForSubpage" do
+    expect(@einfach.pageNr).to eq(1)
+    data = @einfach.getPostDataForSubpage(2)
+    expect(data).not_to be_nil
+    expect(Swissreg::inputValue(data, 'tmMainId')).to eq("")
+    expect(Swissreg::inputValue(data, 'id_swissreg:mainContent:scroll_1')).to eq("idx2")
+    expect(Swissreg::inputValue(data, 'id_swissreg:_idcl')).to eq('id_swissreg:mainContent:scroll_1idx2')
+  end
+
+  it "short search getPostDataForDetail" do
+    expect(@einfach.pageNr).to eq(1)
+    position = 3
+    id = 937439
+    data = @einfach.getPostDataForDetail(position, id)
+    expect(data).not_to be_nil
+    expect(Swissreg::inputValue(data, 'tmMainId')).to eq("#{id}")
+    expect(Swissreg::inputValue(data, 'id_swissreg:mainContent:scroll_1')).to eq('')
+    expect(Swissreg::inputValue(data, 'id_swissreg:_idcl')).to eq("id_swissreg:mainContent:data:#{position}:tm_no_detail:id_detail")
+  end
+end

data/spec/simple_search.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+include Brand2csv
+
+describe 'simple search with > 500 results' do
+  TrademarkSearch = 'TRADEMARK REGISTER SEARCH TIMES: QUERY=[530] SELECT=[1456] SERVER=[1991] DELEGATE=[2088] (HITS=[6349])'
+  
+  before :each do
+    dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data'))
+    session = Swissreg.new("01.01.1990", 'Branding')
+    filename = "#{dataDir}/vereinfachte_1.html"
+    expect(File.exists?(filename)).to be_truthy
+    doc = Nokogiri::Slop(File.open(filename))
+    @einfach = Swissreg::Vereinfachte.new(doc)
+  end
+  
+  it "simple search must contain inputData with vivian" do
+    data = @einfach.inputData
+    expect(data.class).to eq(Array)
+    expect(data.size).to eq(9)
+  end
+
+  it "simple search must return info about trademark search" do
+    expect(Swissreg::inputValue(@einfach.inputData, 'id_swissreg:mainContent:vivian')).to eq(TrademarkSearch)
+  end
+  
+  it "simple search must return hit information" do
+    expect(@einfach.firstHit).to eq(1)
+    expect(@einfach.nrHits).to eq(6349)
+  end
+
+  it "simple search must return details" do
+    expect(@einfach.links2details).not_to be_nil
+    expect(@einfach.links2details.size).to eq(250)
+    expect(@einfach.links2details.index(940377)).not_to be_nil
+  end
+
+  it "simple search must return information about (sub-)pages" do
+    expect(@einfach.pageNr).to eq(1)
+    expect(@einfach.nrSubPages).to eq(26)
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,34 @@
+# encoding: utf-8
+$:.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+$:.unshift File.dirname(__FILE__)
+
+require 'bundler/setup'
+Bundler.require
+
+require 'rspec'
+require "webmock/rspec"
+
+Dir[File.join(File.dirname(__FILE__), "support/**/*.rb")].each { |f| require f }
+
+require 'brand2csv'
+begin
+  capture(:stdout) { load File.expand_path("../../bin/brand2csv", __FILE__) }
+rescue LoadError
+end
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+  config.filter_run_excluding :slow
+  #config.exclusion_filter = {:slow => true}
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+
+  # Helper
+  config.include(ServerMockHelper)
+end

data/spec/support/core_ext/kernel.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+require 'stringio'
+require 'ostruct'
+
+module Kernel
+  # for stdout/stderr
+  def capture(stream)
+    begin
+      stream = stream.to_s
+      eval "$#{stream} = StringIO.new"
+      yield
+      result = eval("$#{stream}").string
+    ensure
+      eval "$#{stream} = #{stream.upcase}"
+    end
+    result
+  end
+
+  alias :original_exit :exit
+  # for load executable file
+  def exit(status=false)
+    (status == 1) ? raise(LoadError) : original_exit
+  end
+end
+

data/spec/support/server_mock_helper.rb

@@ -0,0 +1,143 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module ServerMockHelper
+  
+  def setup_swissreg_ch_server(trademark, timespan, result_folder, trademark_ids)
+    # main
+    stub_response = File.read(File.expand_path("../../data/main.html", __FILE__))
+    stub_request(:get, "https://www.swissreg.ch/srclient/faces/jsp/start.jsp").
+      with(
+        :headers => {
+          "Accept" => "*/*",
+          "Host"   => "www.swissreg.ch",
+        }).
+      to_return(
+        :status  => 200,
+        :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+        :body    => stub_response)
+    # erweiterte
+    stub_response = File.read(File.expand_path("../../data/erweiterte_suche.html", __FILE__))
+    stub_request(:post,  "https://www.swissreg.ch/srclient/faces/jsp/start.jsp").
+      with(
+        :headers => {
+          "Accept" => "*/*",
+          "Host"   => "www.swissreg.ch",
+        },
+        :body => {
+          "autoScroll"                => "",
+          "id_swissreg:_idcl"         => "id_swissreg_sub_nav_ipiNavigation_item0",
+          "id_swissreg:_link_hidden_" => "",
+          "id_swissreg_SUBMIT"        => "1",
+          "javax.faces.ViewState"     =>"rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAN0AAExcHQADi9qc3Avc3RhcnQuanNw"
+        }).
+      to_return(
+        :status  => 200,
+        :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+        :body    => stub_response)
+    # result page 1
+    stub_response = File.read(File.expand_path("../../data/#{result_folder}/first_results.html", __FILE__))
+    stub_request(:post,  "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr3.jsp").
+      with(
+        :headers => {
+          "Accept" => "*/*",
+          "Host"   => "www.swissreg.ch",
+        },
+        :body => {
+          "autoScroll"                                     => "0,829",
+          "id_swissreg:_idcl"                              => "",
+          "id_swissreg:_link_hidden_"                      => "",
+          "id_swissreg:mainContent:id_cbxCountry"          => "_ALL",
+          "id_swissreg:mainContent:id_cbxFormatChoice"     => "1",
+          "id_swissreg:mainContent:id_cbxHitsPerPage"      => "250",
+          "id_swissreg:mainContent:id_cbxTMColorClaim"     => "_ALL",
+          "id_swissreg:mainContent:id_cbxTMForm"           => "_ALL",
+          "id_swissreg:mainContent:id_cbxTMTypeGrp"        => "_ALL",
+          "id_swissreg:mainContent:id_ckbTMChoice"         => "tm_lbl_app_date",
+          "id_swissreg:mainContent:id_ckbTMPubReason"      => "8",
+          "id_swissreg:mainContent:id_ckbTMState"          => "3",
+          "id_swissreg:mainContent:id_txf_agent"           => "",
+          "id_swissreg:mainContent:id_txf_appDate"         => "#{timespan}",
+          "id_swissreg:mainContent:id_txf_app_no"          => "",
+          "id_swissreg:mainContent:id_txf_applicant"       => "",
+          "id_swissreg:mainContent:id_txf_expiryDate"      => "",
+          "id_swissreg:mainContent:id_txf_licensee"        => "",
+          "id_swissreg:mainContent:id_txf_nizza_class"     => "",
+          "id_swissreg:mainContent:id_txf_pub_date"        => "",
+          "id_swissreg:mainContent:id_txf_tm_no"           => "",
+          "id_swissreg:mainContent:id_txf_tm_text"         => "#{trademark}",
+          "id_swissreg:mainContent:sub_fieldset:id_submit" => "suchen",
+          "id_swissreg_SUBMIT"                             => "1",
+          "javax.faces.ViewState"                          => "rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAN0AAExcHQADi9qc3Avc3RhcnQuanNw"
+        }).
+      to_return(
+        :status  => 200,
+        :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+        :body    => stub_response)
+    # result page 2
+    stub_response = File.read(File.expand_path("../../data/#{result_folder}/first_results.html", __FILE__))
+    stub_request(:post,  "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr3.jsp").
+      with(
+        :headers => {
+          "Accept" => "*/*",
+          "Host"   => "www.swissreg.ch",
+        },
+        :body => {
+          "autoScroll"                                 => "",
+          "id_swissreg:_idcl"                          => "id_swissreg_sub_nav_ipiNavigation_item0_item3",
+          "id_swissreg:_link_hidden_"                  => "",
+          "id_swissreg:mainContent:id_cbxCountry"      => "_ALL",
+          "id_swissreg:mainContent:id_cbxFormatChoice" => "1",
+          "id_swissreg:mainContent:id_cbxHitsPerPage"  => "25",
+          "id_swissreg:mainContent:id_cbxTMColorClaim" => "_ALL",
+          "id_swissreg:mainContent:id_cbxTMForm"       => "_ALL",
+          "id_swissreg:mainContent:id_cbxTMTypeGrp"    => "_ALL",
+          "id_swissreg:mainContent:id_ckbTMChoice"     => "tm_lbl_applicant",
+          "id_swissreg:mainContent:id_ckbTMPubReason"  => "8",
+          "id_swissreg:mainContent:id_ckbTMState"      => "3",
+          "id_swissreg:mainContent:id_txf_agent"       => "",
+          "id_swissreg:mainContent:id_txf_appDate"     => "",
+          "id_swissreg:mainContent:id_txf_app_no"      => "",
+          "id_swissreg:mainContent:id_txf_applicant"   => "",
+          "id_swissreg:mainContent:id_txf_expiryDate"  => "",
+          "id_swissreg:mainContent:id_txf_licensee"    => "",
+          "id_swissreg:mainContent:id_txf_nizza_class" => "",
+          "id_swissreg:mainContent:id_txf_pub_date"    => "",
+          "id_swissreg:mainContent:id_txf_tm_no"       => "",
+          "id_swissreg:mainContent:id_txf_tm_text"     => "",
+          "id_swissreg_SUBMIT"                         => "1",
+          "javax.faces.ViewState"                      => "rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAN0AAEzcHQAFi9qc3AvdHJhZGVtYXJrL3NyMy5qc3A="
+        }).
+      to_return(
+        :status  => 200,
+        :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+        :body    => stub_response)
+      
+    counter = 0
+    trademark_ids.each{ 
+      |trademark_id|
+      counter += 1
+      filename = File.expand_path("../../data/#{result_folder}/detail_#{sprintf('%05i',counter)}_#{trademark_id.sub('/','.')}.html", __FILE__)
+      stub_response = File.read(filename)
+      stub_request(:get, "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr300.jsp?language=de&section=tm&id=#{trademark_id}").
+        with(
+          :headers => {
+            "Accept" => "*/*",
+            "Host"   => "www.swissreg.ch",
+          }).
+        to_return(
+          :status  => 200,
+          :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+          :body    => stub_response)
+
+    }
+    stub_request(:post, "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr30.jsp").
+    with(:body => {"autoScroll"=>"", "id_swissreg:_idcl"=>"", "id_swissreg:_link_hidden_"=>"", "id_swissreg:mainContent:id_sub_options_result:id_ckbTMChoice"=>"tm_lbl_app_date", "id_swissreg:mainContent:id_sub_options_result:sub_fieldset:id_cbxHitsPerPage"=>"250", "id_swissreg:mainContent:scroll_1"=>"",
+                   "id_swissreg:mainContent:vivian"=>
+                  "TRADEMARK REGISTER SEARCH TIMES: QUERY=[14] SELECT=[20] SERVER=[37] DELEGATE=[46]", "id_swissreg_SUBMIT"=>"1", "javax.faces.ViewState"=>"rO0ABXVyABNbTGphdmEubGFuZy5PYmplY3Q7kM5YnxBzKWwCAAB4cAAAAAN0AAE0cHQAFy9qc3AvdHJhZGVtYXJrL3NyMzAuanNw", "tmMainId"=>""}
+          ).
+      to_return(:status => 200, :body => "", :headers => {})
+
+  end
+ 
+end

data/spec/swissreg_spec.rb

@@ -0,0 +1,45 @@
+#encoding : utf-8
+require 'spec_helper'
+
+describe 'Get some simple example from swissreg' do
+
+  HasVertreterPos = 4
+  pending ('mocking swissreg no longer works')
+  if false
+  it "should get correct results from swissreg" do
+    marke = 'aspectra*'
+    timespan = '01.01.2012-31.12.2012'
+    setup_swissreg_ch_server(marke, timespan, 'aspectra', ["P-480296", "P-482236", "641074"])
+    results = nil
+    capture(:stdout) { results = Brand2csv::run(timespan, marke) }
+    expect(results).not_to be_nil
+    expect(results.size).to eq(3)
+    expect(results[0].zeile_1).to eq('Aspectra AG')
+    expect(results[0].plz).to eq('8004')
+    expect(results[0].ort).to eq('Zürich')
+    csv = "#{timespan}.csv"
+    csv_lines = IO.readlines(csv)
+    expect(csv_lines[1].split(';')[HasVertreterPos]).to eq("Ja")
+    expect(csv_lines[2].split(';')[HasVertreterPos]).to eq("Ja")
+    expect(csv_lines[3].split(';')[HasVertreterPos]).to eq("Nein")
+  end
+
+  it "should get correct results from swissreg when owner has two postal addresses" do
+    marke = 'Urner Wildheu'
+    timespan = '01.05.2013-30.06.2013'
+    setup_swissreg_ch_server(marke, timespan, 'urner_wildheu', ["57862/2013"])
+    results = nil
+    capture(:stdout) { results = Brand2csv::run(timespan, marke) }
+    expect(results).not_to be_nil
+    expect(results.size).to eq(1)
+    expect(results[0].zeile_1).to eq('Philipp Arnold')
+    expect(results[0].zeile_2).to eq('Seestrasse 37a')
+    expect(results[0].plz).to eq('6454')
+    expect(results[0].ort).to eq('Flüelen')
+    csv = "#{timespan}.csv"
+    csv_lines = IO.readlines(csv)
+    expect(csv_lines[1].split(';')[2]).to eq('Philipp Arnold, Seestrasse 37a, 6454 Flüelen')
+    expect(csv_lines[1].split(';')[HasVertreterPos]).to eq("Ja")
+  end
+  end
+end

data/spec/trademark_numbers_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+include Brand2csv
+
+describe 'trademark number search' do
+  
+  before :each do
+    dataDir =  File.expand_path(File.join(File.dirname(__FILE__), 'data'))
+    filename = "#{dataDir}/result_short.html"
+    expect(File.exists?(filename)).to be_truthy
+    @doc = Nokogiri::Slop(File.open(filename))
+  end
+  
+  it "trademark number search must contain 9 numbers" do
+    numbers = Swissreg::getTrademarkNumbers(@doc)
+    expect(numbers).not_to be_nil
+    expect(numbers.size).to eq(9)
+    expect(numbers.index('00127/2011')).not_to be_nil
+  end
+
+end

data/spec/utilities_spec.rb

@@ -0,0 +1,83 @@
+#encoding : utf-8
+require 'spec_helper'
+
+include Brand2csv
+
+describe 'Tests for utility procedure' do
+  
+  before :each do
+    @data = [
+      ["autoScroll", ""],
+      ["id_swissreg:mainContent:id_show_simple_view_hitlist", "Vereinfachte Trefferliste anzeigen"],
+      ["id_swissreg_SUBMIT", "1"],
+      ["id_swissreg:_idcl", "id_swissreg_sub_nav_ipiNavigation_item0"],
+      ["id_swissreg:_link_hidden_", ""],
+      ["javax.faces.ViewState", 'xzy' ],
+    ]
+  end
+  
+  it "inputValue should return nil for not existing key " do
+    expect(Swissreg::inputValue(@data, 'xxx')).to be_nil
+  end
+  
+  it "inputValue should return correct value for existing key " do
+    expect(Swissreg::inputValue(@data, 'autoScroll')).to eq('')
+    expect(Swissreg::inputValue(@data, 'id_swissreg:mainContent:id_show_simple_view_hitlist')).to eq("Vereinfachte Trefferliste anzeigen")
+  end
+  
+  it "HitsPerPage must be 250" do
+    expect(Swissreg::HitsPerPage).to eq(250)
+  end
+  
+end
+
+describe 'Tests parsing adress line' do
+  
+  it "must handle correctly Via San Salvatore, 2" do
+    full_address_line = 'Ideal Hobby Sagl, Via San Salvatore, 2, 6902 Paradiso'
+    number = 'for_debugging'
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
+    expect(zeile_1).to eq('Ideal Hobby Sagl')
+    expect(zeile_2).to eq('Via San Salvatore, 2')
+    expect(zeile_3).to be_nil
+    expect(plz).to eq('6902')
+    expect(ort).to eq('Paradiso')
+  end
+  
+  it "must handle correctly 90, route de Frontenex" do    
+    full_address_line = 'Olivier Karim Wasem, 90, route de Frontenex, 1208 Genève'
+    number = 'for_debugging'
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
+    expect(zeile_1).to eq('Olivier Karim Wasem')
+    expect(zeile_2).to eq('90, route de Frontenex')
+    expect(zeile_3).to be_nil
+    expect(plz).to eq('1208')
+    expect(ort).to eq('Genève')
+  end
+  
+  it "must handle ampersands correctly" do
+    full_address_line = 'Schweiz. Serum- & Impfinstitut, und Institut zur Erforschung der, Infektionskrankheiten, Rehhagstrasse 79, 3018 Bern'    
+    number = 'for_debugging'
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
+    expect(zeile_1).to eq('Schweiz. Serum- & Impfinstitut')
+    expect(zeile_2).to eq('und Institut zur Erforschung der')
+    expect(zeile_3).to eq('Infektionskrankheiten')
+    expect(zeile_4).to eq('Rehhagstrasse 79')
+    expect(zeile_5).to be_nil
+    expect(plz).to eq('3018')
+    expect(ort).to eq('Bern')
+  end
+
+  it "must handle several postal addresses correctly" do 
+    full_address_line = 'Philipp Arnold, Seestrasse 37a, 6454 Flüelen, , Peter Tresoldi, c/o Xitix GmbH, Rathausplatz 4, 6460 Altdorf'
+    number = 'for_debugging'
+    zeile_1, zeile_2, zeile_3, zeile_4, zeile_5, plz, ort = Swissreg::parseAddress(number, full_address_line)
+    expect(zeile_1).to eq('Philipp Arnold')
+    expect(zeile_2).to eq('Seestrasse 37a')
+    expect(zeile_3).to be_nil
+    expect(zeile_4).to be_nil
+    expect(zeile_5).to be_nil
+    expect(plz).to eq('6454')
+    expect(ort).to eq('Flüelen')
+  end
+end