wolf_core 1.0.68 → 1.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fd91295408ff2f54a66a3c894a46c34cbf8ba9c79d0c5d2604cfcef554e2ab0
-  data.tar.gz: 28a7c16e6a124fa97cc80b1a9b8decc9d4446c72d92eb4905e712f0921fec22c
+  metadata.gz: 4d5fa238459aefb14f513bd81c063aff7227a31f27ff2b3d56fbc98b4cfcd38b
+  data.tar.gz: ec08c21d261cde65e3107cde28b3d297d797ee27724df5996b5aea23e43b4755
 SHA512:
-  metadata.gz: 44b79a76c0b17651d393a7bd523acf3adf14dc93211d7d7a9eb32a6a38759f5041dfa0ea1620bf8e8b95e6392c97eefefdca1b3d2cdbdf2e54c99853f3c6272b
-  data.tar.gz: f6b3a6515df0d2868071cc483b47fa166459b2aeb31cfef5c9b50c0509c6fb9cbd41ae9f642c95bea550943bba9177ea055ca402db5c132cc7ad2a0c07ef090d
+  metadata.gz: 7a5f7d94c752f04cef2bd762cfef9ba6ae77ff3c57e5d0913fbce580fa8f88a18e29c2c40cb6c287540cfa193fa95b4ef42335824050390fc52f9c1585ed9d64
+  data.tar.gz: cf5ad9f109e43bbb6beac1f24eaba663515a83f0c955a949c29469067c433c6637c870dc35c7a1c9e89d42bd8bbddae61ad90099503e11e403939b45b0791ce3

data/lib/wolf_core/utils/friendly_model_id.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # In order to use this module on a model you only need to include it and implement the friendly_id_candidates method.
 #
 # Example:
@@ -9,7 +11,8 @@
 #     [[:name], [:name, :id]]
 #   end
 # end
-# This will generate a friendly_id based on the name field, if it is not unique it will append the id to the friendly_id.
+# This will generate a friendly_id based on the name field.
+# If it is not unique it will append the id to the friendly_id.
 #
 # You can also override the set_friendly_id method to customize the friendly_id generation
 
@@ -19,50 +22,55 @@ module WolfCore
     include WolfCore::StringUtils
 
     included do
-      unless column_names.include?('friendly_id')
-        raise "Model #{self.name} does not have a friendly_id column"
-      end
+      raise "Model #{name} does not have a friendly_id column" unless column_names.include?("friendly_id")
 
       scope :by_friendly_id, ->(friendly_id) { where(friendly_id: friendly_id) }
-  
+
       before_save :set_friendly_id
     end
 
     def set_friendly_id
-      return if self.friendly_id.present?
+      return if friendly_id.present?
 
-      friendly_id_id_candidates.each do |candidate|
-        friendly_id = convert_candidate_to_friendly_id(candidate)
-        next if friendly_id.blank?
+      self.friendly_id = generate_friendly_id
+    end
 
-        friendly_id_used = self.class.where.not(id: self.id).find_by(friendly_id: friendly_id).present?
-        next if field_value_used
+    def generate_friendly_id
+      friendly_id = find_unique_friendly_id
+      return friendly_id if friendly_id.present?
 
-        self.friendly_id = friendly_id
-      end
+      default_candidate = Array(friendly_id_candidates.first) + [:id]
+      convert_candidate_to_friendly_id(default_candidate)
+    end
 
-      return if self.friendly_id.present?
+    def find_unique_friendly_id
+      friendly_id_candidates.each do |candidate|
+        friendly_id = convert_candidate_to_friendly_id(candidate)
+        return friendly_id if friendly_id.present? && !friendly_id_used?(friendly_id)
+      end
+      nil
+    end
 
-      default_candidate = Array(friendly_id_id_candidates.first) + [:id]
-      self.friendly_id = convert_candidate_to_friendly_id(default_candidate)
+    def friendly_id_candidates
+      [:id]
     end
 
     def convert_candidate_to_friendly_id(candidate)
       candidate = Array(candidate)
-      candidate.map! { |field| field.to_sym }.uniq!
+      candidate.map!(&:to_sym).uniq!
       candidate.map do |field|
         field_value = send(field)
         parse_field_value(field_value)
-      end.join('-')
+      end.join("-")
     end
 
-    def parse_field_value(field_value)
-      field_value = to_kebab_case(field_value)
-      remove_non_alphanumeric_chars(field_value, exceptions: '-')
+    def friendly_id_used?(friendly_id)
+      self.class.where.not(id: id).find_by(friendly_id: friendly_id).present?
     end
 
-    def friendly_id_candidates
-      [:id]
+    def parse_field_value(field_value)
+      field_value = to_kebab_case(field_value)
+      remove_non_alphanumeric_chars(field_value, exceptions: "-")
     end
   end
-end
+end

data/lib/wolf_core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module WolfCore
-  VERSION = "1.0.68"
+  VERSION = "1.0.69"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wolf_core
 version: !ruby/object:Gem::Version
-  version: 1.0.68
+  version: 1.0.69
 platform: ruby
 authors:
 - Javier Roncallo