geonames_local 0.3.0 → 0.3.1

data/README.rdoc

@@ -13,6 +13,7 @@ To use the adapter, install the corresponding gem:
   MongoDB      =>   mongodb (optional: mongo_ext)
   Tokyo        =>   tokyocabinet
 
+Don't forget to install *unzip* and *curl*.
 
 === PostgreSQL
 

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/bin/geonames

@@ -3,7 +3,7 @@ $VERBOSE = true # -w
 $KCODE = "u" # -Ku
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require "geonames_local"
+require "geonames_cli"
 include Geonames
 
 Geonames::CLI.work(ARGV)

data/geonames_local.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{geonames_local}
-  s.version = "0.3.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Marcos Piccinini"]
-  s.date = %q{2010-03-20}
+  s.date = %q{2010-09-14}
   s.default_executable = %q{geonames}
   s.description = %q{Dump and feed a tokyo cabinet for local geonames search}
   s.email = %q{x@nofxx.com}
@@ -28,7 +28,8 @@ Gem::Specification.new do |s|
      "bin/geonames",
      "geonames.yml",
      "geonames_local.gemspec",
-     "lib/geonames_ext.rb",
+     "lib/geonames_ar.rb",
+     "lib/geonames_cli.rb",
      "lib/geonames_local.rb",
      "lib/geonames_local/adapters/mongodb.rb",
      "lib/geonames_local/adapters/postgres.rb",
@@ -45,9 +46,11 @@ Gem::Specification.new do |s|
      "lib/geonames_local/features/zone.rb",
      "lib/geonames_local/geonames.rb",
      "lib/geonames_local/model/city.rb",
-     "lib/geonames_local/model/conn.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",
      "spec/geonames_local/adapters/mongodb_spec.rb",
      "spec/geonames_local/adapters/postgres_spec.rb",
      "spec/geonames_local/adapters/tokyo_spec.rb",
@@ -57,11 +60,13 @@ Gem::Specification.new do |s|
      "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/city_spec.rb",
+     "spec/geonames_local/model/ar_spec.rb",
+     "spec/geonames_local/mongo/city_spec.rb",
      "spec/geonames_local_spec.rb",
      "spec/spec.opts",
-     "spec/spec_ext_helper.rb",
+     "spec/spec_ar_helper.rb",
      "spec/spec_helper.rb",
+     "spec/spec_mongo_helper.rb",
      "task/benchmark.rb",
      "task/benchmark_cabinet.rb"
   ]
@@ -91,13 +96,15 @@ Have fun because:
 }
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Dump and feed a tokyo local geonames db}
   s.test_files = [
-    "spec/spec_helper.rb",
+    "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/city_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/postgres_spec.rb",
      "spec/geonames_local/adapters/tokyo_spec.rb",
@@ -105,15 +112,15 @@ Have fun because:
      "spec/geonames_local/features/spot_spec.rb",
      "spec/geonames_local/features/zone_spec.rb",
      "spec/geonames_local/features/road_spec.rb",
-     "spec/geonames_local_spec.rb",
-     "spec/spec_ext_helper.rb"
+     "spec/spec_mongo_helper.rb",
+     "spec/geonames_local_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
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<nofxx-georuby>, [">= 1.7.1"])
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
     else

data/lib/{geonames_ext.rb → geonames_ar.rb}

@@ -7,7 +7,6 @@ $:.unshift(File.dirname(__FILE__)) unless
 # Require Libs
 require 'geonames_local/geonames'
 
-require 'geonames_local/model/conn'
 require 'geonames_local/model/country'
 require 'geonames_local/model/province'
 require 'geonames_local/model/city'

data/lib/geonames_cli.rb

@@ -0,0 +1,13 @@
+#
+# Geonames Local
+#
+$:.unshift(File.dirname(__FILE__)) unless
+  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
+
+# Require CLI Stuff
+require 'geonames_local/geonames'
+require 'geonames_local/cli'
+require 'geonames_local/data/shp'
+require 'geonames_local/data/dump'
+require 'geonames_local/data/export'
+

data/lib/geonames_local.rb

@@ -1,13 +1,20 @@
 #
-# Geonames Local
+# Geonames Extension
 #
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
-# Require CLI Stuff
+# Require Libs
 require 'geonames_local/geonames'
-require 'geonames_local/cli'
-require 'geonames_local/data/shp'
-require 'geonames_local/data/dump'
-require 'geonames_local/data/export'
 
+require 'geonames_local/adapters/mongodb'
+
+module Geonames
+
+  Adapter = Geonames::Mongodb.new
+
+end
+
+require 'geonames_local/mongo/country'
+require 'geonames_local/mongo/province'
+require 'geonames_local/mongo/city'

data/lib/geonames_local/adapters/mongodb.rb

@@ -9,6 +9,9 @@ module Geonames
       host, port = params[:host] || "localhost", params[:port] || 27017
       @conn = Mongo::Connection.new(host, port)
       @db = @conn.db(params[:dbname] || "geonames")
+      if params[:user] || params[:password]
+        @db.authenticate(params[:user], params[:password])
+      end
       #purge
       setup
     end
@@ -16,7 +19,7 @@ module Geonames
     def setup
       for re in RESOURCES
         coll = @db.collection(re)
-        coll.create_index(["id", Mongo::ASCENDING], ["gid", Mongo::ASCENDING])
+        coll.create_index([["id", Mongo::ASCENDING], ["gid", Mongo::ASCENDING]])
 
         # Geometric index, more info:
         # http://www.mongodb.org/display/DOCS/Geospatial+Indexing
@@ -28,12 +31,16 @@ module Geonames
       @db.collection(resource.to_s).find().to_a
     end
 
+    def first(resource)
+      @db.collection(resource.to_s).find_one
+    end
+
     def find(resource, id, name=nil)
       @db.collection(resource.to_s).find_one("id" => id)
     end
 
     def find_by_name(resource, name)
-      do_find(resource, "name" => /#{name}/)
+      do_find(resource, "name" => /#{name}/i)
     end
 
     def find_by_zip(resource, zip)

data/lib/geonames_local/features/spot.rb

@@ -92,6 +92,10 @@ module Geonames
       Adapter.all(@coll)
     end
 
+    def first
+      from_hash(Adapter.first(@coll))
+    end
+
     def find(id)
       Adapter.find(@coll, id)
     end

data/lib/geonames_local/model/city.rb

@@ -1,7 +1,26 @@
-class City < Geonames::Spot
+module Geonames
+  module Model
+    class City < ActiveRecord::Base
+      attr_accessor :x, :y, :z
 
-  set_coll "cities"
+      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/mongo/city.rb

@@ -0,0 +1,7 @@
+module Geonames
+  module Mongo
+    class City < Geonames::Spot
+      set_coll "cities"
+    end
+  end
+end

data/lib/geonames_local/mongo/country.rb

@@ -0,0 +1,61 @@
+module Geonames
+  class Country
+    attr_accessor :code, :name, :gid, :iso, :capital, :pop
+
+    def self.all
+      Tokyo.new.all({ :kind => "country" }).map do |c|
+        new(c)
+      end
+    end
+
+    # [0] iso alpha2
+    # [1] iso alpha3
+    # [2] iso numeric
+    # [3] fips code
+    # [4] name
+    # [5] capital
+    # [6] areaInSqKm
+    # [7] population
+    # [8] continent
+    # [9] top level domain
+    # [10] Currency code
+    # [11] Currency name
+    # [12] Phone
+    # [13] Postal Code Format
+    # [14] Postal Code Regex
+    # [15] Languages
+    # [16] Geoname id
+    # [17] Neighbours
+    # [18] Equivalent Fips Code
+    #
+    def self.parse(row)
+      new(row)
+    end
+
+    def initialize(params)
+      parse(params)
+    end
+
+    def parse
+      @iso, @iso3, @ison, @fips, @name, @capital, @area, @pop, continent, tld,
+      currency, phone, postal, langs, gid, neighbours = row.split(/\t/)
+      @code = iso
+    end
+
+    def cities
+      # qry.addcond("country", TBDQRY::QSTREQ, @code)
+    end
+
+    def to_hash
+      { "gid" => @gid.to_s, "name" => @name, "kind" => "country", "code" => @code}
+    end
+
+    def export
+      [@gid, @code, @name]
+    end
+
+    def export_header
+      ["gid", "code", "name"]
+    end
+  end
+end

data/lib/geonames_local/mongo/province.rb

@@ -0,0 +1,18 @@
+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

data/spec/geonames_local/model/ar_spec.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_ar_helper')
+
+class User < ActiveRecord::Base
+  belongs_to :city
+end
+
+
+describe "Active Record Stuff" do
+
+
+  it "should create" do
+    user = User.new(:name => "Defendor")
+    user.city = City.first
+    p City.first
+    user.save
+    User.first.city.name.should eql("Sao Tome")
+  end
+end

data/spec/geonames_local/{model → mongo}/city_spec.rb

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_ext_helper')
+require File.expand_path(File.dirname(__FILE__) + '/../../spec_mongo_helper')
 require "geo_ruby"
+include Geonames::Mongo
 
 describe City do
 
@@ -32,4 +33,8 @@ describe City do
   it "should find by name" do
     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")
+  end
 end

data/spec/spec_ar_helper.rb

@@ -0,0 +1,55 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+require 'spec'
+require 'spec/autorun'
+require 'active_record'
+require 'postgis_adapter'
+require 'geonames_ar'
+
+ActiveRecord::Base.logger = $logger
+ActiveRecord::Base.establish_connection({ :adapter => "postgresql",
+                                          :database => "geonames_ar",
+                                          :username => "postgres",
+                                          :password => "" })
+
+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 => 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
+
+end

data/spec/spec_helper.rb

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

data/spec/{spec_ext_helper.rb → spec_mongo_helper.rb}

@@ -1,5 +1,5 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'geonames_ext'
+require 'geonames_local'
 require 'spec'
 require 'spec/autorun'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 3
-  - 0
-  version: 0.3.0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Marcos Piccinini
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-20 00:00:00 -03:00
+date: 2010-09-14 00:00:00 -03:00
 default_executable: geonames
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: nofxx-georuby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,6 +36,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -64,7 +66,8 @@ files:
 - bin/geonames
 - geonames.yml
 - geonames_local.gemspec
-- lib/geonames_ext.rb
+- lib/geonames_ar.rb
+- lib/geonames_cli.rb
 - lib/geonames_local.rb
 - lib/geonames_local/adapters/mongodb.rb
 - lib/geonames_local/adapters/postgres.rb
@@ -81,9 +84,11 @@ files:
 - lib/geonames_local/features/zone.rb
 - lib/geonames_local/geonames.rb
 - lib/geonames_local/model/city.rb
-- lib/geonames_local/model/conn.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
 - spec/geonames_local/adapters/mongodb_spec.rb
 - spec/geonames_local/adapters/postgres_spec.rb
 - spec/geonames_local/adapters/tokyo_spec.rb
@@ -93,46 +98,37 @@ 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/model/city_spec.rb
+- spec/geonames_local/model/ar_spec.rb
+- spec/geonames_local/mongo/city_spec.rb
 - spec/geonames_local_spec.rb
 - spec/spec.opts
-- spec/spec_ext_helper.rb
+- spec/spec_ar_helper.rb
 - spec/spec_helper.rb
+- spec/spec_mongo_helper.rb
 - task/benchmark.rb
 - task/benchmark_cabinet.rb
 has_rdoc: true
 homepage: http://github.com/nofxx/geonames_local
 licenses: []
 
-post_install_message: |
-  
-  Geonames Local
-  --------------
-  
-  To use the adapter, install the corresponding gem:
-  
-    PostgreSQL   =>   pg
-    MongoDB      =>   mongodb (optional: mongo_ext)
-    Tokyo        =>   tokyocabinet
-  
-  PostgreSQL
-  ----------
-  
-  Be sure to use a database based on the PostGIS template.
-  
-  MongoDB
-  -------
-  
-  MongoDB 2D support is new, only mongo >= 1.3.3 mongodb gem >= 0.19.2
-  http://github.com/mongodb/mongo-ruby-driver
-  
-  Have fun because:
-
+post_install_message: "\n\
+  Geonames Local\n\
+  --------------\n\n\
+  To use the adapter, install the corresponding gem:\n\n  PostgreSQL   =>   pg\n  MongoDB      =>   mongodb (optional: mongo_ext)\n  Tokyo        =>   tokyocabinet\n\n\
+  PostgreSQL\n\
+  ----------\n\n\
+  Be sure to use a database based on the PostGIS template.\n\n\
+  MongoDB\n\
+  -------\n\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
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -140,6 +136,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -149,15 +146,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 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/city_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/postgres_spec.rb
 - spec/geonames_local/adapters/tokyo_spec.rb
@@ -165,5 +164,5 @@ test_files:
 - 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_spec.rb
-- spec/spec_ext_helper.rb

data/lib/geonames_local/model/conn.rb

@@ -1,7 +0,0 @@
-require 'geonames_local/adapters/mongodb'
-
-module Geonames
-
-  Adapter = Geonames::Mongodb.new
-
-end