doko 0.1.1 → 0.1.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. data/VERSION +1 -1
  2. data/doko.gemspec +1 -1
  3. data/lib/doko.rb +5 -3
  4. data/spec/doko_spec.rb +4 -0
  5. metadata +2 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.1.1
1
+ 0.1.2
data/doko.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "doko"
8
- s.version = "0.1.1"
8
+ s.version = "0.1.2"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Masaki Sawamura"]
data/lib/doko.rb CHANGED
@@ -24,7 +24,7 @@ class Doko
24
24
  body.tr!("（）","()")
25
25
  body.tr!("、",",")
26
26
 
27
- addrs = body.scan(/([^\s,()]{2,8}(都|道|府|県)[^\s,()]{1,8}(市|区|町|村).+)/).map{ |m|
27
+ addrs = body.scan(/\b([^\s,()]{2,3}(都|道|府|県)[^\s,()]{1,8}(市|区|町|村).+)/).map{ |m|
28
28
  line = m[0]
29
29
  line.gsub!(/住所(\s|\n)?/,"")
30
30
  line.gsub!(/〒\d{3}-\d{4}　?/,"")
@@ -33,7 +33,7 @@ class Doko
33
33
  line
34
34
  }
35
35
  if addrs.empty?
36
- addrs = body.scan(/([^\s]+(市|区).{2,8}(町|村).{2,10}\d)/).map{ |m|
36
+ addrs = body.scan(/([^\s][0,6](市|区).{2,8}(町|村){2,10}\d)/).map{ |m|
37
37
  line = m[0]
38
38
  line.gsub!(/住所(\s|\n)?/,"")
39
39
  line.gsub!(/〒\d{3}-\d{4}　?/,"")
@@ -42,7 +42,9 @@ class Doko
42
42
  line
43
43
  }
44
44
  end
45
- addrs
45
+ addrs.select{ |a|
46
+ !a.match(/を/)
47
+ }
46
48
  end
47
49
  end
48
50
 
data/spec/doko_spec.rb CHANGED
@@ -36,4 +36,8 @@ describe "Doko" do
36
36
  addrs = Doko.parse("http://travel.rakuten.co.jp/HOTEL/68236/68236_std.html")
37
37
  addrs.first.should == "熊本県阿蘇郡南阿蘇村河陽4673-18"
38
38
  end
39
+
40
+ it do
41
+ Doko.parse("http://www.ynu.ac.jp/index.html").first.should == "神奈川県横浜市保土ケ谷区常盤台79-1"
42
+ end
39
43
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: doko
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.1
4
+ version: 0.1.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -142,7 +142,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
142
142
  version: '0'
143
143
  segments:
144
144
  - 0
145
- hash: -3967228195836404424
145
+ hash: -1122227401869719247
146
146
  required_rubygems_version: !ruby/object:Gem::Requirement
147
147
  none: false
148
148
  requirements: