geonames_local 0.0.3 → 0.0.4

data/.gitignore

@@ -24,4 +24,5 @@ pkg
 *.pid
 *.log
 *.qgr
-*.lex
+*.lex
+shps

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/geonames.yml

@@ -0,0 +1,14 @@
+#
+# Geonames Local Config Example
+#
+:store: pg
+:codes: [br]
+:level: city
+:mapping:
+  :name: name
+  :geom: true
+:db:
+  :host: localhost
+  :dbname: rtrac_development
+  :user: nofxx
+  :password:

data/geonames_local.gemspec

@@ -0,0 +1,96 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{geonames_local}
+  s.version = "0.0.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Marcos Piccinini"]
+  s.date = %q{2010-01-29}
+  s.default_executable = %q{geonames}
+  s.description = %q{Dump and feed a tokyo cabinet for local geonames search}
+  s.email = %q{x@nofxx.com}
+  s.executables = ["geonames"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".document",
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "bin/geonames",
+     "geonames.yml",
+     "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",
+     "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.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.5}
+  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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    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"])
+    else
+      s.add_dependency(%q<rspec>, [">= 1.2.9"])
+      s.add_dependency(%q<tokyotyrant>, [">= 1.10"])
+    end
+  else
+    s.add_dependency(%q<rspec>, [">= 1.2.9"])
+    s.add_dependency(%q<tokyotyrant>, [">= 1.10"])
+  end
+end
+

data/lib/config/geonames.yml

@@ -2,7 +2,7 @@
 # Geonames Local Config Example
 #
 :store: pg
-:codes: [br, cl]
+:codes: [br, it]
 :level: city
 :mapping:
   :name: name

data/lib/data/cache.rb

@@ -0,0 +1,5 @@
+# module Geonames
+#   class Cache
+
+#   end
+# end

data/lib/data/postgres.rb

@@ -16,35 +16,54 @@ module Geonames
           @conn.exec("SELECT countries.id FROM countries WHERE UPPER(countries.abbr) = UPPER('#{some.country}')")[0]["id"] rescue nil
       c ||= write("countries", {:name => Codes[some.country.downcase.to_sym][:pt_br], :abbr => some.country })
 
-      p = Provinces[some.province] ||= find("provinces", Cache[:provinces].
+      p = nil
+      ci = nil
+      if some.kind_of? Spot
+        p = Provinces[some.province] ||= find("provinces", Cache[:provinces].
                                        find{ |p| p.province == some.province}.gid)
-      [c, p]
+      else
+        ci = find("cities", some.city)
+        p = @conn.exec("SELECT cities.province_id FROM cities WHERE cities.id = #{ci}")[0]["province_id"] rescue nil
+      end
+      [c, p, ci]
     end
 
     #
     # Insert a record
     def insert(some)
-      country_id, province_id = get_some_ids(some)
-      if some.kind == :cities
+      country_id, province_id, city_id = get_some_ids(some)
+      case some.table
+      when :cities
         write("cities", {:name => some.name, :country_id => country_id,
                  :geom => some.geom.as_hex_ewkb, :gid => some.gid,
                  :zip => some.zip, :province_id => province_id})
-      else
+      when :provinces
         write("provinces", { :name => some.name, :abbr => some.abbr,
                  :country_id => country_id, :gid => some.gid })
+      when :roads
+        write("roads", { :name => some.name, :geom => some.geom.as_hex_ewkb, :kind => some.kind,
+                 :country_id => country_id, :city_id => city_id, :province_id => province_id })
       end
     end
 
     #
     # Find a record`s ID
-    def find(kind, id)
-      @conn.exec("SELECT #{kind}.id FROM #{kind} WHERE #{kind}.gid = #{id}")[0]["id"] rescue nil
+    def find(table, id, name=nil)
+      begin
+        if name
+          @conn.exec("SELECT #{table}.id FROM #{table} WHERE (#{table}.name = E'#{id}')")[0]["id"]
+        else
+          @conn.exec("SELECT #{table}.id FROM #{table} WHERE #{table}.gid = #{id}")[0]["id"]
+        end
+      rescue => e
+        nil
+      end
     end
 
     #
     # F'oo -> F''oo  (for pg)
     def escape_name(name)
-      name.gsub("'", "''")
+      name.to_s.gsub("'", "''")
     end
 
     #
@@ -52,9 +71,10 @@ module Geonames
     def pg_values(arr)
       arr.map do |v|
         case v
-        when String then "E'#{escape_name(v)}'"
+        when Numeric then v.to_s
+        when Symbol, String then "E'#{escape_name(v)}'"
         when NilClass then 'NULL'
-        else v
+        else
         end
       end.join(",")
     end
@@ -65,5 +85,9 @@ module Geonames
       for_pg = pg_values(hsh.values)
       @conn.exec("INSERT INTO #{table} (#{hsh.keys.join(",")}) VALUES(#{for_pg}) RETURNING id")[0]["id"]
     end
+
+    def exec(comm)
+      @conn.exec(comm)
+    end
   end
 end

data/lib/data/shp.rb

@@ -0,0 +1,76 @@
+require 'iconv'
+#---
+# Iconv cool tip from http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
+
+module Geonames
+  class SHP
+
+    def initialize(file)
+      @file = file
+      @fname = file.split("/")[-1] rescue nil
+      @type = Object.module_eval("::#{Opt[:type].capitalize}", __FILE__, __LINE__)
+      @ic = Iconv.new('UTF-8//IGNORE', 'UTF-8')
+      @sample = nil
+      shp2pg if file
+      parse if file
+      write if file
+    end
+
+    def shp2pg
+      info "Converting SRID"
+      `shp2pgsql -D -as 4326 #{@file} nil > /tmp/#{@fname}.dump`
+    end
+
+    def parse_line(l)
+      return if l =~ /^SET\s|^BEGIN;|^COPY\s|^END;|^\\/
+      utf = @ic.iconv(l)
+      unless @sample
+        info "Free sample\n" + utf.inspect
+        @sample = true
+      end
+      @type.new(Opt[:map], utf, Opt[:country].upcase, Opt[:city])
+    end
+
+    def parse
+      info "Parsing dump"
+      start = Time.now
+      red = 0
+      File.open("/tmp/#{@fname}.dump") do |f|
+        while line = f.gets
+          if record = parse_line(line.chomp)
+            @table ||= record.table
+            Cache[@table] << record
+            red += 1
+          end
+        end
+      end
+      info "#{red} parsed. #{Time.now-start}s"
+    end
+
+    def reduce!
+      hsh = Cache[:roads].group_by { |r| r.name }
+      arr = []
+      hsh.map do |key, vals|
+        first = vals.delete_at(0)
+#        p vals[0].geom.geometries.concat(vals[1].geom.geometries)
+        vals.map(&:geom).each do |g|
+          first.geom.geometries.concat g.geometries
+        end
+        # = GeoRuby::SimpleFeatures::MultiLineString.
+        #  from_line_strings([*vals.map(&:geom).map(&:geometries)])
+        first
+      end
+    end
+
+    def write
+      db = Postgres.new(Opt[:db])
+      Geonames::CLI.do_write(db, Cache[:zones])
+      Geonames::CLI.do_write(db, reduce!)
+    end
+
+    def self.import(file)
+      new(file)
+    end
+  end
+end
+

data/lib/features/road.rb

@@ -1,2 +1,41 @@
-  class Road
+require "rubygems"
+require "geo_ruby"
+
+class Road
+  attr_reader :city, :province, :country, :zone, :name, :geom, :kind, :table
+
+  def initialize(keys, vals, country=nil, city=nil)
+    s = vals.split("\t")
+    r = {}
+    keys.each_with_index do |k, i|
+      r[k] = s[i]
+    end
+    @name = r[:name]
+    @zone = r[:zone]
+    kind  = r[:kind] || @name.split(" ")[0]
+    @kind = parse_kind(kind)
+    @city = city
+    @country = country
+    parse_geom(r[:geom])
+    @table = :roads
   end
+
+  def parse_geom(hex)
+    @geom = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(hex)
+  end
+
+  def geom=(g)
+    @geom = g
+  end
+
+  def parse_kind(k)
+    case k
+      when /^tun/i then :tunnel
+      when /^av/i then :avenue
+      when /^r/i then :street
+      when /\d/ then :road
+      else :unknown
+    end
+  end
+
+end

data/lib/features/spot.rb

@@ -5,6 +5,7 @@ module Geonames
     alias :x :lon
     alias :y :lat
     alias :geoname_id :gid
+    alias :table :kind
 
     #
     # = Geonames Spot
@@ -58,7 +59,7 @@ module Geonames
     # Parse Geom to float or GeoRuby Point
     def parse_geom(lat, lon)
       @lat, @lon = lat.to_f, lon.to_f
-      
+
       if defined?("GeoRuby")
         @geom = GeoRuby::SimpleFeatures::Point.from_x_y(@lon, @lat)
       end

data/lib/features/zone.rb

@@ -0,0 +1,24 @@
+require "rubygems"
+require "geo_ruby"
+
+class Zone
+  attr_reader :city, :name, :geom, :kind
+
+  def initialize(keys, vals, city=nil)
+    s = vals.split("\t")
+    r = {}
+    keys.each_with_index do |k, i|
+      r[k] = s[i]
+    end
+    @name = r[:name]
+    @zone = r[:zone]
+    @kind = :zone # @name.split(" ")[0] unless kind
+    @city = city
+    parse_geom(r[:geom])
+  end
+
+  def parse_geom(hex)
+    @geom = GeoRuby::SimpleFeatures::Geometry.from_hex_ewkb(hex)
+  end
+
+end

data/lib/geonames_local.rb

@@ -1,8 +1,11 @@
 require 'features/spot'
 require 'features/country'
 require 'features/city'
+require 'features/road'
+require 'features/zone'
 require 'rubygems'
 require 'logger'
+require 'data/shp'
 require 'data/tokyo'
 require 'data/postgres'
 require 'work/cli'
@@ -11,7 +14,7 @@ require 'work/export'
 
 module Geonames
   Opt = {}
-  Cache = {:dump => [], :zip => []}
+  Cache = {:dump => [], :zip => [], :roads => [], :zones => []}
   Codes = YAML.load(File.read(File.join(File.dirname(__FILE__),'config', 'codes.yml')))
   VERSION =  File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
 

data/lib/work/cli.rb

@@ -20,12 +20,19 @@ BANNER
         opts.separator ""
         opts.separator "Config file:"
         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 }
+        opts.on("--city CITY", String, "Use city gid to import" ) { |s| options[:city] = s }
+        opts.on("--country COUNTRY", String, "Use country gid to import" ) { |s| options[:country] = s }
+        opts.separator ""
         opts.separator "Common Options:"
         opts.on("-h", "--help", "Show this message" ) { puts opts; exit }
         opts.on("-v", "--verbose", "Turn on logging to STDOUT" ) { |bool| options[:verbose] = bool }
@@ -46,6 +53,7 @@ BANNER
     end
     private_class_method :parse_options
 
+    # Ugly but works?
     def self.work(argv)
       trap(:INT) { stop! }
       trap(:TERM) { stop! }
@@ -55,6 +63,11 @@ BANNER
         Opt.merge! YAML.load(File.read(Opt[:config]))
       end
 
+      if shp = Opt[:shp]
+        SHP.import(shp)
+        exit
+      end
+
       if argv[0] =~ /list|codes/
          Codes.each do |key,val|
           str = [val.values, key.to_s].join(" ").downcase
@@ -107,13 +120,15 @@ BANNER
     end
 
     def self.do_write(db, val)
-      key = val[0].kind
+      return if val.empty?
+      key = val[0].table
       start = Time.now
       writt = 0
-      info "\nWriting #{key}..."
+      info "\nWriting #{val.length} #{key}..."
       val.each do |v|
-        unless db.find v.kind, v.gid
-          db.insert v
+        meth = v.respond_to?(:gid) ? [v.gid] : [v.name, true]
+        unless db.find(v.table, *meth)
+          db.insert(v)
           writt += 1
         end
       end

data/spec/data/cache_spec.rb

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

data/spec/data/postgres_spec.rb

@@ -0,0 +1,11 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe Postgres do
+
+  def wipe_db
+  end
+
+  describe "Parsing Dump" do
+    # before(:all)
+  end
+end

data/spec/data/shp_spec.rb

@@ -0,0 +1,20 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe SHP do
+
+  Cache[:roads] = [Road.new([:name,:zone,:geom],"R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E6100000020000009561DC0DA22B47C0EAB12D03CEF237C0136058FE7C2B47C0DE54A4C2D8F237C0"),
+                   Road.new([:name,:zone,:geom],"R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E610000003000000136058FE7C2B47C0DE54A4C2D8F237C0094E7D20792B47C0CCB56801DAF237C0CDCAF6216F2B47C08F1B7E37DDF237C0"),
+                   Road.new([:name,:zone,:geom], "R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E610000003000000A0F99CBB5D2B47C07A8F334DD8F237C019C6DD205A2B47C008E8BE9CD9F237C009C38025572B47C00DA5F622DAF237C0"),
+                   Road.new([:name,:zone,:geom],"R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E61000000300000009C38025572B47C00DA5F622DAF237C0155454FD4A2B47C082397AFCDEF237C0FB213658382B47C053060E68E9F237C0")]
+
+  Opt[:type] = "road"
+
+  it "should merge two records linestrings" do
+    @s = SHP.new(nil)
+    r = @s.reduce!
+    r.length.should eql(1)
+    r[0].geom.as_hex_ewkb.should_not eql(Cache[:roads][0].geom.as_hex_ewkb)
+  end
+
+
+end

data/spec/data/tokyo_spec.rb

@@ -2,28 +2,28 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe "Tokyo" do
 
-  it "should write down a spot" do
-    t = Geonames::Tokyo.new('localhost', 1978)
-    m = mock(Geonames::Spot, { :gid => 888, :to_hash => { "gid" => 888, "kind" => "city", "lat" => 5.5 }})
-    t.write(m)
-  end
+#   it "should write down a spot" do
+#     t = Geonames::Tokyo.new('localhost', 1978)
+#     m = mock(Geonames::Spot, { :gid => 888, :to_hash => { "gid" => 888, "kind" => "city", "lat" => 5.5 }})
+#     t.write(m)
+#   end
 
-  it "should read it up" do
-    t = Geonames::Tokyo.new('localhost', 1978)
-    record = t.find(888)
-    record.should be_instance_of Geonames::Spot
-  end
+#   it "should read it up" do
+#     t = Geonames::Tokyo.new('localhost', 1978)
+#     record = t.find(888)
+#     record.should be_instance_of Geonames::Spot
+#   end
 
-  it "should not duplicate" do
-    t = Geonames::Tokyo.new('localhost', 1978)
-    t.all({ :gid => 888}).length.should eql(1)
-  end
+#   it "should not duplicate" do
+#     t = Geonames::Tokyo.new('localhost', 1978)
+#     t.all({ :gid => 888}).length.should eql(1)
+#   end
 
-  it "should return all countries" do
-    all = Geonames::Country.all
-    all.should be_instance_of Array
-    all[0].should be_instance_of Geonames::Country
-    all[0].gid.should eql(1)
-  end
+#   it "should return all countries" do
+#     all = Geonames::Country.all
+#     all.should be_instance_of Array
+#     all[0].should be_instance_of Geonames::Country
+#     all[0].gid.should eql(1)
+#   end
 
 end

data/spec/features/road_spec.rb

@@ -0,0 +1,68 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "geo_ruby"
+
+describe Road do
+
+  describe "Parsing Dump" do
+
+    before do
+      @road = Road.new([:zone, :name, :geom], "RIO COMPRIDO\tAV PAULO DE FRONTIN\t0105000020E6100000010000000102000020E61000000700000029A117E0C79A45C0D50B2027B3EE36C0782289C2C99A45C0ED188FFFC5EE36C0E6D342ABCA9A45C0AB8A7A7BD0EE36C00216B5BFCC9A45C07359511DDFEE36C0C489F290CE9A45C0DEA42096F7EE36C0453B2C65CD9A45C0DFCF664816EF36C04089595CCD9A45C00A220DA31AEF36C0")
+    end
+
+    it "should parse zone" do
+      @road.zone.should eql("RIO COMPRIDO")
+    end
+
+    it "should parse code" do
+      @road.name.should eql("AV PAULO DE FRONTIN")
+    end
+
+    it "should parse kind" do
+      @road.kind.should eql(:avenue)
+    end
+
+    it "should parse geom" do
+      @road.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiLineString)
+    end
+
+    it "should have 1 geometry" do
+      @road.geom.should have(1).geometries
+    end
+
+    it "should have 1 geometry linestring" do
+      geom = @road.geom.geometries[0]
+      geom.should be_kind_of(GeoRuby::SimpleFeatures::LineString)
+    end
+
+    it "should have 1 geometry linestring with n points" do
+      @road.geom.geometries[0].should have(7).points
+    end
+
+  end
+
+  describe "Another parse" do
+    before do
+      @road = Road.new([:length, :name, :null, :null, :geom], "35.487\tMS-380\t2\t\N\t0105000020E6100000010000000102000020E6100000120000005A4B85AD49DC4BC0D9438EB3AE8736C04D5707662DDA4BC07FD132464F8336C05AF6FA9F8FD84BC0C43ACFACA97E36C07DAC68ABFED14BC0ADFF26E9687936C036ED20214BD04BC035B173E5557A36C0C115051259CD4BC0E4C9CF15617636C0429724EA1AC94BC04C0D087A5E7536C04C0FAB81C5C54BC0FD07B789257336C07FB8E40122BE4BC026F0474B218036C053A51A37ABBD4BC0E03173F8698036C0D642B66B34BD4BC0BC4E66A4B28036C0D696B79FBDBC4BC05337214FFB8036C01CA71ED346BC4BC043DCA3F8438136C07879EB05D0BB4BC0212EEEA08C8136C0B5131E3859BB4BC08F1D0048D58136C0A17BB669E2BA4BC0259BD9ED1D8236C007B7B49A6BBA4BC07D977A92668236C0BE2439F759B94BC0B67D375CCC8236C0")
+    end
+
+    it "should parse code" do
+      @road.name.should eql("MS-380")
+    end
+
+    it "should parse kind" do
+      @road.kind.should eql(:road)
+    end
+
+    it "should parse geom" do
+      @road.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiLineString)
+    end
+
+  end
+end
+
+
+# RIO COMPRIDO\tAV PAULO DE FRONTIN\t0105000020E6100000010000000102000020E61000000700000029A117E0C79A45C0D50B2027B3EE36C0782289C2C99A45C0ED188FFFC5EE36C0E6D342ABCA9A45C0AB8A7A7BD0EE36C00216B5BFCC9A45C07359511DDFEE36C0C489F290CE9A45C0DEA42096F7EE36C0453B2C65CD9A45C0DFCF664816EF36C04089595CCD9A45C00A220DA31AEF36C0
+# RIO COMPRIDO\tELEV ENG FREYSSINET\t0105000020E6100000010000000102000020E61000001600000029A117E0C79A45C0D50B2027B3EE36C0616EE6DEC39A45C03A36CF0E94EE36C0E8C4CE25C09A45C0C7CC5FA884EE36C06FC623BBAD9A45C0CC16549751EE36C0C886FA2AA99A45C03FFE37E23EEE36C0D8A69F2DA79A45C036DFE40921EE36C0C5B0C586A89A45C060E6BA0F0FEE36C0417340F4B29A45C0CCD0A07BB9ED36C0F28BB536B89A45C01F0BB3CE94ED36C038AED593BA9A45C0AD84B8EA77ED36C0C8D80C30BD9A45C0DB5E15A837ED36C0642CEC83C29A45C04E78D9AEA9EC36C01FF44297C79A45C08091F28337EC36C0D0C63FCECA9A45C0ACC190D2E7EB36C06160C265CC9A45C0F4BA5997ABEB36C0141C44A2D19A45C046DA3ABC0BEB36C00A5183F3D49A45C0A800B9F987EA36C08F84CC8CD69A45C078B5508D41EA36C0FDEFEEEDD49A45C06F668B46D8E936C06DF2C8EBD39A45C05C575FADBEE936C05718F576D39A45C0D31DF017B1E936C056E59516D29A45C0F9EE1635A7E936C0
+# GAMBOA\tTUN JOAO RICARDO\t0105000020E6100000010000000102000020E6100000060000008156E6D6F19845C06D89F7CECCE536C00A1B72A6CF9845C07AAC746217E636C016E1A9D1C99845C0A3B9AA0C24E636C0EE90F8C5C49845C047B01D022FE636C05F1D9379BB9845C0ADEA1C3443E636C0B146DDF6B19845C05FC1548D57E636C0
+# SANTO CRISTO\tVD S PEDRO E S PAULO\t0105000020E6100000010000000102000020E610000006000000AC45D194B79945C04409BB661DE636C0B49FF422B89945C081E6846525E636C022FF9BAC949945C031F0CFDF8FE636C0978E80ED8F9945C056113F209EE636C0AF1242F7879945C001FE5FA5B8E636C09AB3B4607D9945C0A38B9395DCE636C0
+

data/spec/features/spot_spec.rb

@@ -0,0 +1,191 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "geo_ruby"
+
+describe Spot do
+
+  describe "Parsing Dump" do
+
+    before do
+      @spot = Spot.new("6319037\tMaxaranguape\tMaxaranguape\t\t-5.46874226086957\t-35.3565714695652\tA\tADM2\tBR\t22\t2407500\t6593\t\t12\t\t\t\tAmerica/Recife\t2006-12-17", :dump)
+    end
+
+    it "should parse geoid integer" do
+      @spot.geoname_id.should eql(6319037)
+      @spot.gid.should eql(6319037)
+    end
+
+    it "should parse code" do
+      @spot.code.should eql("6593")
+    end
+
+    it "should parse province code" do
+      @spot.province.should eql("2407500")
+    end
+
+    it "should parse name" do
+      @spot.name.should eql("Maxaranguape")
+      @spot.ascii.should eql("Maxaranguape")
+    end
+
+    it "should parse geostuff" do
+      @spot.lat.should be_close(-5.4687, 0.001)
+      @spot.y.should be_close(-5.4687, 0.001)
+      @spot.lon.should be_close(-35.3565, 0.001)
+    end
+
+    it "should parse spot kind" do
+      @spot.kind.should eql(:cities)
+    end
+
+    it "should parse spot country" do
+      @spot.country.should eql("BR")
+    end
+
+    it "shuold parse timezone" do
+      @spot.tz.should eql("America/Recife")
+    end
+
+    it "should parse updated_at" do
+      @spot.updated_at.should be_instance_of(Time)
+      @spot.updated_at.day.should eql(17)
+    end
+  end
+
+  describe "More Parseing" do
+
+    before do
+      @spot =  Geonames::Spot.new("3384862\tRiacho Zuza\tRiacho Zuza\t\t-9.4333333\t-37.6666667\tH\tSTMI\tBR\t\t02\t\t\t\t0\t\t241\tAmerica/Maceio\t1993-12-17\n", :dump)
+    end
+
+    it "should parse geoid integer" do
+      @spot.geoname_id.should eql(3384862)
+    end
+
+    it "should parse name" do
+      @spot.name.should eql("Riacho Zuza")
+      @spot.ascii.should eql("Riacho Zuza")
+    end
+
+    it "should parse geostuff" do
+      @spot.lat.should be_close(-9.4333333, 0.001)
+      @spot.lon.should be_close(-37.6666667, 0.001)
+    end
+
+    it "should parse spot kind" do
+      @spot.kind.should eql(:other)
+    end
+
+    it "should parse spot country" do
+      @spot.country.should eql("BR")
+    end
+
+    it "shuold parse timezone" do
+      @spot.tz.should eql("America/Maceio")
+    end
+
+    it "should parse updated_at" do
+      @spot.updated_at.should be_instance_of(Time)
+      @spot.updated_at.day.should eql(17)
+    end
+  end
+
+  describe "Parsing Province" do
+
+    before do
+      @spot =  Geonames::Spot.new("3457153\tEstado de Minas Gerais\tEstado de Minas Gerais\tMinas,Minas Geraes,Minas Gerais\t-18.0\t-44.0\tA\tADM1\tBR\tBR\t15\t\t\t\t16672613\t\t1219\tAmerica/Sao_Paulo\t2007-05-15\n", :dump)
+    end
+
+    it "should be kind of province" do
+      @spot.kind.should eql(:provinces)
+    end
+
+    it "should parse geoid" do
+      @spot.geoname_id.should eql(3457153)
+      @spot.gid.should eql(3457153)
+    end
+
+    it "should parse code" do
+      @spot.code.should be_empty
+    end
+
+    it "should parse province code" do
+      @spot.province.should eql("15")
+    end
+
+    it "should create abbr" do
+      @spot.abbr.should eql("MG")
+    end
+
+    it "should parse name" do
+      @spot.name.should eql("Minas Gerais")
+      @spot.ascii.should eql("Estado de Minas Gerais")
+    end
+
+    it "should parse geostuff" do
+      @spot.lat.should be_close(-18.0, 0.001)
+      @spot.lon.should be_close(-44.0, 0.001)
+    end
+
+  end
+
+  describe "Parsing Zip" do
+
+    before do
+      @spot =  Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t-14.7574\t-49.3596\t\n", :zip)
+    end
+
+    it "should parse zip oO" do
+      @spot.zip.should eql("76375")
+    end
+
+    it "should be a city" do
+      @spot.kind.should eql(:cities)
+    end
+
+    it "should parse code" do
+      @spot.code.should eql("5209804")
+    end
+
+    it "should parse geoid integer" do
+      @spot.gid.should be_nil # eql(3384862)
+    end
+
+    it "should parse name" do
+      @spot.name.should eql("Hidrolina")
+      @spot.ascii.should be_nil # eql("Hidrolina")
+    end
+
+    it "should parse geostuff" do
+      @spot.lat.should be_close(-14.7574, 0.001)
+      @spot.lon.should be_close(-49.3596, 0.001)
+    end
+
+  end
+
+end
+
+# 6319037 Maxaranguape  Maxaranguape    -5.46874226086957 -35.3565714695652 A ADM2  BR    22  2407500     6593    12  America/Recife  2006-12-17
+# 6319038 Mossoró Mossoro   -5.13813983076923 -37.2784795923077 A ADM2  BR    22  2408003     205822    33  America/Fortaleza 2006-12-17
+# 6319039 Nísia Floresta  Nisia Floresta    -6.06240228440367 -35.1690981651376 A ADM2  BR    22  2408201     15817   15  America/Recife  2006-12-17
+# 6319040 Paraú Parau   -5.73215878787879 -37.1366413030303 A ADM2  BR
+# 22  2408706     4093    94  America/Fortaleza 2006-12-17
+
+# "BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t-14.7574\t-49.3596\t\n"
+# "BR\t73920-000\tIaciara\tGoias\t29\t\t5209903\t\t-14.0819\t-46.7211\t\n"
+# "BR\t75550-000\tInaciolândia\tGoias\t29\t\t5209937\t\t-18.4989\t-49.9016\t\n"
+# "BR\t75955-000\tIndiara\tGoias\t29\t\t5209952\t^C\t-17.2276\t-49.9667\t\n"
+# "IT\t89900\tVena\tCalabria\t\tVibo Valentia\tVV\t\t38.6578\t16.0602\t4\n"
+# "IT\t89900\tVibo Marina\tCalabria\t\tVibo Valentia\tVV\t\t38.7143\t16.1135\t4\n"
+# "IT\t89900\tTriparni\tCalabria\t\tVibo Valentia\tVV\t\t38.6839\t16.0672\t4\n"
+# "IT\t89900\tPiscopio\tCalabria\t\tVibo Valentia\tVV\t\t38.6635\t16.112\t4\n"
+
+# "3457153\tEstado de Minas Gerais\tEstado de Minas Gerais\tMinas,Minas Geraes,Minas Gerais\t-18.0\t-44.0\tA\tADM1\tBR\tBR\t15\t\t\t\t16672613\t\t1219\tAmerica/Sao_Paulo\t2007-05-15\n"
+# "3457415\tEstado de Mato Grosso do Sul\tEstado de Mato Grosso do Sul\tEstado do Mato Grosso do Sul,Mato Grosso do Sul\t-21.0\t-55.0\tA\tADM1\tBR\t\t11\t\t\t\t2233378\t\t446\tAmerica/Campo_Grande\t2007-05-15\n"
+# "3457419\tEstado de Mato Grosso\tEstado de Mato Grosso\tMato Grosso\t-13.0\t-56.0\tA\tADM1\tBR\t\t14\t\t\t\t2235832\t\t335\tAmerica/Cuiaba\t2007-05-15\n"
+# "3462372\tEstado de Goiás\tEstado de Goias\tGoias,Goiaz,Goiás,Goyaz\t-15.5807107391621\t-49.63623046875\tA\tADM1\tBR\t\t29\t\t\t\t5521522\t\t695\tAmerica/Araguaina\t2009-10-04\n"
+# "3463504\tDistrito Federal\tDistrito Federal\tDistrito Federal,Distrito Federal de Brasilia,Distrito Federal de Brasília,Futuro Distrito Federal,Municipio Federal,Novo Distrito Federal\t-15.75\t-47.75\tA\tADM1\tBR\t\t07\t\t\t\t1821946\t\t1035\tAmerica/Sao_Paulo\t2007-05-15\n"
+
+# "3165361\tToscana\tToscana\tTaskana,Toscan-a,Toscana,Toscane,Toscann-a,Toskana,Toskania,Toskanio,Toskansko,Toskánsko,Toskāna,Toszkana,Toszkána,Tuscany,Tuschena,Tuschèna,Tuscia,toseukana ju,tosukana zhou,tuo si ka na,twsqnh,Таскана,Тоскана,טוסקנה,تسکانہ,ტოსკანა,トスカーナ州,托斯卡纳,토스카나 주\t43.4166667\t11.0\tA\tADM1\tIT\t\t16\t\t\t\t3718210\t\t249\tEurope/Rome\t2010-01-17\n"
+# "3169778\tRegione Puglia\tRegione Puglia\tApulia,Apulie,Apulien,Apulië,Pouilles,Puglia\t41.25\t16.25\tA\tADM1\tIT\t\t13\t\t\t\t4021957\t\t95\tEurope/Rome\t2009-03-11\n"
+# "3170831\tRegione Piemonte\tRegione Piemonte\tPedemons,Pedemontium,Piamonte,Piedmont,Piemont,Piemonte,Piémont,Piëmont,Regione Piemonte\t45.0\t8.0\tA\tADM1\tIT\t\t12\t\t\t\t4294081\t\t185\tEurope/Rome\t2008-08-18\n"

data/spec/features/zone_spec.rb

@@ -0,0 +1,62 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require "geo_ruby"
+
+describe Zone do
+
+  describe "Parsing Dump" do
+
+    before do
+      @zone = Zone.new([:name, :null, :geom], "Copacabana\t2\t0106000020E6100000010000000103000020E6100000010000001B000000DE024322029645C0E3263B4536F736C06A78FF7D099745C05F4C17BC3AF836C016ECF835959745C0A6303C5AF6F836C031D79B0DEE9745C02A86A360EDF936C0BBC7A929259845C054515A9559FB36C0050527EF109845C02AD15A3969FC36C0A5705221BD9745C031151F7ACBFC36C0A96DC310049845C0055C26CBE0FC36C0C0FA3CDA6E9845C02424EED2F6FC36C08D80123FF49845C03C190018D7FB36C02E4C5C15199945C0A11ABD694CFB36C00D94B215269945C0F04B5E66CAFA36C03440A3EA169945C029ADE30D51FA36C082988494F89845C06DF6F65FD3F936C0E1CC3ABED39845C00B593959CFF836C0C0ED50117D9845C045937E53F2F736C03440A3EA169945C0CDFE644A93F636C0BA204AE9E29845C0C2EF96F233F636C08C60DFA8C29845C0A38B4DC61DF636C06DA128929D9845C03DE8AF4604F636C047CEF70F499845C08B67D19D49F636C0E87201390A9845C073BEF5F5B5F636C05F50930A799745C0B707094838F636C06CEAA05AAD9645C049A9FD439CF536C034760E48739645C0B9F4FBDC84F536C0F2A307AC159645C0CCEA3108E3F636C0DE024322029645C0E3263B4536F736C0")
+    end
+
+    it "should parse code" do
+      @zone.name.should eql("Copacabana")
+    end
+
+    it "should parse kind" do
+      @zone.kind.should eql(:zone)
+    end
+
+    it "should parse geom" do
+      @zone.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiPolygon)
+    end
+
+    it "should have 1 geometry" do
+      @zone.geom.should have(1).geometries
+    end
+
+    it "should have 1 geometry polygon" do
+      geom = @zone.geom.geometries[0]
+      geom.should be_kind_of(GeoRuby::SimpleFeatures::Polygon)
+    end
+
+    it "should have 1 geometry polygon with n points" do
+      @zone.geom.geometries[0][0].should have(27).points
+    end
+
+  end
+
+  describe "Another parse" do
+    before do
+      @zone = Zone.new([:name, :null, :geom], "Botafogo\t4\t0106000020E6100000010000000103000020E610000001000000260000008C60DFA8C29845C0A38B4DC61DF636C0D68132D5E79845C090FADA554EF536C069D119B12A9945C0D857001102F436C0298D2075189945C0BFEDCBEBA8F336C049DBDD0FFA9845C0EEE2E7537BF336C0D68132D5E79845C0C2DCE6FB5FF336C0A761EE3BB99845C0FD7DA07637F336C048D58ABADF9845C061341567FBF136C0D5CD0D24649845C01D4DDC69AEF136C0106FC79E3B9845C058EE95E485F136C0739E6AE14F9845C043737CCFE3F036C0C10619C0459845C0466297DF9AF036C0BD63D9FE0A9845C0AF6F70421DF036C0A8E8BFE9689745C022C3C82715F036C0AF7A1ABB5A9745C08103515A72F036C0805AD6212C9745C0A04BBB9F39F036C03FFE0258109745C0E861C12D4AF036C0FD2EA4E8CC9645C08103515A72F036C03F62B834969645C0A9913A22AFF036C0C96B208E639645C0875AB5CC30F136C02DFC02077A9645C03E01065281F136C0BD3A35D49B9645C04CFB74214EF136C04048B7CBD99645C0F0F4ABBE6EF136C0ABD7DAF91F9745C0521060C417F236C083C8D321229745C0BC1081D776F236C009643E7BF99645C083E4C80ECAF236C0D16BCFB3BF9645C0EFBC652AD8F236C084595B73599645C07CA67AEF3AF336C0B1592EAC6B9645C0A3A74E6AB4F336C03DAE50A9189645C0D653696356F436C02127B0EE3C9645C070D22BCB62F536C034760E48739645C0B9F4FBDC84F536C06CEAA05AAD9645C049A9FD439CF536C05F50930A799745C0B707094838F636C0E87201390A9845C073BEF5F5B5F636C047CEF70F499845C08B67D19D49F636C06DA128929D9845C03DE8AF4604F636C08C60DFA8C29845C0A38B4DC61DF636C0")
+    end
+
+    it "should parse code" do
+      @zone.name.should eql("Botafogo")
+    end
+
+    it "should parse geom" do
+      @zone.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiPolygon)
+    end
+
+    it "should have 1 geometry polygon with n points" do
+      @zone.geom.geometries[0][0].should have(38).points
+    end
+
+  end
+end
+
+# Copacabana\t2\t0106000020E6100000010000000103000020E6100000010000001B000000DE024322029645C0E3263B4536F736C06A78FF7D099745C05F4C17BC3AF836C016ECF835959745C0A6303C5AF6F836C031D79B0DEE9745C02A86A360EDF936C0BBC7A929259845C054515A9559FB36C0050527EF109845C02AD15A3969FC36C0A5705221BD9745C031151F7ACBFC36C0A96DC310049845C0055C26CBE0FC36C0C0FA3CDA6E9845C02424EED2F6FC36C08D80123FF49845C03C190018D7FB36C02E4C5C15199945C0A11ABD694CFB36C00D94B215269945C0F04B5E66CAFA36C03440A3EA169945C029ADE30D51FA36C082988494F89845C06DF6F65FD3F936C0E1CC3ABED39845C00B593959CFF836C0C0ED50117D9845C045937E53F2F736C03440A3EA169945C0CDFE644A93F636C0BA204AE9E29845C0C2EF96F233F636C08C60DFA8C29845C0A38B4DC61DF636C06DA128929D9845C03DE8AF4604F636C047CEF70F499845C08B67D19D49F636C0E87201390A9845C073BEF5F5B5F636C05F50930A799745C0B707094838F636C06CEAA05AAD9645C049A9FD439CF536C034760E48739645C0B9F4FBDC84F536C0F2A307AC159645C0CCEA3108E3F636C0DE024322029645C0E3263B4536F736C0
+# Urca\t3\t0106000020E6100000010000000103000020E6100000010000001B0000002127B0EE3C9645C070D22BCB62F536C03DAE50A9189645C0D653696356F436C0B1592EAC6B9645C0A3A74E6AB4F336C084595B73599645C07CA67AEF3AF336C0E83F2850F59545C055D7AD3C9FF336C0DC146FFBDC9545C05C1D2A82ACF336C0D1AB3413C99545C05A5BAB15A8F336C01A57D1575A9545C091A56AC0D9F236C0C4ABD57A139545C0B6F9F5385CF236C0F455FDDCE09445C049FA5FF698F236C0C7552AA4CE9445C0A5A45A9178F236C06BAB2F09EF9445C061A3A4F0F2F136C041000765BA9445C0974CCB1059F136C03455C0E6919445C0A8A166B83CF136C051025D60269445C077C0834475F136C073CD3C4DED9345C0ADBF9312F6F036C0D74FB1CC5D9345C0980DE0176DF036C042ED293B4A9345C0620ED049ECF036C0B3A5A698B29345C0024AB15844F136C01A85C978D69345C00965B547C0F136C00ECD44B4AD9345C0A124EB3987F236C08E7D184B389345C04FF77B54ECF236C007B240C5319345C0C0AFF8B154F336C062F6BACCE69445C0CDE500904CF436C005FD244EEC9445C0DF38B3A39CF436C0E9BC9FD8169545C01F0AEC70AAF436C02127B0EE3C9645C070D22BCB62F536C0
+# Botafogo\t4\t0106000020E6100000010000000103000020E610000001000000260000008C60DFA8C29845C0A38B4DC61DF636C0D68132D5E79845C090FADA554EF536C069D119B12A9945C0D857001102F436C0298D2075189945C0BFEDCBEBA8F336C049DBDD0FFA9845C0EEE2E7537BF336C0D68132D5E79845C0C2DCE6FB5FF336C0A761EE3BB99845C0FD7DA07637F336C048D58ABADF9845C061341567FBF136C0D5CD0D24649845C01D4DDC69AEF136C0106FC79E3B9845C058EE95E485F136C0739E6AE14F9845C043737CCFE3F036C0C10619C0459845C0466297DF9AF036C0BD63D9FE0A9845C0AF6F70421DF036C0A8E8BFE9689745C022C3C82715F036C0AF7A1ABB5A9745C08103515A72F036C0805AD6212C9745C0A04BBB9F39F036C03FFE0258109745C0E861C12D4AF036C0FD2EA4E8CC9645C08103515A72F036C03F62B834969645C0A9913A22AFF036C0C96B208E639645C0875AB5CC30F136C02DFC02077A9645C03E01065281F136C0BD3A35D49B9645C04CFB74214EF136C04048B7CBD99645C0F0F4ABBE6EF136C0ABD7DAF91F9745C0521060C417F236C083C8D321229745C0BC1081D776F236C009643E7BF99645C083E4C80ECAF236C0D16BCFB3BF9645C0EFBC652AD8F236C084595B73599645C07CA67AEF3AF336C0B1592EAC6B9645C0A3A74E6AB4F336C03DAE50A9189645C0D653696356F436C02127B0EE3C9645C070D22BCB62F536C034760E48739645C0B9F4FBDC84F536C06CEAA05AAD9645C049A9FD439CF536C05F50930A799745C0B707094838F636C0E87201390A9845C073BEF5F5B5F636C047CEF70F499845C08B67D19D49F636C06DA128929D9845C03DE8AF4604F636C08C60DFA8C29845C0A38B4DC61DF636C0
+# Flamengo\t5\t0106000020E6100000010000000103000020E6100000010000001B0000003FFE0258109745C0E861C12D4AF036C0505F06F0EC9645C061922586A4EE36C0E340E3A0AF9645C0A4624A4E9AEE36C0E340E3A0AF9645C0732E602406EE36C0DF4D6D4F899645C069BD2F5CF7EC36C03CA0B8582D9645C069BD2F5CF7EC36C05115EC3A1D9645C080D8EC67A1EC36C0D4740B5B169645C09080E9BD7CEC36C028793995099645C00E3B47AB1BEC36C0E89B8A1E3A9645C0BB9E4A9D8CEB36C02486C343E39545C064A7A61173EB36C0920C18BF849545C0A21C245CDEEB36C0E1B59E7BED9545C08855DFE729EE36C0B8FE5B2C049645C0B95A3CEB64EF36C041A95EF9EE9545C00EE55931B3EF36C053FE6393C49545C03C68BEE2A2EF36C08F187850C19545C075C47C11D7EF36C038AF2FC38E9545C0FC8F5497DDEF36C038AF2FC38E9545C023970D2C3CF036C0EA3F166CBC9545C00D84B2039EF036C04DD4C1CA2A9645C0D1F66EC79DF136C0B261DB56579645C0B01C4273A9F136C02DFC02077A9645C03E01065281F136C0C96B208E639645C0875AB5CC30F136C03F62B834969645C0A9913A22AFF036C0FD2EA4E8CC9645C08103515A72F036C03FFE0258109745C0E861C12D4AF036C0

data/spec/geonames_local_spec.rb

@@ -1,87 +1,10 @@
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "GeonamesLocal" do
-
-  describe "Parsing" do
-    before do
-      @spot =  Geonames::Spot.new("6319037\tMaxaranguape\tMaxaranguape\t\t-5.46874226086957\t-35.3565714695652\tA\tADM2\tBR\t22\t2407500\t6593\t\t12\t\t\t\tAmerica/Recife\t2006-12-17")
-    end
-
-    it "should parse geoid integer" do
-      @spot.geoname_id.should eql(6319037)
-    end
-
-    it "should parse name" do
-      @spot.name.should eql("Maxaranguape")
-      @spot.ascii.should eql("Maxaranguape")
-    end
-
-    it "should parse geostuff" do
-      @spot.lat.should be_close(-5.4687, 0.001)
-      @spot.y.should be_close(-5.4687, 0.001)
-      @spot.lon.should be_close(-35.3565, 0.001)
-    end
-
-    it "should parse spot kind" do
-      @spot.kind.should eql(:city)
-    end
-
-    it "should parse spot country" do
-      @spot.country.should eql("BR")
-    end
-
-    it "shuold parse timezone" do
-      @spot.tz.should eql("America/Recife")
-    end
-
-    it "should parse updated_at" do
-      @spot.updated_at.should be_instance_of(Time)
-      @spot.updated_at.day.should eql(17)
-    end
+describe Geonames do
+  it "should have a cache" do
+    Cache.should be_instance_of(Hash)
   end
 
-  describe "More Parseing" do
-    before do
-      @spot =  Geonames::Spot.new("3384862\tRiacho Zuza\tRiacho Zuza\t\t-9.4333333\t-37.6666667\tH\tSTMI\tBR\t\t02\t\t\t\t0\t\t241\tAmerica/Maceio\t1993-12-17\n")
-    end
-
-    it "should parse geoid integer" do
-      @spot.geoname_id.should eql(3384862)
-    end
 
-    it "should parse name" do
-      @spot.name.should eql("Riacho Zuza")
-      @spot.ascii.should eql("Riacho Zuza")
-    end
-
-    it "should parse geostuff" do
-      @spot.lat.should be_close(-9.4333333, 0.001)
-      @spot.lon.should be_close(-37.6666667, 0.001)
-    end
-
-    it "should parse spot kind" do
-      @spot.kind.should eql(:other)
-    end
-
-    it "should parse spot country" do
-      @spot.country.should eql("BR")
-    end
-
-    it "shuold parse timezone" do
-      @spot.tz.should eql("America/Maceio")
-    end
-
-    it "should parse updated_at" do
-      @spot.updated_at.should be_instance_of(Time)
-      @spot.updated_at.day.should eql(17)
-    end
-  end
 end
-
-# 6319037 Maxaranguape  Maxaranguape    -5.46874226086957 -35.3565714695652 A ADM2  BR    22  2407500     6593    12  America/Recife  2006-12-17
-# 6319038 Mossoró Mossoro   -5.13813983076923 -37.2784795923077 A ADM2  BR    22  2408003     205822    33  America/Fortaleza 2006-12-17
-# 6319039 Nísia Floresta  Nisia Floresta    -6.06240228440367 -35.1690981651376 A ADM2  BR    22  2408201     15817   15  America/Recife  2006-12-17
-
-# 6319040 Paraú Parau   -5.73215878787879 -37.1366413030303 A ADM2  BR
-# 22  2408706     4093    94  America/Fortaleza 2006-12-17

data/spec/spec_helper.rb

@@ -3,7 +3,8 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'geonames_local'
 require 'spec'
 require 'spec/autorun'
+include Geonames
 
 Spec::Runner.configure do |config|
-  
+
 end

data/spec/work/cli_spec.rb

@@ -0,0 +1,8 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe CLI do
+
+  describe "Parsing Dump" do
+    # before(:all)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geonames_local
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-28 00:00:00 -02:00
+date: 2010-01-29 00:00:00 -02:00
 default_executable: geonames
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -49,24 +49,36 @@ files:
 - Rakefile
 - VERSION
 - bin/geonames
+- geonames.yml
+- 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
 - 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
@@ -98,6 +110,13 @@ 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