klastera 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d4f51a31ad550a707ac854779af0d6335062752af2bf79eeb41e23eefc0ddce
-  data.tar.gz: 4abd8e21893258c0dd037d7596168a9266247441be74a751c0d6ee8ae2231796
+  metadata.gz: 878d34d9ec3f16b43e8ae1a84c4b773086606477f2b86db4052fd92eea525337
+  data.tar.gz: 338c177eaa872b07fa293ae69ec2989956a27c6feb66353a691506d9d6f2050b
 SHA512:
-  metadata.gz: 29c527c10bbb047607183891488a773655ff8d394ca28961e9745dd067cf77f0a8aa6012f096d334c3209a70e4adb1359b0623b4f3a28dd3d9dca08594328783
-  data.tar.gz: d55827e7deaa63de06c32a27a0ece3df1217d8eb4a553e1cdedee6b0efd882d33c77e9bcc9a574e89f0c7c7ae4ba4c7380c1ac74e3db79eef5f7892b4c6d62b4
+  metadata.gz: 1600809f0477ef856f83546cb04a28bd9b3e39bb139df8544e8a4c9006d9542540e0590921dbfc06c9159f8bcdfae93e4ef92bdf1341f0f173c823b958f575ff
+  data.tar.gz: 6098336be0ed5ae4aeb3de2ef873809d9f3ff06e57cd3dfa8f1dd971c9eecf2fd7dc1bb7be214e2d905a9027a97eb7ba6fe520064a1c6b993a653192c4f5afa4

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

@@ -7,7 +7,6 @@ module Klastera::Concerns::ClusterUser
     belongs_to :user
     belongs_to :cluster
 
-    validates :user_id, presence: true
     validates :cluster_id, presence: true
 
     scope :of, -> (user,organization) {

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

@@ -14,8 +14,6 @@ module Klastera::Concerns::User
     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?) }
-    before_destroy do |record|
-    end
 
     def use_cluster?; self.cluster_role.present?; end
 
@@ -35,6 +33,24 @@ module Klastera::Concerns::User
       self.organization.is_in_cluster_mode? && ( self.is_a_cluster_admin? || self.is_a_cluster_root? )
     end
 
+    # We will try to create a cluster_user record whether
+    # the organization is using force mode (if cluster_id isn't present,
+    # will raise a validation error) or cluster_id is present
+    # (on organizations with show/use mode).
+    def try_to_clusterify!(role,cluster_id)
+      if self.try(:organization).try(:is_in_cluster_mode?)
+        self.cluster_role = role
+        if self.try(:organization).try(:required_suborganization_mode?) || cluster_id.present?
+          self.cluster_users_attributes = {
+            DateTime.now.to_i => {
+              cluster_id: cluster_id,
+              _destroy: false
+            }
+          }
+        end
+      end
+    end
+
     private
 
     def at_least_one_role

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

@@ -13,7 +13,7 @@
   >
     <%= fa_icon 'info-circle', class: 'btn-link' %>
   </span>
-  <%= f.select :use_cluster_as, Cluster::MODES.map{|cm|[t("klastera.#{cm}"),cm]}, { include_blank: true }, { class: 'form-control' } %>
+  <%= f.select :use_cluster_as, ::Cluster::MODES.map{|cm|[t("klastera.#{cm}"),cm]}, { include_blank: true }, { class: 'form-control' } %>
 </div>
 
 <script type="text/javascript">

data/lib/klastera/version.rb

@@ -1,3 +1,3 @@
 module Klastera
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/lib/klastera.rb

@@ -29,7 +29,6 @@ module Klastera
       scope_klass = scope_klass.where(organization_id: organization)
 
       session_clusters(user,organization) do |clusters|
-        clusters = clusters.reject{|c|c.id.blank?}
         if organization.required_suborganization_mode?
           scope_klass = scope_klass.where("#{scope.table_name}.cluster_id IN (?)",clusters)
         elsif organization.optional_mode? && user.is_a_cluster_user?
@@ -61,7 +60,10 @@ module Klastera
      ##
     def session_clusters(user,organization)
       clusters = organization.is_in_cluster_mode? ? ::ClusterUser.get_clusters_from(user,organization) : []
-      yield(clusters) if block_given?
+      if block_given?
+        clusters = clusters.reject{|c|c.id.blank?}
+        yield(clusters)
+      end
       clusters
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-09 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails