geopolitical 3.2.0 → 4.1.0

data/app/views/geopolitical/hoods/index.html.erb

@@ -0,0 +1,42 @@
+<div class="container">
+  <div class="row">
+    <div class="page-header">
+      <h1 class="title"><%= Hood.model_name.human(count: 2) %></h1>
+      <%= link_to t('geopolitical.actions.new', model: Hood.model_name.human), new_hood_path %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="content">
+      <table class="table">
+        <thead>
+          <tr>
+            <th><%= Hood.human_attribute_name(:name) %></th>
+            <th><%= Hood.human_attribute_name(:city_id) %></th>
+            <th><%= Hood.human_attribute_name(:souls) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @hoods.each do |hood| %>
+            <tr>
+              <td>
+                <%= hood.name %>
+                <%= link_to hood.slug, hood_path(hood) %>
+              </td>
+              <td><%= hood.city&.name %></td>
+              <td><%= hood.souls %></td>
+              <td align="right">
+                <%= link_to t('geopolitical.actions.edit'), edit_hood_path(hood) %>
+                <%= button_to t('geopolitical.actions.destroy'), hood_path(hood), method: :delete,
+                  data: { turbo_confirm: t('geopolitical.actions.confirm_destroy', model: Hood.model_name.human) } %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="row">
+    <%= link_to t('geopolitical.actions.back'), root_path %>
+  </div>
+</div>

data/app/views/geopolitical/hoods/new.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/geopolitical/hoods/show.html.erb

@@ -0,0 +1,20 @@
+<div class="container">
+  <div class="row">
+    <h1><%= @hood.name %></h1>
+  </div>
+  <div class="row">
+    <p>
+      <b><%= Hood.human_attribute_name(:slug) %>:</b>
+      <%= @hood.slug %>
+    </p>
+    <p>
+      <b><%= Hood.human_attribute_name(:city_id) %>:</b>
+      <%= link_to @hood.city, city_path(@hood.city) if @hood.city %>
+    </p>
+  </div>
+  <div class="row">
+    <%= link_to t('geopolitical.actions.edit'), edit_hood_path(@hood) %>
+    |
+    <%= link_to t('geopolitical.actions.back'), hoods_path %>
+  </div>
+</div>

data/app/views/geopolitical/nations/_form.html.erb

@@ -0,0 +1,44 @@
+<div class="container">
+  <div class="row">
+    <div class="page-header">
+      <h1>
+        <% key = @nation.new_record? ? 'new' : 'edit' %>
+        <%= t("geopolitical.forms.#{key}", model: Nation.model_name.human) %>
+      </h1>
+    </div>
+  </div>
+  <div class="row">
+    <%= form_with model: @nation, url: (@nation.persisted? ? nation_path(@nation) : nations_path) do |f| %>
+      <% if @nation.errors.any? %>
+        <ul>
+          <% @nation.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      <% end %>
+      <div class="form-group">
+        <%= f.label :name %>
+        <%= f.text_field :name %>
+      </div>
+      <div class="form-group">
+        <%= f.label :abbr %>
+        <%= f.text_field :abbr %>
+      </div>
+      <div class="form-group">
+        <%= f.label :slug %>
+        <%= f.text_field :slug %>
+      </div>
+      <div class="form-group">
+        <%= f.label :lang %>
+        <%= f.text_field :lang %>
+      </div>
+      <div class="form-group">
+        <%= f.label :cash %>
+        <%= f.text_field :cash %>
+      </div>
+      <div class="forms-buttons">
+        <%= f.submit t('geopolitical.actions.save') %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/geopolitical/nations/_nation.html.erb

@@ -0,0 +1,7 @@
+<div class="nation">
+  <h4><%= link_to nation.name, nation_path(nation) %></h4>
+  <span class="gray"><%= nation.abbr %></span>
+  <div class="right">
+    <%= link_to t('geopolitical.actions.edit'), edit_nation_path(nation) %>
+  </div>
+</div>

data/app/views/geopolitical/nations/edit.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/geopolitical/nations/index.html.erb

@@ -0,0 +1,46 @@
+<div class="container">
+  <div class="row">
+    <div class="page-header">
+      <h1 class="title"><%= Nation.model_name.human(count: 2) %></h1>
+      <%= link_to t('geopolitical.actions.new', model: Nation.model_name.human), new_nation_path %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="content">
+      <table class="table">
+        <thead>
+          <tr>
+            <th><%= Nation.human_attribute_name(:abbr) %></th>
+            <th><%= Nation.human_attribute_name(:code3) %></th>
+            <th><%= Nation.human_attribute_name(:name) %></th>
+            <th><%= Nation.human_attribute_name(:postal) %></th>
+            <th><%= Nation.human_attribute_name(:lang) %></th>
+            <th><%= Nation.human_attribute_name(:cash) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @nations.each do |nation| %>
+            <tr>
+              <td><%= nation.abbr %></td>
+              <td><%= nation.code3.presence || nation.code %></td>
+              <td>
+                <%= nation.name %>
+                <%= link_to nation.slug, nation_path(nation) %>
+              </td>
+              <td><%= nation.postal %></td>
+              <td><%= truncate(nation.lang.to_s) %></td>
+              <td><%= nation.cash %></td>
+              <td class="last">
+                <%= link_to t('geopolitical.actions.edit'), edit_nation_path(nation) %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="row">
+    <%= link_to t('geopolitical.actions.back'), root_path %>
+  </div>
+</div>

data/app/views/geopolitical/nations/new.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/geopolitical/nations/show.html.erb

@@ -0,0 +1,28 @@
+<div class="container">
+  <div class="row">
+    <h1><%= @nation.name %></h1>
+  </div>
+  <div class="row">
+    <p>
+      <b><%= Nation.human_attribute_name(:abbr) %>:</b>
+      <%= @nation.abbr %> <%= @nation.code3 %>
+    </p>
+    <p>
+      <b><%= Nation.human_attribute_name(:slug) %>:</b>
+      <%= @nation.slug %>
+    </p>
+    <p>
+      <b><%= Nation.human_attribute_name(:lang) %>:</b>
+      <%= @nation.lang %>
+    </p>
+    <p>
+      <b><%= Nation.human_attribute_name(:cash) %>:</b>
+      <%= @nation.cash %>
+    </p>
+  </div>
+  <div class="row">
+    <%= link_to t('geopolitical.actions.edit'), edit_nation_path(@nation) %>
+    |
+    <%= link_to t('geopolitical.actions.back'), nations_path %>
+  </div>
+</div>

data/app/views/geopolitical/regions/_form.html.erb

@@ -0,0 +1,40 @@
+<div class="container">
+  <div class="row">
+    <div class="page-header">
+      <h1>
+        <% key = @region.new_record? ? 'new' : 'edit' %>
+        <%= t("geopolitical.forms.#{key}", model: Region.model_name.human) %>
+      </h1>
+    </div>
+  </div>
+  <div class="row">
+    <%= form_with model: @region, url: (@region.persisted? ? region_path(@region) : regions_path) do |f| %>
+      <% if @region.errors.any? %>
+        <ul>
+          <% @region.errors.full_messages.each do |message| %>
+            <li><%= message %></li>
+          <% end %>
+        </ul>
+      <% end %>
+      <div class="form-group">
+        <%= f.label :name %>
+        <%= f.text_field :name %>
+      </div>
+      <div class="form-group">
+        <%= f.label :abbr %>
+        <%= f.text_field :abbr %>
+      </div>
+      <div class="form-group">
+        <%= f.label :slug %>
+        <%= f.text_field :slug %>
+      </div>
+      <div class="form-group">
+        <%= f.label :nation_id %>
+        <%= f.select :nation_id, @nations, include_blank: true %>
+      </div>
+      <div class="forms-buttons">
+        <%= f.submit t('geopolitical.actions.save') %>
+      </div>
+    <% end %>
+  </div>
+</div>

data/app/views/geopolitical/regions/_region.html.erb

@@ -0,0 +1,6 @@
+<div class="region">
+  <h4><%= link_to region.name, region_path(region) %></h4>
+  <div class="right">
+    <%= link_to t('geopolitical.actions.edit'), edit_region_path(region) %>
+  </div>
+</div>

data/app/views/geopolitical/regions/edit.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/geopolitical/regions/index.html.erb

@@ -0,0 +1,42 @@
+<div class="container">
+  <div class="row">
+    <div class="page-header">
+      <h1 class="title"><%= Region.model_name.human(count: 2) %></h1>
+      <%= link_to t('geopolitical.actions.new', model: Region.model_name.human), new_region_path %>
+    </div>
+  </div>
+  <div class="row">
+    <div class="content">
+      <table class="table">
+        <thead>
+          <tr>
+            <th><%= Region.human_attribute_name(:abbr) %></th>
+            <th><%= Region.human_attribute_name(:name) %></th>
+            <th><%= Region.human_attribute_name(:nation_id) %></th>
+            <th><%= Region.human_attribute_name(:cities) %></th>
+            <th></th>
+          </tr>
+        </thead>
+        <tbody>
+          <% @regions.each do |region| %>
+            <tr>
+              <td><%= region.abbr %></td>
+              <td>
+                <%= region.name %>
+                <%= link_to region.slug, region_path(region) %>
+              </td>
+              <td><%= region.nation&.name %></td>
+              <td><%= region.cities.count %></td>
+              <td class="last">
+                <%= link_to t('geopolitical.actions.edit'), edit_region_path(region) %>
+              </td>
+            </tr>
+          <% end %>
+        </tbody>
+      </table>
+    </div>
+  </div>
+  <div class="row">
+    <%= link_to t('geopolitical.actions.back'), root_path %>
+  </div>
+</div>

data/app/views/geopolitical/regions/new.html.erb

@@ -0,0 +1 @@
+<%= render 'form' %>

data/app/views/geopolitical/regions/show.html.erb

@@ -0,0 +1,24 @@
+<div class="container">
+  <div class="row">
+    <h1><%= @region.name %></h1>
+  </div>
+  <div class="row">
+    <p>
+      <b><%= Region.human_attribute_name(:slug) %>:</b>
+      <%= @region.slug %>
+    </p>
+    <p>
+      <b><%= Region.human_attribute_name(:nation_id) %>:</b>
+      <%= link_to @region.nation, @region.nation %>
+    </p>
+    <p>
+      <b><%= Region.human_attribute_name(:abbr) %>:</b>
+      <%= @region.abbr %>
+    </p>
+  </div>
+  <div class="row">
+    <%= link_to t('geopolitical.actions.edit'), edit_region_path(@region) %>
+    |
+    <%= link_to t('geopolitical.actions.back'), regions_path %>
+  </div>
+</div>

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

@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="<%= I18n.locale %>">
+  <head>
+    <meta charset="utf-8">
+    <meta content="width=device-width, initial-scale=1.0" name="viewport">
+    <title><%= t('geopolitical.title') %></title>
+    <%= stylesheet_link_tag 'geopolitical/application', media: 'all' %>
+    <%= javascript_include_tag 'geopolitical/application' %>
+    <%= csrf_meta_tags %>
+  </head>
+  <body>
+    <nav>
+      <% [Nation, Region, City, Hood].each do |klass| %>
+        <%= link_to klass.model_name.human(count: 2), send("#{klass.to_s.downcase.pluralize}_path") %>
+      <% end %>
+    </nav>
+    <% if notice %>
+      <p class="notice"><%= notice %></p>
+    <% end %>
+    <% if alert %>
+      <p class="alert"><%= alert %></p>
+    <% end %>
+    <%= yield %>
+  </body>
+</html>

data/geopolitical.gemspec

@@ -16,11 +16,10 @@ Gem::Specification.new do |s|
 
   # 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)$})
+                             .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 'haml', '>= 6.0'
   s.add_dependency 'mongoid', '>= 8.0.0'
-  s.add_dependency 'mongoid-geospatial', '>= 4.0.0'
+  s.add_dependency 'mongoid-geospatial', '>= 7.0.0'
 end

data/lib/geopolitical/engine.rb

@@ -2,7 +2,6 @@
 
 require 'mongoid'
 require 'mongoid/geospatial'
-require 'haml'
 
 module Geopolitical
   # Rails Engine

data/lib/geopolitical/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Geopolitical
-  VERSION = '3.2.0'
+  VERSION = '4.1.0'
 end

data/lib/geopolitical.rb

@@ -15,6 +15,15 @@ module Geopolitical
   #   Geopolitical.parent_controller = 'Admin::BaseController'
   #
   mattr_accessor :parent_controller, default: 'ActionController::Base'
+
+  # The typing search behind Geopolitical::Postal.suggest / .pick — :google or
+  # :geoapify, and its key. Either unset and the search is off.
+  #
+  #   Geopolitical.postal_provider = :google
+  #   Geopolitical.postal_key      = ENV['GOOGLE_MAPS_KEY']
+  #
+  mattr_accessor :postal_provider
+  mattr_accessor :postal_key
 end
 
 if Object.const_defined?('Rails')
@@ -27,4 +36,8 @@ else
   require_relative '../app/models/region'
   require_relative '../app/models/city'
   require_relative '../app/models/hood'
+  require_relative '../app/models/geopolitical/postal'
+  require_relative '../app/models/geopolitical/postal/brasilapi'
+  require_relative '../app/models/geopolitical/postal/google'
+  require_relative '../app/models/geopolitical/postal/geoapify'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geopolitical
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Marcos Piccinini
@@ -9,20 +9,6 @@ bindir: bin
 cert_chain: []
 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
@@ -43,14 +29,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 7.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:
@@ -75,37 +61,41 @@ files:
 - app/helpers/geopolitical/application_helper.rb
 - app/models/city.rb
 - app/models/concerns/geopolitocracy.rb
+- app/models/geopolitical/postal.rb
+- app/models/geopolitical/postal/brasilapi.rb
+- app/models/geopolitical/postal/geoapify.rb
+- app/models/geopolitical/postal/google.rb
 - app/models/hood.rb
 - app/models/nation.rb
 - app/models/region.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
+- app/views/geopolitical/cities/_city.html.erb
+- app/views/geopolitical/cities/_form.html.erb
+- app/views/geopolitical/cities/edit.html.erb
+- app/views/geopolitical/cities/index.html.erb
+- app/views/geopolitical/cities/new.html.erb
+- app/views/geopolitical/cities/show.html.erb
+- app/views/geopolitical/geopolitical/edit.html.erb
+- app/views/geopolitical/geopolitical/index.html.erb
+- app/views/geopolitical/geopolitical/new.html.erb
+- app/views/geopolitical/hoods/_city.html.erb
+- app/views/geopolitical/hoods/_form.html.erb
+- app/views/geopolitical/hoods/edit.html.erb
+- app/views/geopolitical/hoods/index.html.erb
+- app/views/geopolitical/hoods/new.html.erb
+- app/views/geopolitical/hoods/show.html.erb
+- app/views/geopolitical/nations/_form.html.erb
+- app/views/geopolitical/nations/_nation.html.erb
+- app/views/geopolitical/nations/edit.html.erb
+- app/views/geopolitical/nations/index.html.erb
+- app/views/geopolitical/nations/new.html.erb
+- app/views/geopolitical/nations/show.html.erb
+- app/views/geopolitical/regions/_form.html.erb
+- app/views/geopolitical/regions/_region.html.erb
+- app/views/geopolitical/regions/edit.html.erb
+- app/views/geopolitical/regions/index.html.erb
+- app/views/geopolitical/regions/new.html.erb
+- app/views/geopolitical/regions/show.html.erb
+- app/views/layouts/geopolitical.html.erb
 - config/locales/geopolitical.en.yml
 - config/locales/geopolitical.pt.yml
 - config/routes.rb

data/app/views/geopolitical/cities/_city.html.haml

@@ -1,4 +0,0 @@
-.city
-  %h4= link_to city.name, city_path(city)
-  .right
-    = link_to t('geopolitical.actions.edit'), edit_city_path(city)

data/app/views/geopolitical/cities/_form.html.haml

@@ -1,28 +0,0 @@
-.container
-  .row
-    .page-header
-      %h1
-        - key = @city.new_record? ? 'new' : 'edit'
-        = t("geopolitical.forms.#{key}", model: City.model_name.human)
-  .row
-    = form_with model: @city, url: (@city.persisted? ? city_path(@city) : cities_path), html: { class: 'form' } do |f|
-      - if @city.errors.any?
-        %ul
-          - @city.errors.full_messages.each do |message|
-            %li= message
-      .form-group
-        = f.label :nation_id
-        = f.select :nation_id, @nations, include_blank: true
-      .form-group
-        = f.label :region_id
-        = f.select :region_id, @regions, include_blank: true
-      .form-group
-        = f.label :name
-        = f.text_field :name
-      .form-group
-        = f.label :slug
-        = f.text_field :slug
-      .form-group
-        = f.label :souls
-        = f.number_field :souls
-      = f.submit t('geopolitical.actions.save')

data/app/views/geopolitical/cities/edit.html.haml

@@ -1 +0,0 @@
-= render 'form'

data/app/views/geopolitical/cities/index.html.haml

@@ -1,32 +0,0 @@
-.container
-  .row
-    .page-header
-      %h1.title= City.model_name.human(count: 2)
-      = link_to t('geopolitical.actions.new', model: City.model_name.human), new_city_path
-  .row
-    .content
-      %table.table
-        %thead
-          %tr
-            %th= City.human_attribute_name(:name)
-            %th= City.human_attribute_name(:postal)
-            %th= City.human_attribute_name(:region_id)
-            %th= City.human_attribute_name(:nation_id)
-            %th= City.human_attribute_name(:souls)
-            %th
-        %tbody
-          - @cities.each do |city|
-            %tr
-              %td
-                = city.name
-                = link_to city.slug, city_path(city)
-              %td= city.postal
-              %td= city.region&.name
-              %td= city.nation&.name
-              %td= city.souls
-              %td{align: 'right'}
-                = link_to t('geopolitical.actions.edit'), edit_city_path(city)
-                = button_to t('geopolitical.actions.destroy'), city_path(city), method: :delete,
-                  data: { turbo_confirm: t('geopolitical.actions.confirm_destroy', model: City.model_name.human) }
-  .row
-    = link_to t('geopolitical.actions.back'), root_path

data/app/views/geopolitical/cities/new.html.haml

@@ -1 +0,0 @@
-= render 'form'

data/app/views/geopolitical/cities/show.html.haml

@@ -1,17 +0,0 @@
-.container
-  .row
-    %h1= @city.name
-  .row
-    %p
-      %b #{City.human_attribute_name(:slug)}:
-      = @city.slug
-    %p
-      %b #{City.human_attribute_name(:nation_id)}:
-      = link_to @city.nation, nation_path(@city.nation) if @city.nation
-    %p
-      %b #{City.human_attribute_name(:region_id)}:
-      = link_to @city.region, region_path(@city.region) if @city.region
-  .row
-    = link_to t('geopolitical.actions.edit'), edit_city_path(@city)
-    |
-    = link_to t('geopolitical.actions.back'), cities_path

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

@@ -1 +0,0 @@
-= render "form"

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

@@ -1,19 +0,0 @@
-%h1= t('geopolitical.title')
-%hr
-
-- [Nation, Region, City, Hood].each do |klass|
-  .block
-    %h3.title
-      = link_to klass.model_name.human(count: 2), send("#{klass.to_s.downcase.pluralize}_path")
-      %small= klass.count
-    .right.links
-      = link_to t('geopolitical.actions.new', model: klass.model_name.human),
-        send("new_#{klass.to_s.downcase}_path")
-
-%br
-%h4
-  = t('geopolitical.dashboard.populate')
-  %small= link_to 'geonames_local', 'https://github.com/nofxx/geonames_local'
-
-%hr
-%p= link_to 'fireho/geopolitical', 'https://github.com/fireho/geopolitical'

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

@@ -1 +0,0 @@
-= render "form"

data/app/views/geopolitical/hoods/_city.html.haml

@@ -1,4 +0,0 @@
-.hood
-  %h4= link_to hood.name, hood_path(hood)
-  .right
-    = link_to t('geopolitical.actions.edit'), edit_hood_path(hood)