mongoid_ability 2.0.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbab2a3e7461bdec8e23c4d9b1027cac1575efed88174a704c4178b1e666c442
-  data.tar.gz: 03370daedb464860849fb9fab3144d6b718cad2a24044ea341deb7179d5879d5
+  metadata.gz: 9a0e978ec258c3a3b3e93fa34b6943c8af6b09666722b0ac2b61f196fa972394
+  data.tar.gz: 132f93b4885b86db918c22739859944b86d98e83a07fd7f90ac0e259b5d6e901
 SHA512:
-  metadata.gz: 451a7e6d02d26419a0629584bf7a1627e2b58c8688db01f5b9bdfdeebec693b77d09ad1a46c5b40272fb31245e4e80476fb81b87606d40940a0b6d62aa0802b7
-  data.tar.gz: '084a93016fbc7b4ec745502bbf98addb04754b7081738262e68682ac7ead9026b27c3b9439c81d86b895e3a1a9d603f58397ec5a61c6c23cdcb9240c890dab4e'
+  metadata.gz: 50b463ff75c3ecf23a1187b05fcba527c4b50bd47e3c4831d7aece79124b366194d28da44af3acb414f4d0a8de8c02799a24e321a138bab1046552463f7b8a4e
+  data.tar.gz: 06dee8bd65eacce1939aca16d3f6b001b7ed58e708f776903eeb3a2bd4873cf1a3d8d09e5a817590571113d29795b038ec979cacd6f243f43f18d07084d2efab

data/.travis.yml

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

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.0.0
+
+* upgrade to Mongoid 7+
+
 ## 2.0.3
 
 * memoize `model_adapter` for better performance

data/lib/mongoid_ability/lock.rb

@@ -9,7 +9,11 @@ module MongoidAbility
         field :outcome, type: Boolean, default: false
         field :opts, as: :options, type: Hash, default: {}
 
-        belongs_to :subject, polymorphic: true, touch: true, optional: true
+        belongs_to :subject, polymorphic: true, optional: true
+        # Mongoid 7 does not support `touch: true` on polymorphic associations
+        after_save -> { subject.touch if subject? }
+        after_destroy -> { subject.touch if subject? }
+        after_touch -> { subject.touch if subject? }
 
         # TODO: validate that action is defined on subject or its superclasses
         validates :action, presence: true, uniqueness: { scope: [:subject_type, :subject_id, :outcome] }

data/lib/mongoid_ability/owner.rb

@@ -3,6 +3,8 @@ module MongoidAbility
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
+        include Mongoid::Touchable::InstanceMethods
+
         delegate  :can?, :cannot?,
                   to: :ability
 

data/lib/mongoid_ability/subject.rb

@@ -3,6 +3,8 @@ module MongoidAbility
     def self.included(base)
       base.extend ClassMethods
       base.class_eval do
+        include Mongoid::Touchable::InstanceMethods
+
         # always set the _type field as it is used by :accessible_by queries
         field :_type, type: String, default: model_name
       end

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = '2.0.3'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/mongoid_ability.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'cancancan', '~> 2.2'
-  spec.add_dependency 'mongoid', '>= 5', '< 7'
+  spec.add_dependency 'mongoid', '~> 7.0', '>= 7.0.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'coveralls'

data/test/mongoid_ability/owner_test.rb

@@ -17,7 +17,7 @@ module MongoidAbility
 
       describe 'locks relation' do
         it { subject.class.locks_relation_name.must_equal :my_locks }
-        it { subject.locks_relation.metadata[:name].must_equal :my_locks }
+        it { subject.reflect_on_association(:my_locks).name.must_equal :my_locks }
       end
     end
 

data/test/support/test_classes/my_lock.rb

@@ -3,7 +3,12 @@ class MyLock
   include Mongoid::Timestamps
   include MongoidAbility::Lock
 
-  embedded_in :owner, polymorphic: true, touch: true
+  embedded_in :owner, polymorphic: true
+
+  # Mongoid 7 does not support `touch: true` on polymorphic associations
+  after_save -> { owner.touch if owner? }
+  after_destroy -> { owner.touch if owner? }
+  after_touch -> { owner.touch if owner? }
 end
 
 class MyLock1 < MyLock

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-16 00:00:00.000000000 Z
+date: 2018-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan
@@ -28,22 +28,22 @@ dependencies:
   name: mongoid
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
+        version: '7.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '5'
-    - - "<"
+        version: '7.0'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement