geonames_local 3.1.1 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e73d4bb7dd75933118a18ad64f13563e47b64e5
-  data.tar.gz: fc75d8a753756a87433b16c9da287cb9bd9bc090
+  metadata.gz: 6c076a06bf13c93cdc9f86aa0a7b215f92fc148b
+  data.tar.gz: 01481b044838b7b3cde40de3ff0103ad7c932771
 SHA512:
-  metadata.gz: 82c9f917f022ba89fe63b7cb817e04f4652ba37eaf651760cd5a1c4409a2d090cbf495b23e0117c9f7eedeb860da3f6164aff83f22ebd58be3d72d81ae5a2f2c
-  data.tar.gz: 50d6134373286472f0980f4e68046c355eba088c89311a2b3f0148ff4463284d0c0456d147f19dca033586e4cc1159900cca452e217680a378b12e1eb4e71bc7
+  metadata.gz: 76f0ce5d8302588eedf7b05b25f2e1868169dc138c74e9618c8e16efe98a00f24bf085bfa8db0a049d4d1fe2cfa846c1981df5bcb58bf513f85f11c4919bbc64
+  data.tar.gz: df126c44103aaa93d2e20197c053894de6778622220f5031c2f399766342cd9351d27273a5d379ea98d4ed863daf011d219cc26636368f0f29ed4e10af360a37

data/.gitignore

@@ -26,3 +26,5 @@ pkg
 *.qgr
 *.lex
 shps
+Gemfile.lock
+tmp/*

data/Guardfile

@@ -0,0 +1,9 @@
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+require 'guard'
+
+guard 'rspec' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { "spec" } # { |m| "spec spec/lib/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.rdoc

@@ -1,17 +1,16 @@
 = Geonames Local
 
-Downloads and store Geonames.org data locally (MongoDB, PostGIS, Tokyo).
+Downloads and store Geonames.org data locally (MongoDB, Mongoid).
 Making every Geoname API operation possible on your servers.
 No hit limit, fast as possible.
 
 
 == Usage
 
-To use one adapter, install the corresponding gem:
+Install where you want to populate the DB:
+
+  gem install geonames_local
 
-  MongoDB      =>   mongoid, geopolitical (optional: mongo_ext)
-  PostgreSQL   =>   pg
-  Tokyo        =>   tokyocabinet
 
 You will also need in your system:
 
@@ -21,8 +20,13 @@ You will also need in your system:
 
 === Config YML
 
+
+Create a config yml file:
+
+
   geonames conf
 
+
 Will generate a "geonames.yml" file on your folder.
 The file is self explanatory.
 
@@ -30,13 +34,13 @@ The file is self explanatory.
 
 To run it. Use -v for verbose.
 
-If you are not sure your country code, use:
+If you are not sure your country/nation code, use:
 
   geonames list <search>
 
-To populate the countries database for the first time use:
+To populate the nations database for the first time use:
 
-  geonames -c geoconfig.yml countries
+  geonames -c geoconfig.yml nations
 
 
 == Mongoid
@@ -53,42 +57,6 @@ TBD (by someone else)
 Be sure to use a database based on the PostGIS template.
 
 
-=== Migration
-
-Default PG migration:
-
-    create_table :cities do |t|
-      t.references :country, :null => false
-      t.references :province
-      t.string  :name,   :null => false
-      t.point   :geom,   :srid => 4326
-      t.integer :gid, :zip
-    end
-
-    create_table :provinces do |t|
-      t.references :country, :null => false
-      t.string :name, :null => false
-      t.string :abbr, :limit => 2, :null => false
-      t.integer :gid
-    end
-
-    create_table :countries do |t|
-      t.string :name, :limit => 30, :null => false
-      t.string :abbr, :limit => 2,  :null => false
-    end
-
-    add_index :cities, :name
-    add_index :cities, :zip
-    add_index :cities, :country_id
-    add_index :cities, :province_id
-    add_index :cities, :gid,  :unique  => true
-    add_index :cities, :geom, :spatial => true
-    add_index :provinces, :name
-    add_index :provinces, :abbr
-    add_index :provinces, :country_id
-    add_index :provinces, :gid,  :unique => true
-    add_index :countries, :abbr, :unique => true
-    add_index :countries, :name, :unique => true
 
 
 == TODO/Problems

data/lib/geonames_local/models/mongodb.rb

@@ -18,7 +18,7 @@ module Geonames
       class << self
 
         def nations data, clean
-          Nation.delete_all # if clean
+          Nation.delete_all if clean
           data.each do |row|
             create Nation, parse_nation(row) rescue nil
           end
@@ -26,7 +26,7 @@ module Geonames
 
 
         def batch data, clean = false
-          [Region, City].each(&:delete_all) #if clean
+          [Region, City].each(&:delete_all) if clean
 
           @regions, @cities = data[:region], data[:city]
           @regions.each { |r| create Region, parse_region(r) }
@@ -81,8 +81,8 @@ module Geonames
             try += 1
             break if try > 7
           end
-
-          info s.inspect
+          # ---
+          # info s.inspect
           info "City: #{s.zip} | #{slug} - #{s.name} / #{region.try(:abbr)}"
           {
             name_translations: translate(s.name),

data/lib/geonames_local/models/postgis.rb

@@ -54,3 +54,41 @@ module Geonames
     #end
   end
 end
+
+
+#   === Migration
+
+# Default PG migration:
+
+#     create_table :cities do |t|
+#       t.references :country, :null => false
+#       t.references :province
+#       t.string  :name,   :null => false
+#       t.point   :geom,   :srid => 4326
+#       t.integer :gid, :zip
+#     end
+
+#     create_table :provinces do |t|
+#       t.references :country, :null => false
+#       t.string :name, :null => false
+#       t.string :abbr, :limit => 2, :null => false
+#       t.integer :gid
+#     end
+
+#     create_table :countries do |t|
+#       t.string :name, :limit => 30, :null => false
+#       t.string :abbr, :limit => 2,  :null => false
+#     end
+
+#     add_index :cities, :name
+#     add_index :cities, :zip
+#     add_index :cities, :country_id
+#     add_index :cities, :province_id
+#     add_index :cities, :gid,  :unique  => true
+#     add_index :cities, :geom, :spatial => true
+#     add_index :provinces, :name
+#     add_index :provinces, :abbr
+#     add_index :provinces, :country_id
+#     add_index :provinces, :gid,  :unique => true
+#     add_index :countries, :abbr, :unique => true
+#     add_index :countries, :name, :unique => true

data/lib/geonames_local/version.rb

@@ -1,3 +1,3 @@
 module Geonames
-  VERSION = '3.1.1'
+  VERSION = '3.1.3'
 end

data/spec/geonames_local/features/spot_spec.rb

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require "spec_helper"
 require "geo_ruby"
 
 describe Spot do
@@ -17,8 +17,8 @@ describe Spot do
       spot.code.should eql("6593")
     end
 
-    it "should parse province code" do
-      spot.province.should eql("2407500")
+    it "should parse region code" do
+      spot.region.should eql("2407500")
     end
 
     it "should parse name" do
@@ -36,8 +36,8 @@ describe Spot do
       spot.kind.should eql(:city)
     end
 
-    it "should parse spot country" do
-      spot.country.should eql("BR")
+    it "should parse spot nation" do
+      spot.nation.should eql("BR")
     end
 
     it "shuold parse timezone" do
@@ -72,8 +72,8 @@ describe Spot do
       spot.kind.should eql(:other)
     end
 
-    it "should parse spot country" do
-      spot.country.should eql("BR")
+    it "should parse spot nation" do
+      spot.nation.should eql("BR")
     end
 
     it "shuold parse timezone" do
@@ -86,12 +86,12 @@ describe Spot do
     end
   end
 
-  describe "Parsing Province" do
+  describe "Parsing Region" do
 
     let(: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) }
 
-    it "should be kind of province" do
-      spot.kind.should eql(:province)
+    it "should be kind of region" do
+      spot.kind.should eql(:region)
     end
 
     it "should parse geoid" do
@@ -103,8 +103,8 @@ describe Spot do
       spot.code.should be_empty
     end
 
-    it "should parse province code" do
-      spot.province.should eql("15")
+    it "should parse region code" do
+      spot.region.should eql("15")
     end
 
     it "should create abbr" do
@@ -151,12 +151,12 @@ describe Spot do
       spot.kind.should eql(:city)
     end
 
-    it "should parse country" do
-      spot.country.should eql("BR")
+    it "should parse nation" do
+      spot.nation.should eql("BR")
     end
 
-    it "should parse province" do
-      spot.province.should eql("06")
+    it "should parse region" do
+      spot.region.should eql("06")
     end
 
     it "should parse pop" do
@@ -193,13 +193,12 @@ describe Spot do
       spot.kind.should eql(:city)
     end
 
-    it "should parse country" do
-      spot.country.should eql("BR")
+    it "should parse nation" do
+      spot.nation.should eql("BR")
     end
 
-    it "should parse province" do
-      pending
-      spot.province.should eql("18")
+    it "should parse region" do
+      spot.region.should eql("18")
     end
 
     it "should parse pop" do
@@ -211,10 +210,10 @@ describe Spot do
 
   describe "Parsing Zip" do
 
-    let(:spot) { Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t\t-14.7574\t-49.3596\t\n", :zip) }
+    let(:spot) { Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t\t5209804\t29\t\t\t-14.7574\t-49.3596\t\n", :zip) }
 
     it "should parse zip oO" do
-      spot.zip.should eql("76375")
+      spot.zip.should eql("76375-000")
     end
 
     it "should be a city" do
@@ -246,7 +245,7 @@ describe Spot do
 
   describe "From Hash" do
 
-    let(:spot) { Spot.from_hash({"id" => 9, "name" => "Sao Rock", "geom" => [15,15], "kind" => "city", "country" => "BR", "gid" => 13232, "tz" => "America/Foo", "ascii" => "Rock"}) }
+    let(:spot) { Spot.from_hash({"id" => 9, "name" => "Sao Rock", "geom" => [15,15], "kind" => "city", "nation" => "BR", "gid" => 13232, "tz" => "America/Foo", "ascii" => "Rock"}) }
 
     it "should be an spot" do
       spot.should be_instance_of Spot
@@ -269,8 +268,8 @@ describe Spot do
       spot.ascii.should eql("Rock")
     end
 
-    it "should set the country abbr" do
-      spot.country.should eql("BR")
+    it "should set the nation abbr" do
+      spot.nation.should eql("BR")
     end
 
   end

data/spec/geonames_local/models/mongodb_spec.rb

@@ -1,42 +1,152 @@
 # -*- coding: utf-8 -*-
-require File.dirname(__FILE__) + '/../../spec_helper'
+require "spec_helper"
 
-require 'geonames_local/models/mongodb'
-include Models::Mongo
+# require 'geonames_local/models/mongodb'
+# include Models::Mongo
 
-describe "City" do
+# describe "City" do
 
-  # before(:all) do
-  #   Models::Mongo::City.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
-  #   Models::Mongo::City.insert("cities", {"id" => 66, "name" => "Rock City", "geom" => [2,3]})
-  # end
+#   # before(:all) do
+#   #   Models::Mongo::City.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
+#   #   Models::Mongo::City.insert("cities", {"id" => 66, "name" => "Rock City", "geom" => [2,3]})
+#   # end
 
-  after(:all) do
-    Mongodb.new({:dbname => "geonames_test"}).purge
-  end
+#   after(:all) do
+#     Mongodb.new({:dbname => "geonames_test"}).purge
+#   end
 
-  it "should set a collection name" do
-    City.collection.should eql("cities")
-  end
+#   it "should set a collection name" do
+#     City.collection.should eql("cities")
+#   end
 
-  it "should find all cities" do
-    Models::Mongo::City.all.should_not be_empty
-  end
+#   it "should find all cities" do
+#     Models::Mongo::City.all.should_not be_empty
+#   end
 
-  it "should be a city instance" do
-    Models::Mongo::City.nearest(1,1).should be_instance_of(Models::Mongo::City)
-  end
+#   it "should be a city instance" do
+#     Models::Mongo::City.nearest(1,1).should be_instance_of(Models::Mongo::City)
+#   end
 
-  it "should find city nearest point" do
-    Models::Mongo::City.nearest(1,1).name.should eql("Rock City")
-  end
+#   it "should find city nearest point" do
+#     Models::Mongo::City.nearest(1,1).name.should eql("Rock City")
+#   end
 
-  it "should find by name" do
-    Models::Mongo::City.find_by_name("Rock")[0].name.should eql("Rock City")
-  end
+#   it "should find by name" do
+#     Models::Mongo::City.find_by_name("Rock")[0].name.should eql("Rock City")
+#   end
 
-  it "should find by name" do
-    City.find_by_name("rock").first.name.should eql("Rock City")
-  end
+#   it "should find by name" do
+#     City.find_by_name("rock").first.name.should eql("Rock City")
+#   end
 
-end
+# end
+# require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+# require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/mongodb')
+
+# describe "Mongo Models" do
+
+#   SPECDB = "geonames_spec"
+
+#   before() do
+#     Mongodb.new({:dbname => SPECDB}).purge
+#     @mong = Mongodb.new({:dbname => SPECDB})
+
+#   end
+
+#   def mock_spot(name)
+#     Spot.new("1\t#{name}\t#{name}\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
+
+#   describe "Parsing dump" do
+#     before do
+#       @mock_spot = mock("Spot")
+#     end
+
+#     it "should find all" do
+#      @mong.all("cities").each { |c| p c["geom"]} #should eql([])
+#     end
+
+#     it "should store something" do
+#       @mock_spot.should_receive(:to_hash).and_return({"id" => 7, "name" => "Sao Tome", "geom" => [5,5]})
+#       @mong.insert("cities", @mock_spot)
+#       @mong.count("cities").should eql(1)
+#     end
+
+#     it "should store a spot" do
+#       @mong.insert("cities", mock_spot("Loco"))
+#       @mong.find("cities", 1)["name"].should eql("Loco")
+#     end
+
+#     it "should store geom with sinusoidal projection" do
+#       @mock_spot.should_receive(:to_hash).and_return({"id" => 8, "name" => "Sao Tome", "geom" => [5,8]})
+#       @mong.insert("cities", @mock_spot)
+#       @mong.find("cities", 8)["geom"][0].should be_within(0.01).of(4.95)
+#       @mong.find("cities", 8)["geom"][1].should eql(8)
+#     end
+
+#     it "should have some indexes" do
+#       @mong.index_info("cities").to_a.length.should eql(3)
+#     end
+
+#     describe "Finds" do
+
+#       before() do
+#         @mong.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
+#         @mong.insert("cities", {"id" => 10, "name" => "Sao Tome", "geom" => [-7,-34]})
+#         @mong.insert("cities", {"id" => 11, "name" => "Sao Benedito", "geom" => [-9,-39]})
+#       end
+
+#       it "should make sure it's on the collection" do
+#         @mong.count("cities").should eql(3)
+#       end
+
+#       it "should find geo" do
+#         @mong.find_near("cities", -5, -35).first["name"].should eql("Sao Tome")
+#         @mong.find_near("cities", -5, -35).first["geom"][0].should be_within(0.1).of(-5.80,)
+#         @mong.find_near("cities", -5, -35).first["geom"][1].should eql(-34)
+#       end
+
+#       it "should find geo limited" do
+#         @mong.find_near("cities", -5, -35, 1).length.should eql(1)
+#       end
+
+#       it "should find within box" do
+#         @mong.find_within("cities", [[10, 10],[20, 20]]).length.should eql(1)
+#         @mong.find_within("cities", [[10, 10],[20, 20]]).first["name"].should eql("Sao Paulo")
+#       end
+
+#       it "should find within tiny radius" do
+#         @mong.find_within("cities", [[-6, -36], 2]).length.should eql(0)
+#       end
+
+#       it "should find within radius" do
+#         @mong.find_within("cities", [[-6, -36], 3]).length.should eql(1)
+#       end
+
+#       it "should find within wider radius" do
+#         @mong.find_within("cities", [[-6, -36], 5]).length.should eql(2)
+#       end
+
+#       it "should find within wider radius limited" do
+#         @mong.find_within("cities", [[-6, -36], 5], 1).length.should eql(1)
+#       end
+
+#       it "should find geoNear" do
+#         @mong.near("cities", -5, -35).first["dis"].should be_within(0.01).of(1.97)
+#         @mong.near("cities", -5, -35).first["obj"]["name"].should eql("Sao Tome")
+#       end
+
+#       it "should find geoNear" do
+#         @mong.near("cities", -5, -35).first["dis"].should be_within(0.01).of(1.97)
+#         @mong.near("cities", -5, -35).first["obj"]["name"].should eql("Sao Tome")
+#       end
+
+#       it "should find geoNear limited" do
+#         @mong.near("cities", -5, -35, 1).length.should eql(1)
+#       end
+
+#     end
+
+#   end
+
+# end

data/spec/geonames_local/models/postgis_spec.rb

@@ -11,31 +11,31 @@
 # end
 
 # def brasil
-#   Models::AR::Country.find_or_create_by_name(:name => "Brazil", :abbr => "BR")
+#   Models::AR::Nation.find_or_create_by_name(:name => "Brazil", :abbr => "BR")
 # end
 
-# describe "Country" do
+# describe "Nation" do
 
 #   it "should create countries" do
-#     Models::AR::Country.create(:name => "Chad", :abbr => "TD").should be_valid
+#     Models::AR::Nation.create(:name => "Chad", :abbr => "TD").should be_valid
 #   end
 
 #   it "should write to db" do
 #     lambda do
-#       Models::AR::Country.create(:name => "Itália", :abbr => "IT")
-#     end.should change(Models::AR::Country, :count).by(1)
+#       Models::AR::Nation.create(:name => "Itália", :abbr => "IT")
+#     end.should change(Models::AR::Nation, :count).by(1)
 #   end
 
 # end
 
-# describe "Province" do
+# describe "Region" do
 
 #   it "should be a class instance of ar" do
-#     Models::AR::Province.new.should be_instance_of Models::AR::Province
+#     Models::AR::Region.new.should be_instance_of Models::AR::Region
 #   end
 
 #   it "should create" do
-#     Models::AR::Province.create(:name => "Chadland", :country => brasil).should be_valid
+#     Models::AR::Region.create(:name => "Chadland", :nation => brasil).should be_valid
 #   end
 # end
 
@@ -46,7 +46,7 @@
 #   end
 
 #   it "should create" do
-#     Models::AR::City.create(:name => "Chadland", :country => brasil).should be_valid
+#     Models::AR::City.create(:name => "Chadland", :nation => brasil).should be_valid
 #   end
 # end
 # #  DatabaseCleaner.clean
@@ -56,8 +56,8 @@
 #   before do
 #  #   DatabaseCleaner.clean
 #     @br ||= brasil
-#     Models::AR::City.create!("name" => "São Tomé", "geom" => [15,15], :country => @br)
-#     Models::AR::City.create!("name" => "Rock CIty", "geom" => [18,16], :country => @br)
+#     Models::AR::City.create!("name" => "São Tomé", "geom" => [15,15], :nation => @br)
+#     Models::AR::City.create!("name" => "Rock CIty", "geom" => [18,16], :nation => @br)
 #   end
 
 #   it "should record" do

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

@@ -20,9 +20,9 @@ describe "Tokyo" do
 #   end
 
 #   it "should return all countries" do
-#     all = Geonames::Country.all
+#     all = Geonames::Nation.all
 #     all.should be_instance_of Array
-#     all[0].should be_instance_of Geonames::Country
+#     all[0].should be_instance_of Geonames::Nation
 #     all[0].gid.should eql(1)
 #   end
 

data/spec/spec_ar_helper.rb

@@ -43,13 +43,13 @@
 
 #   create_table :cities, :force => true  do |t|
 #     t.references :country, :null => false
-#     t.references :province
+#     t.references :region
 #     t.string  :name, :null => false
 #     t.point   :geom,   :srid => 4326
 #     t.integer :gid, :zip
 #   end
 
-#   create_table :provinces, :force => true do |t|
+#   create_table :regions, :force => true do |t|
 #     t.references :country, :null => false
 #     t.string :name, :null => false
 #     t.string :abbr, :limit => 3
@@ -65,12 +65,12 @@
 #   add_index :cities, :gid
 #   add_index :cities, :zip
 #   add_index :cities, :country_id
-#   add_index :cities, :province_id
+#   add_index :cities, :region_id
 #   add_index :cities, :geom, :spatial => true
-#   add_index :provinces, :name
-#   add_index :provinces, :abbr
-#   add_index :provinces, :gid
-#   add_index :provinces, :country_id
+#   add_index :regions, :name
+#   add_index :regions, :abbr
+#   add_index :regions, :gid
+#   add_index :regions, :country_id
 #   add_index :countries, :abbr, :unique => true
 #   add_index :countries, :name, :unique => true
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geonames_local
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.1.3
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-10-07 00:00:00.000000000 Z
 dependencies: []
 description: Dumps geonames data to feed a local db
 email: x@nofxx.com
@@ -19,8 +19,9 @@ extra_rdoc_files:
 - MIT-LICENSE
 - README.rdoc
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
+- Guardfile
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -43,9 +44,6 @@ files:
 - lib/geonames_local/models/postgis.rb
 - lib/geonames_local/models/tokyo.rb
 - lib/geonames_local/version.rb
-- spec/geonames_local/adapters/mongodb_spec.rb
-- spec/geonames_local/adapters/postgis_spec.rb
-- spec/geonames_local/adapters/tokyo_spec.rb
 - spec/geonames_local/cli_spec.rb
 - spec/geonames_local/data/cache_spec.rb
 - spec/geonames_local/data/dump_spec.rb
@@ -55,6 +53,7 @@ files:
 - spec/geonames_local/features/zone_spec.rb
 - spec/geonames_local/models/mongodb_spec.rb
 - spec/geonames_local/models/postgis_spec.rb
+- spec/geonames_local/models/tokyo_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec_ar_helper.rb
 - spec/spec_helper.rb
@@ -81,12 +80,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
@@ -96,9 +95,6 @@ signing_key:
 specification_version: 4
 summary: Dumps geonames data for local usage
 test_files:
-- spec/geonames_local/adapters/mongodb_spec.rb
-- spec/geonames_local/adapters/postgis_spec.rb
-- spec/geonames_local/adapters/tokyo_spec.rb
 - spec/geonames_local/cli_spec.rb
 - spec/geonames_local/data/cache_spec.rb
 - spec/geonames_local/data/dump_spec.rb
@@ -108,6 +104,7 @@ test_files:
 - spec/geonames_local/features/zone_spec.rb
 - spec/geonames_local/models/mongodb_spec.rb
 - spec/geonames_local/models/postgis_spec.rb
+- spec/geonames_local/models/tokyo_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec_ar_helper.rb
 - spec/spec_helper.rb

data/spec/geonames_local/adapters/mongodb_spec.rb

@@ -1,110 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/mongodb')
-
-describe "Mongo Models" do
-
-  SPECDB = "geonames_spec"
-
-  before() do
-    Mongodb.new({:dbname => SPECDB}).purge
-    @mong = Mongodb.new({:dbname => SPECDB})
-
-  end
-
-  def mock_spot(name)
-    Spot.new("1\t#{name}\t#{name}\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
-
-  describe "Parsing dump" do
-    before do
-      @mock_spot = mock("Spot")
-    end
-
-    it "should find all" do
-     @mong.all("cities").each { |c| p c["geom"]} #should eql([])
-    end
-
-    it "should store something" do
-      @mock_spot.should_receive(:to_hash).and_return({"id" => 7, "name" => "Sao Tome", "geom" => [5,5]})
-      @mong.insert("cities", @mock_spot)
-      @mong.count("cities").should eql(1)
-    end
-
-    it "should store a spot" do
-      @mong.insert("cities", mock_spot("Loco"))
-      @mong.find("cities", 1)["name"].should eql("Loco")
-    end
-
-    it "should store geom with sinusoidal projection" do
-      @mock_spot.should_receive(:to_hash).and_return({"id" => 8, "name" => "Sao Tome", "geom" => [5,8]})
-      @mong.insert("cities", @mock_spot)
-      @mong.find("cities", 8)["geom"][0].should be_within(0.01).of(4.95)
-      @mong.find("cities", 8)["geom"][1].should eql(8)
-    end
-
-    it "should have some indexes" do
-      @mong.index_info("cities").to_a.length.should eql(3)
-    end
-
-    describe "Finds" do
-
-      before() do
-        @mong.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
-        @mong.insert("cities", {"id" => 10, "name" => "Sao Tome", "geom" => [-7,-34]})
-        @mong.insert("cities", {"id" => 11, "name" => "Sao Benedito", "geom" => [-9,-39]})
-      end
-
-      it "should make sure it's on the collection" do
-        @mong.count("cities").should eql(3)
-      end
-
-      it "should find geo" do
-        @mong.find_near("cities", -5, -35).first["name"].should eql("Sao Tome")
-        @mong.find_near("cities", -5, -35).first["geom"][0].should be_within(0.1).of(-5.80,)
-        @mong.find_near("cities", -5, -35).first["geom"][1].should eql(-34)
-      end
-
-      it "should find geo limited" do
-        @mong.find_near("cities", -5, -35, 1).length.should eql(1)
-      end
-
-      it "should find within box" do
-        @mong.find_within("cities", [[10, 10],[20, 20]]).length.should eql(1)
-        @mong.find_within("cities", [[10, 10],[20, 20]]).first["name"].should eql("Sao Paulo")
-      end
-
-      it "should find within tiny radius" do
-        @mong.find_within("cities", [[-6, -36], 2]).length.should eql(0)
-      end
-
-      it "should find within radius" do
-        @mong.find_within("cities", [[-6, -36], 3]).length.should eql(1)
-      end
-
-      it "should find within wider radius" do
-        @mong.find_within("cities", [[-6, -36], 5]).length.should eql(2)
-      end
-
-      it "should find within wider radius limited" do
-        @mong.find_within("cities", [[-6, -36], 5], 1).length.should eql(1)
-      end
-
-      it "should find geoNear" do
-        @mong.near("cities", -5, -35).first["dis"].should be_within(0.01).of(1.97)
-        @mong.near("cities", -5, -35).first["obj"]["name"].should eql("Sao Tome")
-      end
-
-      it "should find geoNear" do
-        @mong.near("cities", -5, -35).first["dis"].should be_within(0.01).of(1.97)
-        @mong.near("cities", -5, -35).first["obj"]["name"].should eql("Sao Tome")
-      end
-
-      it "should find geoNear limited" do
-        @mong.near("cities", -5, -35, 1).length.should eql(1)
-      end
-
-    end
-
-  end
-
-end

data/spec/geonames_local/adapters/postgis_spec.rb

@@ -1,12 +0,0 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/postgis')
-
-describe Postgis do
-
-  def wipe_db
-  end
-
-  describe "Parsing Dump" do
-    # before(:all)
-  end
-end