precedences 1.5.1 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69c48ce2d4dd7a75e39e091581e48c02475ad26e4715a70ef99f705fd1d95ab8
-  data.tar.gz: 621913cb7d2b49741586fbdb0cccac0c0487b830c63b67d59330d8b3f3c68cd3
+  metadata.gz: f38cb3d4a0d686152dba85df8e36c3bfb7f9c78e9a1e2167fe526cc8826a3b22
+  data.tar.gz: 302e835fa556e5a71ccd2896db769372eda815e1d73779a0feb4cb6055bf3bf1
 SHA512:
-  metadata.gz: ea0d0643888097323ebe4cfe4c2c44c5593f5256bf292e3a6da7c0a79e0a56c8737ef33c7747be29f49178b0168a7db668f99f1b9dd6052d1c7a0d9c98c1f465
-  data.tar.gz: 9f8759e3f0583e4c8184268de8884bac91864e738457e3029d205e26d9fdedb1bad35ca1d8029ef766d7a403d84a9411045a35528724ebedce4194230451e445
+  metadata.gz: 18b50411d57cbc635d49ef76d8e2c1f5383411817b7abe084427a5dbfc300d23b12cbd5745bd911dbd0aecebe41b4bc414dbc7419291551d357bd7e9ea895476
+  data.tar.gz: 5a908f668ff5b34d262ca5a24ec437bf3dcc8049d67e06d900924417ce1d85b64867d7640e7813888e8752550ee3e572279e227295b1b508ad7942bdb7ac0274

data/CHANGELOG

@@ -1,3 +1,10 @@
+# 1.6.1
+
+  - Correction du bug quand classement par index et suppression
+    d’un item (trou)
+  - Ajout de la possibilité de définir une autre clé pour le
+    classement (`per_other_key`).
+
 # 1.5.1
 
   - Ajout de l’option `:cycle` pour `Q.select`

data/Manual/Manuel-fr.md

@@ -86,6 +86,25 @@ choix = precedencize(choices, file) do |q|
 end
 ~~~
 
+On peut aussi définir une autre clé que `:value` pour le tri, avec la propriété `per_other_key`
+
+~~~ruby
+require 'precedences'
+
+#
+# Des choix avec des valeurs spéciales
+#
+choices = [
+  {name:"La classe Integer"   , pkey: :entier, value: Integer},
+  {name:"La classe Array"     , pkey: :liste   ,value: Array},
+  {name:"La classe Hash"      , pkey: :table , value: Hash},
+]
+
+choix = precedencize(choices, file) do |q|
+  q.question "Choisis une classe"
+  q.per_other_key :pkey  # <=== autre clé
+end
+~~~
 
 
 ## Options possibles

data/lib/precedences/precedence.rb

@@ -21,6 +21,7 @@ class Precedence
     @per_page   = nil
     @default    = 1
     @precedences_per_index  = false
+    @per_other_key          = nil
     @add_choice_cancel      = nil
   end
 
@@ -89,6 +90,10 @@ class Precedence
     @precedences_per_index === true
   end
 
+  def per_other_key?
+    not(@per_other_key.nil?)
+  end
+
   def add_choice_cancel?
     not(@add_choice_cancel.nil?)
   end
@@ -135,6 +140,17 @@ class Precedence
   end
   def precedences_per_index=(value) ; precedences_per_index(value) end
 
+  def per_other_key(value = :__no_value)
+    if value == :__no_value
+      return @per_other_key
+    elsif not(value)
+      @per_other_key = nil
+    else
+      @per_other_key = value
+    end
+  end
+  def per_other_key=(value) ; per_other_key(value) end
+
   ##
   # To add the cancel choice
   # 
@@ -178,16 +194,17 @@ class Precedence
     #
     # Main method whose sort items
     # 
-    # @api private
+    # @private
     def sort_items(choices)
       return choices unless File.exist?(filepath)
       prec_ids = get_precedences_ids
       if precedences_per_index?
         choices_copy = choices.dup
-        choices = prec_ids.map do |id| 
-          item = choices_copy[id.to_i - 1]
+        choices = []
+        prec_ids.each do |id| 
+          item = choices_copy[id.to_i - 1] || next
           choices_copy[id.to_i - 1] = nil
-          item
+          choices << item
         end
         # On ajoute les choix restants
         choices += choices_copy.compact
@@ -195,8 +212,9 @@ class Precedence
         # 
         # Cas normal
         # 
+        key_prec = per_other_key? ? per_other_key : :value
         choices.sort!{|a, b|
-          (prec_ids.index(a[:value].to_s)||10000) <=> (prec_ids.index(b[:value].to_s)||10000)
+          (prec_ids.index(a[key_prec].to_s)||10000) <=> (prec_ids.index(b[key_prec].to_s)||10000)
         }
       end
       return choices
@@ -219,7 +237,7 @@ class Precedence
 
     # Save the values order in filepath file
     # 
-    # @api private
+    # @private
     def set_precedences_ids(value)
       if precedences_per_index?
         # 
@@ -245,7 +263,7 @@ class Precedence
 
     # Get the values sorted if filepath exists.
     # 
-    # @api private
+    # @private
     def get_precedences_ids
       @get_precedences_ids ||= begin
         File.exist?(filepath) ? File.read(filepath).split("\n") : [] 
@@ -257,7 +275,7 @@ class Precedence
     # Raise an argument error otherwise.
     # If it's a folder, set to .precedences file
     # 
-    # @api private
+    # @private
     def filepath_validize_or_raises
       File.exist?(File.dirname(filepath)) || raise(ArgumentError.new("Precedences incorrect file: its folder should exist."))
       if File.exist?(filepath) && File.directory?(filepath)
@@ -270,7 +288,7 @@ class Precedence
     ##
     # Check if given choices are valid. Raise an ArgumentError otherwise
     # 
-    # @api private
+    # @private
     def choices_valid_or_raises(choices)
       # 
       # On en aura besoin

data/lib/precedences/version.rb

@@ -1,3 +1,3 @@
 module Precedences
-  VERSION = "1.5.1"
+  VERSION = "1.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: precedences
 version: !ruby/object:Gem::Version
-  version: 1.5.1
+  version: 1.6.1
 platform: ruby
 authors:
 - PhilippePerret
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-23 00:00:00.000000000 Z
+date: 2024-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clir