klastera 1.5.5.1 → 1.5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01b3c7e4c25fc9bfa852d34304d0f0cb12b832da7565375eb9e4cb5f4abc2566
-  data.tar.gz: 5ccc41a05b2e0ae3a5e8f4b16176be63ec752b0a112f3d8c1276bd403b591386
+  metadata.gz: 1b7a266fca197bb8333a1bfa72e2a36b2bdec447429a1e50e95b5b89dc31fb5f
+  data.tar.gz: fd8ec6949e6fea5015fe33090ecf09a90e9815361d8e861fb42ac856e83ff111
 SHA512:
-  metadata.gz: 07c277261a1ff65e45ca4413587c3ca51952e497176d2a3e29e361c955a51e2d6d77bd4ae5ee8946e8981d56fa1ec756eed81b12e454f623732e5505a7a09349
-  data.tar.gz: 6f1097125134ab6a528c165df1396697c4c83db96bbfa2265b19f04025a2f72fe5a4e423dcf2a49f23fb0fcb75156911471190e332fae94cd962e2331d0042b7
+  metadata.gz: 29ed3030a1296a3fb95073255642e9bef489fea5d136291d8d6f8e71f5b2b6f8ab040034e56c5dc66e70d09451d1880290fedfbbc904ac105ec7dc58ae4810f8
+  data.tar.gz: 7bc4e57bdac9abc5cf68be34bc64c48dbce81f6db405485e4dca1e6a8079e1d97e28630e159fb5049158a5d0f280fd000849b89e0cf6dfdc87f2a56bd4ae4e6b

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? }
@@ -50,8 +54,10 @@ module Klastera::Concerns::Clusterizable
       )
     end
 
+    # No cuenta las filas marcadas para destruir: quitar una zona con el basurero y agregar otra en
+    # el mismo guardado deja una sola zona al final, y no debe rechazarse.
     def has_one_cluster_entity
-      if cluster_entities.length > 1
+      if cluster_entities.reject(&:marked_for_destruction?).length > 1
         return errors.add(:cluster_entities, I18n.t('klastera.messages.has_one_cluster_entity'))
       end
     end

data/lib/klastera/version.rb

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

data/test/models/klastera/clusterizable_nested_attributes_test.rb

@@ -0,0 +1,64 @@
+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
+
+    # Entidad que permite una sola zona (por defecto): quitar una y agregar otra en el mismo guardado
+    # deja una sola, y la validacion no debe contar la fila marcada para destruir.
+    test "acepta quitar una zona y agregar otra en el mismo guardado" do
+      entity, ce, = build_entity_with_cluster
+      otro = ::Cluster.create!(organization: entity.organization, name: "otro-#{SecureRandom.hex(2)}")
+      entity.assign_attributes(cluster_entities_attributes: {
+        "0" => { "id" => ce.id, "_destroy" => "1" },
+        "1" => { "cluster_id" => otro.id.to_s, "_destroy" => "false" }
+      })
+      entity.valid?
+      assert_not entity.errors[:cluster_entities].any? { |m| m == I18n.t('klastera.messages.has_one_cluster_entity') }
+    end
+
+    test "sigue rechazando dos zonas vigentes en una entidad de una sola zona" do
+      entity, _ce, = build_entity_with_cluster
+      otro = ::Cluster.create!(organization: entity.organization, name: "otro2-#{SecureRandom.hex(2)}")
+      entity.assign_attributes(cluster_entities_attributes: { "1" => { "cluster_id" => otro.id.to_s, "_destroy" => "false" } })
+      entity.valid?
+      assert entity.errors[:cluster_entities].any?
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.5.5.1
+  version: 1.5.5.3
 platform: ruby
 authors:
 - Gino Barahona
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-25 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