iarea 0.1.4 → 0.2.0

data/.travis.yml

@@ -0,0 +1,2 @@
+rvm:
+  - 1.9.2

data/Gemfile.lock

@@ -28,6 +28,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler
   iarea!
   rake
   rdoc

data/Rakefile

@@ -17,3 +17,4 @@ end
 task :default => :test
 
 require 'bundler/gem_tasks'
+load './lib/tasks/iarea.rake'

data/iarea.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rdoc'
   s.add_development_dependency 'rake'
+  s.add_development_dependency 'bundler'
 end

data/lib/iarea/version.rb

@@ -1,3 +1,3 @@
 module Iarea
-  VERSION = "0.1.4"
+  VERSION = "0.2.0"
 end

data/lib/iarea/zone.rb

@@ -2,12 +2,14 @@ module Iarea
   class Zone < OpenStruct
     @@zones = []
 
+    # Prefectures in the zone
     def prefectures
       DB[:prefectures].where(:zone_id => self.id).select(:id).order(:id).map do |prefecture|
         Prefecture.find(prefecture[:id])
       end
     end
 
+    # Areas in the zone
     def areas
       DB[:areas].where(:zone_id => self.id).select(:areacode).order(:areacode).map do |area|
         Area.find(area[:areacode])
@@ -15,10 +17,12 @@ module Iarea
     end
 
     class << self
+      # Find a zone by <tt>id</tt>
       def find(id)
         @@zones[id] ||= new DB[:zones].where(:id => id).first
       end
 
+      # All zones
       def all
         DB[:zones].select(:id).order(:id).all.map{ |z| find(z[:id]) }
       end

data/spec/iarea/prefecture_spec.rb

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

data/spec/iarea/zone_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Iarea::Zone do
   describe 'Tokyo' do
-    subject { Iarea::Zone.find(2) }
+    subject { Iarea::Zone.find(3) }
     its(:name) { should == "関東甲信越" }
 
     it '#prefectures' do
@@ -12,7 +12,7 @@ describe Iarea::Zone do
   end
 
   describe 'Shikoku' do
-    subject { Iarea::Zone.find(7) }
+    subject { Iarea::Zone.find(8) }
     it '#areas' do
       subject.areas.map(&:name).should == ["高松市周辺", "東讃", "中讃", "西讃", "徳島市", "徳島県北部", "徳島県西部", "徳島県南部", "中予", "東予", "南予北部", "南予南部", "高知市", "高知県中部", "高知県東部", "高知県西部"]
     end
@@ -20,9 +20,9 @@ describe Iarea::Zone do
 
   describe 'equivalence' do
     before do
-      @a = Iarea::Zone.find(0)
-      @b = Iarea::Zone.find(0)
-      @c = Iarea::Zone.find(1)
+      @a = Iarea::Zone.find(1)
+      @b = Iarea::Zone.find(1)
+      @c = Iarea::Zone.find(2)
     end
     it do
       @a.should == @b
@@ -33,6 +33,6 @@ describe Iarea::Zone do
   end
 
   it '#all' do
-    Iarea::Zone.all.should == (0..8).map {|i| Iarea::Zone.find(i)}
+    Iarea::Zone.all.should == (1..9).map {|i| Iarea::Zone.find(i)}
   end
 end

data/tools/import_areas.rb

@@ -64,13 +64,15 @@ db.transaction do
   end
   # zones
   data['zones'].each_with_index do |zone, i|
-    $stderr.puts "  importing zone %d %s" % [i, zone['name']]
-    db[:zones].insert(:id => i, :name => zone['name'])
+    id = i + 1
+    $stderr.puts "  importing zone %d %s" % [id, zone['name']]
+    db[:zones].insert(:id => id, :name => zone['name'])
   end
   # prefs
   data['prefs'].each_with_index do |pref, i|
-    $stderr.puts "  importing prefecture %d %s" % [i, pref['name']]
-    db[:prefectures].insert(:id => i, :name => pref['name'], :zone_id => pref['zone'])
+    id = i + 1
+    $stderr.puts "  importing prefecture %d %s" % [id, pref['name']]
+    db[:prefectures].insert(:id => id, :name => pref['name'], :zone_id => pref['zone'] + 1)
   end
   # areas
   data['areas'].each do |areacode, area|
@@ -85,8 +87,8 @@ db.transaction do
       :south => area['msSouth'],
       :east => area['msEast'],
       :north => area['msNorth'],
-      :zone_id => area['zone'],
-      :prefecture_id => area['pref']
+      :zone_id => area['zone'] + 1,
+      :prefecture_id => area['pref'] + 1
     }
     # fix .js problem
     if hash[:name] == '新宿１?２丁目'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iarea
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,12 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-07-21 00:00:00.000000000 Z
+date: 2011-08-01 00:00:00.000000000 +09:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
-  requirement: &2152073560 !ruby/object:Gem::Requirement
+  requirement: &2158352220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152073560
+  version_requirements: *2158352220
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &2152072320 !ruby/object:Gem::Requirement
+  requirement: &2158351740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152072320
+  version_requirements: *2158351740
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152071540 !ruby/object:Gem::Requirement
+  requirement: &2158351260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152071540
+  version_requirements: *2158351260
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152066340 !ruby/object:Gem::Requirement
+  requirement: &2158350760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152066340
+  version_requirements: *2158350760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152065540 !ruby/object:Gem::Requirement
+  requirement: &2158350300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +66,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152065540
+  version_requirements: *2158350300
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2158349800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2158349800
 description: A library for DoCoMo Open Iarea.
 email:
 - dara@shidara.net
@@ -74,6 +86,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
@@ -96,6 +110,7 @@ files:
 - 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: 
@@ -108,21 +123,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2329483377850070231
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2329483377850070231
 requirements: []
 rubyforge_project: iarea
-rubygems_version: 1.8.3
+rubygems_version: 1.6.1
 signing_key: 
 specification_version: 3
 summary: A library for DoCoMo Open Iarea.