geopolitical 3.2.0 → 3.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6eab76b546c1fe68a2b74c24193504f349c650ef97a5982cc87ee5fb74769d4e
-  data.tar.gz: 3301e6d264d6446a0663941819b76b64f956e83f89a16e5bcf70f87644abe616
+  metadata.gz: 29f0c0d286b916e4998c96f873a2ca71309cebdb24b5237d0d2a9983fb6a0b78
+  data.tar.gz: dc3f5db9a230f9ce51716fd93d41b47f36435bc8a319028399d9980dacd74616
 SHA512:
-  metadata.gz: e4b582dacaf75fe5584450b61ee55d05bab5e15565ee7ee31c0104a852fcd1d28853fef45aa11c5de67bc48d9be8f18997789032fed639dd4deba8a5cd8e45ad
-  data.tar.gz: 1461b8bf452628a21c708f7c884d72301d0ac421079671b554e1aa2d4816064adafde8595c95c988936b52f85b5996c37bd27e08c00ee8e1d31461f88c200e68
+  metadata.gz: 5d5bf693346187061b119960d60de605a1eca32b8a56fd29d9b18273292d826c99b8c06d778b070db3a6dcbc0966263626aa5cfe64de35cee09f0573438a58ed
+  data.tar.gz: 547960a20a10bdba9e01af25e1ed8c9809c2a7f5e25330ff3cea774fc051a2f00380dc574eaff71ad4fde17b95a4a70f6f1be4203e33069f93e6c366da3d578d

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 3.2.1
+
+- Every uniqueness validation now has a unique index behind it, so concurrent writes can't slip a duplicate past the check:
+  - `Nation` abbr: unique (the writer upcases, so it is case-insensitive).
+  - `City` name: unique on `{nation_id, region_id, name}`, the validation's own scope.
+  - `Region` abbr within a nation: partial on `abbr > ""` instead of sparse. Sparse did nothing on a compound index whose `nation_id` is always set, so the second abbr-less region in a nation failed to save.
+- The concern no longer declares `{abbr: 1}`. Mongoid keys a declaration on its fields alone, so the concern's copy silently swallowed `Nation`'s unique one. `Region` keeps its own.
+- `spec/models/indexes_spec.rb` inserts straight into the collection, past the validations, and expects the index to refuse.
+
 ## 3.2.0
 
 - Slugs work in every script: `東京` → `東京`, `Санкт-Петербург` → `санкт-петербург`. Non-Latin names were previously invalid (blank slug). Accents are stripped via NFKD (`Hà Nội` → `ha-noi`). Underscores now become hyphens.
@@ -25,4 +34,4 @@
 - `Nation#lang=` keeps the nations other languages instead of wiping `langs` to a single entry.
 - `Nation[]` returns `nil` for an unknown abbr instead of raising `DocumentNotFound`.
 
-**Upgrading:** stored slugs are not rewritten until a document is saved again, so existing data is untouched � but region-less cities will pick up a nation suffix the next time they are saved, and `City.create_indexes` will now fail on a database that already holds duplicate city slugs. `geonames_local` depends on `geopolitical > 0.8.4` (no upper bound) and will pick this up on its next bundle.
+**Upgrading:** stored slugs are not rewritten until a document is saved again, so existing data is untouched � but region-less cities will pick up a nation suffix the next time they are saved, and `City.create_indexes` will now fail on a database that already holds duplicate city slugs. `geonames_local` depends on `geopolitical > 0.8.4` (no upper bound) and will pick this up on its next bundle.

data/app/models/city.rb

@@ -61,6 +61,7 @@ class City
 
   index({ slug: 1 }, unique: true)
   index({ name: 1, nation_id: 1 }) # For lookups by name within a nation
+  index({ nation_id: 1, region_id: 1, name: 1 }, { unique: true }) # Backs the name uniqueness validation
   index({ nation_id: 1 })          # For finding all cities in a nation
   index({ region_id: 1 }, sparse: true) # For finding cities in a region, sparse if region is optional
   index({ souls: -1 }) # For sorting by population count

data/app/models/concerns/geopolitocracy.rb

@@ -77,10 +77,10 @@ module Geopolitocracy
     # @!endgroup
 
     # @!group Indexes
-    # NOTE: no plain slug index here — each model declares its own (unique where it
-    # can be), and a duplicate key declaration would silently shadow theirs.
+    # NOTE: no slug or abbr index here — each model declares its own (unique where
+    # it can be). Mongoid keys a declaration on the fields alone, so a second
+    # `index({ abbr: 1 }, unique: true)` in a model would be silently ignored.
     index({ name: 1 }) # For sorting and lookups by name
-    index({ abbr: 1 }, { sparse: true }) # Sparse as abbr can be nil
     index({ code: 1 }, { sparse: true }) # Sparse as code can be nil
     # @!endgroup
 

data/app/models/nation.rb

@@ -61,6 +61,7 @@ class Nation
 
   index({ name: 1 }) # Index for sorting by name, common operation
   index({ slug: 1 }, { unique: true }) # Slugs must be globally unique for nations
+  index({ abbr: 1 }, { unique: true }) # abbr is upcased by its writer, so plain unique is case-insensitive
 
   # Nation['br'] => the Nation with abbr BR (the abbr is the _id), nil if unknown.
   # @param abbr [String, Symbol]

data/app/models/region.rb

@@ -30,14 +30,16 @@ class Region
   validates :name, uniqueness: { scope: :nation_id, message: 'must be unique within its nation' }
   # `abbr` (from Geopolitocracy) should also be unique within its nation if present.
   validates :abbr,
-            uniqueness: { scope: :nation_id, allow_nil: true, message: 'must be unique within its nation if provided' }
+            uniqueness: { scope: :nation_id, allow_blank: true, message: 'must be unique within its nation if provided' }
   # Slug (from Geopolitocracy) should be unique within its nation. Presence is already validated by Geopolitocracy.
   validates :slug, uniqueness: { scope: :nation_id, message: 'must be unique within its nation' }
 
   index({ slug: 1 }) # For .search; global uniqueness is not required, see the compound index below
   index({ abbr: 1 }, { sparse: true }) # Sparse index as abbr can be nil
   index({ nation_id: 1, name: 1 }, { unique: true }) # Enforce uniqueness of name within nation
-  index({ nation_id: 1, abbr: 1 }, { unique: true, sparse: true }) # Enforce uniqueness of abbr within nation
+  # Partial, not sparse: nation_id is always set, so a sparse compound index
+  # still indexes every abbr-less region and the second one collides.
+  index({ nation_id: 1, abbr: 1 }, { unique: true, partial_filter_expression: { abbr: { '$gt' => '' } } })
   index({ nation_id: 1, slug: 1 }, { unique: true }) # Enforce uniqueness of slug within nation
 
   # Retrieves the phone dialing code for the region.

data/lib/geopolitical/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geopolitical
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.2.1
 platform: ruby
 authors:
 - Marcos Piccinini