geopolitical 3.0.0 → 3.2.0

data/app/views/layouts/geopolitical.html.haml

@@ -1,20 +1,18 @@
 !!!
-%html{:lang => "en"}
+%html{lang: I18n.locale}
   %head
-    / Meta, title, CSS, favicons, etc.
-    %meta{:charset => "utf-8"}/
-    %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}/
-    %meta{:content => "", :name => "description"}/
-    %meta{:content => "", :name => "author"}/
-
-    %title Geopolitical
-    / Baccafe core CSS
-    = stylesheet_link_tag    "geopolitical/application", media: "all"
-    = javascript_include_tag "geopolitical/application"
+    %meta{charset: 'utf-8'}/
+    %meta{content: 'width=device-width, initial-scale=1.0', name: 'viewport'}/
+    %title= t('geopolitical.title')
+    = stylesheet_link_tag 'geopolitical/application', media: 'all'
+    = javascript_include_tag 'geopolitical/application'
     = csrf_meta_tags
-    //%link{:href => image_path("favicon.png?v=111119"), :rel => "shortcut icon"}/
   %body
-    - [Nation, Region, City, Hood].each do |klass|
-      = link_to klass.model_name.human.pluralize, send("#{klass.to_s.downcase.pluralize}_path")
-
+    %nav
+      - [Nation, Region, City, Hood].each do |klass|
+        = link_to klass.model_name.human(count: 2), send("#{klass.to_s.downcase.pluralize}_path")
+    - if notice
+      %p.notice= notice
+    - if alert
+      %p.alert= alert
     = yield

data/config/locales/geopolitical.en.yml

@@ -0,0 +1,76 @@
+en:
+  mongoid:
+    models:
+      nation:
+        one: Nation
+        other: Nations
+      region:
+        one: Region
+        other: Regions
+      city:
+        one: City
+        other: Cities
+      hood:
+        one: Hood
+        other: Hoods
+    attributes:
+      nation:
+        name: Name
+        abbr: Abbr
+        slug: Slug
+        code: Code
+        code3: ISO
+        lang: Lang
+        langs: Languages
+        cash: Cash
+        tld: TLD
+        souls: Population
+        postal: Postal
+        phone: Phone
+        capital_id: Capital
+      region:
+        name: Name
+        abbr: Abbr
+        slug: Slug
+        nation_id: Nation
+        timezone: Timezone
+        souls: Population
+        postal: Postal
+        phone: Phone
+        cities: Cities
+      city:
+        name: Name
+        slug: Slug
+        nation_id: Nation
+        region_id: Region
+        area: Area
+        geom: Coordinates
+        souls: Population
+        postal: Postal
+        phone: Phone
+      hood:
+        name: Name
+        slug: Slug
+        city_id: City
+        rank: Rank
+        souls: Population
+        postal: Postal
+        phone: Phone
+  geopolitical:
+    title: Geopolitical
+    actions:
+      new: "New %{model}"
+      edit: Edit
+      destroy: Destroy
+      back: Back
+      save: Save
+      confirm_destroy: "Destroy %{model}?"
+    forms:
+      new: "New %{model}"
+      edit: "Editing %{model}"
+    flash:
+      created: "%{model} created."
+      updated: "%{model} updated."
+      destroyed: "%{model} deleted."
+    dashboard:
+      populate: Use geonames_local to populate data easily!

data/config/locales/geopolitical.pt.yml

@@ -0,0 +1,77 @@
+pt:
+  mongoid:
+    models:
+      nation:
+        one: País
+        other: Países
+      region:
+        one: Região
+        other: Regiões
+      city:
+        one: Cidade
+        other: Cidades
+      hood:
+        one: Bairro
+        other: Bairros
+    attributes:
+      nation:
+        name: Nome
+        abbr: Sigla
+        slug: Slug
+        code: Código
+        code3: ISO
+        lang: Idioma
+        langs: Idiomas
+        cash: Moeda
+        tld: Domínio
+        souls: População
+        postal: CEP
+        phone: Telefone
+        capital_id: Capital
+      region:
+        name: Nome
+        abbr: Sigla
+        slug: Slug
+        nation_id: País
+        timezone: Fuso horário
+        souls: População
+        postal: CEP
+        phone: Telefone
+        cities: Cidades
+      city:
+        name: Nome
+        slug: Slug
+        nation_id: País
+        region_id: Região
+        area: Área
+        geom: Coordenadas
+        souls: População
+        postal: CEP
+        phone: Telefone
+      hood:
+        name: Nome
+        slug: Slug
+        city_id: Cidade
+        rank: Ordem
+        souls: População
+        postal: CEP
+        phone: Telefone
+  geopolitical:
+    title: Geopolítico
+    actions:
+      # "Adicionar/Editando" avoid the novo/nova gender agreement of %{model}
+      new: "Adicionar %{model}"
+      edit: Editar
+      destroy: Remover
+      back: Voltar
+      save: Salvar
+      confirm_destroy: "Remover %{model}?"
+    forms:
+      new: "Adicionar %{model}"
+      edit: "Editando %{model}"
+    flash:
+      created: Registro criado com sucesso.
+      updated: Registro atualizado com sucesso.
+      destroyed: Registro removido com sucesso.
+    dashboard:
+      populate: Use o geonames_local para popular os dados facilmente!

data/geopolitical.gemspec

@@ -1,24 +1,26 @@
-$LOAD_PATH.push File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
 
-# Maintain your gem's version:
-require 'geopolitical/version'
+require_relative 'lib/geopolitical/version'
 
-# Describe your gem and declare its dependencies:
 Gem::Specification.new do |s|
   s.name        = 'geopolitical'
   s.version     = Geopolitical::VERSION
-  s.platform    = Gem::Platform::RUBY
   s.authors     = ['Marcos Piccinini']
   s.email       = ['x@nofxx.com']
-  s.homepage    = 'http://github.com/fireho/geopolitical'
-  s.summary     = 'Geopolitical models for mongoid.'
-  s.description = 'Geopolitical models for mongoid as a rails engine.'
+  s.homepage    = 'https://github.com/fireho/geopolitical'
+  s.summary     = 'Nation, Region, City and Hood models for Mongoid.'
+  s.description = 'The whole planet as four Mongoid models: hierarchy, i18n names, ' \
+                  'unicode-safe slugs, geo queries, phone/postal fallbacks and an admin engine.'
   s.license     = 'MIT'
+  s.metadata    = { 'rubygems_mfa_required' => 'true', 'source_code_uri' => s.homepage }
 
-  s.files = `git ls-files`.split("\n")
-  s.test_files = Dir['spec/**/*']
+  # Ship the engine (app, config, lib) and the docs. No specs, no dev tooling.
+  s.files = `git ls-files -z`.split("\x0")
+            .grep(%r{^(app|config|lib)/|^(README\.md|CHANGELOG\.md|MIT-LICENSE|geopolitical\.gemspec)$})
   s.require_paths = ['lib']
+  s.required_ruby_version = '>= 3.2.0'
 
-  s.add_dependency 'mongoid', '>= 4.0'
-  s.add_dependency 'mongoid-geospatial', '>= 4.0'
+  s.add_dependency 'haml', '>= 6.0'
+  s.add_dependency 'mongoid', '>= 8.0.0'
+  s.add_dependency 'mongoid-geospatial', '>= 4.0.0'
 end

data/lib/geopolitical/engine.rb

@@ -1,5 +1,8 @@
+# frozen_string_literal: true
+
 require 'mongoid'
 require 'mongoid/geospatial'
+require 'haml'
 
 module Geopolitical
   # Rails Engine

data/lib/geopolitical/version.rb

@@ -1,4 +1,5 @@
-# :nodoc:
+# frozen_string_literal: true
+
 module Geopolitical
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.2.0'
 end

data/lib/geopolitical.rb

@@ -1,10 +1,30 @@
-require 'geopolitical/engine' if Object.const_defined?('Rails')
+# frozen_string_literal: true
+
+require 'active_support/core_ext/module/attribute_accessors'
 
 #
 # Geopolitical
 #
-# Nations, Regions, Cities...
-#
+# Nations, Regions, Cities and Hoods
 #
 module Geopolitical
+  # Controller the engine's controllers inherit from. The admin UI has no
+  # authentication of its own — point this at a controller of yours that does:
+  #
+  #   # config/initializers/geopolitical.rb
+  #   Geopolitical.parent_controller = 'Admin::BaseController'
+  #
+  mattr_accessor :parent_controller, default: 'ActionController::Base'
+end
+
+if Object.const_defined?('Rails')
+  require 'geopolitical/engine'
+else
+  require 'mongoid'
+  require 'mongoid/geospatial'
+  require_relative '../app/models/concerns/geopolitocracy'
+  require_relative '../app/models/nation'
+  require_relative '../app/models/region'
+  require_relative '../app/models/city'
+  require_relative '../app/models/hood'
 end

metadata

@@ -1,152 +1,124 @@
 --- !ruby/object:Gem::Specification
 name: geopolitical
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Marcos Piccinini
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 8.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: mongoid-geospatial
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.0'
-description: Geopolitical models for mongoid as a rails engine.
+        version: 4.0.0
+description: 'The whole planet as four Mongoid models: hierarchy, i18n names, unicode-safe
+  slugs, geo queries, phone/postal fallbacks and an admin engine.'
 email:
 - x@nofxx.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- Gemfile
-- Guardfile
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
-- Rakefile
 - app/assets/images/geopolitical/.gitkeep
 - app/assets/images/geopolitical/.keep
 - app/assets/javascripts/geopolitical/application.js
 - app/assets/stylesheets/geopolitical/application.css
+- app/controllers/geopolitical/application_controller.rb
+- app/controllers/geopolitical/cities_controller.rb
+- app/controllers/geopolitical/geopolitical_controller.rb
+- app/controllers/geopolitical/hoods_controller.rb
+- app/controllers/geopolitical/nations_controller.rb
+- app/controllers/geopolitical/regions_controller.rb
 - app/helpers/geopolitical/application_helper.rb
 - app/models/city.rb
 - app/models/concerns/geopolitocracy.rb
 - app/models/hood.rb
 - app/models/nation.rb
 - app/models/region.rb
-- app/serializers/city_serializer.rb
-- app/serializers/nation_serializer.rb
-- app/serializers/region_serializer.rb
 - app/views/geopolitical/cities/_city.html.haml
 - app/views/geopolitical/cities/_form.html.haml
+- app/views/geopolitical/cities/edit.html.haml
 - app/views/geopolitical/cities/index.html.haml
+- app/views/geopolitical/cities/new.html.haml
 - app/views/geopolitical/cities/show.html.haml
 - app/views/geopolitical/geopolitical/edit.html.haml
 - app/views/geopolitical/geopolitical/index.html.haml
 - app/views/geopolitical/geopolitical/new.html.haml
 - app/views/geopolitical/hoods/_city.html.haml
 - app/views/geopolitical/hoods/_form.html.haml
+- app/views/geopolitical/hoods/edit.html.haml
 - app/views/geopolitical/hoods/index.html.haml
+- app/views/geopolitical/hoods/new.html.haml
 - app/views/geopolitical/hoods/show.html.haml
 - app/views/geopolitical/nations/_form.html.haml
 - app/views/geopolitical/nations/_nation.html.haml
+- app/views/geopolitical/nations/edit.html.haml
 - app/views/geopolitical/nations/index.html.haml
+- app/views/geopolitical/nations/new.html.haml
 - app/views/geopolitical/nations/show.html.haml
 - app/views/geopolitical/regions/_form.html.haml
 - app/views/geopolitical/regions/_region.html.haml
+- app/views/geopolitical/regions/edit.html.haml
 - app/views/geopolitical/regions/index.html.haml
+- app/views/geopolitical/regions/new.html.haml
 - app/views/geopolitical/regions/show.html.haml
 - app/views/layouts/geopolitical.html.haml
-- bin/rails
+- config/locales/geopolitical.en.yml
+- config/locales/geopolitical.pt.yml
 - config/routes.rb
 - geopolitical.gemspec
 - lib/geopolitical.rb
 - lib/geopolitical/engine.rb
 - lib/geopolitical/version.rb
-- lib/tasks/geopolitical_tasks.rake
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/app/assets/images/.keep
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/controllers/concerns/.keep
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/app/mailers/.keep
-- spec/dummy/app/models/.keep
-- spec/dummy/app/models/concerns/.keep
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/bin/bundle
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/config.ru
-- spec/dummy/config/application.rb
-- spec/dummy/config/boot.rb
-- spec/dummy/config/environment.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/lib/assets/.keep
-- spec/dummy/log/.keep
-- spec/dummy/log/development.log
-- spec/dummy/log/test.log
-- spec/dummy/public/404.html
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/favicon.ico
-- spec/fabricators/city_fabricator.rb
-- spec/fabricators/hood_fabricator.rb
-- spec/fabricators/nation_fabricator.rb
-- spec/fabricators/region_fabricator.rb
-- spec/models/city_spec.rb
-- spec/models/hood_spec.rb
-- spec/models/nation_spec.rb
-- spec/models/region_spec.rb
-- spec/spec_helper.rb
-homepage: http://github.com/fireho/geopolitical
+homepage: https://github.com/fireho/geopolitical
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+  source_code_uri: https://github.com/fireho/geopolitical
 rdoc_options: []
 require_paths:
 - lib
@@ -154,57 +126,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
-summary: Geopolitical models for mongoid.
-test_files:
-- spec/dummy/bin/rails
-- spec/dummy/bin/rake
-- spec/dummy/bin/bundle
-- spec/dummy/app/views/layouts/application.html.erb
-- spec/dummy/app/assets/javascripts/application.js
-- spec/dummy/app/assets/stylesheets/application.css
-- spec/dummy/app/helpers/application_helper.rb
-- spec/dummy/public/favicon.ico
-- spec/dummy/public/422.html
-- spec/dummy/public/500.html
-- spec/dummy/public/404.html
-- spec/dummy/log/test.log
-- spec/dummy/log/development.log
-- spec/dummy/config.ru
-- spec/dummy/README.rdoc
-- spec/dummy/Rakefile
-- spec/dummy/config/initializers/wrap_parameters.rb
-- spec/dummy/config/initializers/backtrace_silencers.rb
-- spec/dummy/config/initializers/session_store.rb
-- spec/dummy/config/initializers/secret_token.rb
-- spec/dummy/config/initializers/mime_types.rb
-- spec/dummy/config/initializers/filter_parameter_logging.rb
-- spec/dummy/config/initializers/inflections.rb
-- spec/dummy/config/mongoid.yml
-- spec/dummy/config/boot.rb
-- spec/dummy/config/locales/en.yml
-- spec/dummy/config/routes.rb
-- spec/dummy/config/environments/development.rb
-- spec/dummy/config/environments/test.rb
-- spec/dummy/config/environments/production.rb
-- spec/dummy/config/application.rb
-- spec/dummy/config/environment.rb
-- spec/fabricators/nation_fabricator.rb
-- spec/fabricators/hood_fabricator.rb
-- spec/fabricators/region_fabricator.rb
-- spec/fabricators/city_fabricator.rb
-- spec/models/nation_spec.rb
-- spec/models/region_spec.rb
-- spec/models/city_spec.rb
-- spec/models/hood_spec.rb
-- spec/spec_helper.rb
+summary: Nation, Region, City and Hood models for Mongoid.
+test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis

data/.gitignore

@@ -1,11 +0,0 @@
-.bundle/
-log/*.log
-pkg/
-spec/dummy/db/*.sqlite3
-spec/dummy/db/*.sqlite3-journal
-spec/dummy/log/*.log
-spec/dummy/tmp/
-spec/dummy/.sass-cache
-Gemfile.lock
-tmp/*
-coverage/*

data/.rspec

@@ -1 +0,0 @@
---color

data/.travis.yml

@@ -1,26 +0,0 @@
-language: ruby
-bundler_args: --without development
-rvm:
-  - 2.2.2
-  - ruby-head
-  - jruby
-  - jruby-head
-  - rbx-2
-
-# jdk:
-#   - oraclejdk7
-#   - openjdk7
-
-env: CI="travis"
-
-matrix:
-  allow_failures:
-    - rvm: jruby
-    - rvm: ruby-head
-
-services:
-  - mongodb
-
-script: "bundle exec rspec"
-
-sudo: false

data/Gemfile

@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'mongoid', '>= 5.0.0.beta'
-
-gemspec
-
-gem 'rails'
-gem 'faker'
-gem 'fabrication'
-gem 'rspec'
-gem 'rspec-rails'
-gem 'guard'
-gem 'guard-rspec'
-gem 'guard-rubocop'
-gem 'coveralls', require: false

data/Guardfile

@@ -1,24 +0,0 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
-# ignore(/\/.#.+/)
-
-guard :rubocop, all_on_start: false, keep_failed: false, notification: false, cli: ['--format', 'emacs'] do
-  watch(/^app\/(.+)\.rb$/)
-  watch(/^lib\/(.+)\.rb$/)
-  watch(/^spec\/(.+)\.rb$/)
-end
-
-guard :rspec, cmd: 'bundle exec rspec' do
-  watch(/^spec\/.+_spec\.rb$/)
-  watch(/^spec\/spec_helper\.rb$/) { 'spec' }
-  watch(/^app\/(.+)\.rb$/)         { |m| "spec/#{m[1]}_spec.rb" }
-  watch(/^lib\/(.+)\.rb$/)         { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch(%r{^app/models/concerns/(.+)\.rb$}) { |_m| 'spec/models/*._spec.rb' }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$}) do |m|
-    [
-      "spec/routing/#{m[1]}_routing_spec.rb",
-      "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb",
-      "spec/requests/#{m[1]}_spec.rb"
-    ]
-  end
-end

data/Rakefile

@@ -1,25 +0,0 @@
-begin
-  require 'bundler/setup'
-rescue LoadError
-  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
-end
-
-require 'bundler/gem_tasks'
-
-require 'rspec/core/rake_task'
-# require 'rubocop/rake_task'
-
-require 'rdoc/task'
-
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'Geopolitical'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
-APP_RAKEFILE = File.expand_path('../spec/dummy/Rakefile', __FILE__)
-# load 'rails/tasks/engine.rake'
-
-# Bundler::GemHelper.install_tasks

data/app/serializers/city_serializer.rb

@@ -1,8 +0,0 @@
-# Serializer for Cities
-class CitySerializer < ActiveModel::Serializer
-  attributes :id, :name
-
-  def name
-    object.with_region
-  end
-end

data/app/serializers/nation_serializer.rb

@@ -1,4 +0,0 @@
-# Serializer for Nations
-class NationSerializer < ActiveModel::Serializer
-  attributes :id, :name
-end

data/app/serializers/region_serializer.rb

@@ -1,4 +0,0 @@
-# Serializer for Regions
-class RegionSerializer < ActiveModel::Serializer
-  attributes :id, :name
-end