geonames_local 3.3.1 → 3.3.3

data/lib/geonames_local/geonames.rb

@@ -1,14 +1,10 @@
-require 'logger'
-require 'yaml'
-
 module Geonames
   Opt = {}
-  Cache = {:dump => [], :zip => [], :roads => [], :zones => []}
+  Cache = { dump: [], zip: [], roads: [], zones: [] }
   Codes = YAML.load(File.read(File.join(File.dirname(__FILE__), 'config', 'codes.yml')))
 
   def info(txt)
-    if Opt[:verbose]
-      puts(txt)
-    end
+    return unless Opt[:verbose]
+    puts(txt) # Logger.info...
   end
 end

data/lib/geonames_local/models/mongodb.rb

@@ -1,9 +1,13 @@
-require 'mongoid'
 require 'mongoid_geospatial'
-require 'geopolitical/helpers'
+require 'geopolitical'
+require 'geopolitical/../../app/models/concerns/geopolitocracy'
+require 'geopolitical/../../app/models/nation'
+require 'geopolitical/../../app/models/region'
+require 'geopolitical/../../app/models/city'
+require 'geopolitical/../../app/models/hood'
 
 Mongoid.configure do |config|
-  #config.master = Mongo::Connection.new.db("symbolize_test")
+  # 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])
@@ -11,46 +15,45 @@ end
 
 module Geonames
   module Models
-    require 'geopolitical/../../app/models/hood'
-    require 'geopolitical/../../app/models/city'
-    require 'geopolitical/../../app/models/region'
-    require 'geopolitical/../../app/models/nation'
     module MongoWrapper
-
       class << self
-
-        def batch data, clean = false
-          [Region, City].each(&:delete_all) if clean
-
+        def batch(data)
           @regions, @cities = data[:region], data[:city]
           @regions.each { |r| create Region, parse_region(r) }
           @cities.each  { |c| create City, parse_city(c) }
         end
 
-        def create klass, data
+        def clean
+          [Nation, Region, City].each(&:delete_all)
+        end
+
+        def create(klass, data)
           # info "#{klass}.new #{data}"
           klass.create! data
         rescue => e
           warn "Prob com spot #{e} #{e.backtrace.join("\n")}"
         end
 
-        def translate txt
+        def translate(txt)
           name_i18n = Opt[:locales].reduce({}) do |h, l|
-            h.merge({ l => txt })
+            h.merge(l => txt)
           end
         end
 
         #
         # Parse Nations
         #
-        def nations data, clean
-          Nation.delete_all if clean
+        def nations(data)
           data.each do |row|
             create Nation, parse_nation(row) rescue nil
           end
         end
 
-        def parse_nation row
+        def nations_populated?
+          Nation.count > 0
+        end
+
+        def parse_nation(row)
           abbr, iso3, ison, fips, name, capital, area, pop, continent,
           tld, cur_code, cur_name, phone, pos_code, pos_regex,
           langs, gid, neighbours = row.split(/\t/)
@@ -67,13 +70,13 @@ module Geonames
         #
         # Parse Regions
         #
-        def parse_region s
-          nation = Nation.find_by(abbr: /#{s.nation}/i)
-          info "Region: #{s.name} / #{s.abbr}"
+        def parse_region(r)
+          nation = Nation.find_by(abbr: /#{r.nation}/i)
+          info "Region: #{r.name} / #{r.abbr}"
           {
-            name_translations: translate(s.name),
-            gid: s.gid, abbr: s.abbr,
-            nation: nation, code: s.region
+            name_translations: translate(r.name),
+            gid: r.gid, abbr: r.abbr,
+            nation: nation, code: r.region
           }
         end
 
@@ -97,17 +100,14 @@ module Geonames
             name_translations: translate(s.name),
             slug: attempt, gid: s.gid, code: s.code,
             souls: s.pop, geom: [s.lon, s.lat],
-            region: region, abbr: region.abbr, zip: s.zip # tz
+            region: region, zip: s.zip # tz
           }
         end
-
       end
-
     end
 
     # class Nation < Geonames::Spot
 
-
     #   def parse row
     #   end
 
@@ -132,6 +132,5 @@ module Geonames
     #   belongs_to :city
 
     # end
-
   end
 end

data/lib/geonames_local/models/postgis.rb

@@ -1,61 +1,59 @@
 module Geonames
   module Models
-    #module Postgis
+    # module Postgis
 
-      class City < ActiveRecord::Base
-        attr_accessor :x, :y, :z
+    class City < ActiveRecord::Base
+      attr_accessor :x, :y, :z
 
-        belongs_to :region
-        belongs_to :nation
+      belongs_to :region
+      belongs_to :nation
 
-        validates_presence_of :nation
-        validates_presence_of :name
-        # validates_uniqueness_of :name, :scope => :region_id
+      validates_presence_of :nation
+      validates_presence_of :name
+      # validates_uniqueness_of :name, :scope => :region_id
 
-        def abbr
-          region.try(:abbr) || nation.abbr
-        end
+      def abbr
+        region.try(:abbr) || nation.abbr
+      end
 
-        def geom=(val)
-          self[:geom] = case val
-          when Array then Point.xy(*val)
-          else val
-          end
+      def geom=(val)
+        self[:geom] = case val
+        when Array then Point.xy(*val)
+        else val
         end
+      end
 
-        # Instantiate self.geom as a Point
-        def validation
-          self.nation ||= region.nation
-          unless !@x || !@y || @x == "" || @y == ""
-            self.geom = Point.from_x_y(@x.to_f, @y.to_f)
-          end
+      # Instantiate self.geom as a Point
+      def validation
+        self.nation ||= region.nation
+        unless !@x || !@y || @x == '' || @y == ''
+          self.geom = Point.from_x_y(@x.to_f, @y.to_f)
         end
       end
+    end
 
-      class Region < ActiveRecord::Base
-        has_many :cities
-        belongs_to :nation
-
-        validates_uniqueness_of :name, :abbr,  :scope => :nation_id
-      end
+    class Region < ActiveRecord::Base
+      has_many :cities
+      belongs_to :nation
 
-      class Nation < ActiveRecord::Base
-        has_many :regions
-        has_many :cities
-        validates_presence_of :name, :abbr
-        validates_uniqueness_of :name, :abbr
-      end
+      validates_uniqueness_of :name, :abbr,  scope: :nation_id
+    end
 
-      class Spot < ActiveRecord::Base
-        validates_presence_of :name
-      end
+    class Nation < ActiveRecord::Base
+      has_many :regions
+      has_many :cities
+      validates_presence_of :name, :abbr
+      validates_uniqueness_of :name, :abbr
+    end
 
+    class Spot < ActiveRecord::Base
+      validates_presence_of :name
+    end
 
-    #end
+    # end
   end
 end
 
-
 #   === Migration
 
 # Default PG migration:

data/lib/geonames_local/version.rb

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

data/lib/geonames_local.rb

@@ -1,6 +1,11 @@
 #
 # Geonames Extension
 #
+require 'geo_ruby'
+require 'geo_ruby/ewk'
+require 'geo_ruby/geojson'
+# require 'logger'
+require 'yaml'
 
 # Require Libs
 require 'geonames_local/features/spot'

data/spec/geonames_local/cli_spec.rb

@@ -3,9 +3,9 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 # Acceptance to go!
 describe CLI do
 
-  describe "Parsing Dump" do
+  describe 'Parsing Dump' do
 
-    it "should fetch zips" do
+    it 'should fetch zips' do
 
     end
     # before(:all)

data/spec/geonames_local/data/shp_spec.rb

@@ -2,20 +2,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe SHP do
 
-  Cache[:roads] = [Road.new([:name,:zone,:geom],"R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E6100000020000009561DC0DA22B47C0EAB12D03CEF237C0136058FE7C2B47C0DE54A4C2D8F237C0"),
-                   Road.new([:name,:zone,:geom],"R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E610000003000000136058FE7C2B47C0DE54A4C2D8F237C0094E7D20792B47C0CCB56801DAF237C0CDCAF6216F2B47C08F1B7E37DDF237C0"),
-                   Road.new([:name,:zone,:geom], "R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E610000003000000A0F99CBB5D2B47C07A8F334DD8F237C019C6DD205A2B47C008E8BE9CD9F237C009C38025572B47C00DA5F622DAF237C0"),
-                   Road.new([:name,:zone,:geom],"R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E61000000300000009C38025572B47C00DA5F622DAF237C0155454FD4A2B47C082397AFCDEF237C0FB213658382B47C053060E68E9F237C0")]
+  Cache[:roads] = [Road.new([:name, :zone, :geom], "R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E6100000020000009561DC0DA22B47C0EAB12D03CEF237C0136058FE7C2B47C0DE54A4C2D8F237C0"),
+                   Road.new([:name, :zone, :geom], "R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E610000003000000136058FE7C2B47C0DE54A4C2D8F237C0094E7D20792B47C0CCB56801DAF237C0CDCAF6216F2B47C08F1B7E37DDF237C0"),
+                   Road.new([:name, :zone, :geom], "R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E610000003000000A0F99CBB5D2B47C07A8F334DD8F237C019C6DD205A2B47C008E8BE9CD9F237C009C38025572B47C00DA5F622DAF237C0"),
+                   Road.new([:name, :zone, :geom], "R DOUTOR VITAL BRASIL\t\\N\t0105000020E6100000010000000102000020E61000000300000009C38025572B47C00DA5F622DAF237C0155454FD4A2B47C082397AFCDEF237C0FB213658382B47C053060E68E9F237C0")]
 
-  Opt[:type] = "road"
+  Opt[:type] = 'road'
 
-  it "should merge two records linestrings" do
+  it 'should merge two records linestrings' do
     pending
     @s = SHP.new(nil)
     r = @s.reduce!
-    r.length.should eql(1)
-    r[0].geom.as_hex_ewkb.should_not eql(Cache[:roads][0].geom.as_hex_ewkb)
+    expect(r.length).to eql(1)
+    expect(r[0].geom.as_hex_ewkb).not_to eql(Cache[:roads][0].geom.as_hex_ewkb)
   end
 
-
 end

data/spec/geonames_local/features/road_spec.rb

@@ -1,68 +1,65 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
-require "geo_ruby"
+require 'spec_helper'
 
 describe Road do
 
-  describe "Parsing Dump" do
+  describe 'Parsing Dump' do
 
     before do
       @road = Road.new([:zone, :name, :geom], "RIO COMPRIDO\tAV PAULO DE FRONTIN\t0105000020E6100000010000000102000020E61000000700000029A117E0C79A45C0D50B2027B3EE36C0782289C2C99A45C0ED188FFFC5EE36C0E6D342ABCA9A45C0AB8A7A7BD0EE36C00216B5BFCC9A45C07359511DDFEE36C0C489F290CE9A45C0DEA42096F7EE36C0453B2C65CD9A45C0DFCF664816EF36C04089595CCD9A45C00A220DA31AEF36C0")
     end
 
-    it "should parse zone" do
-      @road.zone.should eql("RIO COMPRIDO")
+    it 'should parse zone' do
+      expect(@road.zone).to eql('RIO COMPRIDO')
     end
 
-    it "should parse code" do
-      @road.name.should eql("AV PAULO DE FRONTIN")
+    it 'should parse code' do
+      expect(@road.name).to eql('AV PAULO DE FRONTIN')
     end
 
-    it "should parse kind" do
-      @road.kind.should eql(:avenue)
+    it 'should parse kind' do
+      expect(@road.kind).to eql(:avenue)
     end
 
-    it "should parse geom" do
-      @road.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiLineString)
+    it 'should parse geom' do
+      expect(@road.geom).to be_kind_of(GeoRuby::SimpleFeatures::MultiLineString)
     end
 
-    it "should have 1 geometry" do
-      @road.geom.should have(1).geometries
+    it 'should have 1 geometry' do
+      expect(@road.geom.size).to eq(1)
     end
 
-    it "should have 1 geometry linestring" do
+    it 'should have 1 geometry linestring' do
       geom = @road.geom.geometries[0]
-      geom.should be_kind_of(GeoRuby::SimpleFeatures::LineString)
+      expect(geom).to be_kind_of(GeoRuby::SimpleFeatures::LineString)
     end
 
-    it "should have 1 geometry linestring with n points" do
-      @road.geom.geometries[0].should have(7).points
+    it 'should have 1 geometry linestring with n points' do
+      expect(@road.geom.geometries[0].size).to eq(7)
     end
 
   end
 
-  describe "Another parse" do
+  describe 'Another parse' do
     before do
       @road = Road.new([:length, :name, :null, :null, :geom], "35.487\tMS-380\t2\t\N\t0105000020E6100000010000000102000020E6100000120000005A4B85AD49DC4BC0D9438EB3AE8736C04D5707662DDA4BC07FD132464F8336C05AF6FA9F8FD84BC0C43ACFACA97E36C07DAC68ABFED14BC0ADFF26E9687936C036ED20214BD04BC035B173E5557A36C0C115051259CD4BC0E4C9CF15617636C0429724EA1AC94BC04C0D087A5E7536C04C0FAB81C5C54BC0FD07B789257336C07FB8E40122BE4BC026F0474B218036C053A51A37ABBD4BC0E03173F8698036C0D642B66B34BD4BC0BC4E66A4B28036C0D696B79FBDBC4BC05337214FFB8036C01CA71ED346BC4BC043DCA3F8438136C07879EB05D0BB4BC0212EEEA08C8136C0B5131E3859BB4BC08F1D0048D58136C0A17BB669E2BA4BC0259BD9ED1D8236C007B7B49A6BBA4BC07D977A92668236C0BE2439F759B94BC0B67D375CCC8236C0")
     end
 
-    it "should parse code" do
-      @road.name.should eql("MS-380")
+    it 'should parse code' do
+      expect(@road.name).to eql('MS-380')
     end
 
-    it "should parse kind" do
-      @road.kind.should eql(:road)
+    it 'should parse kind' do
+      expect(@road.kind).to eql(:road)
     end
 
-    it "should parse geom" do
-      @road.geom.should be_kind_of(GeoRuby::SimpleFeatures::MultiLineString)
+    it 'should parse geom' do
+      expect(@road.geom).to be_kind_of(GeoRuby::SimpleFeatures::MultiLineString)
     end
 
   end
 end
 
-
 # RIO COMPRIDO\tAV PAULO DE FRONTIN\t0105000020E6100000010000000102000020E61000000700000029A117E0C79A45C0D50B2027B3EE36C0782289C2C99A45C0ED188FFFC5EE36C0E6D342ABCA9A45C0AB8A7A7BD0EE36C00216B5BFCC9A45C07359511DDFEE36C0C489F290CE9A45C0DEA42096F7EE36C0453B2C65CD9A45C0DFCF664816EF36C04089595CCD9A45C00A220DA31AEF36C0
 # RIO COMPRIDO\tELEV ENG FREYSSINET\t0105000020E6100000010000000102000020E61000001600000029A117E0C79A45C0D50B2027B3EE36C0616EE6DEC39A45C03A36CF0E94EE36C0E8C4CE25C09A45C0C7CC5FA884EE36C06FC623BBAD9A45C0CC16549751EE36C0C886FA2AA99A45C03FFE37E23EEE36C0D8A69F2DA79A45C036DFE40921EE36C0C5B0C586A89A45C060E6BA0F0FEE36C0417340F4B29A45C0CCD0A07BB9ED36C0F28BB536B89A45C01F0BB3CE94ED36C038AED593BA9A45C0AD84B8EA77ED36C0C8D80C30BD9A45C0DB5E15A837ED36C0642CEC83C29A45C04E78D9AEA9EC36C01FF44297C79A45C08091F28337EC36C0D0C63FCECA9A45C0ACC190D2E7EB36C06160C265CC9A45C0F4BA5997ABEB36C0141C44A2D19A45C046DA3ABC0BEB36C00A5183F3D49A45C0A800B9F987EA36C08F84CC8CD69A45C078B5508D41EA36C0FDEFEEEDD49A45C06F668B46D8E936C06DF2C8EBD39A45C05C575FADBEE936C05718F576D39A45C0D31DF017B1E936C056E59516D29A45C0F9EE1635A7E936C0
 # GAMBOA\tTUN JOAO RICARDO\t0105000020E6100000010000000102000020E6100000060000008156E6D6F19845C06D89F7CECCE536C00A1B72A6CF9845C07AAC746217E636C016E1A9D1C99845C0A3B9AA0C24E636C0EE90F8C5C49845C047B01D022FE636C05F1D9379BB9845C0ADEA1C3443E636C0B146DDF6B19845C05FC1548D57E636C0
 # SANTO CRISTO\tVD S PEDRO E S PAULO\t0105000020E6100000010000000102000020E610000006000000AC45D194B79945C04409BB661DE636C0B49FF422B89945C081E6846525E636C022FF9BAC949945C031F0CFDF8FE636C0978E80ED8F9945C056113F209EE636C0AF1242F7879945C001FE5FA5B8E636C09AB3B4607D9945C0A38B9395DCE636C0
-