decoupage_administratif 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15d8baade56f4081ec11036e1a10269d9a561eaca357835a9d6f81ae798749ec
-  data.tar.gz: dc037fd227031b91ed1f9c44035ac1ea5c58b0322ca40f7f81cff54b9327017a
+  metadata.gz: 849db1d260bc7687d74158eb642a2a49c63dffc39bf20ff53635231b9875d955
+  data.tar.gz: cae4db6bbef56db6524be7d77fd6a10a78656d17c98c07ed4bd1d4f823e0b2d4
 SHA512:
-  metadata.gz: 6203a3495a45bbcde0201432929485e5d6aa5b8270a8afed54936712561b8c890dbea27c6a9763781e7fa1a40a8a0fef6863dbd368371313d024a4e0584850f1
-  data.tar.gz: b549a507147fba9e578d1104d521c4f2bea2e3a9d1cf9ab97406d81073b7c2fdf5f1428fa8acc23fa18ad5784bd17099c4a0218f6e39000aed503afe85d05073
+  metadata.gz: ddc815e22292f9318259046937c23fc7754ba1565d47ac9c49ea24c57bab315a858d4c2df782e04b7bb92583bd011ee64d770b0f11084f6f8e02a2779e7d4ac6
+  data.tar.gz: 8933516d15633dc0f4a60df35ae2039a28328c2e0ca29eda49867810b1edeebf2c177917c2d94b011cc134811c6c6799934062f37d226e9f9c17f03b870e7208

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 ## [Unreleased]
 
+## [0.3.0] - 2025-11-14
+
+### Added
+- **BaseModel**: Support for array values in `where` method to filter on multiple values (e.g., `where(commune_type: [:commune_actuelle, :arrondissement_municipal])`)
+- **Commune**: Municipal districts (arrondissements of Paris, Lyon, Marseille) are now included in `Commune.actuelles` method
+- New commune type `:arrondissement_municipal` for municipal districts
+
+### Changed
+- `Commune.actuelles` now returns both current communes and municipal districts (`:commune_actuelle` and `:arrondissement_municipal`)
+
+### Fixed
+- RBS type signature for `commune_type` attribute corrected from `String` to `Symbol`
+
 ## [0.2.0] - 2025-08-29
 
 ### Changed

data/README.md

@@ -63,10 +63,13 @@ Exemple d’utilisation basique :
 DecoupageAdministratif::Region.all
 
 # Trouver une commune par code INSEE
-# Une commune a un commune_type qui peut être `commune-actuelle`, `commune-deleguee` (anciennes communes) ou `commune-associee` (anciennes communes avec un statut spécial)
+# Une commune a un commune_type qui peut être :commune_actuelle, :commune_deleguee (anciennes communes), :commune_associee (anciennes communes avec un statut spécial) ou :arrondissement_municipal (arrondissements de Paris, Lyon, Marseille)
 commune = DecoupageAdministratif::Commune.find('75056')
 puts commune.nom # => "Paris"
 
+# Lister toutes les communes actuelles (communes actuelles + arrondissements municipaux)
+DecoupageAdministratif::Commune.actuelles
+
 # Lister les départements d'une région
 DecoupageAdministratif::Region.find('84').departements
 
@@ -224,10 +227,13 @@ Basic usage example:
 DecoupageAdministratif::Region.all
 
 # Find a municipality by INSEE code
-# A municipality has a `commune_type` which can be :commune_actuelle (current municipalities), :commune_deleguee (former municipalities), or :commune_associee (former municipalities with a special status)
+# A municipality has a `commune_type` which can be :commune_actuelle (current municipalities), :commune_deleguee (former municipalities), :commune_associee (former municipalities with a special status), or :arrondissement_municipal (municipal districts of Paris, Lyon, Marseille)
 commune = DecoupageAdministratif::Commune.find('75056')
 puts commune.nom # => "Paris"
 
+# List all current municipalities (current communes + municipal districts)
+DecoupageAdministratif::Commune.actuelles
+
 # List departments of a region
 DecoupageAdministratif::Region.find('84').departements
 

data/lib/decoupage_administratif/base_model.rb

@@ -24,37 +24,103 @@ module DecoupageAdministratif
       all.find { |item| criteria.all? { |k, v| item.send(k) == v } }
     end
 
+    # Filter records based on criteria with optional case-insensitive and partial matching
+    #
     # @param args [Hash] keyword arguments containing filter criteria and options
-    # @option args [Boolean] :case_insensitive perform case-insensitive matching
-    # @option args [Boolean] :partial allow partial string matching (contains)
+    # @option args [Boolean] :case_insensitive perform case-insensitive matching (only for String values)
+    # @option args [Boolean] :partial allow partial string matching using contains logic (only for String values)
+    #
+    # @note When filtering with an Array:
+    #   - Without options: checks if the item's value is included in the array (similar to SQL IN clause)
+    #   - With case_insensitive: performs case-insensitive matching for each array element (String values only)
+    #   - With partial: checks if item's value contains any of the array elements (String values only)
+    #   - Both options can be combined for case-insensitive partial matching
+    #
     # @return [Array] an array of all items that match the criteria
-    # @example
+    #
+    # @example Simple filtering
     #   DecoupageAdministratif::Departement.where(code_region: '52')
+    #
+    # @example Case-insensitive and partial matching
     #   DecoupageAdministratif::Commune.where(nom: 'pari', case_insensitive: true, partial: true)
-    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    #
+    # @example Array filtering (SQL IN-like behavior)
+    #   DecoupageAdministratif::Commune.where(commune_type: [:commune_actuelle, :arrondissement_municipal])
+    #
+    # @example Array filtering with case-insensitive matching
+    #   DecoupageAdministratif::Commune.where(nom: ['paris', 'mamers'], case_insensitive: true)
+    #
+    # @example Array filtering with partial matching
+    #   DecoupageAdministratif::Commune.where(nom: ['par', 'mam'], partial: true)
     def where(**args)
-      # Separate options from criteria
       case_insensitive = args.delete(:case_insensitive) || false
       partial = args.delete(:partial) || false
 
       all.select do |item|
-        args.all? do |key, value|
-          item_value = item.send(key)
-
-          if case_insensitive && value.is_a?(String) && item_value.is_a?(String)
-            if partial
-              item_value.downcase.include?(value.downcase)
-            else
-              item_value.downcase == value.downcase
-            end
-          elsif partial && value.is_a?(String) && item_value.is_a?(String)
-            item_value.include?(value)
-          else
-            item_value == value
-          end
-        end
+        args.all? { |key, value| matches?(item.send(key), value, case_insensitive, partial) }
       end
-      # rubocop:enable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    end
+
+    private
+
+    # Check if item_value matches the filter_value based on options
+    #
+    # @param item_value [Object] the value from the item being filtered
+    # @param filter_value [Object, Array] the value(s) to filter by
+    # @param case_insensitive [Boolean] whether to perform case-insensitive matching
+    # @param partial [Boolean] whether to perform partial (contains) matching
+    # @return [Boolean] true if the value matches the filter
+    def matches?(item_value, filter_value, case_insensitive, partial)
+      return match_array?(item_value, filter_value, case_insensitive, partial) if filter_value.is_a?(Array)
+      return match_single_value?(item_value, filter_value, case_insensitive, partial) if strings?(item_value, filter_value)
+
+      item_value == filter_value
+    end
+
+    # Check if item_value matches any value in the filter array
+    #
+    # @param item_value [Object] the value from the item being filtered
+    # @param filter_array [Array] array of values to match against
+    # @param case_insensitive [Boolean] whether to perform case-insensitive matching
+    # @param partial [Boolean] whether to perform partial (contains) matching
+    # @return [Boolean] true if the value matches any element in the array
+    def match_array?(item_value, filter_array, case_insensitive, partial)
+      return filter_array.include?(item_value) unless apply_string_options?(item_value, filter_array)
+
+      filter_array.any? { |filter_element| match_single_value?(item_value, filter_element, case_insensitive, partial) }
+    end
+
+    # Check if item_value matches filter_value with string options
+    #
+    # @param item_value [String] the string value from the item
+    # @param filter_value [String] the string value to filter by
+    # @param case_insensitive [Boolean] whether to perform case-insensitive matching
+    # @param partial [Boolean] whether to use partial (contains) matching
+    # @return [Boolean] true if strings match according to options
+    def match_single_value?(item_value, filter_value, case_insensitive, partial)
+      return item_value.downcase.include?(filter_value.downcase) if case_insensitive && partial
+      return item_value.downcase == filter_value.downcase if case_insensitive
+      return item_value.include?(filter_value) if partial
+
+      item_value == filter_value
+    end
+
+    # Check if both values are strings
+    #
+    # @param value1 [Object] first value to check
+    # @param value2 [Object] second value to check
+    # @return [Boolean] true if both values are strings
+    def strings?(value1, value2)
+      value1.is_a?(String) && value2.is_a?(String)
+    end
+
+    # Check if string matching options should be applied
+    #
+    # @param item_value [Object] the value from the item
+    # @param filter_array [Array] the filter array
+    # @return [Boolean] true if string options should be applied
+    def apply_string_options?(item_value, filter_array)
+      item_value.is_a?(String) && filter_array.all? { |v| v.is_a?(String) }
     end
   end
 end

data/lib/decoupage_administratif/commune.rb

@@ -20,6 +20,7 @@ module DecoupageAdministratif
     #     - :commune_actuelle: Standard current commune
     #     - :commune_deleguee: Delegated commune
     #     - :commune_associee: Associated commune
+    #     - :arrondissement_municipal: Municipal district (Paris, Lyon, Marseille)
     #   @note Default value is :commune_actuelle
     attr_reader :code, :nom, :zone, :region_code, :departement_code, :commune_type
 
@@ -54,9 +55,9 @@ module DecoupageAdministratif
       end
     end
 
-    # @return [Array<Commune>] a collection of all communes _actuelles_
+    # @return [Array<Commune>] a collection of all communes _actuelles_ and municipal districts
     def self.actuelles
-      @actuelles ||= where(commune_type: :commune_actuelle)
+      @actuelles ||= where(commune_type: %i[commune_actuelle arrondissement_municipal])
     end
 
     # @raise [NotFoundError] if no region is found for the code

data/lib/decoupage_administratif/departement.rb

@@ -4,6 +4,7 @@ module DecoupageAdministratif
   class Departement
     extend BaseModel
     include TerritoryExtensions
+
     # @!attribute [r] code
     #   @return [String] INSEE code of the department
     # @!attribute [r] nom

data/lib/decoupage_administratif/search.rb

@@ -118,7 +118,7 @@ module DecoupageAdministratif
     # Check if only one key and it is nil
     # @return [Boolean]
     def only_nil_key?
-      @codes.keys.uniq.count == 1 && @codes.keys.first.nil?
+      @codes.keys.uniq.one? && @codes.keys.first.nil?
     end
 
     # Should add departement to result?
@@ -154,7 +154,7 @@ module DecoupageAdministratif
     # @return [void]
     def search_for_epcis
       @epcis = []
-      return if @codes.keys.uniq.count == 1 && @codes.keys.first.nil?
+      return if @codes.keys.uniq.one? && @codes.keys.first.nil?
 
       @codes.each_value do |communes|
         # Find EPCIs that match all communes in the current group
@@ -171,7 +171,7 @@ module DecoupageAdministratif
     # @return [void]
     def search_for_communes
       @communes = []
-      return if @codes.keys.uniq.count == 1 && @codes.keys.first.nil?
+      return if @codes.keys.uniq.one? && @codes.keys.first.nil?
 
       @codes.each_value do |communes|
         communes.map { |commune| @communes << commune }

data/lib/decoupage_administratif/territory_strategies.rb

@@ -10,7 +10,7 @@ module DecoupageAdministratif
       def includes_any_commune_code?(commune_insee_codes)
         return false if commune_insee_codes.empty?
 
-        check_inclusion(commune_insee_codes)
+        check_inclusion?(commune_insee_codes)
       end
 
       def insee_codes
@@ -21,7 +21,7 @@ module DecoupageAdministratif
 
       attr_reader :territory
 
-      def check_inclusion(commune_insee_codes)
+      def check_inclusion?(commune_insee_codes)
         raise NotImplementedError, "Must be implemented by subclass"
       end
 
@@ -33,7 +33,7 @@ module DecoupageAdministratif
     class CommuneStrategy < Base
       private
 
-      def check_inclusion(commune_insee_codes)
+      def check_inclusion?(commune_insee_codes)
         commune_insee_codes.include?(territory.code)
       end
 
@@ -45,7 +45,7 @@ module DecoupageAdministratif
     class DepartementStrategy < Base
       private
 
-      def check_inclusion(commune_insee_codes)
+      def check_inclusion?(commune_insee_codes)
         departement_prefix = territory.code.length == 2 ? territory.code : territory.code[0..1]
         commune_insee_codes.any? { |commune_code| commune_code.start_with?(departement_prefix) }
       end
@@ -58,7 +58,7 @@ module DecoupageAdministratif
     class RegionStrategy < Base
       private
 
-      def check_inclusion(commune_insee_codes)
+      def check_inclusion?(commune_insee_codes)
         departement_codes = territory.departements.map(&:code)
         commune_insee_codes.any? do |commune_code|
           dept_code = commune_code.length >= 3 && commune_code[0..1].to_i >= 96 ? commune_code[0..2] : commune_code[0..1]
@@ -74,7 +74,7 @@ module DecoupageAdministratif
     class EpciStrategy < Base
       private
 
-      def check_inclusion(commune_insee_codes)
+      def check_inclusion?(commune_insee_codes)
         epci_commune_codes = territory.membres.map { |membre| membre[:code] || membre["code"] }
         (epci_commune_codes & commune_insee_codes).any?
       end

data/lib/decoupage_administratif/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module DecoupageAdministratif
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
   DATA_VERSION = "5.2.0"
   DATA_SOURCE = "@etalab/decoupage-administratif"
 end

data/sig/decoupage_administratif/base_model.rbs

@@ -2,6 +2,14 @@ module DecoupageAdministratif
   module BaseModel
     def find: (String) -> untyped
     def find_by: (Hash[Symbol, untyped]) -> untyped
-    def where: (Hash[Symbol, untyped]) -> Array[untyped]
+    def where: (**untyped) -> Array[untyped]
+
+    private
+
+    def matches?: (untyped item_value, untyped filter_value, bool case_insensitive, bool partial) -> bool
+    def match_array?: (untyped item_value, Array[untyped] filter_array, bool case_insensitive, bool partial) -> bool
+    def match_single_value?: (String item_value, String filter_value, bool case_insensitive, bool partial) -> bool
+    def strings?: (untyped value1, untyped value2) -> bool
+    def apply_string_options?: (untyped item_value, Array[untyped] filter_array) -> bool
   end
 end

data/sig/decoupage_administratif/commune.rbs

@@ -8,7 +8,7 @@ module DecoupageAdministratif
     attr_reader zone: String
     attr_reader region_code: String
     attr_reader departement_code: String
-    attr_reader commune_type: String
+    attr_reader commune_type: Symbol
 
     def initialize: (
         code: String,
@@ -21,7 +21,7 @@ module DecoupageAdministratif
 
     def self.all: () -> Array[Commune]
 
-    def self.communes_actuelles: () -> Array[Commune]
+    def self.actuelles: () -> Array[Commune]
 
     def region: () -> Region
 

data/sig/decoupage_administratif/territory_strategies.rbs

@@ -11,7 +11,7 @@ module DecoupageAdministratif
 
       attr_reader territory: untyped
 
-      def check_inclusion: (Array[String] commune_insee_codes) -> bool
+      def check_inclusion?: (Array[String] commune_insee_codes) -> bool
 
       def calculate_insee_codes: () -> Array[String]
     end
@@ -19,7 +19,7 @@ module DecoupageAdministratif
     class CommuneStrategy < Base
       private
 
-      def check_inclusion: (Array[String] commune_insee_codes) -> bool
+      def check_inclusion?: (Array[String] commune_insee_codes) -> bool
 
       def calculate_insee_codes: () -> Array[String]
     end
@@ -27,7 +27,7 @@ module DecoupageAdministratif
     class DepartementStrategy < Base
       private
 
-      def check_inclusion: (Array[String] commune_insee_codes) -> bool
+      def check_inclusion?: (Array[String] commune_insee_codes) -> bool
 
       def calculate_insee_codes: () -> Array[String]
     end
@@ -35,7 +35,7 @@ module DecoupageAdministratif
     class RegionStrategy < Base
       private
 
-      def check_inclusion: (Array[String] commune_insee_codes) -> bool
+      def check_inclusion?: (Array[String] commune_insee_codes) -> bool
 
       def calculate_insee_codes: () -> Array[String]
     end
@@ -43,7 +43,7 @@ module DecoupageAdministratif
     class EpciStrategy < Base
       private
 
-      def check_inclusion: (Array[String] commune_insee_codes) -> bool
+      def check_inclusion?: (Array[String] commune_insee_codes) -> bool
 
       def calculate_insee_codes: () -> Array[String]
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decoupage_administratif
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Lucien Mollard
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-08-29 00:00:00.000000000 Z
+date: 2025-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake