klastera 1.4.3 → 1.4.4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e524bc600751df634962778af44d6b9bd782cabdf7a125a145d2a7efbfbe6950
-  data.tar.gz: ab457168729e69d5f1ca94f40ea667b78e3610993eaa686998e8aa792f865db1
+  metadata.gz: 5360c25a358007e11929e1c705ed18f97538d0a2dcfa7817e838dc422457a3f7
+  data.tar.gz: 319361af1415f3337408b376703a6b8e8021975d137be787c4ec8e2ea318ad4f
 SHA512:
-  metadata.gz: f30c250c13e081a7aebeb66fce89386638d445a92f5dd995c4855483a45efd7bf7927265980fff8ffcef7ca3e9d3f5fc53c618b05babc92464a6986a8878df84
-  data.tar.gz: 97007ff678bbc223506ac5fc53814c9b7363c3e45ba4f39455f73d8abdd1012bab6fd7b126b3237cc42b91fbbb6a969061c72ece12549aa1d84ae0810522a43a
+  metadata.gz: 56d74c36d8de04066a89ac3d0cb05abfedca150d6e5264872cb1e283138f76e828eadfca43824e7977020898a7a69287f2392b9263a6316eb4cd6b9ca5e8d397
+  data.tar.gz: 39917be78a6bac52e0077d0f6cf40e915c2c11fd360d79ee51881fec65577c21093c9080f06e3b74cbcc0f514b0cc6cca1bbc8b0e6720eca23b0fc08203e56f0

data/app/models/klastera/clusterizable.rb

@@ -0,0 +1,5 @@
+module Klastera
+  class ClusterEntity < ActiveRecord::Base
+    include Klastera::Concerns::Clusterizable
+  end
+end

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

@@ -1,13 +1,16 @@
 module Klastera::Concerns::Clusterizable
   extend ActiveSupport::Concern
+
   included do
+    class MutipleClustersOperationError < StandardError; end
+
     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
 
-    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) }
@@ -18,6 +21,10 @@ module Klastera::Concerns::Clusterizable
       end
     end
 
+    def allow_multiple_clusters?(default=:one)
+      organization.present? && organization.cluster_cardinality_of(self.class, default: default) == :many
+    end
+
     ##
      # This is a legacy method and we don't recommend using it.
      # Implement directly Klastera.entity_clusters_string_list instead of this method.
@@ -25,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/organization.rb

@@ -1,7 +1,7 @@
 module Klastera::Concerns::Organization
   extend ActiveSupport::Concern
   included do
-    
+    serialize :cluster_config
     has_many :clusters
     
     validates :use_cluster_as, inclusion: { in: ::Cluster::MODES.map{|m|m.to_s}, message: I18n.t('klastera.clusters.wrong_option') }, if: proc{ use_cluster_as.present? }
@@ -11,6 +11,17 @@ module Klastera::Concerns::Organization
       self.use_cluster_as.to_s.to_sym
     end
 
+    def cluster_cardinality_of(entity, default: :many)
+      if cluster_config.is_a?(Hash)
+        entities_cardinality = cluster_config[:entities]&.[](:cardinality)||{}
+        entity = entity.to_s.to_sym
+        if entities_cardinality.has_key?(entity)
+          default = entities_cardinality[entity]
+        end
+      end
+      default.to_s.to_sym
+    end
+
     ##
      # Return a boolean if one of three of options was set in organization
      # As useless option you can retrieve the value passing false as argument.

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/app/views/layouts/klastera/_cluster_entity_fields.html.erb

@@ -1,6 +1,6 @@
 <tr class="nested-fields">
   <td class="field">
-    <%= f.select :cluster_id, @clusters_session.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    <%= f.select :cluster_id, @clusters_session.order(:order,:name).map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
   </td>
   <td class="action vertical-align-middle text-center" width="44">
     <%= link_to_remove_association f, class: 'btn btn-danger btn-xs text-danger' do %>

data/app/views/layouts/klastera/_cluster_filter.html.erb

@@ -7,7 +7,7 @@
   <%=yield(f) if block_given? %>
 
   <% if cluster_organization.is_in_cluster_mode? %>
-    <% cluster_collection = cluster_list.map{|c|[c.name,(c.id||c.nid)]} %>
+    <% cluster_collection = cluster_list.order(:order, :name).map{|c|[c.name,(c.id||c.nid)]} %>
     <% if cluster_collection.size > 1 %>
       <div class="inline-label-control-block">
         <%= f.input :cluster_id, collection: cluster_collection, prompt: t('klastera.clusters.all'), label: false, wrapper: false %>

data/app/views/layouts/klastera/_cluster_user_fields.html.erb

@@ -1,6 +1,6 @@
 <tr class="nested-fields">
   <td class="field">
-    <%= f.select :cluster_id, @user.organization.clusters.map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
+    <%= f.select :cluster_id, @user.organization.clusters.order(:order, :name).map{|c|[c.name,c.id]}, { include_blank: true }, { class: 'form-control' } %>
   </td>
   <td class="action vertical-align-middle text-center" width="44">
     <%= link_to_remove_association f, class: 'btn btn-danger btn-xs text-danger' do %>

data/db/migrate/20200908180057_add_cluster_config_to_organization.rb

@@ -0,0 +1,5 @@
+class AddClusterConfigToOrganization < ActiveRecord::Migration
+  def change
+    add_column :organizations, :cluster_config, :text
+  end
+end

data/lib/klastera.rb

@@ -54,7 +54,7 @@ module Klastera
       end
       _cluster_entities.map do |ce|
         ce.cluster.try(attribute)
-      end.compact.join(separator)
+      end.compact.sort.join(separator)
     end
 
     ##

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.4.3"
+  VERSION = "1.4.4.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4.3.1
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-08 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -58,6 +58,7 @@ files:
 - app/models/klastera/cluster_entity.rb
 - app/models/klastera/cluster_filter.rb
 - app/models/klastera/cluster_user.rb
+- app/models/klastera/clusterizable.rb
 - app/models/klastera/concerns/cluster.rb
 - app/models/klastera/concerns/cluster_entity.rb
 - app/models/klastera/concerns/cluster_filter.rb
@@ -93,6 +94,7 @@ files:
 - db/migrate/20200330010551_create_klastera_cluster_users.rb
 - db/migrate/20200330221601_add_order_field_to_clusters.rb
 - db/migrate/20200518142609_create_klastera_cluster_entities.rb
+- db/migrate/20200908180057_add_cluster_config_to_organization.rb
 - lib/klastera.rb
 - lib/klastera/engine.rb
 - lib/klastera/version.rb