geonames_local 3.3.0 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fdef4304a7290c1a586d7e9b437153021bbc6b37
-  data.tar.gz: 41eb2353c1e671d5e6986922221aed29563eb5d5
+  metadata.gz: c788cde1271fbcde5596ca18134547b68ebe2488
+  data.tar.gz: 983752fea10114e374c21e75e23b5e21808c31fe
 SHA512:
-  metadata.gz: 01b20afbb5e96032c2882dde15dbc7025e77bd39a50884b6f54f4bf8acc4981273e715eeb472f39cf1db1f4d0c437f8dad4c07640d4506f10042d9024c643ed7
-  data.tar.gz: 5f194b2ddc720aa9fdaeb6ef3fd155c52933dba1bd3b9abda4a3c48fca37af590e398144a0e515f13c69112656468f60855b397f64f87bc663fd3cb34e51d98f
+  metadata.gz: a7a08a957601e2663126bd6fe7c5021b46b6527e0e15a1549e8b6971b5ad688443f82c73aad92ba44e93f4e48567a6034a108c742c24d92bb472af2fb92ee369
+  data.tar.gz: eb7b597058aa178b5e8f28f1d565a9b586dd7099d3b6675b3d32bc99ca45c1fc13d2b7f3020b532d5e12a7ae0af69f71af223e95cbb10b1ba13413a161f31204

data/README.md

@@ -11,7 +11,7 @@ Use
 
 Install where you want to populate the DB:
 
-  gem install geonames_local
+    gem install geonames_local
 
 
 You will also need in your system:
@@ -25,24 +25,30 @@ Config
 
 Create a config yml file:
 
-
-  geonames init
-
+    geonames init
 
 Will generate a "geonames.yml" file on your folder.
 The file is self explanatory.
 
-  geonames -c geonames.yml
+Geonames splits the nations/countries database from the rest, so:
+
+
+To populate the nations database for the first time use:
+
+    geonames -c geoconfig.yml nations
+
+
+Then you can run geonames to populate regions/cities...
+
+    geonames -c geonames.yml
 
 To run it. Use -v for verbose.
 
-If you are not sure your country/nation code, use:
 
-  geonames list <search>
+If you are not sure your country/nation code, use:
 
-To populate the nations database for the first time use:
+    geonames list <search>
 
-  geonames -c geoconfig.yml nations
 
 
 Adapters

data/bin/geonames

@@ -3,8 +3,8 @@
 # $KCODE = "u" # -Ku
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require "geonames_local"
-require "geonames_local/cli"
+require 'geonames_local'
+require 'geonames_local/cli'
 include Geonames
 
 Geonames::CLI.work(ARGV)

data/geonames_local.gemspec

@@ -25,8 +25,8 @@ Gem::Specification.new do |gem|
     "README.md"
   ]
 
-  gem.add_dependency('mongoid', ['>= 3.0.0'])
-  gem.add_dependency('geopolitical', ['>= 0.8.0'])
+  gem.add_dependency('mongoid', ['~> 3.1.0'])
+  gem.add_dependency('geopolitical', ['> 0.8.1'])
 
   gem.post_install_message = %q{
 Geonames Local

data/lib/geonames_local.rb

@@ -1,8 +1,6 @@
 #
 # Geonames Extension
 #
-$:.unshift(File.dirname(__FILE__)) unless
-  $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 # Require Libs
 require 'geonames_local/features/spot'

data/lib/geonames_local/cli.rb

@@ -11,32 +11,35 @@ require 'geonames_local/cli'
 
 
 module Geonames
+  #
+  # Command Line Interface for Geonames Local
+  #
+  #
   class CLI
     def self.parse_options(argv)
       options = {}
 
       argv.options do |opts|
-        opts.banner = "Geonames Command Line Usage\n\n    geonames <nation code(s)> <opts>\n\n\n"
-
-
-        opts.on("-l", "--level LEVEL", String, "The level of logging to report" ) { |level| options[:level] = level }
-        opts.on("-d", "--dump", "Dump DB before all" ) { options[:dump] = true }
-        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 "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("--nation NATION", String, "Use nation gid to import" ) { |s| options[:nation] = 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 }
-        opts.on("-V", "--version", "Show version") {  puts Geonames::VERSION;  exit }
-        opts.separator ""
+        opts.banner = 'Geonames Command Line Usage\n\n    geonames <nation code(s)> <opts>\n\n\n'
+
+        opts.on('-l', '--level LEVEL', String, 'The level of logging to report') { |level| options[:level] = level }
+        opts.on('-d', '--dump', 'Dump DB before all') { options[:dump] = true }
+        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 '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('--nation NATION', String, 'Use nation gid to import') { |s| options[:nation] = 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 }
+        opts.on('-V', '--version', 'Show version') {  puts Geonames::VERSION;  exit }
+        opts.separator ''
         begin
           opts.parse!
           if argv.empty? && !options[:config]
@@ -56,23 +59,26 @@ module Geonames
     class << self
 
       def load_config
+        info "Loading config file..."
         if Opt[:config]
           Opt.merge! YAML.load(File.read(Opt[:config]))
         else
           # Load config/geonames.yml if there's one
-          if File.exists?(cfg = File.join("config", "geonames.yml"))
+          if File.exists?(cfg = File.join('config', 'geonames.yml'))
             Opt.merge! YAML.load(File.read(cfg))
           else
-            raise
+            fail
           end
         end
       rescue
-        info "Cant't find config file"
+        info "Can't find config file"
         exit
       end
 
       # Ugly but works?
       def work(argv)
+        info "Geopolitical Local Start!"
+
         trap(:INT) { stop! }
         trap(:TERM) { stop! }
         Opt.merge! parse_options(argv)
@@ -90,7 +96,7 @@ module Geonames
         #
         if argv[0] =~ /list|codes/
           Codes.each do |key,val|
-            str = [val.values, key.to_s].join(" ").downcase
+            str = [val.values, key.to_s].join(' ').downcase
             if s = argv[1]
               next unless str =~ /#{s.downcase}/
             end
@@ -103,9 +109,9 @@ module Geonames
         # If arguments scaffold, config, write down yml.
         #
         if argv[0] =~ /scaff|conf|init/
-          fname = (argv[1] || "geonames") + ".yml"
+          fname = (argv[1] || 'geonames') + '.yml'
           if File.exist?(fname)
-            puts "File exists."
+            puts "File exists: #{fname}"
           else
             puts "Writing to #{fname}"
             `cp #{File.join(File.dirname(__FILE__), 'config', 'geonames.yml')} #{fname}`
@@ -116,7 +122,7 @@ module Geonames
         #
         # Require georuby optionally
         #
-        require "geo_ruby" if Opt[:mapping] && Opt[:mapping][:geom]
+        require 'geo_ruby' if Opt[:mapping] && Opt[:mapping][:geom]
 
         #
         # Load config if we got til here
@@ -142,7 +148,7 @@ module Geonames
             dump = Geonames::Dump.new(:all, :dump)
             info "\n---\nTotal #{dump.data.length} parsed."
 
-            info "Writing to nations DB"
+            info 'Writing to nations DB'
             Geonames::Models::MongoWrapper.nations dump.data, Opt[:clean]
 
             # Regions, Cities....
@@ -151,10 +157,10 @@ module Geonames
             dump = Geonames::Dump.new(Opt[:nations], :dump).data
             info "\n---\nTotal #{dump.size} parsed. #{zip.size} zips."
 
-            info "Join dump << zip"
+            info 'Join dump << zip'
             dump = unify!(dump, zip).group_by(&:kind)
 
-            info "Writing to DB..."
+            info 'Writing to DB...'
             Geonames::Models::MongoWrapper.batch dump, Opt[:clean]
             # info "Writing cities..."
             # Geonames::Models::City.from_batch dump[:city]
@@ -165,13 +171,13 @@ module Geonames
       def load_adapter(name)
         begin
           require "geonames_local/models/#{name}"
-          #  rescue LoadError
-          #   puts "Can't find adapter for #{name}"
-          #  stop!
+        rescue LoadError
+          info "Can't find adapter for #{name}"
+          stop!
         end
       end
 
-      def unify! dump, zip
+      def unify!(dump, zip)
         start = Time.now
         dump.map! do |spot|
           if other = zip.find { |d| d.code == spot.code }
@@ -181,16 +187,15 @@ module Geonames
             spot
           end
         end
-        info "Done. #{(Time.now-start).to_i}s"
+        info "Done. #{(Time.now - start).to_i}s"
         dump
       end
 
       def stop!
-        puts "Closing Geonames..."
+        puts 'Closing Geonames...'
         exit
       end
 
-
     end # class < self
 
   end # CLI

data/lib/geonames_local/data/dump.rb

@@ -76,13 +76,12 @@ module Geonames
           end
         end
         total = Time.now - start
-        info "#{red} #{@kind} entries parsed in #{total} sec (#{(red/total).to_i}/s)"
+        info "#{red} #{@kind} spots parsed #{total}s (#{(red / total).to_i}/s)"
       end
       rescue Errno::ENOENT => e
-      info "Failed to download #{file}, skipping."
+      info "Failed to download #{file}, skipping. #{e}"
     end
 
-
   end
 
 end

data/lib/geonames_local/features/spot.rb

@@ -1,4 +1,7 @@
 module Geonames
+  #
+  # Main Ruby Model for Geonames Spot Concept
+  #
   class Spot
     attr_accessor :gid, :name, :ascii, :lat, :lon, :nation, :kind,
                   :code,  :pop, :tz, :geom, :region, :zip, :abbr, :id
@@ -16,7 +19,7 @@ module Geonames
       return unless params.instance_of? String
       kind == :zip ? parse_zip(params) : parse(params)
       if @kind == :region
-        @name.gsub!(/Estado d\w\s/, "")
+        @name.gsub!(/Estado d\w\s/, '')
         @abbr = get_abbr
       end
     end
@@ -26,9 +29,9 @@ module Geonames
     # This works 75% of the time in brazil heh
     #
     def get_abbr
-      s = @name.split(" ")
+      s = @name.split(' ')
       if s.length > 1
-        [s[0][0].chr,s[-1][0].chr].map(&:upcase).join
+        [s[0][0].chr, s[-1][0].chr].map(&:upcase).join
       else
         s[0][0..1].upcase
       end
@@ -37,9 +40,9 @@ module Geonames
     #
     # Parse Geonames Dump Export
     #
-    def parse row
+    def parse(row)
       gid, @name, @ascii, @alternates, lat, lon, feat, kind,
-      @nation, cc2, @region, @code, adm3, adm4, @pop, @ele,
+      @nation, _cc2, @region, @code, _adm3, _adm4, @pop, @ele,
       @gtop, @tz, @up = row.split(/\t/)
 
       @gid = @geoname_id = gid.to_i
@@ -53,8 +56,8 @@ module Geonames
     # Parse Geonames Zip Export
     #
     def parse_zip(row)
-      nation, @zip, @name, a1, a1c, a2, @code, a3, a3c,
-      lat, lon, acc = row.split(/\t/)
+      _nation, @zip, @name, _a1, _a1c, _a2, @code, _a3, _a3c,
+      lat, lon, _acc = row.split(/\t/)
 
       @kind = :city
       parse_geom(lat, lon)
@@ -67,10 +70,10 @@ module Geonames
     def parse_geom(lat, lon)
       @lat, @lon = lat.to_f, lon.to_f
 
-      if defined?("GeoRuby")
+      if defined? GeoRuby
         @geom = GeoRuby::SimpleFeatures::Point.from_x_y(@lon, @lat)
       else
-        { :lat => @lat, :lon => @lon }
+        { lat: @lat, lon: @lon }
       end
     end
 
@@ -81,38 +84,35 @@ module Geonames
     #
     # Parse Time
     def updated_at
-      Time.utc(*@up.split("-"))
+      Time.utc(*@up.split('-'))
     end
 
     # Translate geonames ADMx to models
     def human_code(code)
       case code
-        when 'ADM1' then :region
-        when 'ADM2', 'ADM3', 'ADM4' then :city
+      when 'ADM1' then :region
+      when 'ADM2', 'ADM3', 'ADM4' then :city
       else :other
       end
     end
 
     class << self
 
-      def nearest(x,y)
-        from_hash(Adapter.find_near(@coll, x, y, 1)[0])
+      attr_accessor :collection
+
+      def nearest(x, y)
+        from_hash(Adapter.find_near(collection, x, y, 1)[0])
       end
 
       def from_hash(hsh)
-        spot = self.new
-        hsh.each { |key, val| spot.instance_variable_set("@"+key, val) }
+        spot = new
+        hsh.each { |key, val| spot.instance_variable_set("@#{key}", val) }
         spot.geom = GeoRuby::SimpleFeatures::Point.from_x_y(*spot.geom)
         spot
       end
 
-      def set_coll(name)
-        @coll = name
-      end
-
-      def collection
-        @coll
-      end
     end
+
   end
+
 end

data/lib/geonames_local/models/mongodb.rb

@@ -4,6 +4,7 @@ require 'geopolitical/helpers'
 
 Mongoid.configure do |config|
   #config.master = Mongo::Connection.new.db("symbolize_test")
+  info "Using Mongoid v#{Mongoid::VERSION}"
   info "Mongoid connecting to #{Opt[:db]}"
   config.connect_to(Opt[:db][:name])
 end
@@ -18,14 +19,6 @@ module Geonames
 
       class << self
 
-        def nations data, clean
-          Nation.delete_all if clean
-          data.each do |row|
-            create Nation, parse_nation(row) rescue nil
-          end
-        end
-
-
         def batch data, clean = false
           [Region, City].each(&:delete_all) if clean
 
@@ -35,7 +28,7 @@ module Geonames
         end
 
         def create klass, data
-          info "#{klass}.new #{data}"
+          # info "#{klass}.new #{data}"
           klass.create! data
         rescue => e
           warn "Prob com spot #{e} #{e.backtrace.join("\n")}"
@@ -47,6 +40,15 @@ module Geonames
           end
         end
 
+        #
+        # Parse Nations
+        #
+        def nations data, clean
+          Nation.delete_all if clean
+          data.each do |row|
+            create Nation, parse_nation(row) rescue nil
+          end
+        end
 
         def parse_nation row
           abbr, iso3, ison, fips, name, capital, area, pop, continent,
@@ -62,7 +64,9 @@ module Geonames
           }
         end
 
-
+        #
+        # Parse Regions
+        #
         def parse_region s
           nation = Nation.find_by(abbr: /#{s.nation}/i)
           info "Region: #{s.name} / #{s.abbr}"
@@ -73,7 +77,10 @@ module Geonames
           }
         end
 
-        def parse_city s
+        #
+        # Parse Cities
+        #
+        def parse_city(s)
           region = Region.find_by(code: s.region)
           slug = City.new(slug: s.ascii).slug
           attempt = slug.dup
@@ -95,8 +102,8 @@ module Geonames
         end
 
       end
-    end
 
+    end
 
     # class Nation < Geonames::Spot
 
@@ -105,7 +112,8 @@ module Geonames
     #   end
 
     #   def to_hash
-    #     { "gid" => @gid.to_s, "name" => @name, "kind" => "nation", "code" => @code}
+    #     { "gid" => @gid.to_s, "name" => @name,
+    #     "kind" => "nation", "code" => @code}
     #   end
 
     #   def export
@@ -117,8 +125,6 @@ module Geonames
     #   end
     # end
 
-
-
     # class Zip
     #   include Mongoid::Document
 

data/lib/geonames_local/version.rb

@@ -1,3 +1,3 @@
 module Geonames
-  VERSION = '3.3.0'
+  VERSION = '3.3.1'
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: geonames_local
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.1
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-08 00:00:00.000000000 Z
+date: 2013-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: geopolitical
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.1
 description: Dumps geonames data to feed a local db
 email: x@nofxx.com
 executables: