mongoid_ability 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d30d247467a000a4905761928d401f3a6adbbc10
-  data.tar.gz: a14eed2b95bd69392acc82b46d192902fef23a66
+  metadata.gz: 943814cee43339bf17cc8387496583fbbc797ddf
+  data.tar.gz: 714784b30fa8dad9f3e5aa32c8a25f62f034005a
 SHA512:
-  metadata.gz: 297e80b5fec91daeb637f9394fdac3021df1ba902b20f743855fc1951e0da7adcd401b8207bb034e46357aba1247c3aad20cefbd28507add1a17f0815d66737e
-  data.tar.gz: d8800d4844678c18e62eace9ae607e404fe469986a138fb0b9c3f2625c0986d897f16331b275fbbce266227beb72fce2032e01457ca1c2d9f154035101835890
+  metadata.gz: 05c965309b7d19f5afe52ed51f47189e4a06049a33af6ec640eb845a02137b9938762dd77e32d4b80c6f58037a5b5a7fc09999d71a1c36da5ccbcde021f347b0
+  data.tar.gz: e6d1dcf742c1c3dda15459b4dc1abdfbd7d08bbc419262033b72654df3c4e929a94d799027e42e4bc48c02f88b3d4d469287d7ed5ca5fc83208841150c9973e0

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 script: 'bundle exec rake'
 sudo: false
 rvm:
-  - 2.1.2
+  - 2.2.2
 services:
   - mongodb
 

data/lib/mongoid_ability/accessible_query_builder.rb

@@ -17,18 +17,18 @@ module MongoidAbility
     private # =============================================================
 
     def closed_types_condition
-      { _type: { '$nin' => values.closed_types } }
+      { _type: { '$nin' => values.closed_types.uniq } }
     end
 
     def open_types_and_ids_condition
       {
-        _type: { '$in' => values.open_types_and_ids.map(&:type) },
-        _id: { '$in' => values.open_types_and_ids.map(&:id) }
+        _type: { '$in' => values.open_types_and_ids.map(&:type).uniq },
+        _id: { '$in' => values.open_types_and_ids.map(&:id).uniq }
       }
     end
 
     def closed_ids_condition
-      { _id: { '$nin' => values.closed_ids } }
+      { _id: { '$nin' => values.closed_ids.uniq } }
     end
 
     # ---------------------------------------------------------------------
@@ -42,9 +42,5 @@ module MongoidAbility
     def base_class_superclass
       @base_class_superclass ||= (base_class.ancestors_with_default_locks.last || base_class)
     end
-
-    def default_lock(_cls, action)
-      base_class_superclass.default_locks.detect { |l| l.action.to_s == action.to_s }
-    end
   end
 end

data/lib/mongoid_ability/resolve_default_locks.rb

@@ -1,15 +1,14 @@
 module MongoidAbility
   class ResolveDefaultLocks < ResolveLocks
-
     def call
-      return false if default_locks.any?{ |l| l.closed?(options) }
-      return true if default_locks.any?{ |l| l.open?(options) }
+      return false if default_locks.any? { |l| l.closed?(options) }
+      return true if default_locks.any? { |l| l.open?(options) }
     end
 
     private # =============================================================
 
     def default_locks
-      subject_class.default_locks.select{ |l| l.action.to_s == action.to_s }
+      subject_class.default_locks.select { |l| l.action.to_s == action.to_s }
     end
   end
 end

data/lib/mongoid_ability/resolve_inherited_locks.rb

@@ -1,13 +1,12 @@
 module MongoidAbility
   class ResolveInheritedLocks < ResolveLocks
-
     def call
       uo = user_outcome
-      return uo if uo != nil
+      return uo unless uo.nil?
 
-      if owner.respond_to?(owner.class.inherit_from_relation_name) && owner.inherit_from_relation != nil
+      if owner.respond_to?(owner.class.inherit_from_relation_name) && !owner.inherit_from_relation.nil?
         io = owner.inherit_from_relation.collect { |inherited_owner| inherited_owner_outcome(inherited_owner) }.compact
-        return io.any?{ |o| o == true } unless io.empty?
+        return io.any? { |o| o == true } unless io.empty?
       end
 
       default_outcome
@@ -19,7 +18,7 @@ module MongoidAbility
       @user_outcome ||= ResolveOwnerLocks.call(owner, action, subject_class, subject, options)
     end
 
-    def inherited_owner_outcome inherited_owner
+    def inherited_owner_outcome(inherited_owner)
       @inherited_owner_outcome ||= {}
       @inherited_owner_outcome[inherited_owner] ||= ResolveOwnerLocks.call(inherited_owner, action, subject_class, subject, options)
     end
@@ -27,6 +26,5 @@ module MongoidAbility
     def default_outcome
       @default_outcome ||= ResolveDefaultLocks.call(nil, action, subject_class, nil, options)
     end
-
   end
 end

data/lib/mongoid_ability/resolve_locks.rb

@@ -1,6 +1,5 @@
 module MongoidAbility
   class ResolveLocks < Struct.new(:owner, :action, :subject_type, :subject, :options)
-
     attr_reader(
       :subject_class,
       :subject_id
@@ -18,17 +17,16 @@ module MongoidAbility
       @subject_class = subject_type.to_s.constantize
       @subject_id = subject.id if subject.present?
 
-      raise StandardError, "#{subject_type} class does not have default locks" unless @subject_class.respond_to?(:default_locks)
-      raise StandardError, "#{subject_type} class does not have default lock for :#{action} action" unless @subject_class.self_and_ancestors_with_default_locks.any? do |cls|
-        cls.default_locks.any?{ |l| l.action == action }
+      fail StandardError, "#{subject_type} class does not have default locks" unless @subject_class.respond_to?(:default_locks)
+      fail StandardError, "#{subject_type} class does not have default lock for :#{action} action" unless @subject_class.self_and_ancestors_with_default_locks.any? do |cls|
+        cls.default_locks.any? { |l| l.action == action }
       end
     end
 
     # =====================================================================
 
     def call
-      raise NotImplementedError
+      fail NotImplementedError
     end
-
   end
 end

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

data/mongoid_ability.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "cancancan", "~> 1.9"
-  spec.add_dependency "mongoid", "~> 5.0"
+  spec.add_dependency "mongoid", "~> 5"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "coveralls"

data/test/mongoid_ability/subject_test.rb

@@ -24,6 +24,9 @@ module MongoidAbility
         MySubject.default_locks = []
         MySubject.default_lock MyLock, :read, false
         MySubject.default_lock MyLock1, :read, false
+
+        MySubject1.default_locks = []
+        MySubject1.default_lock MyLock, :read, true
       end
 
       it 'does not allow multiple locks for same action' do
@@ -37,6 +40,11 @@ module MongoidAbility
       it 'replaces existing locks with new one' do
         MySubject.default_locks.detect { |l| l.action == :read }.class.must_equal MyLock1
       end
+
+      it 'replaces superclass locks' do
+        MySubject1.default_locks.count.must_equal 1
+        MySubject1.default_locks.detect { |l| l.action == :read }.outcome.must_equal true
+      end
     end
 
     describe '.is_root_class?' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
 platform: ruby
 authors:
 - Tomáš Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -204,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Custom Ability class that allows CanCanCan authorization library store permissions