mongoid_ability 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dae67db7ec93cdbf840238c3dd2b482646550ea5
-  data.tar.gz: 9585efb9e63dbbee879f2865d378e9dcf81081a8
+  metadata.gz: 721df8ecdb6424b68a3bc809f25cdaba1c8ff688
+  data.tar.gz: 6d80989eadf2723af7eef09b9069b63ca2b84e26
 SHA512:
-  metadata.gz: e92310170b4733d744668f02b59595f5ffc0a1b10b8aab414ff1db137a0fb417d0392f370b0cc341895503fea19bebd89799d8d7744c989ddc9d23aef946e06c
-  data.tar.gz: f02421d9e891f91af19df44dc0a289beef01719e5fff3a1ef116a341f6ae10515bd4fc34fbddbc139ba03056e945fdf8a187e96c859203adc975c77539edbd62
+  metadata.gz: b2a8e5866633b0cb5451edf17ade4b4b4fc5977f6bac78054df986b13b674e4647b6d0d3d704b5fed4bacb13b2225496153379f749f3fe1f827e09459998e28b
+  data.tar.gz: 8cd962801bd4b8960432707c6a4a8a0b6f8bd2fced346a9dee183f2724a830a67076b244563134a81fd79b1c620e8b0c452f963c3aaf88eeb77799be714f9f1c

data/CHANGELOG.md

@@ -1,27 +1,33 @@
-# 2.0.0
+# CHANGELOG
+
+## 2.0.1
+
+* make sure all `subject_id` values are converted to BSON
+
+## 2.0.0
 
 * Full rewrite, which more closely follows the `CanCanCan` conventions: instead of custom algorithm for resolving permissions, the `Lock` documents are now converted to standard `CanCanCan` rules. Similarly the `.acessible_by` criteria are now handled by standard model adapter (`MongoidAdapter`), to be extracted to separate gem. Therefore this gem can benefit for potential future performance improvements of `CanCanCan`. Lastly, the `ability` objects are now cacheable, therefore the conversion of `Lock` documents to `CanCanCan` rule objects does not need to be performed on every request.
 
-# 1.0.0
+## 1.0.0
 
 * conforms to '[MONGOID-4418](https://jira.mongodb.org/browse/MONGOID-4418) Don't allow PersistenceContext method as field names' by renaming the `Lock` field `:options` to `:opts` (but aliasing it `as: :options`). As a result the `Mongoid::Ability` API stays unchanged, however in some cases it might be necessary to migrate the values from the `:options` fields to the new `:opts`.
 
-# 0.4.3
+## 0.4.3
 
 * stub `default_locks` in tests to avoid brittle tests
 * fix the ability syntactic sugar to support both proc & direct call
 
-# 0.4.2
+## 0.4.2
 
 * **yanked**
 * improved clarity in class naming
 
-# 0.4.1
+## 0.4.1
 
 * **yanked**
 * `Resolver` classes now accept `subject_id` (instead of `subject`) for greater flexibility
 
-# 0.4.0
+## 0.4.0
 
 * **yanked**
 * the `Resolver` classes refactored to return locks (instead of just an outcome)

data/lib/mongoid_ability/ability.rb

@@ -83,9 +83,15 @@ module MongoidAbility
       ability_type = lock.outcome ? :can : :cannot
       cls = lock.subject_class
       options = lock.options
-      options = options.merge(id: lock.subject_id) if lock.id_lock?
+      options = options.merge(id: convert_to_bson(lock.subject_id)) if lock.id_lock?
       action = lock.action
       send ability_type, action, cls, options
     end
+
+    def convert_to_bson(id)
+      return id unless id.is_a?(String)
+      return id unless BSON::ObjectId.legal?(id)
+      BSON::ObjectId.from_string(id)
+    end
   end
 end

data/lib/mongoid_ability/version.rb

@@ -1,3 +1,3 @@
 module MongoidAbility
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.0.1'.freeze
 end

data/test/mongoid_ability/ability_basic_test.rb

@@ -35,6 +35,13 @@ module MongoidAbility
 
         it { ability.can?(:read, my_subject).must_equal true }
         it { ability.cannot?(:read, my_subject).must_equal false }
+
+        describe 'when id stored as String' do
+          let(:read_lock) { MyLock.new(subject_type: my_subject.model_name.to_s, subject_id: my_subject.id.to_s, action: :read, outcome: true) }
+
+          it { ability.can?(:read, my_subject).must_equal true }
+          it { ability.cannot?(:read, my_subject).must_equal false }
+        end
       end
     end
 

data/test/mongoid_ability/ability_marshal_test.rb

@@ -4,14 +4,23 @@ module MongoidAbility
   describe 'marshal' do
     before(:all) { MySubject.default_lock MyLock, :read, true }
 
-    let(:read_lock) { MyLock.new(subject_type: MySubject1, action: :read, outcome: false) }
+    let(:my_subject) { MySubject.new }
+    let(:read_lock) { MyLock.new(subject_type: my_subject.model_name.to_s, subject_id: my_subject.id.to_s, action: :update, outcome: false) }
     let(:owner) { MyRole.new(my_locks: [read_lock]) }
     let(:ability) { Ability.new(owner) }
 
     let(:ability_dump) { Marshal.dump(ability) }
     let(:ability_load) { Marshal.load(ability_dump) }
 
-    it { ability_dump.must_be :present? }
-    it { ability_load.send(:rules).count.must_equal 2 }
+    let(:loaded_rules) { ability_load.send(:rules) }
+
+    describe 'dump' do
+      it { ability_dump.must_be :present? }
+    end
+
+    describe 'load' do
+      it { loaded_rules.count.must_equal 2 }
+      it { loaded_rules.map(&:conditions).must_include({ id: my_subject.id }) }
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mongoid_ability
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Tomas Celizna
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cancancan