geonames_local 1.0.0 → 2.0.0

data/lib/geonames_local/version.rb

@@ -1,3 +1,3 @@
 module Geonames
-  VERSION = '1.0.0'
+  VERSION = '2.0.0'
 end

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

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/postgres')
+require File.expand_path(File.dirname(__FILE__) + '/../../../lib/geonames_local/adapters/postgis')
 
-describe Postgres do
+describe Postgis do
 
   def wipe_db
   end

data/spec/geonames_local/features/spot_spec.rb

@@ -156,8 +156,7 @@ describe Spot do
     end
 
     it "should parse province" do
-      pending
-      spot.province.should eql("C")
+      spot.province.should eql("06")
     end
 
     it "should parse pop" do
@@ -200,7 +199,7 @@ describe Spot do
 
     it "should parse province" do
       pending
-      spot.province.should eql("C")
+      spot.province.should eql("18")
     end
 
     it "should parse pop" do
@@ -212,7 +211,7 @@ describe Spot do
 
   describe "Parsing Zip" do
 
-    let(:spot) { Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t-14.7574\t-49.3596\t\n", :zip) }
+    let(:spot) { Geonames::Spot.new("BR\t76375-000\tHidrolina\tGoias\t29\t\t5209804\t\t\t-14.7574\t-49.3596\t\n", :zip) }
 
     it "should parse zip oO" do
       spot.zip.should eql("76375")
@@ -223,7 +222,7 @@ describe Spot do
     end
 
     it "should parse code" do
-      spot.code.should eql("5209804")
+      spot.code.should eql("29")
     end
 
     it "should parse geoid integer" do
@@ -247,7 +246,7 @@ describe Spot do
 
   describe "From Hash" do
 
-    let(:spot) { Spot.from_hash({"id" => 9, "name" => "Sao Rock", "geom" => [15,15], "kind" => "cities", "country" => "BR", "gid" => 13232, "tz" => "America/Foo", "ascii" => "Rock"}) }
+    let(:spot) { Spot.from_hash({"id" => 9, "name" => "Sao Rock", "geom" => [15,15], "kind" => "city", "country" => "BR", "gid" => 13232, "tz" => "America/Foo", "ascii" => "Rock"}) }
 
     it "should be an spot" do
       spot.should be_instance_of Spot
@@ -302,4 +301,3 @@ end
 # "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/geonames_local/models/{mongo_spec.rb → mongodb_spec.rb}

@@ -1,20 +1,22 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_mongo_helper')
-require "geo_ruby"
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+require 'geonames_local/models/mongodb'
+include Models::Mongo
 
 describe "City" do
 
-  before(:all) do
-    Adapter.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
-    Adapter.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"}).purge
+    Mongodb.new({:dbname => "geonames_test"}).purge
   end
 
   it "should set a collection name" do
-    Models::Mongo::City.collection.should eql("cities")
+    City.collection.should eql("cities")
   end
 
   it "should find all cities" do
@@ -34,6 +36,7 @@ describe "City" do
   end
 
   it "should find by name" do
-    Models::Mongo::City.find_by_name("rock")[0].name.should eql("Rock City")
+    City.find_by_name("rock").first.name.should eql("Rock City")
   end
+
 end

data/spec/geonames_local/models/postgis_spec.rb

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+# require File.expand_path(File.dirname(__FILE__) + '/../../spec_ar_helper')
+# module Geonames
+#   module Models
+#     module AR
+#       class User < ActiveRecord::Base
+#         belongs_to :city
+#       end
+#     end
+#   end
+# end
+
+# def brasil
+#   Models::AR::Country.find_or_create_by_name(:name => "Brazil", :abbr => "BR")
+# end
+
+# describe "Country" do
+
+#   it "should create countries" do
+#     Models::AR::Country.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)
+#   end
+
+# end
+
+# describe "Province" do
+
+#   it "should be a class instance of ar" do
+#     Models::AR::Province.new.should be_instance_of Models::AR::Province
+#   end
+
+#   it "should create" do
+#     Models::AR::Province.create(:name => "Chadland", :country => brasil).should be_valid
+#   end
+# end
+
+# describe "City" do
+
+#   it "should be a class instance of ar" do
+#     Models::AR::City.new.should be_instance_of Models::AR::City
+#   end
+
+#   it "should create" do
+#     Models::AR::City.create(:name => "Chadland", :country => brasil).should be_valid
+#   end
+# end
+# #  DatabaseCleaner.clean
+
+# describe "Active Record Stuff" do
+
+#   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)
+#   end
+
+#   it "should record" do
+#     Models::AR::City.count.should eql(2)
+#   end
+
+#   it "should create" do
+#     user = Models::AR::User.new(:name => "Defendor")
+#     user.city = Models::AR::City.first
+#     user.save
+#     Models::AR::User.first.city.name.should eql("São Tomé")
+#   end
+# end

data/spec/geonames_local_spec.rb

@@ -2,6 +2,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Geonames do
+
   it "should have a cache" do
     Cache.should be_instance_of(Hash)
   end

data/spec/spec_ar_helper.rb

@@ -1,96 +1,96 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rspec'
-require 'rspec/autorun'
-require 'active_record'
-require 'postgis_adapter'
-require 'database_cleaner'
-Opt[:db] = { :adapter => "postgresql",
-                                          :database => "geonames_ar",
-                                          :username => "postgres",
-                                          :password => "" }
-require 'geonames_ar'
-include Geonames::Models
-
- # DatabaseCleaner.strategy = :truncation
-
-ActiveRecord::Base.logger = $logger
-
-begin
-  ActiveRecord::Base.establish_connection(Opt[:db])
-  ActiveRecord::Migration.verbose = false
-  PG_VERSION = ActiveRecord::Base.connection.select_value("SELECT version()").scan(/PostgreSQL ([\d\.]*)/)[0][0]
-
-  puts "Running against PostgreSQL #{PG_VERSION}"
-
-rescue PGError
-  puts "Test DB not found, creating one for you..."
-  `createdb -U postgres geonames_ar -T template_postgis`
-  puts "Done. Please run spec again."
-  exit
-end
-
-
-
-ActiveRecord::Schema.define() do
-
-  create_table :users, :force => true do |t|
-    t.string              :name, :nick, :limit => 100
-    t.string              :email
-    t.integer             :code
-    t.references          :city
-  end
-
-  create_table :cities, :force => true  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, :force => true do |t|
-    t.references :country, :null => false
-    t.string :name, :null => false
-    t.string :abbr, :limit => 3
-    t.integer :gid
-  end
-
-  create_table :countries, :force => true do |t|
-    t.string :name, :limit => 30, :null => false
-    t.string :abbr, :limit => 2,  :null => false
-  end
-
-  add_index :cities, :name
-  add_index :cities, :gid
-  add_index :cities, :zip
-  add_index :cities, :country_id
-  add_index :cities, :province_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 :countries, :abbr, :unique => true
-  add_index :countries, :name, :unique => true
-
-end
-
-RSpec.configure do |c|
-
-  c.before(:suite) do
-    DatabaseCleaner.strategy = :transaction
-    DatabaseCleaner.clean_with(:truncation,
-    {:except => %w[geography_columns schema_migrations spatial_ref_sys geometry_columns]})
-  end
-
-  c.before(:each) do
-    DatabaseCleaner.start
-  end
-
-  c.after(:each) do
-    DatabaseCleaner.clean
-  end
-
-
-end
+# $LOAD_PATH.unshift(File.dirname(__FILE__))
+# $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+# require 'rspec'
+# require 'rspec/autorun'
+# require 'active_record'
+# require 'postgis_adapter'
+# require 'database_cleaner'
+# Opt[:db] = { :adapter => "postgresql",
+#                                           :database => "geonames_ar",
+#                                           :username => "postgres",
+#                                           :password => "" }
+# require 'geonames_ar'
+# include Geonames::Models
+
+#  # DatabaseCleaner.strategy = :truncation
+
+# ActiveRecord::Base.logger = $logger
+
+# begin
+#   ActiveRecord::Base.establish_connection(Opt[:db])
+#   ActiveRecord::Migration.verbose = false
+#   PG_VERSION = ActiveRecord::Base.connection.select_value("SELECT version()").scan(/PostgreSQL ([\d\.]*)/)[0][0]
+
+#   puts "Running against PostgreSQL #{PG_VERSION}"
+
+# rescue PGError
+#   puts "Test DB not found, creating one for you..."
+#   `createdb -U postgres geonames_ar -T template_postgis`
+#   puts "Done. Please run spec again."
+#   exit
+# end
+
+
+
+# ActiveRecord::Schema.define() do
+
+#   create_table :users, :force => true do |t|
+#     t.string              :name, :nick, :limit => 100
+#     t.string              :email
+#     t.integer             :code
+#     t.references          :city
+#   end
+
+#   create_table :cities, :force => true  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, :force => true do |t|
+#     t.references :country, :null => false
+#     t.string :name, :null => false
+#     t.string :abbr, :limit => 3
+#     t.integer :gid
+#   end
+
+#   create_table :countries, :force => true do |t|
+#     t.string :name, :limit => 30, :null => false
+#     t.string :abbr, :limit => 2,  :null => false
+#   end
+
+#   add_index :cities, :name
+#   add_index :cities, :gid
+#   add_index :cities, :zip
+#   add_index :cities, :country_id
+#   add_index :cities, :province_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 :countries, :abbr, :unique => true
+#   add_index :countries, :name, :unique => true
+
+# end
+
+# RSpec.configure do |c|
+
+#   c.before(:suite) do
+#     DatabaseCleaner.strategy = :transaction
+#     DatabaseCleaner.clean_with(:truncation,
+#     {:except => %w[geography_columns schema_migrations spatial_ref_sys geometry_columns]})
+#   end
+
+#   c.before(:each) do
+#     DatabaseCleaner.start
+#   end
+
+#   c.after(:each) do
+#     DatabaseCleaner.clean
+#   end
+
+
+# end

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'geonames_cli'
 require 'geonames_local'
+require 'geonames_local/cli'
 require 'rspec'
 require 'rspec/autorun'
 include Geonames

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geonames_local
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: georuby
@@ -45,12 +45,7 @@ files:
 - bin/geonames
 - geonames.yml
 - geonames_local.gemspec
-- lib/geonames_ar.rb
-- lib/geonames_cli.rb
 - lib/geonames_local.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.sql
@@ -58,7 +53,6 @@ files:
 - lib/geonames_local/data/dump.rb
 - lib/geonames_local/data/export.rb
 - lib/geonames_local/data/shp.rb
-- lib/geonames_local/data/sync.rb
 - lib/geonames_local/features/road.rb
 - lib/geonames_local/features/spot.rb
 - lib/geonames_local/features/zone.rb
@@ -68,7 +62,7 @@ files:
 - lib/geonames_local/models/tokyo.rb
 - lib/geonames_local/version.rb
 - spec/geonames_local/adapters/mongodb_spec.rb
-- spec/geonames_local/adapters/postgres_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
@@ -77,12 +71,11 @@ files:
 - spec/geonames_local/features/road_spec.rb
 - spec/geonames_local/features/spot_spec.rb
 - spec/geonames_local/features/zone_spec.rb
-- spec/geonames_local/models/ar_spec.rb
-- spec/geonames_local/models/mongo_spec.rb
+- spec/geonames_local/models/mongodb_spec.rb
+- spec/geonames_local/models/postgis_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec_ar_helper.rb
 - spec/spec_helper.rb
-- spec/spec_mongo_helper.rb
 - task/benchmark.rb
 - task/benchmark_cabinet.rb
 homepage: http://github.com/nofxx/geonames_local
@@ -116,7 +109,7 @@ specification_version: 3
 summary: Dump and feed a tokyo local geonames db
 test_files:
 - spec/geonames_local/adapters/mongodb_spec.rb
-- spec/geonames_local/adapters/postgres_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
@@ -125,10 +118,9 @@ test_files:
 - spec/geonames_local/features/road_spec.rb
 - spec/geonames_local/features/spot_spec.rb
 - spec/geonames_local/features/zone_spec.rb
-- spec/geonames_local/models/ar_spec.rb
-- spec/geonames_local/models/mongo_spec.rb
+- spec/geonames_local/models/mongodb_spec.rb
+- spec/geonames_local/models/postgis_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec_ar_helper.rb
 - spec/spec_helper.rb
-- spec/spec_mongo_helper.rb
 has_rdoc: