doko 0.1.6 → 0.1.7

data/VERSION

@@ -1 +1 @@
-0.1.6
+0.1.7

data/doko.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "doko"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Masaki Sawamura"]

data/lib/doko.rb

@@ -14,7 +14,7 @@ class Doko
     if str.match( /^#{URI.regexp}$/ )
       str = open(str).read
     end
-    if str.match(/<html/)
+    if str.match(/<html/i)
       @text =  (Nokogiri::HTML(str)/"body").text
     else
       @text = str
@@ -24,36 +24,40 @@ class Doko
   def parse
     body = @text
     body.tr!("０-９","0-9")
-    body.tr!("ー","-")
     body.tr!("（）","()")
     body.tr!("、",",")
     body.tr!("　"," ")
     body.tr!("．",".")
-    
     blackchars =  ",()\n"
-    
+
     addrs = body.scan(/\b([^\s,()]{2,3}(都|道|府|県)[^\s,()]{1,8}(市|区|町|村)[^#{blackchars}]+)/).map{ |m|
-      line = m[0]
-      line.gsub!(/住所(\s|\n)?/,"")
-      line.gsub!(/〒\d{3}-\d{4}　?/,"")
-      line.gsub!(/\s+$/,"")
-      line.gsub!(/\s?電話:.+$/,"")
-      line
+      clean(m[0])
     }
     if addrs.empty?
       addrs = body.scan(/([^\s]{1,6}(市|区).{2,8}(区|町|村)[^\s,()]{2,10}\d)/).map{ |m|
-        line = m[0]
-        line.gsub!(/住所(\s|\n)?/,"")
-        line.gsub!(/〒\d{3}-\d{4}　?/,"")
-        line.gsub!("[MAP]","")
-        line.gsub!(/(TEL|FAX):\d{2,4}-\d{2,4}-\d{2,4}/,"")
-        line
+        clean(m[0])
       }
     end
     addrs.select{ |a|
       !a.match(/を/)
     }
   end
+
+  private
+
+
+  def clean(line)
+    line.gsub!(/住所(\s|\n)?/,"")
+    line.gsub!(/〒\d{3}-\d{4}　?/,"")
+    line.gsub!(/\s+$/,"")
+    line.gsub!(/\s?電話:.+$/,"")
+    line.gsub!("[MAP]","")
+    line.gsub!(/(TEL|FAX):\d{2,4}-\d{2,4}-\d{2,4}/,"")
+    line.gsub!(/(\dー)*\d/) do |t|
+      t.tr("ー","-")
+    end
+    line
+  end
 end
 
 

data/spec/doko_spec.rb

@@ -4,7 +4,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 require 'open-uri'
 
 describe "Doko" do
-
   it "should retrieve address from string"  do
     Doko.parse("ここは\n東京都港区芝浦3-4-1\nです").first.should == "東京都港区芝浦3-4-1"
   end
@@ -50,4 +49,9 @@ describe "Doko" do
   it do
     Doko.parse("http://atnd.org/events/28384").first.should == "東京都千代田区神田駿河台2-3 DH2001Bldg."
   end
+
+  it do
+    page = open("http://www.nttr.co.jp/corporate_profile/index.htm").read.encode("utf-8")
+    Doko.parse(page).first.should == "東京都港区芝浦3-4-1 グランパークタワー"
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doko
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3862698864711078623
+      hash: 4235072000421726462
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: