klastera 1.4.4 → 1.4.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c15103fa238ee96065a307c2e8e4d30e99488174d0c1f6cd47cf76752998e37c
-  data.tar.gz: e6d79698657b081437e62238c3925e5346a4b47b17f5e4671f11bfeb7f6806a8
+  metadata.gz: ef0519c775285f8e1684e2b7710f6a2729d89335f4742a04f4267a156870746d
+  data.tar.gz: 87adbf443e12d8dc8eb93a6d40dd7518d138dea65c404fc8ac19e9a69ea7a742
 SHA512:
-  metadata.gz: 3e39ddb9802da7ed9f31e320e8ac36f5f26cb2fe8a4d09065c5de22fee3851e7593b08cd7223455dfdf19a718d63a98610269c2c9702e51160834938181f47d7
-  data.tar.gz: 2a2f371d207ce603d3887a86cedabe5451d3edc056b5549361c46dfa0ed8a0c64aa7e4897251db7683457880c5b2868f374067690a5a9c5d34c0f92f3863f32f
+  metadata.gz: 252b2cc54c25a5d1338d7064610ff2806c4e246f44f1101809fe97b5d0167e9d75de71994f1820e67f0e9c26e164be36ea2fd6ee0922eea9c8152c4ebbce83bb
+  data.tar.gz: 573ef0536c76d2fb6b199ac188cc90ec8f04b780f4d2562a6772b3f73051e77f62d4897ecc633fd3b869ae5d4c5f97a536bb31ebcf13a1c8c58904a37d326d4c

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

@@ -9,8 +9,8 @@ module Klastera::Concerns::Clusterizable
     has_many :cluster_entities, as: :entity, class_name: Klastera::ClusterEntity
     accepts_nested_attributes_for :cluster_entities, reject_if: :all_blank, allow_destroy: true
 
-    validates :cluster_id, presence: true, if: proc { self.try(:cluster_id) && self.organization.required_suborganization_mode? }
-    validate :at_least_one_cluster_entity, if: proc { self.organization.required_suborganization_mode? }
+    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? }
     validate :uniqueness_of_cluster_entity_record
 
     scope :includes_cluster, -> { includes(cluster_entities: :cluster) }
@@ -22,7 +22,7 @@ module Klastera::Concerns::Clusterizable
     end
 
     def allow_multiple_clusters?(default=:one)
-      organization.cluster_cardinality_of(self.class, default: default) == :many
+      organization.present? && organization.cluster_cardinality_of(self.class, default: default) == :many
     end
 
     ##
@@ -32,7 +32,7 @@ module Klastera::Concerns::Clusterizable
      ##
     def clusters_string_separated_by(separator,attribute=:name)
       Klastera.entity_clusters_string_list!(
-        self.cluster_entities, separator, attribute
+        cluster_entities, separator, attribute
       )
     end
 

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

@@ -11,29 +11,29 @@ module Klastera::Concerns::User
 
     has_many :cluster_users, inverse_of: :user, class_name: ::ClusterUser.to_s
     accepts_nested_attributes_for :cluster_users, reject_if: :all_blank, allow_destroy: true
-    validates :cluster_role, presence: true, if: proc{ self.organization.is_in_cluster_mode? }
-    validates :cluster_role, inclusion: { in: CLUSTER_ROLES , message: I18n.t('klastera.clusters.wrong_option') }, if: proc{ cluster_role.present? }
-    validate :at_least_one_role, if: proc{ self.use_cluster? && self.try(:need_cluster_assignation?) }
+    validates :cluster_role, presence: true, if: -> { organization.present? && organization.is_in_cluster_mode? }
+    validates :cluster_role, inclusion: { in: CLUSTER_ROLES , message: I18n.t('klastera.clusters.wrong_option') }, if: -> { cluster_role.present? }
+    validate :at_least_one_role, if: -> { use_cluster? && try(:need_cluster_assignation?) }
 
-    def use_cluster?; self.cluster_role.present?; end
+    def use_cluster?; cluster_role.present?; end
 
-    def is_a_cluster_root?; self.cluster_role == CLUSTER_ROOT; end
-    def is_a_cluster_admin?; self.cluster_role == CLUSTER_ADMIN; end
-    def is_a_cluster_user?; self.cluster_role == CLUSTER_USER; end
+    def is_a_cluster_root?; cluster_role == CLUSTER_ROOT; end
+    def is_a_cluster_admin?; cluster_role == CLUSTER_ADMIN; end
+    def is_a_cluster_user?; cluster_role == CLUSTER_USER; end
 
     def need_cluster_assignation?
-      self.try(:organization).try(:required_suborganization_mode?) && self.is_a_cluster_user?
+      organization.present? && organization.required_suborganization_mode? && is_a_cluster_user?
     end
 
     def can_admin_clusters?
-      self.organization.is_in_cluster_mode? && ( self.is_a_cluster_admin? || self.is_a_cluster_root? )
+      organization.present? && organization.is_in_cluster_mode? && ( is_a_cluster_admin? || is_a_cluster_root? )
     end
 
     #
     # It tells if this user should see what they cluster role or organization dictates
     # Adminers and users from show cluster modes skip cluster clause
     def cannot_skip_cluster_clause?
-      ! ( self.is_a_cluster_admin? || self.is_a_cluster_root? || ( self.organization.optional_suborganization_mode? && self.cluster_users.blank? ) )
+      ! ( is_a_cluster_admin? || is_a_cluster_root? || ( organization.present? && organization.optional_suborganization_mode? && cluster_users.blank? ) )
     end
 
     #
@@ -43,9 +43,9 @@ module Klastera::Concerns::User
     # cluster_id is present (on show/use mode organizations).
     #
     def try_to_clusterify!(role,cluster_ids)
-      if self.try(:organization).try(:is_in_cluster_mode?)
+      if organization.present? && organization.is_in_cluster_mode?
         self.cluster_role = role
-        if self.try(:organization).try(:required_suborganization_mode?) || cluster_ids.present?
+        if ( organization.present? && organization.required_suborganization_mode? ) || cluster_ids.present?
           timestamp = DateTime.now.to_i
           nested_attributes = {}
           cluster_ids.each do |cluster_id|

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.4.4"
+  VERSION = "1.4.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.4.1
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -128,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Clusterization Engine