mongoid_ability 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e46cdf87be76c61f854d456116226b64bd95834
-  data.tar.gz: ae4c2ebfbe8da92a62a89af5be4428d2679a678b
+  metadata.gz: c507aee422f260d41b3362fdaab309fcaaec4b6d
+  data.tar.gz: 64cfd77de7d1498dde919e10e3639c7d8be4d668
 SHA512:
-  metadata.gz: 86b7fec05cee106cbdbcef83f7e8f9b5a235ccaded227dd019860a18bf072f99ebe783ec0cf3f146bc78e1dd1f91c4b6a74ae54072d22b55daceeaaf4af34c31
-  data.tar.gz: 837eea204af7eaab2077d5d13a6c1b204f42a3db60ddf1730e81496e522f823c57b861f79fcefc138d43a425c5e18d434c64e3bb709057d125f9d128551e17b6
+  metadata.gz: 719e74564b155969eb8873e216e52c85756b82ccbc04573dda5b4ea66c80138c7e1596325daa51dfc15495b3e528db1602ad3c89eea5485170d45cb8bb5df27c
+  data.tar.gz: bebec4577d5ef119322b2c9ac30b83a42cd4dc73fd62b0faabd95e686c212741420f0e19eaf964991008c7aba39488534f47bf8ec573e7d22f390e287f6a09fc

data/lib/mongoid_ability/accessible_query_builder.rb

@@ -7,24 +7,34 @@ module MongoidAbility
     # =====================================================================
 
     def call
-      or_conditions = [closed_types_condition, open_ids_condition].reject(&:blank?)
-      base_class.criteria.where(:$and => [{ :$or => or_conditions }, closed_ids_condition])
+      return base_class.criteria unless and_conditions.present?
+      base_class.criteria.where(and_conditions)
     end
 
     private # =============================================================
 
+    def or_conditions
+      return unless conditions = [closed_types_condition, open_ids_condition].compact.presence
+      { :$or => conditions }
+    end
+
+    def and_conditions
+      return unless conditions = [or_conditions, closed_ids_condition].compact.presence
+      { :$and => conditions }
+    end
+
     def closed_types_condition
+      return unless values.closed_types.present?
       { :_type.nin => values.closed_types }
     end
 
     def open_ids_condition
-      {
-        :_type.in => values.open_types_and_ids.map(&:type),
-        :_id.in => values.open_types_and_ids.map(&:id)
-      }
+      return unless values.open_types_and_ids.present?
+      { :_id.in => values.open_types_and_ids.map(&:id) }
     end
 
     def closed_ids_condition
+      return unless values.closed_ids.present?
       { :_id.nin => values.closed_ids }
     end
 

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Tomáš Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan