klastera 1.5.5 → 1.5.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f9a474c54506a3e2a3b92ce5961de94a71dd28699354b671be08337b4bdfac5
-  data.tar.gz: 01db2dd1040338587462593e22ef1103f3c7ecd6ce13e48656dcd47eb7cf31c9
+  metadata.gz: 7f593dccae852483eb2b18e8254ee94c1e44804bcb59780cd26a8987ef383443
+  data.tar.gz: f28976b48568045dfe38b3feb2915de5e87b079279b0a31e481f48741fdbd0a0
 SHA512:
-  metadata.gz: a54cf22f075c58094950f74345fe924686f79ab8454ca6afc4b80555bbe26367d56500867b1fbf83f3f270d9f0effe9d9907ceacdbc18f02f32f35654abf237d
-  data.tar.gz: d197f19bc4c590359364cbd965295fb981dedfc22f0e33cf02673c75bfc5228b50f6543d316ee2de887437deec92ceb65bcadc617f1d6a4b1af3f2e44f53ae05
+  metadata.gz: a2b1d549df310a5bf569316f5e9de36f66c9be7b5d052108d85aa1345f6d05527a536494ca39ea37e2f19f663e8973dd5d62a107ea101168f63d5a2ace6566b4
+  data.tar.gz: 1353ffb7147a62d4e35cf28a0ccafa2e976460e96db0dc566cc48ed1db0e16e2ea315d65fcd8b12c2642cea76f53e3a2b2a8c10d48000f08efb93f72f4f9c749

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

@@ -7,7 +7,11 @@ module Klastera::Concerns::Clusterizable
     belongs_to :cluster
 
     has_many :cluster_entities, as: :entity, class_name: "Klastera::ClusterEntity"
-    accepts_nested_attributes_for :cluster_entities, reject_if: :all_blank, allow_destroy: true
+    # reject_if exige cluster_id presente. Con :all_blank, una fila EXISTENTE (con id) cuyo select
+    # se deja en blanco (include_blank del formulario) no se descarta y se guarda con cluster_id=NULL:
+    # queda un cluster_entity huérfano, invisible en el formulario, que cuenta en las validaciones y
+    # bloquea el guardado. Para quitar una zona existente se usa _destroy, no vaciar el select.
+    accepts_nested_attributes_for :cluster_entities, reject_if: ->(attrs) { attrs[:cluster_id].blank? }, allow_destroy: true
 
     validates :cluster_id, presence: true, if: -> { cluster_id.present? && organization.present? && organization.required_suborganization_mode? }
     validate :at_least_one_cluster_entity, if: -> { organization.present? && organization.required_suborganization_mode? }
@@ -33,7 +37,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 +78,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.2"
 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
 

data/test/models/klastera/clusterizable_nested_attributes_test.rb

@@ -0,0 +1,43 @@
+require 'test_helper'
+
+# Estos tests no corren dentro de este repo: no existe test/dummy y usan modelos de Llegando
+# (Profile, Organization, ::Cluster). Para correrlos hay que copiarlos a llegando-neo con la gema
+# apuntando a esta rama.
+#
+# El test que prueba el fix es "no vacia el cluster_id de una fila existente": con :all_blank
+# falla (la fila queda con cluster_id NULL). Los otros dos pasan igual en main y protegen que
+# el cambio no rompa el descarte de filas nuevas vacias ni agregar/destruir zonas.
+module Klastera
+  class ClusterizableNestedAttributesTest < ActiveSupport::TestCase
+    def build_entity_with_cluster
+      entity = Profile.create!(organization: Organization.first, nid: SecureRandom.hex(4))
+      cluster = ::Cluster.create!(organization: entity.organization, name: "c-#{SecureRandom.hex(2)}")
+      ce = Klastera::ClusterEntity.create!(entity: entity, cluster_id: cluster.id)
+      [entity.reload, ce, cluster]
+    end
+
+    test "descarta una fila nueva con cluster_id vacio" do
+      entity, = build_entity_with_cluster
+      entity.assign_attributes(cluster_entities_attributes: { "0" => { "cluster_id" => "", "_destroy" => "false" } })
+      assert_equal 1, entity.cluster_entities.size
+    end
+
+    test "no vacia el cluster_id de una fila existente" do
+      entity, ce, cluster = build_entity_with_cluster
+      entity.assign_attributes(cluster_entities_attributes: { "0" => { "id" => ce.id, "cluster_id" => "", "_destroy" => "false" } })
+      entity.save!
+      assert_equal cluster.id, ce.reload.cluster_id
+    end
+
+    test "sigue permitiendo agregar y destruir zonas" do
+      entity, ce, = build_entity_with_cluster
+      otro = ::Cluster.create!(organization: entity.organization, name: "otro")
+      entity.assign_attributes(cluster_entities_attributes: {
+        "0" => { "id" => ce.id, "_destroy" => "1" },
+        "1" => { "cluster_id" => otro.id.to_s, "_destroy" => "false" }
+      })
+      assert entity.cluster_entities.any?(&:marked_for_destruction?)
+      assert entity.cluster_entities.any? { |c| c.new_record? && c.cluster_id == otro.id }
+    end
+  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.2
 platform: ruby
 authors:
 - Gino Barahona
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-20 00:00:00.000000000 Z
+date: 2026-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -108,6 +108,7 @@ files:
 - test/klastera_test.rb
 - test/models/klastera/cluster_test.rb
 - test/models/klastera/cluster_user_test.rb
+- test/models/klastera/clusterizable_nested_attributes_test.rb
 - test/test_helper.rb
 homepage: https://github.com/ginosx/klastera
 licenses:
@@ -128,16 +129,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Clusterization Engine
 test_files:
-- test/controllers/klastera/clusters_controller_test.rb
-- test/fixtures/klastera/cluster_users.yml
-- test/fixtures/klastera/clusters.yml
 - test/integration/navigation_test.rb
-- test/klastera_test.rb
-- test/models/klastera/cluster_test.rb
+- test/models/klastera/clusterizable_nested_attributes_test.rb
 - test/models/klastera/cluster_user_test.rb
+- test/models/klastera/cluster_test.rb
+- test/klastera_test.rb
+- test/fixtures/klastera/clusters.yml
+- test/fixtures/klastera/cluster_users.yml
 - test/test_helper.rb
+- test/controllers/klastera/clusters_controller_test.rb