klastera 1.5.5 → 1.5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9a474c54506a3e2a3b92ce5961de94a71dd28699354b671be08337b4bdfac5
-  data.tar.gz: 01db2dd1040338587462593e22ef1103f3c7ecd6ce13e48656dcd47eb7cf31c9
+  metadata.gz: 01b3c7e4c25fc9bfa852d34304d0f0cb12b832da7565375eb9e4cb5f4abc2566
+  data.tar.gz: 5ccc41a05b2e0ae3a5e8f4b16176be63ec752b0a112f3d8c1276bd403b591386
 SHA512:
-  metadata.gz: a54cf22f075c58094950f74345fe924686f79ab8454ca6afc4b80555bbe26367d56500867b1fbf83f3f270d9f0effe9d9907ceacdbc18f02f32f35654abf237d
-  data.tar.gz: d197f19bc4c590359364cbd965295fb981dedfc22f0e33cf02673c75bfc5228b50f6543d316ee2de887437deec92ceb65bcadc617f1d6a4b1af3f2e44f53ae05
+  metadata.gz: 07c277261a1ff65e45ca4413587c3ca51952e497176d2a3e29e361c955a51e2d6d77bd4ae5ee8946e8981d56fa1ec756eed81b12e454f623732e5505a7a09349
+  data.tar.gz: 6f1097125134ab6a528c165df1396697c4c83db96bbfa2265b19f04025a2f72fe5a4e423dcf2a49f23fb0fcb75156911471190e332fae94cd962e2331d0042b7

data/app/models/klastera/concerns/clusterizable.rb

@@ -33,7 +33,7 @@ module Klastera::Concerns::Clusterizable
     def clusters_string_separated_by(separator, attribute=:name)
       # Use Rails cache for frequently accessed cluster strings
       cache_key = [self.cache_key_with_version, :clusters_string, separator, attribute]
-      
+
       Rails.cache.fetch(cache_key, expires_in: 30.minutes) do
         Klastera.entity_clusters_string_list!(
           cluster_entities, separator, attribute
@@ -74,9 +74,9 @@ module Klastera::Concerns::Clusterizable
      ##
     def preload_clusters(collection)
       return collection if collection.empty?
-      
+
       ActiveRecord::Associations::Preloader.new.preload(
-        collection, 
+        collection,
         cluster_entities: :cluster
       )
       collection

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.5.5"
+  VERSION = "1.5.5.1"
 end

data/lib/klastera.rb

@@ -53,10 +53,10 @@ module Klastera
       if allowed_cluster_ids.is_a?(Array)
         _cluster_entities.select!{|ce| allowed_cluster_ids.include?(ce.cluster_id)}
       end
-      
+
       # Performance optimization: Use preloaded data when available
       if cluster_entities.respond_to?(:loaded?) && cluster_entities.loaded? &&
-         _cluster_entities.all? { |ce| ce.association(:cluster).loaded? }
+        _cluster_entities.all? { |ce| ce.association(:cluster).loaded? }
         # Use in-memory data (much faster)
         _cluster_entities.map do |ce|
           ce.cluster.try(attribute)
@@ -64,13 +64,29 @@ module Klastera
       else
         # Fallback to original method with database query
         # But use a single query instead of N+1
-        cluster_ids = _cluster_entities.map(&:cluster_id).compact.uniq
+
+        cluster_ids = _cluster_entities.filter_map(&:cluster_id).uniq
         return "" if cluster_ids.empty?
-        
-        clusters_hash = ::Cluster.where(id: cluster_ids).pluck(:id, attribute).to_h
-        _cluster_entities.map do |ce|
-          clusters_hash[ce.cluster_id]
-        end.compact.sort.join(separator)
+
+        records = ::Cluster.where(id: cluster_ids).pluck(:id, attribute)
+        return "" if records.empty?
+
+        # clusters_hash = if records.any? && !records.first.is_a?(Array)
+        #   records.map { |id| [id, id] }.to_h
+        # else
+        #   records.to_h
+        # end
+        # _cluster_entities.map do |ce|
+        #   clusters_hash[ce.cluster_id]
+        # end.compact.sort.join(separator)
+
+        clusters_hash = records.first.is_a?(Array) ? records.to_h : records.index_by(&:itself)
+        _cluster_entities
+          .filter_map { |entity| clusters_hash[entity.cluster_id] }
+          .uniq
+          .sort
+          .join(separator)
+
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.5.5
+  version: 1.5.5.1
 platform: ruby
 authors:
 - Gino Barahona
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-20 00:00:00.000000000 Z
+date: 2025-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails