iarea 0.0.2 → 0.0.3

data/Rakefile

@@ -10,10 +10,10 @@ begin
     gem.homepage = "http://github.com/darashi/iarea"
     gem.authors = ["Yoji Shidara"]
 
-    gem.add_dependency "sequel", ">= 3.10.0"
-    gem.add_dependency "sqlite3-ruby", ">= 1.2.5"
+    gem.add_dependency "sequel", ">= 3.22.0"
+    gem.add_dependency "sqlite3-ruby", ">= 1.3.3"
 
-    gem.add_development_dependency "rspec", ">= 1.3.0"
+    gem.add_development_dependency "rspec", ">= 2.5.0"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
@@ -21,11 +21,8 @@ end
 
 Jeweler::GemcutterTasks.new
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:test) do |t|
-  t.spec_files = FileList['test/**/*_test.rb']
-  t.libs << 'test'
-
+require 'rspec/core/rake_task.rb'
+RSpec::Core::RakeTask.new(:test) do |t|
   t.verbose = true
 end
 

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/iarea.gemspec

@@ -1,61 +1,59 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{iarea}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Yoji Shidara"]
-  s.date = %q{2010-04-26}
+  s.date = %q{2011-04-04}
   s.description = %q{A library for DoCoMo Open Iarea.}
   s.email = %q{dara@shidara.net}
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "db/iareadata.sqlite3",
-     "iarea.gemspec",
-     "lib/iarea.rb",
-     "lib/tasks/iarea.rake",
-     "test/iarea/iarea_test.rb",
-     "test/test_helper.rb",
-     "tools/import_meshes.rb"
+    "MIT-LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "db/iareadata.sqlite3",
+    "iarea.gemspec",
+    "lib/iarea.rb",
+    "lib/tasks/iarea.rake",
+    "spec/iarea/iarea_spec.rb",
+    "spec/spec_helper.rb",
+    "tools/import_areas.rb",
+    "tools/import_meshes.rb"
   ]
   s.homepage = %q{http://github.com/darashi/iarea}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6.1}
+  s.rubygems_version = %q{1.5.2}
   s.summary = %q{A library for DoCoMo Open Iarea.}
   s.test_files = [
-    "test/iarea/iarea_test.rb",
-     "test/test_helper.rb"
+    "spec/iarea/iarea_spec.rb",
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, [">= 3.10.0"])
-      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_development_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_runtime_dependency(%q<sequel>, [">= 3.22.0"])
+      s.add_runtime_dependency(%q<sqlite3-ruby>, [">= 1.3.3"])
+      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
     else
-      s.add_dependency(%q<sequel>, [">= 3.10.0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-      s.add_dependency(%q<rspec>, [">= 1.3.0"])
+      s.add_dependency(%q<sequel>, [">= 3.22.0"])
+      s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.3"])
+      s.add_dependency(%q<rspec>, [">= 2.5.0"])
     end
   else
-    s.add_dependency(%q<sequel>, [">= 3.10.0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 1.2.5"])
-    s.add_dependency(%q<rspec>, [">= 1.3.0"])
+    s.add_dependency(%q<sequel>, [">= 3.22.0"])
+    s.add_dependency(%q<sqlite3-ruby>, [">= 1.3.3"])
+    s.add_dependency(%q<rspec>, [">= 2.5.0"])
   end
 end
 

data/lib/tasks/iarea.rake

@@ -1,6 +1,7 @@
 require 'json'
 require 'open-uri'
 require 'tmpdir'
+require 'tempfile'
 
 namespace :iarea do
   desc "generate database"
@@ -10,12 +11,10 @@ namespace :iarea do
     desc "fetch iarea metadata"
     task :def do
       uri = "http://www.nttdocomo.co.jp/service/imode/make/content/iarea/domestic/map/js/iarea_def.js"
-      js = URI(uri).read.force_encoding('cp932').encode('UTF-8')
-      js.sub!(%r|^var IAreaDef=new function\(\)\{|, "")
-      data = {}
-      js.scan %r|this\.(.+?)=(.+?);|m do |key, json|
-        data[key] = JSON.parse(json)
-      end
+      tf = Tempfile.open("iarea")
+      tf.write URI(uri).read
+      tf.close
+      ruby "./tools/import_areas.rb", tf.path, "db/iareadata.sqlite3"
     end
 
     desc "fetch iareadata.lzh"
@@ -26,7 +25,9 @@ namespace :iarea do
           File.open("iareadata.lzh", "w") do |f|
             f.write URI(uri).read
           end
-          system "lha", "xf", "iareadata.lzh"
+          unless system("lha", "xf", "iareadata.lzh")
+            raise "lha failed"
+          end
         end
         ruby "./tools/import_meshes.rb", dir, "db/iareadata.sqlite3"
       end

data/{test/iarea/iarea_test.rb → spec/iarea/iarea_spec.rb}

@@ -1,5 +1,5 @@
 # encoding: UTF-8
-require 'test_helper'
+require 'spec_helper'
 
 describe Iarea::Utils do
   it ".lat_lng_to_meshcode" do
@@ -16,21 +16,10 @@ describe Iarea::Area do
       Iarea::Area.find_by_lat_lng(43.0568397222222,141.3478975)
     end
 
-    it "#name" do
-      subject.name.should == "すすきの"
-    end
-
-    it "#areacode" do
-      subject.areacode.should == "00208"
-    end
-
-    it "#areaid" do
-      subject.areaid.should == "002"
-    end
-
-    it "#subareaid" do
-      subject.subareaid.should == "08"
-    end
+    its(:name) { should == "すすきの" }
+    its(:areacode) { should == "00208" }
+    its(:areaid) { should == "002" }
+    its(:subareaid) { should == "08" }
   end
 
   context "at out of Japan" do

data/{test/test_helper.rb → spec/spec_helper.rb}

@@ -1,3 +1,3 @@
-require 'spec'
+require 'rspec'
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
 require 'iarea'

data/tools/import_areas.rb

@@ -0,0 +1,85 @@
+#!/usr/bin/env ruby
+
+require 'csv'
+require 'json'
+require 'sequel'
+
+if ARGV.size != 2
+  puts "usage #$0 [iarea_def.js] [dest_sqlite3_file]"
+  exit -1
+end
+
+src_path = ARGV.shift
+dest_path = ARGV.shift
+
+db = Sequel.sqlite(dest_path)
+
+db.drop_table :zones if db.table_exists?(:zones)
+db.create_table :zones do
+  primary_key :id
+  String :name
+end
+
+db.drop_table :prefectures if db.table_exists?(:prefectures)
+db.create_table :prefectures do
+  primary_key :id
+  String :name
+  Integer :zone_id
+  index :zone_id
+end
+
+db.drop_table :areas if db.table_exists?(:areas)
+db.create_table :areas do
+  String :areaid
+  String :subareaid
+  String :areacode
+  String :name
+  Integer :west
+  Integer :south
+  Integer :east
+  Integer :north
+  Integer :zone_id
+  Integer :prefecture_id
+  index :areaid
+  index :subareaid
+  index :areacode, :unique => true
+  index :zone_id
+  index :prefecture_id
+end
+
+db.transaction do
+  js = open(src_path, "r:cp932").read
+  js.sub!(%r|^var IAreaDef=new function\(\)\{|, "")
+  data = {}
+  js.scan %r|this\.(.+?)=(.+?);|m do |key, json|
+    data[key] = JSON.parse(json)
+  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'])
+  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'])
+  end
+  # areas
+  data['areas'].each do |areacode, area|
+    $stderr.puts "  importing area %s %s" % [areacode, area['name']]
+    # insert area
+    area = {
+      :areaid => areacode[0..2],
+      :subareaid => areacode[3..4],
+      :areacode => areacode,
+      :name => area['name'],
+      :west => area['msWest'],
+      :south => area['msSouth'],
+      :east => area['msEast'],
+      :north => area['msNorth'],
+      :zone_id => area['zone'],
+      :prefecture_id => area['pref']
+    }
+    db[:areas].insert(area)
+  end
+end

data/tools/import_meshes.rb

@@ -22,19 +22,6 @@ db.create_table :meshes do
   index :areacode
 end
 
-db.drop_table :areas if db.table_exists?(:areas)
-db.create_table :areas do
-  String :areaid
-  String :subareaid
-  String :areacode
-  String :name
-  Integer :west
-  Integer :south
-  Integer :east
-  Integer :north
-  index :areacode
-end
-
 db.transaction do
   meshes = db[:meshes]
   areas = db[:areas]
@@ -45,19 +32,9 @@ db.transaction do
       areacode = areaid + subareaid
 
       name.encode!("UTF-8")
-      # insert area
-      area = { :areaid => areaid,
-        :subareaid => subareaid,
-        :areacode => areacode,
-        :name => name,
-        :west => west,
-        :south => south,
-        :east => east,
-        :north => north }
-      areas.insert(area)
 
       mesh_data.pop if mesh_data.last.nil?
-      $stderr.puts "importing area %s %s" % [areacode, name]
+      $stderr.puts "  importing meshes %s %s" % [areacode, name]
       num_meshes = mesh_data.shift(7).map(&:to_i)
 
       expected_num_meshes = num_meshes.inject(&:+)

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: iarea
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 0
-  - 2
-  version: 0.0.2
+  prerelease: 
+  version: 0.0.3
 platform: ruby
 authors: 
 - Yoji Shidara
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-26 00:00:00 +09:00
+date: 2011-04-04 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,11 +21,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 10
-        - 0
-        version: 3.10.0
+        version: 3.22.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -40,11 +32,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 2
-        - 5
-        version: 1.2.5
+        version: 1.3.3
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -55,11 +43,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
+        version: 2.5.0
   type: :development
   version_requirements: *id003
 description: A library for DoCoMo Open Iarea.
@@ -71,7 +55,6 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- .gitignore
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -80,16 +63,17 @@ files:
 - iarea.gemspec
 - lib/iarea.rb
 - lib/tasks/iarea.rake
-- test/iarea/iarea_test.rb
-- test/test_helper.rb
+- spec/iarea/iarea_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: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -97,24 +81,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6.1
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: A library for DoCoMo Open Iarea.
 test_files: 
-- test/iarea/iarea_test.rb
-- test/test_helper.rb
+- spec/iarea/iarea_spec.rb
+- spec/spec_helper.rb

data/.gitignore

@@ -1,2 +0,0 @@
-.bundle
-pkg