protector 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a094c41767f9fee30c80858e19061dd0468c877a
-  data.tar.gz: b202613a388beb22fcf6209b56d36fbf22bfe2b8
+  metadata.gz: 06ef70fc6fb353ebf794e6386d1f071f5561bf01
+  data.tar.gz: e566043d18cb952d1eff71144afaa1f50d7b2657
 SHA512:
-  metadata.gz: 371868628bfce74285256e22c178c015f69bc93754747a9c15cadb7092b04b2cd2d2f25e17e1d6b22f19b9311a257fcd4b0bcb01bded148c7bc153835eb70858
-  data.tar.gz: 275e55334c99481a7f3eae8f3576aa18c26e3275d271f5d8563425b1abfbadf8f72f7fa100464f4bf7f3ab9490d784794d216acd4450b50bac23b55126327068
+  metadata.gz: 89d14e47526fbbe0b59f63467188db88ac0d7a02729370da0ff07a4938cd43c47d7fee7639cbd429f09a9020f5a93af5ac50d700414c178feb80f93197918fe8
+  data.tar.gz: 2e82a2ce1327e8f5573d7321ac481a2054850ddce6d5fde687362cda6525da3b31317cf23423ffea86d5116c1dff981e15c335d371086eedff033857276af679

data/lib/protector/adapters/active_record/relation.rb

@@ -37,6 +37,10 @@ module Protector
           @klass.protector_meta.evaluate(subject)
         end
 
+        def protector_relation
+          protector_meta.relation ? merge(protector_meta.relation) : clone
+        end
+
         # @note Unscoped relation drops properties and therefore should be re-restricted
         def unscoped
           return super unless protector_subject?
@@ -66,13 +70,13 @@ module Protector
         # Merges current relation with restriction and calls real `calculate`
         def calculate(*args)
           return super unless protector_subject?
-          merge(protector_meta.relation).unrestrict!.calculate *args
+          protector_relation.unrestrict!.calculate *args
         end
 
         # Merges current relation with restriction and calls real `exists?`
         def exists?(*args)
           return super unless protector_subject?
-          merge(protector_meta.relation).unrestrict!.exists? *args
+          protector_relation.unrestrict!.exists? *args
         end
 
         # Forwards protection subject to the new instance
@@ -117,7 +121,7 @@ module Protector
           return exec_queries_without_protector unless protector_subject?
 
           subject  = protector_subject
-          relation = merge(protector_meta.relation).unrestrict!
+          relation = protector_relation.unrestrict!
           relation = protector_substitute_includes(subject, relation)
 
           # Preserve associations from internal loading. We are going to handle that

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

data/spec/lib/protector/adapters/active_record_spec.rb

@@ -16,8 +16,6 @@ if defined?(ActiveRecord)
               scope{ where('1=0') } 
             elsif x == '+'
               scope{ where(klass.table_name => {number: 999}) }
-            elsif !Protector.config.paranoid && Protector::Adapters::ActiveRecord.modern?
-              scope { all }
             end
 
             can :view, :dummy_id unless x == '-'
@@ -123,6 +121,7 @@ if defined?(ActiveRecord)
 
       context "with open relation" do
         context "adequate", paranoid: false do
+
           it "checks existence" do
             Dummy.any?.should == true
             Dummy.restrict!('!').any?.should == true
@@ -130,7 +129,9 @@ if defined?(ActiveRecord)
 
           it "counts" do
             Dummy.count.should == 4
-            Dummy.restrict!('!').count.should == 4
+            dummy = Dummy.restrict!('!')
+            dummy.count.should == 4
+            dummy.protector_subject?.should == true
           end
 
           it "fetches" do
@@ -149,7 +150,9 @@ if defined?(ActiveRecord)
 
           it "counts" do
             Dummy.count.should == 4
-            Dummy.restrict!('!').count.should == 0
+            dummy = Dummy.restrict!('!')
+            dummy.count.should == 0
+            dummy.protector_subject?.should == true
           end
 
           it "fetches" do
@@ -169,7 +172,9 @@ if defined?(ActiveRecord)
 
         it "counts" do
           Dummy.count.should == 4
-          Dummy.restrict!('-').count.should == 0
+          dummy = Dummy.restrict!('-')
+          dummy.count.should == 0
+          dummy.protector_subject?.should == true
         end
 
         it "fetches" do
@@ -193,7 +198,9 @@ if defined?(ActiveRecord)
 
         it "counts" do
           Dummy.count.should == 4
-          Dummy.restrict!('+').count.should == 2
+          dummy = Dummy.restrict!('+')
+          dummy.count.should == 2
+          dummy.protector_subject?.should == true
         end
 
         it "fetches" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Boris Staal