geonames_local 3.1.3 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c076a06bf13c93cdc9f86aa0a7b215f92fc148b
-  data.tar.gz: 01481b044838b7b3cde40de3ff0103ad7c932771
+  metadata.gz: fdef4304a7290c1a586d7e9b437153021bbc6b37
+  data.tar.gz: 41eb2353c1e671d5e6986922221aed29563eb5d5
 SHA512:
-  metadata.gz: 76f0ce5d8302588eedf7b05b25f2e1868169dc138c74e9618c8e16efe98a00f24bf085bfa8db0a049d4d1fe2cfa846c1981df5bcb58bf513f85f11c4919bbc64
-  data.tar.gz: df126c44103aaa93d2e20197c053894de6778622220f5031c2f399766342cd9351d27273a5d379ea98d4ed863daf011d219cc26636368f0f29ed4e10af360a37
+  metadata.gz: 01b20afbb5e96032c2882dde15dbc7025e77bd39a50884b6f54f4bf8acc4981273e715eeb472f39cf1db1f4d0c437f8dad4c07640d4506f10042d9024c643ed7
+  data.tar.gz: 5f194b2ddc720aa9fdaeb6ef3fd155c52933dba1bd3b9abda4a3c48fca37af590e398144a0e515f13c69112656468f60855b397f64f87bc663fd3cb34e51d98f

data/{README.rdoc → README.md}

@@ -1,11 +1,13 @@
-= Geonames Local
+Geonames Local
+==============
 
 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
+Use
+---
 
 Install where you want to populate the DB:
 
@@ -18,13 +20,13 @@ You will also need in your system:
 * curl
 
 
-=== Config YML
-
+Config
+------
 
 Create a config yml file:
 
 
-  geonames conf
+  geonames init
 
 
 Will generate a "geonames.yml" file on your folder.
@@ -43,7 +45,8 @@ To populate the nations database for the first time use:
   geonames -c geoconfig.yml nations
 
 
-== Mongoid
+Adapters
+--------
 
 So, supposing Mongoid, something like this is possible:
 
@@ -59,24 +62,7 @@ Be sure to use a database based on the PostGIS template.
 
 
 
-== TODO/Problems
+Next
+----
 
-- Local relational mapping of geonames data
-- Map geonames fields to your db scheme
-- Countries are a static yml file :/
 - IP Geonames? http://ipinfodb.com
-
-
-== Note on Patches/Pull Requests
-
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2009 Marcos Piccinini. See LICENSE for details.

data/geonames_local.gemspec

@@ -19,21 +19,22 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.summary = %q{Dumps geonames data for local usage}
 
+
   gem.extra_rdoc_files = [
     "MIT-LICENSE",
-    "README.rdoc"
+    "README.md"
   ]
 
+  gem.add_dependency('mongoid', ['>= 3.0.0'])
+  gem.add_dependency('geopolitical', ['>= 0.8.0'])
+
   gem.post_install_message = %q{
 Geonames Local
 --------------
 
-To use the adapter, install the corresponding gem:
-
-  PostgreSQL   =>   pg
-  MongoDB      =>   mongoid (optional: mongo_ext)
-  Tokyo        =>   tokyocabinet
+Use `geonames init` to create a config.yml file.
+Or `geonames -c config.yml` to run using a config file.
 
-Have fun because:
+Have fun!
 }
 end

data/lib/geonames_local/cli.rb

@@ -71,123 +71,128 @@ module Geonames
         exit
       end
 
-    # Ugly but works?
-    def work(argv)
-      trap(:INT) { stop! }
-      trap(:TERM) { stop! }
-      Opt.merge! parse_options(argv)
-      if Opt[:locales].nil? || Opt[:locales].empty?
-        Opt[:locales] = ['en']
-      end
-
-      load_config
+      # Ugly but works?
+      def work(argv)
+        trap(:INT) { stop! }
+        trap(:TERM) { stop! }
+        Opt.merge! parse_options(argv)
+        if Opt[:locales].nil? || Opt[:locales].empty?
+          Opt[:locales] = ['en']
+        end
 
-      if shp = Opt[:shp]
-        SHP.import(shp)
-        exit
-      end
+        if shp = Opt[:shp]
+          SHP.import(shp)
+          exit
+        end
 
-      #
-      # Return Codes and Exit
-      #
-      if argv[0] =~ /list|codes/
-         Codes.each do |key,val|
-          str = [val.values, key.to_s].join(" ").downcase
-          if s = argv[1]
-            next unless str =~ /#{s.downcase}/
+        #
+        # Return Codes and Exit
+        #
+        if argv[0] =~ /list|codes/
+          Codes.each do |key,val|
+            str = [val.values, key.to_s].join(" ").downcase
+            if s = argv[1]
+              next unless str =~ /#{s.downcase}/
+            end
+            puts "#{val[:en_us]}: #{key}"
           end
-          puts "#{val[:en_us]}: #{key}"
+          exit
         end
-        exit
-      end
 
-      #
-      # If arguments scaffold, config, write down yml.
-      #
-      if argv[0] =~ /scaff|conf/
-        fname = (argv[1] || "geonames") + ".yml"
-        if File.exist?(fname)
-          puts "File exists."
-        else
-          puts "Writing to #{fname}"
-          `cp #{File.join(File.dirname(__FILE__), 'config', 'geonames.yml')} #{fname}`
+        #
+        # If arguments scaffold, config, write down yml.
+        #
+        if argv[0] =~ /scaff|conf|init/
+          fname = (argv[1] || "geonames") + ".yml"
+          if File.exist?(fname)
+            puts "File exists."
+          else
+            puts "Writing to #{fname}"
+            `cp #{File.join(File.dirname(__FILE__), 'config', 'geonames.yml')} #{fname}`
+          end
+          exit
         end
-        exit
-      end
 
-      #
-      # Require georuby optionally
-      #
-      require "geo_ruby" if Opt[:mapping] && Opt[:mapping][:geom]
-
-      #
-      # Export Data as CSV or JSON
-      #
-      if argv[0] =~ /csv|json/
-        Geonames::Export.new(Nation.all).to_csv
-
-      #
-      # Do the magic! Import Geonames Data
-      #
-      else
-        load_adapter(Opt[:store])
-        info "Using adapter #{Opt[:store]}.."
-
-        # Nations
-        if Opt[:nations].empty? || argv[0] =~ /coun|nati/
-          info "\nPopulating 'nations' database..."
-          dump = Geonames::Dump.new(:all, :dump)
-          info "\n---\nTotal #{dump.data.length} parsed."
-
-          info "Writing to nations DB"
-          Geonames::Models::MongoWrapper.nations dump.data, Opt[:clean]
-
-        # Regions, Cities....
+        #
+        # Require georuby optionally
+        #
+        require "geo_ruby" if Opt[:mapping] && Opt[:mapping][:geom]
+
+        #
+        # Load config if we got til here
+        #
+        load_config
+
+        #
+        # Export Data as CSV or JSON
+        #
+        if argv[0] =~ /csv|json/
+          Geonames::Export.new(Nation.all).to_csv
+
+          #
+          # Do the magic! Import Geonames Data
+          #
         else
-          zip = Geonames::Dump.new(Opt[:nations], :zip).data
-          dump = Geonames::Dump.new(Opt[:nations], :dump).data
-          info "\n---\nTotal #{dump.size} parsed. #{zip.size} zips."
+          load_adapter(Opt[:store])
+          info "Using adapter #{Opt[:store]}.."
 
-          info "Join dump << zip"
-          dump = unify!(dump, zip).group_by(&:kind)
+          # Nations
+          if Opt[:nations].empty? || argv[0] =~ /coun|nati/
+            info "\nPopulating 'nations' database..."
+            dump = Geonames::Dump.new(:all, :dump)
+            info "\n---\nTotal #{dump.data.length} parsed."
 
-          info "Writing to DB..."
-          Geonames::Models::MongoWrapper.batch dump, Opt[:clean]
-          # info "Writing cities..."
-          # Geonames::Models::City.from_batch dump[:city]
+            info "Writing to nations DB"
+            Geonames::Models::MongoWrapper.nations dump.data, Opt[:clean]
+
+            # Regions, Cities....
+          else
+            zip = Geonames::Dump.new(Opt[:nations], :zip).data
+            dump = Geonames::Dump.new(Opt[:nations], :dump).data
+            info "\n---\nTotal #{dump.size} parsed. #{zip.size} zips."
+
+            info "Join dump << zip"
+            dump = unify!(dump, zip).group_by(&:kind)
+
+            info "Writing to DB..."
+            Geonames::Models::MongoWrapper.batch dump, Opt[:clean]
+            # info "Writing cities..."
+            # Geonames::Models::City.from_batch dump[:city]
+          end
         end
       end
-    end
 
-    def load_adapter(name)
-      begin
-        require "geonames_local/models/#{name}"
-    #  rescue LoadError
-     #   puts "Can't find adapter for #{name}"
-      #  stop!
+      def load_adapter(name)
+        begin
+          require "geonames_local/models/#{name}"
+          #  rescue LoadError
+          #   puts "Can't find adapter for #{name}"
+          #  stop!
+        end
       end
-    end
 
-    def unify! dump, zip
-      start = Time.now
-      dump.map! do |spot|
-        if other = zip.find { |d| d.code == spot.code }
-          spot.zip = other.zip
-          spot
-        else
-          spot
+      def unify! dump, zip
+        start = Time.now
+        dump.map! do |spot|
+          if other = zip.find { |d| d.code == spot.code }
+            spot.zip = other.zip
+            spot
+          else
+            spot
+          end
         end
+        info "Done. #{(Time.now-start).to_i}s"
+        dump
       end
-      info "Done. #{(Time.now-start).to_i}s"
-      dump
-    end
 
-    def stop!
-      puts "Closing Geonames..."
-      exit
-    end
-    end
+      def stop!
+        puts "Closing Geonames..."
+        exit
+      end
+
+
+    end # class < self
 
-  end
+  end # CLI
 
-end
+end # Geonames

data/lib/geonames_local/config/geonames.yml

@@ -10,7 +10,7 @@
   :geom: true
 :db:
   :host: localhost
-  :dbname: geonames_local
+  :name: geonames_local
   # :user:
   # :password:
   # :purge: false

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 "Mongoid connecting to #{Opt[:db]}"
   config.connect_to(Opt[:db][:name])
 end
 
@@ -34,9 +35,10 @@ module Geonames
         end
 
         def create klass, data
+          info "#{klass}.new #{data}"
           klass.create! data
         rescue => e
-          info "Prob com spot #{klass}, #{data} #{e}"
+          warn "Prob com spot #{e} #{e.backtrace.join("\n")}"
         end
 
         def translate txt

data/lib/geonames_local/version.rb

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

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: geonames_local
 version: !ruby/object:Gem::Version
-  version: 3.1.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Marcos Piccinini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-07 00:00:00.000000000 Z
-dependencies: []
+date: 2013-10-08 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
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: geopolitical
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 description: Dumps geonames data to feed a local db
 email: x@nofxx.com
 executables:
@@ -17,13 +45,13 @@ executables:
 extensions: []
 extra_rdoc_files:
 - MIT-LICENSE
-- README.rdoc
+- README.md
 files:
 - ".gitignore"
 - Gemfile
 - Guardfile
 - MIT-LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - bin/geonames
 - geonames.yml
@@ -68,13 +96,10 @@ post_install_message: |2
   Geonames Local
   --------------
 
-  To use the adapter, install the corresponding gem:
+  Use `geonames init` to create a config.yml file.
+  Or `geonames -c config.yml` to run using a config file.
 
-    PostgreSQL   =>   pg
-    MongoDB      =>   mongoid (optional: mongo_ext)
-    Tokyo        =>   tokyocabinet
-
-  Have fun because:
+  Have fun!
 rdoc_options: []
 require_paths:
 - lib