doko 0.1.8 → 0.1.9

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.1.9

data/doko.gemspec

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

data/lib/doko.rb

@@ -10,8 +10,32 @@ class Doko
     self.new(str).parse
   end
 
+  def self.deep(url)
+    addrs = parse(url)
+    if addrs.empty?
+      addrs = links(url).map{ |u|
+        parse(u)
+      }.flatten
+    end
+    addrs
+  end
+
+  def self.links(url)
+    uri = URI.parse(url)
+    out = []
+    doc = Nokogiri::HTML(open(url).read)
+    doc.search("a").each do |a|
+      if a[:href].match(/access/) && !a[:href].match(/http/)
+        out << uri + a[:href]
+      end
+    end
+    out.uniq
+  end
+
   def initialize(str)
-    if str.match( /^#{URI.regexp}$/ )
+    if str.kind_of? URI 
+      str = open(str.to_s).read
+    elsif str.match( /^#{URI.regexp}$/ )
       str = open(str).read
     end
     if str.match(/<html/i)

data/sample/Gemfile.lock

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

data/sample/app.rb

@@ -9,6 +9,6 @@ end
 
 post '/' do
   @url = params[:url]
-  @addrs = Doko.parse(@url)
+  @addrs = Doko.deep(@url)
   erb :index
 end

data/spec/doko_spec.rb

@@ -5,59 +5,67 @@ 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
-
-  it "should retrieve address from html" do
-    addrs = Doko.parse(open("http://r.tabelog.com/tokyo/A1304/A130401/13130066/").read)
-    addrs.first.should == "東京都新宿区新宿3-38-1 ルミネエスト7F"
-  end
-
-  it "should return addr from tabelog url" do
+  describe "parse" do
+      
+    it "should retrieve address from string"  do
+      Doko.parse("ここは\n東京都港区芝浦3-4-1\nです").first.should == "東京都港区芝浦3-4-1"
+    end
+    
+    it "should retrieve address from html" do
+      addrs = Doko.parse(open("http://r.tabelog.com/tokyo/A1304/A130401/13130066/").read)
+      addrs.first.should == "東京都新宿区新宿3-38-1 ルミネエスト7F"
+    end
+    
+    it "should return addr from tabelog url" do
       addrs = Doko.parse("http://r.tabelog.com/kanagawa/A1401/A140104/14001924/")
       addrs.first.should == "神奈川県横浜市中区海岸通1-1"
-  end
-  
-  it "should return from 30min" do
-    addrs = Doko.parse("http://30min.jp/place/23481")
-    addrs.first.should == "東京都墨田区業平1-21-4 第2刀川ビル1F"
-  end
-
-  it "should return addr from site 1" do
-    Doko.parse("http://thanikitchen.com/")[0] == "東京都品川区南大井6-11-10"
-    Doko.parse("http://thanikitchen.com/")[1] == "東京都品川区大井7-29-8"
-  end
-
-  it "should return addr in kyoto" do
-    addrs = Doko.parse("http://www.tripadvisor.jp/Hotel_Review-g298564-d2317992-Reviews-Royal_Park_Hotel_The_Kyoto-Kyoto_Kyoto_Prefecture_Kinki.html")
-    addrs.first.should == "京都府京都市中京区三条通河原町東入ル"
-  end
-
-  it "should return addr in kumamoto" do
-    addrs = Doko.parse("http://travel.rakuten.co.jp/HOTEL/68236/68236_std.html")
-    addrs.first.should == "熊本県阿蘇郡南阿蘇村河陽4673-18"
-  end
-
-  it do
-    Doko.parse("http://www.ynu.ac.jp/index.html").first.should == "神奈川県横浜市保土ケ谷区常盤台79-1"
-  end
-
-  it do
-    Doko.parse("http://www.nissan-stadium.jp/").first.should == "横浜市港北区小机町3300"
+    end
+    
+    it "should return from 30min" do
+      addrs = Doko.parse("http://30min.jp/place/23481")
+      addrs.first.should == "東京都墨田区業平1-21-4 第2刀川ビル1F"
+    end
+    
+    it "should return addr from site 1" do
+      Doko.parse("http://thanikitchen.com/")[0] == "東京都品川区南大井6-11-10"
+      Doko.parse("http://thanikitchen.com/")[1] == "東京都品川区大井7-29-8"
+    end
+    
+    it "should return addr in kyoto" do
+      addrs = Doko.parse("http://www.tripadvisor.jp/Hotel_Review-g298564-d2317992-Reviews-Royal_Park_Hotel_The_Kyoto-Kyoto_Kyoto_Prefecture_Kinki.html")
+      addrs.first.should == "京都府京都市中京区三条通河原町東入ル"
+    end
+    
+    it "should return addr in kumamoto" do
+      addrs = Doko.parse("http://travel.rakuten.co.jp/HOTEL/68236/68236_std.html")
+      addrs.first.should == "熊本県阿蘇郡南阿蘇村河陽4673-18"
+    end
+    
+    it do
+      Doko.parse("http://www.ynu.ac.jp/index.html").first.should == "神奈川県横浜市保土ケ谷区常盤台79-1"
+    end
+    
+    it do
+      Doko.parse("http://www.nissan-stadium.jp/").first.should == "横浜市港北区小机町3300"
+    end
+    
+    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
+    
+    it do 
+      Doko.parse("http://www.stadium2002.com/stadium/index.php").first.should == "さいたま市緑区中野田500"
+    end
   end
 
-  it do
-    Doko.parse("http://atnd.org/events/28384").first.should == "東京都千代田区神田駿河台2-3 DH2001Bldg."
+  describe "deep" do
+    it do
+      Doko.deep("http://www.risonare-atami.com/").first.should == "静岡県熱海市水口町2-13-1"
+    end
   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
-
-  it do 
-    Doko.parse("http://www.stadium2002.com/stadium/index.php").first.should == "さいたま市緑区中野田500"
-  end
-
 end

metadata

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