geonames_local 0.3.1 → 0.5.0

data/spec/geonames_local/models/ar_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/{mongo/city_spec.rb → models/mongo_spec.rb}

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_mongo_helper')
 require "geo_ruby"
-include Geonames::Mongo
 
-describe City do
+describe "City" do
 
   before(:all) do
     Adapter.insert("cities", {"id" => 9, "name" => "Sao Paulo", "geom" => [15,15]})
@@ -15,26 +14,26 @@ describe City do
   end
 
   it "should set a collection name" do
-    City.collection.should eql("cities")
+    Models::Mongo::City.collection.should eql("cities")
   end
 
   it "should find all cities" do
-    City.all.should_not be_empty
+    Models::Mongo::City.all.should_not be_empty
   end
 
   it "should be a city instance" do
-    City.nearest(1,1).should be_instance_of(City)
+    Models::Mongo::City.nearest(1,1).should be_instance_of(Models::Mongo::City)
   end
 
   it "should find city nearest point" do
-    City.nearest(1,1).name.should eql("Rock City")
+    Models::Mongo::City.nearest(1,1).name.should eql("Rock City")
   end
 
   it "should find by name" do
-    City.find_by_name("Rock")[0].name.should eql("Rock City")
+    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")[0].name.should eql("Rock City")
+    Models::Mongo::City.find_by_name("rock")[0].name.should eql("Rock City")
   end
 end

data/spec/spec_ar_helper.rb

@@ -1,19 +1,38 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'spec'
-require 'spec/autorun'
+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
-ActiveRecord::Base.establish_connection({ :adapter => "postgresql",
-                                          :database => "geonames_ar",
-                                          :username => "postgres",
-                                          :password => "" })
 
-ActiveRecord::Schema.define() do
+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
@@ -21,35 +40,57 @@ ActiveRecord::Schema.define() do
     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 => 2, :null => false
-      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
+
+  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,10 +1,11 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'geonames_cli'
-require 'spec'
-require 'spec/autorun'
+require 'geonames_local'
+require 'rspec'
+require 'rspec/autorun'
 include Geonames
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
 end

data/spec/spec_mongo_helper.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'geonames_local'
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
+require 'rspec/autorun'
+include Geonames::Models

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 1
-  version: 0.3.1
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -03:00
+date: 2011-04-24 00:00:00 -03:00
 default_executable: geonames
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -58,7 +58,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -79,29 +78,27 @@ 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
 - lib/geonames_local/geonames.rb
-- lib/geonames_local/model/city.rb
-- lib/geonames_local/model/country.rb
-- lib/geonames_local/model/province.rb
-- lib/geonames_local/mongo/city.rb
-- lib/geonames_local/mongo/country.rb
-- lib/geonames_local/mongo/province.rb
+- lib/geonames_local/models/ar.rb
+- lib/geonames_local/models/mongo.rb
+- lib/geonames_local/models/tokyo.rb
 - spec/geonames_local/adapters/mongodb_spec.rb
 - spec/geonames_local/adapters/postgres_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
 - spec/geonames_local/data/shp_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/model/ar_spec.rb
-- spec/geonames_local/mongo/city_spec.rb
+- spec/geonames_local/models/ar_spec.rb
+- spec/geonames_local/models/mongo_spec.rb
 - spec/geonames_local_spec.rb
-- spec/spec.opts
 - spec/spec_ar_helper.rb
 - spec/spec_helper.rb
 - spec/spec_mongo_helper.rb
@@ -123,8 +120,8 @@ post_install_message: "\n\
   MongoDB 2D support is new, only mongo >= 1.3.3 mongodb gem >= 0.19.2\n\
   http://github.com/mongodb/mongo-ruby-driver\n\n\
   Have fun because:\n"
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -151,18 +148,19 @@ signing_key:
 specification_version: 3
 summary: Dump and feed a tokyo local geonames db
 test_files: 
-- spec/spec_ar_helper.rb
-- spec/spec_helper.rb
-- spec/geonames_local/data/shp_spec.rb
-- spec/geonames_local/data/cache_spec.rb
-- spec/geonames_local/model/ar_spec.rb
-- spec/geonames_local/mongo/city_spec.rb
-- spec/geonames_local/cli_spec.rb
+- spec/geonames_local/adapters/mongodb_spec.rb
 - spec/geonames_local/adapters/postgres_spec.rb
 - spec/geonames_local/adapters/tokyo_spec.rb
-- spec/geonames_local/adapters/mongodb_spec.rb
+- spec/geonames_local/cli_spec.rb
+- spec/geonames_local/data/cache_spec.rb
+- spec/geonames_local/data/dump_spec.rb
+- spec/geonames_local/data/shp_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/features/road_spec.rb
-- spec/spec_mongo_helper.rb
+- spec/geonames_local/models/ar_spec.rb
+- spec/geonames_local/models/mongo_spec.rb
 - spec/geonames_local_spec.rb
+- spec/spec_ar_helper.rb
+- spec/spec_helper.rb
+- spec/spec_mongo_helper.rb

data/.gitignore

@@ -1,28 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-*flymake.rb
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-*.tct
-*.pid
-*.log
-*.qgr
-*.lex
-shps

data/lib/geonames_local/model/city.rb

@@ -1,26 +0,0 @@
-module Geonames
-  module Model
-    class City < ActiveRecord::Base
-      attr_accessor :x, :y, :z
-
-      belongs_to :province
-      belongs_to :country
-
-      validates_presence_of :country
-      validates_presence_of :name
-
-      def abbr
-        province.try(:abbr) || country.abbr
-      end
-
-      # Instantiate self.geom as a Point
-      def validation
-        self.country ||= province.country
-        unless !@x || !@y || @x == "" || @y == ""
-          self.geom = Point.from_x_y(@x.to_f, @y.to_f)
-        end
-      end
-
-    end
-  end
-end

data/lib/geonames_local/model/province.rb

@@ -1,18 +0,0 @@
-module Geonames
-  class Province
-    attr_accessor :code, :name, :gid
-
-    def self.all
-      Tokyo.new.all({ :kind => "province" }).map do |c|
-        new(c)
-      end
-    end
-
-    def initialize(params)
-      @code = params["code"]
-      @name = params["name"]
-      @gid = params["gid"]
-    end
-
-  end
-end