klastera 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc8d3414d044460f33127e9eef4f0cb7cc6e6b83333697a944e5248cfe4970fd
-  data.tar.gz: 063dbb2a15f6b98b0219ac5af5059b40fa1da440c2e298a6140be4637ad1a504
+  metadata.gz: e524bc600751df634962778af44d6b9bd782cabdf7a125a145d2a7efbfbe6950
+  data.tar.gz: ab457168729e69d5f1ca94f40ea667b78e3610993eaa686998e8aa792f865db1
 SHA512:
-  metadata.gz: af3e0d45ee32b14aa1f5b5bb27b246af015bfd6191b93846e52ca5e7789d245c7f068dc741afaa872a76244059dd31e71d543a8c1c8696c0346d183ac1bbb90b
-  data.tar.gz: 715adddc9f158ceb9c5eaa60e1318c986355d3f8a9e0c875b72903c053cc21fcf207cae038aefac9a51c4e65ffcf4a76ee13047e4a7dd70f908bcdbb0f202428
+  metadata.gz: f30c250c13e081a7aebeb66fce89386638d445a92f5dd995c4855483a45efd7bf7927265980fff8ffcef7ca3e9d3f5fc53c618b05babc92464a6986a8878df84
+  data.tar.gz: 97007ff678bbc223506ac5fc53814c9b7363c3e45ba4f39455f73d8abdd1012bab6fd7b126b3237cc42b91fbbb6a969061c72ece12549aa1d84ae0810522a43a

data/lib/klastera.rb

@@ -79,9 +79,8 @@ module Klastera
     # cluster_filter_id is present when the optional_suborganization mode is on. BUT!
     # Be aware that if the cluster_filter is not present, the value of force_cluster_clause
     # will be overridden by the returned value of cannot_skip_cluster_clause? method.
-    #
-    def cluster_scope!(scope_klass, user, organization, cluster_filter=nil, force_cluster_clause=false)
-      scope_klass = scope_class(scope_klass)
+    def should_clusterize_scope?(user, organization, cluster_filter=nil, force_cluster_clause=false)
+      should = false # I don't know if this is a good idea
       if organization.is_in_cluster_mode? && ( cluster_filter.present? || force_cluster_clause = user.cannot_skip_cluster_clause? ) # yes, this is an assignation
         cluster_ids = []
         # Set another variable as array to get the cluster id(s)
@@ -92,15 +91,27 @@ module Klastera
         end
         # We will avoid the query unless cluster_ids is having values OR force_cluster_clause is set (see method description)
         if cluster_ids.present? || force_cluster_clause
-          scope_klass = scope_klass.eager_load(:organization,cluster_entities: :cluster)
           # We add the unclustered if the value of cluster_filter have the special without_cluster string or as method description says
           if cluster_ids.delete(UNCLUSTERED_ENTITY) || ( force_cluster_clause && organization.optional_suborganization_mode? )
             cluster_ids << nil
           end
-          scope_klass = scope_klass.where( cluster_entities: { cluster_id: cluster_ids } )
+          should = true
+        end
+      end
+      yield(should,cluster_ids)
+    end
+
+    #
+    # The cleanest and fast way to clusterize a entity!
+    #
+    def cluster_scope!(scope_klass, user, organization, cluster_filter=nil, force_cluster_clause=false)
+      scope = scope_class(scope_klass)
+      should_clusterize_scope?(user,organization,cluster_filter,force_cluster_clause) do |should,cluster_ids|
+        if should
+          scope = scope.eager_load(:organization,cluster_entities: :cluster).where( cluster_entities: { cluster_id: cluster_ids } )
         end
       end
-      scope_klass.where(organization_id: organization)
+      scope.where(organization_id: organization)
     end
 
     # 

data/lib/klastera/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: klastera
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Gino Barahona
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2020-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails