doko 0.2.0 → 0.2.1

data/README.md

@@ -12,8 +12,13 @@ p addrs #=> ["東京都港区芝浦3-41"]
  # from url 
 addrs = Doko.parse("http://r.tabelog.com/tokyo/A....")
 p addrs #=> ["神奈川県横浜市中区.."]
+
+ # from a web site
+ addrs = Doko.deep("http://foo-bar.com/")
+ p addrs #=> ["東京都.."]  # this is from foo-bar.com/access/index.htm ,for example
 ```
 
+
 "doko?" means "where?" in japanese.
 
 

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/doko.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "doko"
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Masaki Sawamura"]
-  s.date = "2012-06-11"
+  s.date = "2012-07-05"
   s.description = "retrieve japanese address line from a web page or a string"
   s.email = "masaki.sw@gmail.com"
   s.extra_rdoc_files = [

data/lib/doko.rb

@@ -9,20 +9,25 @@ class Doko
     self.new(str).parse
   end
 
-  def self.deep(url)
-    addrs = parse(url)
+  def self.deep(str,base_uri=nil)
+    addrs = parse(str)
     if addrs.empty?
-      addrs = links(url).map{ |u|
+      addrs = links(str,base_uri).map{ |u|
         parse(u)
       }.flatten
     end
     addrs
   end
 
-  def self.links(url)
-    uri = URI.parse(url)
+  def self.links(str,base_uri=nil)
     out = []
-    doc = Nokogiri::HTML(open(url).read)
+    if str.match( /^#{URI.regexp}$/ )
+      uri = URI.parse(str)
+      doc = Nokogiri::HTML(open(uri).read)
+    elsif str.kind_of? String
+      uri = URI.parse(base_uri)
+      doc = Nokogiri::HTML(str)
+    end
     doc.search("a").each do |a|
       if a[:href] && a[:href].match(/access/) && !a[:href].match(/http/)
         out << uri + a[:href]
@@ -81,6 +86,7 @@ class Doko
       t.tr("ー","-")
     end
     line.sub!(/\s$/,"")
+    line.gsub!(/\s{3,}+.+$/,"")
     line
   end
 end

data/sample/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    doko (0.1.9)
+    doko (0.2.0)
       nokogiri
     nokogiri (1.5.3)
     rack (1.3.6)

data/sample/views/index.erb

@@ -50,6 +50,7 @@
     </p>
     <% end %>
 
+    <!-- new version -->
   </body>
 </html>
   

data/spec/doko_spec.rb

@@ -6,6 +6,7 @@ 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
@@ -71,6 +72,12 @@ describe "Doko" do
       Doko.deep("http://www.risonare-atami.com/").first.should == "静岡県熱海市水口町2-13-1"
     end
 
+    it "can pase from page html" do
+      url = "http://www.risonare-atami.com/"
+      page = open(url).read
+      Doko.deep(page,url).first.should == "静岡県熱海市水口町2-13-1"
+    end
+
     it do 
       Doko.deep("http://www.yokohama-akarenga.jp/index.html").should be_empty
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: doko
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-11 00:00:00.000000000 Z
+date: 2012-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -146,7 +146,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4468521619932611074
+      hash: 3043947709731025530
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: