brand2csv 0.2.7 → 0.2.8

data/.travis.yml

@@ -1,6 +1,14 @@
 language: ruby
 
+script: bundle exec rake spec
+
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
+notifications:
+  email:
+    recipients:
+      - ngiger@ywesee.com
+      - yasaka@ywesee.com
+      - zdavatz@ywesee.com

data/History.txt

@@ -1,3 +1,9 @@
+=== 0.2.8 28.08.2013
+
+* Update author
+* Add build badge
+* Fix webmock specs
+
 === 0.2.7 27.08.2013
 
 * Update to handle too many result view in swissreg

data/README.md

@@ -1,5 +1,7 @@
 # brand2csv
 
+[![Build Status](https://secure.travis-ci.org/zdavatz/brand2csv.png)](http://travis-ci.org/zdavatz/brand2csv)
+
 brand2csv using swissreg.ch to get addresses.
 
 ## Usage
@@ -20,3 +22,6 @@ Usage:
     The results are stored in the file <date_selected>.csv.
     The trademark name is either a real brand name or a link to an image.
 ```
+## Travis
+You can find Travis builds here:
+  * https://travis-ci.org/zdavatz/brand2csv

data/Rakefile

@@ -6,7 +6,7 @@ require 'hoe'
 
 Hoe.spec "brand2csv" do
   self.author      = "Niklaus Giger, Zeno R.R. Davatz" # gem.authors
-  self.email       = "yasaka@ywesee.com, zdavatz@ywesee.com"
+  self.email       = "ngiger@ywesee.com, zdavatz@ywesee.com"
   self.description = "brand2csv creates csv files for swiss brand registered in a specific time period. 
   The csv contains the brand, link to image (if present), link to the detailinfo at swissreg.ch, name and address of owner (Inhaber)"
   self.summary     = "brand2csv creates csv files for swiss brands."

data/lib/brand2csv.rb

@@ -227,20 +227,21 @@ module Brand2csv
     # the number is only passed to facilitate debugging
     # lines are the address lines 
     def Swissreg::parseAddress(number, inhaber)
-      lines = CGI.unescapeHTML(inhaber).split(LineSplit)
       ort = nil
       plz = nil
-      
-      # Search for plz/address
-      1.upto(lines.length-1).each  {
-        |cnt|
-          if    m = AddressRegexp.match(lines[cnt])
-            lines[cnt+1] = nil
-            plz = m[1]; ort = m[2]
-            cnt.upto(MaxZeilen-1).each{ |cnt2| lines[cnt2] = nil }
-            break
-          end
-      }
+      if inhaber
+        lines = CGI.unescapeHTML(inhaber).split(LineSplit)
+        # Search for plz/address
+        1.upto(lines.length-1).each  {
+          |cnt|
+            if    m = AddressRegexp.match(lines[cnt])
+              lines[cnt+1] = nil
+              plz = m[1]; ort = m[2]
+              cnt.upto(MaxZeilen-1).each{ |cnt2| lines[cnt2] = nil }
+              break
+            end
+        }
+      end
       unless plz
         puts "Achtung! Konnte Marke #{number} mit Inhaber #{lines.inspect} nicht parsen" if $VERBOSE
         return nil,   nil,     nil,     nil,     nil,     nil,     nil, nil

data/lib/brand2csv/version.rb

@@ -1,3 +1,3 @@
 module Brand2csv
-  VERSION = "0.2.7"
+  VERSION = "0.2.8"
 end

data/spec/csv_spec.rb

@@ -1,8 +1,6 @@
 #encoding : utf-8
-require 'rspec'
-require 'pp'
+require 'spec_helper'
 require 'tempfile'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/','brand2csv.rb'))
 
 include Brand2csv
 
@@ -26,4 +24,4 @@ describe 'Csv' do
     inhalte[2].should == nil
   end
 
-end
+end

data/spec/detail_spec.rb

@@ -1,7 +1,5 @@
 #encoding : utf-8
-require 'rspec'
-require 'pp'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/','brand2csv.rb'))
+require 'spec_helper'
 
 include Brand2csv
 
@@ -27,4 +25,4 @@ describe 'Detail' do
     @marke.name.should == 'https://www.swissreg.ch/srclient/images/loadImage?Action=LoadImg&ItemType=tm&ImageType=print&ImageHash=F431E13A9D8F363BD06604796634142A18A5BA7C.jpeg'
   end
 
-end
+end

data/spec/short_spec.rb

@@ -1,6 +1,4 @@
-require 'rspec'
-require 'pp'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/','brand2csv.rb'))
+require 'spec_helper'
 
 include Brand2csv
 
@@ -54,4 +52,4 @@ describe 'Short (e.g. corvatsch*)' do
     Swissreg::inputValue(data, 'id_swissreg:mainContent:scroll_1').should == ''
     Swissreg::inputValue(data, 'id_swissreg:_idcl').should == "id_swissreg:mainContent:data:#{position}:tm_no_detail:id_detail"
   end
-end
+end

data/spec/simple_search.rb

@@ -1,6 +1,4 @@
-require 'rspec'
-require 'pp'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/','brand2csv.rb'))
+require 'spec_helper'
 
 include Brand2csv
 
@@ -42,4 +40,4 @@ describe 'simple search with > 500 results' do
     @einfach.nrSubPages.should == 26
   end
 
-end
+end

data/spec/spec_helper.rb

@@ -6,9 +6,15 @@ require 'bundler/setup'
 Bundler.require
 
 require 'rspec'
-require 'brand2csv'
+require "webmock/rspec"
 
-Dir[File.join(File.dirname(__FILE__), "spec/support/**/*.rb")].each { |f| require f }
+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
@@ -22,4 +28,7 @@ RSpec.configure do |config|
   # the seed, which is printed after each run.
   #     --seed 1234
   config.order = 'random'
+
+  # Helper
+  config.include(ServerMockHelper)
 end

data/spec/utilities_spec.rb

@@ -1,7 +1,5 @@
 #encoding : utf-8
-require 'rspec'
-require 'pp'
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib/','brand2csv.rb'))
+require 'spec_helper'
 
 include Brand2csv
 
@@ -69,4 +67,4 @@ describe 'Tests parsing adress line' do
     plz.should == '3018'
     ort.should == 'Bern'
   end
-end
+end

metadata

@@ -1,109 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: brand2csv
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.2.8
   prerelease: 
-  segments: 
-  - 0
-  - 2
-  - 7
-  version: 0.2.7
 platform: ruby
-authors: 
+authors:
 - Niklaus Giger, Zeno R.R. Davatz
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-27 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-08-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mechanize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 6
-        version: "2.6"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.6'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  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: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 4
-        - 0
-        version: "4.0"
+      - !ruby/object:Gem::Version
+        version: '4.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '4.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  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 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 3
-        - 4
-        version: "3.4"
+    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
-  version_requirements: *id005
-description: |-
-  brand2csv creates csv files for swiss brand registered in a specific time period. 
-    The csv contains the brand, link to image (if present), link to the detailinfo at swissreg.ch, name and address of owner (Inhaber)
-email: yasaka@ywesee.com, zdavatz@ywesee.com
-executables: 
+  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
+  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
+executables:
 - brand2csv
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - LICENCE.txt
 - Manifest.txt
 - README.md
-files: 
+files:
 - .gitignore
 - .rspec
 - .travis.yml
@@ -151,37 +151,28 @@ files:
 - .gemtest
 homepage: https://github.com/zdavatz/brand2csv
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.md
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: brand2csv
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: brand2csv creates csv files for swiss brands.
 test_files: []
-