doko 0.1.9 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.2.0

data/doko.gemspec

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

data/lib/doko.rb

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-# -*- code:utf-8 -*-
 
 require 'nokogiri'
 require 'open-uri'
@@ -25,7 +24,7 @@ class Doko
     out = []
     doc = Nokogiri::HTML(open(url).read)
     doc.search("a").each do |a|
-      if a[:href].match(/access/) && !a[:href].match(/http/)
+      if a[:href] && a[:href].match(/access/) && !a[:href].match(/http/)
         out << uri + a[:href]
       end
     end
@@ -52,6 +51,7 @@ class Doko
     body.tr!("、",",")
     body.tr!("　"," ")
     body.tr!("．",".")
+    body.tr!("：",":")
     blackchars =  ",()\n"
 
     addrs = body.scan(/\b([^\s,()]{2,3}(都|道|府|県)[^\s,()]{1,8}(市|区|町|村)[^#{blackchars}]+)/).map{ |m|
@@ -76,10 +76,11 @@ class Doko
     line.gsub!(/\s+$/,"")
     line.gsub!(/\s?電話:.+$/,"")
     line.gsub!("[MAP]","")
-    line.gsub!(/(TEL|FAX):\d{2,4}-\d{2,4}-\d{2,4}/,"")
+    line.gsub!(/(TEL|FAX):\d{2,4}-\d{2,4}-\d{2,4}.+/,"")
     line.gsub!(/(\dー)*\d/) do |t|
       t.tr("ー","-")
     end
+    line.sub!(/\s$/,"")
     line
   end
 end

data/sample/Gemfile.lock

@@ -1,12 +1,8 @@
-PATH
-  remote: ..
-  specs:
-    doko (0.1.8)
-      nokogiri
-
 GEM
   remote: http://rubygems.org/
   specs:
+    doko (0.1.9)
+      nokogiri
     nokogiri (1.5.3)
     rack (1.3.6)
     rack-protection (1.2.0)
@@ -21,5 +17,5 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  doko!
+  doko
   sinatra

data/spec/doko_spec.rb

@@ -6,7 +6,6 @@ require 'open-uri'
 describe "Doko" do
 
   describe "parse" do
-      
     it "should retrieve address from string"  do
       Doko.parse("ここは\n東京都港区芝浦3-4-1\nです").first.should == "東京都港区芝浦3-4-1"
     end
@@ -61,11 +60,19 @@ describe "Doko" do
     it do 
       Doko.parse("http://www.stadium2002.com/stadium/index.php").first.should == "さいたま市緑区中野田500"
     end
+
+    it do
+      Doko.parse("http://www.canalcafe.jp/").first.should == "東京都新宿区神楽坂1-9"
+    end
   end
 
   describe "deep" do
     it do
       Doko.deep("http://www.risonare-atami.com/").first.should == "静岡県熱海市水口町2-13-1"
     end
+
+    it do 
+      Doko.deep("http://www.yokohama-akarenga.jp/index.html").should be_empty
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doko
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2942783918463996752
+      hash: -4468521619932611074
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: