brand2csv 0.2.8 → 0.2.9

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,142 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+
+module ServerMockHelper
+  
+  def setup_swissreg_ch_server(trademark, timespan, result_folder, trademark_ids)
+    # main
+    stub_html_url = "https://www.swissreg.ch/srclient/faces/jsp/start.jsp"
+    stub_response = File.read(File.expand_path("../../data/main.html", __FILE__))
+    stub_request(:get, stub_html_url).
+      with(
+        :headers => {
+          "Accept" => "*/*",
+          "Host"   => "www.swissreg.ch",
+        }).
+      to_return(
+        :status  => 200,
+        :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+        :body    => stub_response)
+    # erweiterte
+    stub_html_url = "https://www.swissreg.ch/srclient/faces/jsp/start.jsp"
+    stub_response = File.read(File.expand_path("../../data/erweiterte_suche.html", __FILE__))
+    stub_request(:post, stub_html_url).
+      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_html_url = "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr3.jsp"
+    stub_response = File.read(File.expand_path("../../data/#{result_folder}/first_results.html", __FILE__))
+    stub_request(:post, stub_html_url).
+      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_html_url = "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr3.jsp"
+    stub_response = File.read(File.expand_path("../../data/#{result_folder}/first_results.html", __FILE__))
+    stub_request(:post, stub_html_url).
+      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
+                     # https://www.swissreg.ch/srclient/faces/jsp/trademark/sr300.jsp?language=de&section=tm&id=57862/2013
+      stub_html_url = "https://www.swissreg.ch/srclient/faces/jsp/trademark/sr300.jsp?language=de&section=tm&id=#{trademark_id}"
+      filename = File.expand_path("../../data/#{result_folder}/detail_#{sprintf('%05i',counter)}_#{trademark_id.sub('/','.')}.html", __FILE__)
+      stub_response = File.read(filename)
+      stub_request(:get, stub_html_url).
+        with(
+          :headers => {
+            "Accept" => "*/*",
+            "Host"   => "www.swissreg.ch",
+          }).
+        to_return(
+          :status  => 200,
+          :headers => {"Content-Type" => 'text/html; charset=utf-8'},
+          :body    => stub_response)
+
+    }
+  end
+ 
+end

data/spec/swissreg_spec.rb

@@ -0,0 +1,44 @@
+#encoding : utf-8
+require 'spec_helper'
+
+describe 'Get some simple example from swissreg' do
+  
+  HasVertreterPos = 4
+  
+  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) }
+    results.should_not be_nil
+    results.size.should == 3
+    results[0].zeile_1.should == 'Aspectra AG'
+    results[0].plz.should == '8004'
+    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"
+  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) }
+    results.should_not be_nil
+    results.size.should == 1
+    results[0].zeile_1.should == 'Philipp Arnold'
+    results[0].zeile_2.should == 'Seestrasse 37a'
+    results[0].plz.should == '6454'
+    results[0].ort.should == 'Flüelen'
+    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"
+  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"
+    File.exists?(filename).should be_true
+    @doc = Nokogiri::Slop(File.open(filename))
+  end
+  
+  it "trademark number search must contain 9 numbers" do
+    numbers = Swissreg::getTrademarkNumbers(@doc)
+    numbers.should_not be_nil
+    numbers.size.should == 9
+    numbers.index('00127/2011').should_not be_nil
+  end
+
+end

data/spec/utilities_spec.rb

@@ -67,4 +67,17 @@ describe 'Tests parsing adress line' do
     plz.should == '3018'
     ort.should == '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)
+    zeile_1.should == 'Philipp Arnold'
+    zeile_2.should == 'Seestrasse 37a'
+    zeile_3.should be_nil
+    zeile_4.should be_nil
+    zeile_5.should be_nil
+    plz.should == '6454'
+    ort.should == 'Flüelen'
+  end
 end

metadata

@@ -1,100 +1,89 @@
 --- !ruby/object:Gem::Specification
 name: brand2csv
 version: !ruby/object:Gem::Version
-  version: 0.2.8
-  prerelease: 
+  version: 0.2.9
 platform: ruby
 authors:
-- Niklaus Giger, Zeno R.R. Davatz
+- Niklaus Giger, Yasuhiro Asaka, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.10'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.4'
-description: ! "brand2csv creates csv files for swiss brand registered in a specific
+description: "brand2csv creates csv files for swiss brand registered in a specific
   time period. \n  The csv contains the brand, link to image (if present), link to
   the detailinfo at swissreg.ch, name and address of owner (Inhaber)"
-email: ngiger@ywesee.com, zdavatz@ywesee.com
+email: ngiger@ywesee.com, yasaka@ywesee.com, zdavatz@ywesee.com
 executables:
 - brand2csv
 extensions: []
@@ -102,7 +91,6 @@ extra_rdoc_files:
 - History.txt
 - LICENCE.txt
 - Manifest.txt
-- README.md
 files:
 - .gitignore
 - .rspec
@@ -111,7 +99,6 @@ files:
 - Gemfile.lock
 - History.txt
 - LICENCE.txt
-- LICENSE
 - Manifest.txt
 - README.md
 - Rakefile
@@ -130,19 +117,30 @@ files:
 - protocol.2013.05.12.textile
 - protocol.2013.05.15.textile
 - protocol.2013.05.21.textile
+- spec/brand2csv_spec.rb
 - spec/csv_spec.rb
+- spec/data/aspectra/detail_00001_P-480296.html
+- spec/data/aspectra/detail_00002_P-482236.html
+- spec/data/aspectra/detail_00003_641074.html
+- spec/data/aspectra/first_results.html
 - spec/data/einfache_suche.html
 - spec/data/erweiterte_suche.html
 - spec/data/main.html
 - spec/data/result_short.html
 - spec/data/resultate_1.html
 - spec/data/resultate_2.html
+- spec/data/urner_wildheu/detail_00001_57862.2013.html
+- spec/data/urner_wildheu/first_results.html
 - spec/data/vereinfachte_1.html
 - spec/data/vereinfachte_detail_33.html
 - spec/detail_spec.rb
 - spec/short_spec.rb
 - spec/simple_search.rb
 - spec/spec_helper.rb
+- spec/support/core_ext/kernel.rb
+- spec/support/server_mock_helper.rb
+- spec/swissreg_spec.rb
+- spec/trademark_numbers_spec.rb
 - spec/utilities_spec.rb
 - spike.rb
 - spike_mechanize_swissreg.rb
@@ -150,7 +148,9 @@ files:
 - swissreg.rb
 - .gemtest
 homepage: https://github.com/zdavatz/brand2csv
-licenses: []
+licenses:
+- GPLv3.0
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -158,21 +158,19 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: brand2csv
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: brand2csv creates csv files for swiss brands.
 test_files: []