iarea 0.0.3 → 0.1.0

data/README.rdoc

@@ -9,6 +9,8 @@ A library for DoCoMo Open Iarea.
   area = Iarea::Area.find_by_lat_lng(43.0568397222222,141.3478975)
   area.name # => "すすきの"
   area.areacode # => "00208"
+  area.zone.name # => "北海道"
+  area.prefecture.name # => "北海道"
 
 = References
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'psych'
 load 'lib/tasks/iarea.rake'
 
 begin

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/iarea.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{iarea}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara"]
-  s.date = %q{2011-04-04}
+  s.date = %q{2011-04-07}
   s.description = %q{A library for DoCoMo Open Iarea.}
   s.email = %q{dara@shidara.net}
   s.extra_rdoc_files = [
@@ -24,17 +24,23 @@ Gem::Specification.new do |s|
     "iarea.gemspec",
     "lib/iarea.rb",
     "lib/tasks/iarea.rake",
-    "spec/iarea/iarea_spec.rb",
+    "spec/iarea/area_spec.rb",
+    "spec/iarea/prefecture_spec.rb",
+    "spec/iarea/util_spec.rb",
+    "spec/iarea/zone_spec.rb",
     "spec/spec_helper.rb",
     "tools/import_areas.rb",
     "tools/import_meshes.rb"
   ]
   s.homepage = %q{http://github.com/darashi/iarea}
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.5.2}
+  s.rubygems_version = %q{1.6.1}
   s.summary = %q{A library for DoCoMo Open Iarea.}
   s.test_files = [
-    "spec/iarea/iarea_spec.rb",
+    "spec/iarea/area_spec.rb",
+    "spec/iarea/prefecture_spec.rb",
+    "spec/iarea/util_spec.rb",
+    "spec/iarea/zone_spec.rb",
     "spec/spec_helper.rb"
   ]
 

data/lib/iarea.rb

@@ -1,24 +1,84 @@
 require 'sequel'
+require 'ostruct'
 
 module Iarea
   DB = Sequel.sqlite(File.expand_path("../../db/iareadata.sqlite3", __FILE__))
 
-  class Area
-    attr_reader :areaid, :subareaid, :areacode, :name, :west, :south, :east, :north
+  class Area < OpenStruct
+    @@areas = {}
+    def prefecture
+      Prefecture.find(self.prefecture_id)
+    end
+
+    def zone
+      Zone.find(self.zone_id)
+    end
 
-    def initialize(data)
-      data.each do |k, v|
-        instance_variable_set("@#{k}", v)
+    def neighbors
+      DB[:neighbors].where(:areacode => areacode).select(:neighbor_areacode).map do |neighbor|
+        Area.find neighbor[:neighbor_areacode]
       end
     end
 
     class << self
+      def find(areacode)
+        @@areas[areacode] ||= new DB[:areas].where(:areacode => areacode).first
+      end
+
       def find_by_lat_lng(lat, lng)
         meshcodes = Utils.expand_meshcode(Utils.lat_lng_to_meshcode(lat, lng))
-        area = DB[:meshes].where(:meshcode => meshcodes).join(:areas, :areacode => :areacode).first
+        area = DB[:meshes].where(:meshcode => meshcodes).select(:areacode).first
         return nil if area.nil?
-        area[:name].force_encoding("UTF-8")
-        new(area)
+        find(area[:areacode])
+      end
+    end
+  end
+
+  class Zone < OpenStruct
+    @@zones = []
+
+    def prefectures
+      DB[:prefectures].where(:zone_id => self.id).select(:id).order(:id).map do |prefecture|
+        Prefecture.find(prefecture[:id])
+      end
+    end
+
+    def areas
+      DB[:areas].where(:zone_id => self.id).select(:areacode).order(:areacode).map do |area|
+        Area.find(area[:areacode])
+      end
+    end
+
+    class << self
+      def find(id)
+        @@zones[id] ||= new DB[:zones].where(:id => id).first
+      end
+
+      def all
+        DB[:zones].select(:id).order(:id).all.map{ |z| find(z[:id]) }
+      end
+    end
+  end
+
+  class Prefecture < OpenStruct
+    @@prefectures = []
+    def zone
+      Zone.find(self.zone_id)
+    end
+
+    def areas
+      DB[:areas].where(:prefecture_id => self.id).select(:areacode).order(:areacode).map do |area|
+        Area.find(area[:areacode])
+      end
+    end
+
+    class << self
+      def find(id)
+        @@prefectures[id] ||= new DB[:prefectures].where(:id => id).first
+      end
+
+      def all
+        DB[:prefectures].select(:id).order(:id).all.map{ |pr| find(pr[:id]) }
       end
     end
   end
@@ -58,10 +118,3 @@ module Iarea
     end
   end
 end
-
-=begin
-require 'sequel'
-db = Sequel.sqlite("iareadata.sqlite3")
-meshcodes = Iarea::Utils.expand_meshcode(meshcode)
-puts db[:meshes].where(:meshcode => meshcodes).join(:areas, :areacode => :areacode).first[:name]
-=end

data/spec/iarea/area_spec.rb

@@ -0,0 +1,51 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe Iarea::Area do
+  context "at 43.0568397222222,141.3478975" do
+    subject { Iarea::Area.find_by_lat_lng(43.0568397222222,141.3478975) }
+
+    its(:name) { should == "すすきの" }
+    its(:areacode) { should == "00208" }
+    its(:areaid) { should == "002" }
+    its(:subareaid) { should == "08" }
+    it do
+      subject.prefecture.name.should == "北海道"
+    end
+    it do
+      subject.zone.name.should == "北海道"
+    end
+    it do
+      subject.neighbors.map(&:name).should == ["大通公園周辺", "大通東", "山鼻/藻岩周辺", "中島公園周辺"]
+    end
+  end
+
+  context "at 35.606022,139.734979" do
+    subject { Iarea::Area.find_by_lat_lng(35.606022,139.734979) }
+    its(:name) { should == "大井町" }
+    its(:areacode) { should == "06003" }
+    its(:areaid) { should == "060" }
+    its(:subareaid) { should == "03" }
+    it do
+      subject.prefecture.name.should == "東京"
+    end
+    it do
+      subject.zone.name.should == "関東甲信越"
+    end
+  end
+
+  context "finding by id" do
+    subject { Iarea::Area.find("06003") }
+    its(:name) { should == "大井町" }
+  end
+
+  context "at out of Japan" do
+    subject do
+      Iarea::Area.find_by_lat_lng(0,0)
+    end
+
+    it "should be nil" do
+      should be_nil
+    end
+  end
+end

data/spec/iarea/prefecture_spec.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe Iarea::Prefecture do
+  describe 'Tokyo' do
+    subject { Iarea::Prefecture.find(12) }
+    its(:name) { should == "東京" }
+    it do
+      subject.zone.name.should == "関東甲信越"
+    end
+  end
+
+  describe 'Okinawa' do
+    subject { Iarea::Prefecture.find(46) }
+    its(:name) { should == "沖縄" }
+    it do
+      subject.areas.map(&:name).should == ["那覇/浦添", "沖縄/名護", "宮古/石垣"]
+    end
+  end
+
+  describe 'equivalence' do
+    before do
+      @a = Iarea::Prefecture.find(0)
+      @b = Iarea::Prefecture.find(0)
+      @c = Iarea::Prefecture.find(1)
+    end
+    it do
+      @a.should == @b
+    end
+    it do
+      @a.should_not == @c
+    end
+  end
+
+  it '#all' do
+    Iarea::Prefecture.all.should == (0..46).map {|i| Iarea::Prefecture.find(i)}
+  end
+end

data/spec/iarea/util_spec.rb

@@ -0,0 +1,11 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe Iarea::Utils do
+  it ".lat_lng_to_meshcode" do
+    Iarea::Utils.lat_lng_to_meshcode(42.8840971954764,141.571321907496).should == "64412430032"
+  end
+  it ".expand_meshcode" do
+    Iarea::Utils.expand_meshcode("64412430032").should == ["644124", "6441243", "64412430", "644124300", "6441243003", "64412430032", "64412430032"]
+  end
+end

data/spec/iarea/zone_spec.rb

@@ -0,0 +1,38 @@
+# encoding: UTF-8
+require 'spec_helper'
+
+describe Iarea::Zone do
+  describe 'Tokyo' do
+    subject { Iarea::Zone.find(2) }
+    its(:name) { should == "関東甲信越" }
+
+    it '#prefectures' do
+      subject.prefectures.map(&:name).should == ["栃木", "群馬", "茨城", "埼玉", "千葉", "東京", "神奈川", "山梨", "長野", "新潟"]
+    end
+  end
+
+  describe 'Shikoku' do
+    subject { Iarea::Zone.find(7) }
+    it '#areas' do
+      subject.areas.map(&:name).should == ["高松市周辺", "東讃", "中讃", "西讃", "徳島市", "徳島県北部", "徳島県西部", "徳島県南部", "中予", "東予", "南予北部", "南予南部", "高知市", "高知県中部", "高知県東部", "高知県西部"]
+    end
+  end
+
+  describe 'equivalence' do
+    before do
+      @a = Iarea::Zone.find(0)
+      @b = Iarea::Zone.find(0)
+      @c = Iarea::Zone.find(1)
+    end
+    it do
+      @a.should == @b
+    end
+    it do
+      @a.should_not == @c
+    end
+  end
+
+  it '#all' do
+    Iarea::Zone.all.should == (0..8).map {|i| Iarea::Zone.find(i)}
+  end
+end

data/tools/import_areas.rb

@@ -47,6 +47,13 @@ db.create_table :areas do
   index :prefecture_id
 end
 
+db.drop_table :neighbors if db.table_exists?(:neighbors)
+db.create_table :neighbors do
+  String :areacode
+  String :neighbor_areacode
+  index :areacode
+end
+
 db.transaction do
   js = open(src_path, "r:cp932").read
   js.sub!(%r|^var IAreaDef=new function\(\)\{|, "")
@@ -68,7 +75,7 @@ db.transaction do
   data['areas'].each do |areacode, area|
     $stderr.puts "  importing area %s %s" % [areacode, area['name']]
     # insert area
-    area = {
+    hash = {
       :areaid => areacode[0..2],
       :subareaid => areacode[3..4],
       :areacode => areacode,
@@ -80,6 +87,10 @@ db.transaction do
       :zone_id => area['zone'],
       :prefecture_id => area['pref']
     }
-    db[:areas].insert(area)
+    db[:areas].insert(hash)
+
+    area['neighbors'].each do |neighbor|
+      db[:neighbors].insert({:areacode => areacode, :neighbor_areacode => neighbor})
+    end
   end
 end

metadata

@@ -1,60 +1,57 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: iarea
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Yoji Shidara
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-04 00:00:00 +09:00
+date: 2011-04-07 00:00:00.000000000 +09:00
 default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sequel
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2160917720 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.22.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2160917720
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2160914320 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2160914320
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2160913380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.0
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2160913380
 description: A library for DoCoMo Open Iarea.
 email: dara@shidara.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -63,38 +60,41 @@ files:
 - iarea.gemspec
 - lib/iarea.rb
 - lib/tasks/iarea.rake
-- spec/iarea/iarea_spec.rb
+- spec/iarea/area_spec.rb
+- spec/iarea/prefecture_spec.rb
+- spec/iarea/util_spec.rb
+- spec/iarea/zone_spec.rb
 - spec/spec_helper.rb
 - tools/import_areas.rb
 - tools/import_meshes.rb
 has_rdoc: true
 homepage: http://github.com/darashi/iarea
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A library for DoCoMo Open Iarea.
-test_files: 
-- spec/iarea/iarea_spec.rb
+test_files:
+- spec/iarea/area_spec.rb
+- spec/iarea/prefecture_spec.rb
+- spec/iarea/util_spec.rb
+- spec/iarea/zone_spec.rb
 - spec/spec_helper.rb

data/spec/iarea/iarea_spec.rb

@@ -1,34 +0,0 @@
-# encoding: UTF-8
-require 'spec_helper'
-
-describe Iarea::Utils do
-  it ".lat_lng_to_meshcode" do
-    Iarea::Utils.lat_lng_to_meshcode(42.8840971954764,141.571321907496).should == "64412430032"
-  end
-  it ".expand_meshcode" do
-    Iarea::Utils.expand_meshcode("64412430032").should == ["644124", "6441243", "64412430", "644124300", "6441243003", "64412430032", "64412430032"]
-  end
-end
-
-describe Iarea::Area do
-  context "at 43.0568397222222,141.3478975" do
-    subject do
-      Iarea::Area.find_by_lat_lng(43.0568397222222,141.3478975)
-    end
-
-    its(:name) { should == "すすきの" }
-    its(:areacode) { should == "00208" }
-    its(:areaid) { should == "002" }
-    its(:subareaid) { should == "08" }
-  end
-
-  context "at out of Japan" do
-    subject do
-      Iarea::Area.find_by_lat_lng(0,0)
-    end
-
-    it "should be nil" do
-      should be_nil
-    end
-  end
-end