geonames_local 0.0.5 → 0.2.1

data/README.rdoc

@@ -4,14 +4,29 @@ Download and store in tokyo or postgresql Geonames.org data.
 Making every Geoname API operation possible on your servers.
 No hit limit, fast as possible.
 
-== Features/Problems
-
-- Local relational mapping of geonames data
-- Map geonames fields to your db scheme UNDONE
-- Countries are a static yml file :/
 
 == Usage
 
+To use the adapter, install the corresponding gem:
+
+  PostgreSQL   =>   pg
+  MongoDB      =>   mongodb (optional: mongo_ext)
+  Tokyo        =>   tokyocabinet
+
+
+=== PostgreSQL
+
+Be sure to use a database based on the PostGIS template.
+
+
+=== MongoDB
+
+MongoDB 2D support is new, only mongo >= 1.3.3 mongodb gem >= 0.19.2
+http://github.com/mongodb/mongo-ruby-driver
+
+
+=== Config YML
+
   geonames conf
 
 Will generate a "geonames.yml" file on your folder.
@@ -75,6 +90,13 @@ Default PG migration:
     add_index :provinces, :country_id
 
 
+== Features/Problems
+
+- Local relational mapping of geonames data
+- Map geonames fields to your db scheme UNDONE
+- Countries are a static yml file :/
+
+
 == Note on Patches/Pull Requests
 
 * Fork the project.

data/Rakefile

@@ -11,8 +11,31 @@ begin
     gem.homepage = "http://github.com/nofxx/geonames_local"
     gem.authors = ["Marcos Piccinini"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "tokyotyrant", ">= 1.10"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+    gem.add_dependency "nofxx-georuby", ">= 1.7.1"
+    gem.post_install_message = <<-POST_INSTALL_MESSAGE
+
+Geonames Local
+--------------
+
+To use the adapter, install the corresponding gem:
+
+  PostgreSQL   =>   pg
+  MongoDB      =>   mongodb (optional: mongo_ext)
+  Tokyo        =>   tokyocabinet
+
+PostgreSQL
+----------
+
+Be sure to use a database based on the PostGIS template.
+
+MongoDB
+-------
+
+MongoDB 2D support is new, only mongo >= 1.3.3 mongodb gem >= 0.19.2
+http://github.com/mongodb/mongo-ruby-driver
+
+Have fun because:
+POST_INSTALL_MESSAGE
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.2.1

data/geonames_local.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geonames_local}
-  s.version = "0.0.5"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-01-30}
+  s.date = %q{2010-03-19}
   s.default_executable = %q{geonames}
   s.description = %q{Dump and feed a tokyo cabinet for local geonames search}
   s.email = %q{x@nofxx.com}
@@ -27,53 +27,77 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/geonames",
      "geonames_local.gemspec",
-     "lib/config/codes.yml",
-     "lib/config/geonames.yml",
-     "lib/data/cache.rb",
-     "lib/data/geoquery.rb",
-     "lib/data/postgres.rb",
-     "lib/data/shp.rb",
-     "lib/data/tokyo.rb",
-     "lib/features/city.rb",
-     "lib/features/country.rb",
-     "lib/features/province.rb",
-     "lib/features/road.rb",
-     "lib/features/spot.rb",
-     "lib/features/zone.rb",
      "lib/geonames_local.rb",
-     "lib/work/cli.rb",
-     "lib/work/dump.rb",
-     "lib/work/export.rb",
-     "spec/data/cache_spec.rb",
-     "spec/data/postgres_spec.rb",
-     "spec/data/shp_spec.rb",
-     "spec/data/tokyo_spec.rb",
-     "spec/features/road_spec.rb",
-     "spec/features/spot_spec.rb",
-     "spec/features/zone_spec.rb",
+     "lib/geonames_local/adapters/mongodb.rb",
+     "lib/geonames_local/adapters/postgres.rb",
+     "lib/geonames_local/adapters/tokyo.rb",
+     "lib/geonames_local/cli.rb",
+     "lib/geonames_local/config/codes.yml",
+     "lib/geonames_local/config/geonames.yml",
+     "lib/geonames_local/data/cache.rb",
+     "lib/geonames_local/data/geoquery.rb",
+     "lib/geonames_local/data/shp.rb",
+     "lib/geonames_local/dump.rb",
+     "lib/geonames_local/export.rb",
+     "lib/geonames_local/features/city.rb",
+     "lib/geonames_local/features/country.rb",
+     "lib/geonames_local/features/province.rb",
+     "lib/geonames_local/features/road.rb",
+     "lib/geonames_local/features/spot.rb",
+     "lib/geonames_local/features/zone.rb",
+     "spec/geonames_local/cli_spec.rb",
+     "spec/geonames_local/data/cache_spec.rb",
+     "spec/geonames_local/data/postgres_spec.rb",
+     "spec/geonames_local/data/shp_spec.rb",
+     "spec/geonames_local/data/tokyo_spec.rb",
+     "spec/geonames_local/features/road_spec.rb",
+     "spec/geonames_local/features/spot_spec.rb",
+     "spec/geonames_local/features/zone_spec.rb",
      "spec/geonames_local_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb",
-     "spec/work/cli_spec.rb",
      "task/benchmark.rb",
      "task/benchmark_cabinet.rb"
   ]
   s.homepage = %q{http://github.com/nofxx/geonames_local}
+  s.post_install_message = %q{
+Geonames Local
+--------------
+
+To use the adapter, install the corresponding gem:
+
+  PostgreSQL   =>   pg
+  MongoDB      =>   mongodb (optional: mongo_ext)
+  Tokyo        =>   tokyocabinet
+
+PostgreSQL
+----------
+
+Be sure to use a database based on the PostGIS template.
+
+MongoDB
+-------
+
+MongoDB 2D support is new, only mongo >= 1.3.3 mongodb gem >= 0.19.2
+http://github.com/mongodb/mongo-ruby-driver
+
+Have fun because:
+}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.6}
   s.summary = %q{Dump and feed a tokyo local geonames db}
   s.test_files = [
-    "spec/data/cache_spec.rb",
-     "spec/data/postgres_spec.rb",
-     "spec/data/shp_spec.rb",
-     "spec/data/tokyo_spec.rb",
-     "spec/features/road_spec.rb",
-     "spec/features/spot_spec.rb",
-     "spec/features/zone_spec.rb",
-     "spec/geonames_local_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/work/cli_spec.rb"
+    "spec/spec_helper.rb",
+     "spec/geonames_local/data/shp_spec.rb",
+     "spec/geonames_local/data/postgres_spec.rb",
+     "spec/geonames_local/data/tokyo_spec.rb",
+     "spec/geonames_local/data/cache_spec.rb",
+     "spec/geonames_local/cli_spec.rb",
+     "spec/geonames_local/features/spot_spec.rb",
+     "spec/geonames_local/features/zone_spec.rb",
+     "spec/geonames_local/features/road_spec.rb",
+     "spec/geonames_local_spec.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -82,14 +106,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<tokyotyrant>, [">= 1.10"])
+      s.add_runtime_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<tokyotyrant>, [">= 1.10"])
+      s.add_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<tokyotyrant>, [">= 1.10"])
+    s.add_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
   end
 end
 

data/lib/geonames_local/adapters/mongodb.rb

@@ -0,0 +1,39 @@
+require "mongo"
+
+module Geonames
+  class Mongodb
+
+    RESOURCES = ["countries", "provinces", "cities"]
+
+    def initialize(params)
+      port = params[:port] || 27017
+      @conn = Mongo::Connection.new(params[:host], port)
+      @db = @conn.db(params[:dbname])
+      purge
+      setup
+    end
+
+    def setup
+      for re in RESOURCES
+        coll = @db.collection(re)
+        coll.create_index(["id", Mongo::ASCENDING])
+        coll.create_index(["geom", Mongo::GEO2D], :min => 0, :max => 180)
+      end
+    end
+
+    def find(resource, id, name=nil)
+      @db.collection(resource.to_s).find("id" => id).to_a.first
+    end
+
+    def insert(resource, spot)
+      @db.collection(resource.to_s).insert(spot.to_hash)
+    end
+
+    def purge
+      for re in RESOURCES
+        @db.drop_collection(re)
+      end
+    end
+
+  end
+end

data/lib/{data → geonames_local/adapters}/postgres.rb

@@ -30,9 +30,9 @@ module Geonames
 
     #
     # Insert a record
-    def insert(some)
+    def insert(table, some)
       country_id, province_id, city_id = get_some_ids(some)
-      case some.table
+      case table
       when :cities
         write("cities", {:name => some.name, :country_id => country_id,
                  :geom => some.geom.as_hex_ewkb, :gid => some.gid,

data/lib/{data → geonames_local/adapters}/tokyo.rb

@@ -1,3 +1,4 @@
+require "tokyocabinet"
 
 module Geonames
   class Tokyo

data/lib/{work → geonames_local}/cli.rb

@@ -4,7 +4,6 @@
 require 'optparse'
 module Geonames
   class CLI
-
     def self.parse_options(argv)
       options = {}
 
@@ -14,6 +13,7 @@ Geonames Command Line Usage:
 
 geonames <country code(s)> <opts>
 
+geonames
 BANNER
         opts.on("-l", "--level LEVEL", String, "The level of logging to report" ) { |level| options[:level] = level }
         opts.on("-d", "--dump", "Dump DB before all" ) { options[:dump] = true }
@@ -22,11 +22,6 @@ BANNER
         opts.on("-c", "--config CONFIG", String, "Geonames Config file path" ) { |file|  options[:config] = file }
         opts.on("-i", "--import CONFIG", String, "Geonames Import SHP/DBF/GPX" ) { |file|  options[:shp] = file }
         opts.separator ""
-        opts.separator "Tyrant Options:"
-        opts.on("-t", "--tyrant", "Use tyrant" ) { options[:tyrant] = true }
-        opts.on("-s", "--server SERVER", String, "Tyrant Server URL" ) { |url|  options[:server] = url }
-        opts.on("-p", "--port PORT", Integer, "Tyrant Server Port")  { |val| options[:port] = val.to_i }
-        opts.separator ""
         opts.separator "SHP Options:"
         opts.on("--map TYPE", Array, "Use zone/road to import" ) { |s| options[:map] = s.map(&:to_sym) }
         opts.on("--type TYPE", String, "Use zone/road to import" ) { |s| options[:type] = s }
@@ -53,8 +48,10 @@ BANNER
     end
     private_class_method :parse_options
 
+    class << self
+
     # Ugly but works?
-    def self.work(argv)
+    def work(argv)
       trap(:INT) { stop! }
       trap(:TERM) { stop! }
       Opt.merge! parse_options(argv)
@@ -79,13 +76,16 @@ BANNER
         exit
       end
 
+      #
+      # If arguments scaffold, config, write down yml.
+      #
       if argv[0] =~ /scaff|conf/
         fname = (argv[1] || "geonames") + ".yml"
         if File.exist?(fname)
           puts "File exists."
         else
           puts "Writing to #{fname}"
-          `cp #{File.join(File.dirname(__FILE__), '..', 'config', 'geonames.yml')} #{fname}`
+          `cp #{File.join(File.dirname(__FILE__), 'config', 'geonames.yml')} #{fname}`
         end
         exit
       end
@@ -94,24 +94,28 @@ BANNER
       if argv[0] =~ /csv|json/
         Geonames::Export.new(Country.all).to_csv
       else
+        db = load_adapter(Opt[:store])
+        info "Using adapter #{Opt[:store]}.."
         Geonames::Dump.work(Opt[:codes], :zip) #rescue puts "Command not found: #{comm} #{@usage}"
         Geonames::Dump.work(Opt[:codes], :dump) #rescue puts "Command not found: #{comm} #{@usage}"
         info "\n---\nTotal #{Cache[:dump].length} parsed. #{Cache[:zip].length} zips."
         info "Join dump << zip"
         unify!
-        write_to_store!
+        write_to_store!(db)
       end
     end
 
-    def self.write_to_store!
-      db = case Opt[:store].to_sym
-           when :tyrant then Geonames::Tokyo.new(Opt[:tyrant])
-           when :pg     then Geonames::Postgres.new(Opt[:db])
-           else
-             info "No store defined!"
-             exit
-           end
+    def load_adapter(name)
+      begin
+        require "geonames_local/adapters/#{name}"
+        Geonames.class_eval(name.capitalize).new(Opt[:db])
+      rescue LoadError
+        puts "Can't find adapter #{name}"
+        stop!
+      end
+    end
 
+    def write_to_store!(db)
       groups = Cache[:dump].group_by(&:kind)
       Cache[:provinces] = groups[:provinces]
       # ensure this order....
@@ -119,16 +123,16 @@ BANNER
       do_write(db, groups[:cities])
     end
 
-    def self.do_write(db, val)
-      return if val.empty?
-      key = val[0].table
+    def do_write(db, values)
+      return if values.empty?
+      key = values[0].table
       start = Time.now
       writt = 0
-      info "\nWriting #{val.length} #{key}..."
-      val.each do |v|
-        meth = v.respond_to?(:gid) ? [v.gid] : [v.name, true]
-        unless db.find(v.table, *meth)
-          db.insert(v)
+      info "\nWriting #{values.length} #{key}..."
+      values.each do |val|
+        meth = val.respond_to?(:gid) ? [val.gid] : [val.name, true]
+        unless db.find(val.table, *meth)
+          db.insert(val.table, val)
           writt += 1
         end
       end
@@ -136,7 +140,7 @@ BANNER
       info "#{writt} #{key} written in #{total} sec (#{(writt/total).to_i}/s)"
     end
 
-    def self.unify!
+    def unify!
       start = Time.now
       Cache[:dump].map! do |spot|
         if other = Cache[:zip].find { |d| d.code == spot.code }
@@ -149,10 +153,11 @@ BANNER
       info "Done. #{(Time.now-start).to_i}s"
     end
 
-    def self.stop!
+    def stop!
       puts "Closing Geonames..."
       exit
     end
+    end
 
   end
 

data/lib/{config → geonames_local/config}/geonames.yml

@@ -1,7 +1,8 @@
 #
 # Geonames Local Config Example
 #
-:store: pg
+# Stores: postgres, mongodb, tokyo, redis
+:store: postgres
 :codes: [br, it]
 :level: city
 :mapping:
@@ -9,6 +10,6 @@
   :geom: true
 :db:
   :host: localhost
-  :dbname: db
+  :dbname: dbname
   :user: postgres
   :password:

data/lib/{work → geonames_local}/dump.rb

@@ -71,6 +71,6 @@ module Geonames
       new(codes, kind)
     end
 
-
   end
+
 end

data/lib/{features → geonames_local/features}/spot.rb

@@ -73,8 +73,9 @@ module Geonames
 
     # For tokyo
     def to_hash
-      { "gid" => @geoname_id.to_s, "kind" => @kind.to_s, "name" => @name, "ascii" => @ascii,
-        "lat" => @lat.to_s, "lon" => @lon.to_s, "tz" => @tz, "country" => @country }
+      { "id" => @geoname_id, "gid" => @geoname_id.to_s, "kind" => @kind.to_s,
+        "name" => @name, "ascii" => @ascii, "country" => @country,
+        "geom" => {"y" => @lat.to_s, "x" => @lon.to_s}, "tz" => @tz }
     end
 
 

data/lib/geonames_local.rb

@@ -1,21 +1,23 @@
-require 'features/spot'
-require 'features/country'
-require 'features/city'
-require 'features/road'
-require 'features/zone'
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
 require 'rubygems'
 require 'logger'
-require 'data/shp'
-require 'data/tokyo'
-require 'data/postgres'
-require 'work/cli'
-require 'work/dump'
-require 'work/export'
+require 'yaml'
+require 'geonames_local/features/spot'
+require 'geonames_local/features/country'
+require 'geonames_local/features/city'
+require 'geonames_local/features/road'
+require 'geonames_local/features/zone'
+require 'geonames_local/data/shp'
+require 'geonames_local/cli'
+require 'geonames_local/dump'
+require 'geonames_local/export'
 
 module Geonames
   Opt = {}
   Cache = {:dump => [], :zip => [], :roads => [], :zones => []}
-  Codes = YAML.load(File.read(File.join(File.dirname(__FILE__),'config', 'codes.yml')))
+  Codes = YAML.load(File.read(File.join(File.dirname(__FILE__), 'geonames_local', 'config', 'codes.yml')))
   VERSION =  File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
 
   def info(txt)

data/spec/geonames_local/data/cache_spec.rb

@@ -0,0 +1,4 @@
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+
+# describe Cache do
+# end

data/spec/{data → geonames_local/data}/postgres_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Postgres do
 

data/spec/{data → geonames_local/data}/shp_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe SHP do
 

data/spec/{data → geonames_local/data}/tokyo_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe "Tokyo" do
 

data/spec/{features → geonames_local/features}/road_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require "geo_ruby"
 
 describe Road do

data/spec/{features → geonames_local/features}/spot_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require "geo_ruby"
 
 describe Spot do

data/spec/{features → geonames_local/features}/zone_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 require "geo_ruby"
 
 describe Zone do

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: geonames_local
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  prerelease: false
+  segments: 
+  - 0
+  - 2
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-30 00:00:00 -02:00
+date: 2010-03-19 00:00:00 -03:00
 default_executable: geonames
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: tokyotyrant
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: nofxx-georuby
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "1.10"
-    version: 
+        segments: 
+        - 1
+        - 7
+        - 1
+        version: 1.7.1
+  type: :runtime
+  version_requirements: *id002
 description: Dump and feed a tokyo cabinet for local geonames search
 email: x@nofxx.com
 executables: 
@@ -50,41 +63,65 @@ files:
 - VERSION
 - bin/geonames
 - geonames_local.gemspec
-- lib/config/codes.yml
-- lib/config/geonames.yml
-- lib/data/cache.rb
-- lib/data/geoquery.rb
-- lib/data/postgres.rb
-- lib/data/shp.rb
-- lib/data/tokyo.rb
-- lib/features/city.rb
-- lib/features/country.rb
-- lib/features/province.rb
-- lib/features/road.rb
-- lib/features/spot.rb
-- lib/features/zone.rb
 - lib/geonames_local.rb
-- lib/work/cli.rb
-- lib/work/dump.rb
-- lib/work/export.rb
-- spec/data/cache_spec.rb
-- spec/data/postgres_spec.rb
-- spec/data/shp_spec.rb
-- spec/data/tokyo_spec.rb
-- spec/features/road_spec.rb
-- spec/features/spot_spec.rb
-- spec/features/zone_spec.rb
+- lib/geonames_local/adapters/mongodb.rb
+- lib/geonames_local/adapters/postgres.rb
+- lib/geonames_local/adapters/tokyo.rb
+- lib/geonames_local/cli.rb
+- lib/geonames_local/config/codes.yml
+- lib/geonames_local/config/geonames.yml
+- lib/geonames_local/data/cache.rb
+- lib/geonames_local/data/geoquery.rb
+- lib/geonames_local/data/shp.rb
+- lib/geonames_local/dump.rb
+- lib/geonames_local/export.rb
+- lib/geonames_local/features/city.rb
+- lib/geonames_local/features/country.rb
+- lib/geonames_local/features/province.rb
+- lib/geonames_local/features/road.rb
+- lib/geonames_local/features/spot.rb
+- lib/geonames_local/features/zone.rb
+- spec/geonames_local/cli_spec.rb
+- spec/geonames_local/data/cache_spec.rb
+- spec/geonames_local/data/postgres_spec.rb
+- spec/geonames_local/data/shp_spec.rb
+- spec/geonames_local/data/tokyo_spec.rb
+- spec/geonames_local/features/road_spec.rb
+- spec/geonames_local/features/spot_spec.rb
+- spec/geonames_local/features/zone_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-- spec/work/cli_spec.rb
 - task/benchmark.rb
 - task/benchmark_cabinet.rb
 has_rdoc: true
 homepage: http://github.com/nofxx/geonames_local
 licenses: []
 
-post_install_message: 
+post_install_message: |
+  
+  Geonames Local
+  --------------
+  
+  To use the adapter, install the corresponding gem:
+  
+    PostgreSQL   =>   pg
+    MongoDB      =>   mongodb (optional: mongo_ext)
+    Tokyo        =>   tokyocabinet
+  
+  PostgreSQL
+  ----------
+  
+  Be sure to use a database based on the PostGIS template.
+  
+  MongoDB
+  -------
+  
+  MongoDB 2D support is new, only mongo >= 1.3.3 mongodb gem >= 0.19.2
+  http://github.com/mongodb/mongo-ruby-driver
+  
+  Have fun because:
+
 rdoc_options: 
 - --charset=UTF-8
 require_paths: 
@@ -93,29 +130,31 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Dump and feed a tokyo local geonames db
 test_files: 
-- spec/data/cache_spec.rb
-- spec/data/postgres_spec.rb
-- spec/data/shp_spec.rb
-- spec/data/tokyo_spec.rb
-- spec/features/road_spec.rb
-- spec/features/spot_spec.rb
-- spec/features/zone_spec.rb
-- spec/geonames_local_spec.rb
 - spec/spec_helper.rb
-- spec/work/cli_spec.rb
+- spec/geonames_local/data/shp_spec.rb
+- spec/geonames_local/data/postgres_spec.rb
+- spec/geonames_local/data/tokyo_spec.rb
+- spec/geonames_local/data/cache_spec.rb
+- spec/geonames_local/cli_spec.rb
+- spec/geonames_local/features/spot_spec.rb
+- spec/geonames_local/features/zone_spec.rb
+- spec/geonames_local/features/road_spec.rb
+- spec/geonames_local_spec.rb

data/spec/data/cache_spec.rb

@@ -1,4 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
-
-# describe Cache do
-# end