mongoid_ability 0.3.4 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c507aee422f260d41b3362fdaab309fcaaec4b6d
-  data.tar.gz: 64cfd77de7d1498dde919e10e3639c7d8be4d668
+  metadata.gz: 7cececf7c6d06e78a0352d1d25585e9015da3435
+  data.tar.gz: 3c2c4e2bf689af0ff65b39c9e6756aca7fba1261
 SHA512:
-  metadata.gz: 719e74564b155969eb8873e216e52c85756b82ccbc04573dda5b4ea66c80138c7e1596325daa51dfc15495b3e528db1602ad3c89eea5485170d45cb8bb5df27c
-  data.tar.gz: bebec4577d5ef119322b2c9ac30b83a42cd4dc73fd62b0faabd95e686c212741420f0e19eaf964991008c7aba39488534f47bf8ec573e7d22f390e287f6a09fc
+  metadata.gz: a4158f26b3ee625ecbac3eee508a8ff310cd35232d9f4af8ae6d7e15e051ca49174a12ddaa279e4bfd785163a7405449e9a14d7fb038685219153b3db2982413
+  data.tar.gz: 11d07ad4dc0b89615ccafb366623a2e756deca09d27b5e194d0344684936906762bd39fadb1e9e35ce235a0bd643fc9fe30e1a683839ece649e501ac22b89e60

data/lib/mongoid_ability/accessible_query_builder.rb

@@ -8,21 +8,25 @@ module MongoidAbility
 
     def call
       return base_class.criteria unless and_conditions.present?
-      base_class.criteria.where(and_conditions)
+      base_class.criteria.where(conditions)
     end
 
-    private # =============================================================
-
-    def or_conditions
-      return unless conditions = [closed_types_condition, open_ids_condition].compact.presence
-      { :$or => conditions }
+    def conditions
+      and_conditions
     end
 
+    private # =============================================================
+
     def and_conditions
       return unless conditions = [or_conditions, closed_ids_condition].compact.presence
       { :$and => conditions }
     end
 
+    def or_conditions
+      return unless conditions = [closed_types_condition, open_ids_condition].compact.presence
+      { :$or => conditions }
+    end
+
     def closed_types_condition
       return unless values.closed_types.present?
       { :_type.nin => values.closed_types }

data/lib/mongoid_ability/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Tomáš Celizna