protector 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8046a17b4ab071f2e5af6511c48a213eb46a8c8a
-  data.tar.gz: 789efaa941d0b0fa7590b2d91e6a7cbfac879975
+  metadata.gz: 4db3bb657e21375e7642202dac85b1c694a9b572
+  data.tar.gz: 3e3e2498415ba55e7fd8b2c6cdc4ff432aaaf8b0
 SHA512:
-  metadata.gz: bc9c1a541de4183af641b8b1d5f498d27eb3804e284d0682f83bba43653ba86475165468f9099dd48a1ccbff266d33724dae82a1737a9c57df5cdc839b3a923b
-  data.tar.gz: c863b7e9044aa4e0b46776280be869df766a2e631746efb048c5ed62ecbd71ccdad82987f0abadeafeb3a5cdd700f45c8a479cde2c73e5d31b1990cfb2e95b01
+  metadata.gz: 27cbad32b5ac59f45af321ae849854146c69ec716b4c7cd51ae0941621b5971352c569746bf352ed3879bb3fa42af76b419d71be604d7e0faa7740c908e9934d
+  data.tar.gz: 77170151fc817bad0d5913ff82025f98e3ef31346062c68821cae69f9165eb80f16aedcbf21aab0a03b4b74f1b8937780ca1d8bff3993059bdeddd5a0c2d7b9e

data/Rakefile

@@ -9,7 +9,7 @@ task :default => :all
 
 desc 'Test the plugin under all supported Rails versions.'
 task :all do |t|
-  exec('bundle exec appraisal install; bundle exec appraisal rspec')
+  exec('bundle exec appraisal rspec')
 end
 
 task :perf do

data/lib/protector/adapters/active_record.rb

@@ -1,6 +1,8 @@
 require 'protector/adapters/active_record/base'
 require 'protector/adapters/active_record/association'
+require 'protector/adapters/active_record/singular_association'
 require 'protector/adapters/active_record/relation'
+require 'protector/adapters/active_record/collection_proxy'
 require 'protector/adapters/active_record/preloader'
 require 'protector/adapters/active_record/strong_parameters'
 
@@ -15,9 +17,11 @@ module Protector
         ::ActiveRecord::Base.send :include, Protector::Adapters::ActiveRecord::Base
         ::ActiveRecord::Relation.send :include, Protector::Adapters::ActiveRecord::Relation
         ::ActiveRecord::Associations::SingularAssociation.send :include, Protector::Adapters::ActiveRecord::Association
+        ::ActiveRecord::Associations::SingularAssociation.send :include, Protector::Adapters::ActiveRecord::SingularAssociation
         ::ActiveRecord::Associations::CollectionAssociation.send :include, Protector::Adapters::ActiveRecord::Association
         ::ActiveRecord::Associations::Preloader.send :include, Protector::Adapters::ActiveRecord::Preloader
         ::ActiveRecord::Associations::Preloader::Association.send :include, Protector::Adapters::ActiveRecord::Preloader::Association
+        ::ActiveRecord::Associations::CollectionProxy.send :include, Protector::Adapters::ActiveRecord::CollectionProxy
       end
 
       def self.modern?

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

@@ -6,6 +6,8 @@ module Protector
         extend ActiveSupport::Concern
 
         included do
+          include Protector::DSL::Base
+
           # AR 4 has renamed `scoped` to `scope`
           if method_defined?(:scope)
             alias_method_chain :scope, :protector
@@ -14,20 +16,20 @@ module Protector
             alias_method 'scoped', 'scope_with_protector'
           end
 
-          alias_method_chain :build, :protector
+          alias_method_chain :build_record, :protector
         end
 
         # Wraps every association with current subject
         def scope_with_protector(*args)
           scope = scope_without_protector(*args)
-          scope = scope.restrict!(owner.protector_subject) if owner.protector_subject?
+          scope = scope.restrict!(protector_subject) if protector_subject?
           scope
         end
 
         # Forwards protection subject to the new instance
-        def build_with_protector(*args, &block)
-          return build_without_protector(*args, &block) unless owner.protector_subject?
-          build_without_protector(*args, &block).restrict!(owner.protector_subject)
+        def build_record_with_protector(*args)
+          return build_record_without_protector(*args) unless protector_subject?
+          build_record_without_protector(*args).restrict!(protector_subject)
         end
       end
     end

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

@@ -60,6 +60,11 @@ module Protector
             end
             # rubocop:enable ParenthesesAroundCondition
           end
+
+          def association(*params)
+            return super unless protector_subject?
+            super.restrict!(protector_subject)
+          end
         end
 
         module ClassMethods

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

@@ -0,0 +1,16 @@
+module Protector
+  module Adapters
+    module ActiveRecord
+      # Patches `ActiveRecord::Associations::CollectionProxy`
+      module CollectionProxy
+        extend ActiveSupport::Concern
+        delegate :protector_subject, :protector_subject?, :to => :@association
+
+        def restrict!(*args)
+          @association.restrict!(*args)
+          self
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Protector
+  module Adapters
+    module ActiveRecord
+      # Patches `ActiveRecord::Associations::SingularAssociation`
+      module SingularAssociation
+        extend ActiveSupport::Concern
+
+        included do
+          alias_method_chain :reader, :protector
+        end
+
+        # Reader has to be explicitly overrided for cases when the
+        # loaded association is cached
+        def reader_with_protector(*args)
+          return reader_without_protector(*args) unless protector_subject?
+          reader_without_protector(*args).try :restrict!, protector_subject
+        end
+
+        # Forwards protection subject to the new instance
+        def build_record_with_protector(*args)
+          return build_record_without_protector(*args) unless protector_subject?
+          build_record_without_protector(*args).restrict!(protector_subject)
+        end
+      end
+    end
+  end
+end

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

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

@@ -137,6 +137,7 @@ if defined?(ActiveRecord)
         Dummy.restrict!('!').where(number: 999).to_a.first.protector_subject.should == '!'
         Dummy.restrict!('!').new.protector_subject.should == '!'
         Dummy.restrict!('!').first.fluffies.new.protector_subject.should == '!'
+        Dummy.first.fluffies.restrict!('!').new.protector_subject.should == '!'
       end
 
       it "checks creatability" do
@@ -242,6 +243,149 @@ if defined?(ActiveRecord)
       end
     end
 
+    #
+    # Model scope
+    #
+    describe Protector::Adapters::ActiveRecord::Association do
+      describe "validates on create! within association" do
+        it "when restricted from entity" do
+          expect { Dummy.first.restrict!('-').fluffies.create!(string: 'test').delete }.to raise_error
+        end
+
+        it "when restricted from association" do
+          expect { Dummy.first.fluffies.restrict!('-').create!(string: 'test').delete }.to raise_error
+        end
+      end
+
+      context "singular association" do
+        it "forwards subject" do
+          Fluffy.restrict!('!').first.dummy.protector_subject.should == '!'
+          Fluffy.first.restrict!('!').dummy.protector_subject.should == '!'
+        end
+
+        it "forwards cached subject" do
+          Dummy.first.fluffies.restrict!('!').first.dummy.protector_subject.should == '!'
+        end
+      end
+
+      context "collection association" do
+        it "forwards subject" do
+          Dummy.restrict!('!').first.fluffies.protector_subject.should == '!'
+          Dummy.first.restrict!('!').fluffies.protector_subject.should == '!'
+          Dummy.restrict!('!').first.fluffies.new.protector_subject.should == '!'
+          Dummy.first.restrict!('!').fluffies.new.protector_subject.should == '!'
+          Dummy.first.fluffies.restrict!('!').new.protector_subject.should == '!'
+        end
+
+        context "with open relation" do
+          context "adequate", paranoid: false do
+
+            it "checks existence" do
+              Dummy.first.fluffies.any?.should == true
+              Dummy.first.restrict!('!').fluffies.any?.should == true
+              Dummy.first.fluffies.restrict!('!').any?.should == true
+            end
+
+            it "counts" do
+              Dummy.first.fluffies.count.should == 2
+
+              fluffies = Dummy.first.restrict!('!').fluffies
+              fluffies.count.should == 2
+              fluffies.protector_subject?.should == true
+
+              fluffies = Dummy.first.fluffies.restrict!('!')
+              fluffies.count.should == 2
+              fluffies.protector_subject?.should == true
+            end
+
+            it "fetches" do
+              Dummy.first.fluffies.count.should == 2
+              Dummy.first.restrict!('!').fluffies.length.should == 2
+              Dummy.first.fluffies.restrict!('!').length.should == 2
+            end
+          end
+
+          context "paranoid", paranoid: true do
+            it "checks existence" do
+              Dummy.first.fluffies.any?.should == true
+              Dummy.first.restrict!('!').fluffies.any?.should == false
+              Dummy.first.fluffies.restrict!('!').any?.should == false
+            end
+
+            it "counts" do
+              Dummy.first.fluffies.count.should == 2
+
+              fluffies = Dummy.first.restrict!('!').fluffies
+              fluffies.count.should == 0
+              fluffies.protector_subject?.should == true
+
+              fluffies = Dummy.first.fluffies.restrict!('!')
+              fluffies.count.should == 0
+              fluffies.protector_subject?.should == true
+            end
+
+            it "fetches" do
+              Dummy.first.fluffies.count.should == 2
+              Dummy.first.restrict!('!').fluffies.length.should == 0
+              Dummy.first.fluffies.restrict!('!').length.should == 0
+            end
+          end
+        end
+      end
+
+      context "with null relation" do
+        it "checks existence" do
+          Dummy.first.fluffies.any?.should == true
+          Dummy.first.restrict!('-').fluffies.any?.should == false
+          Dummy.first.fluffies.restrict!('-').any?.should == false
+        end
+
+        it "counts" do
+          Dummy.first.fluffies.count.should == 2
+
+          fluffies = Dummy.first.restrict!('-').fluffies
+          fluffies.count.should == 0
+          fluffies.protector_subject?.should == true
+
+          fluffies = Dummy.first.fluffies.restrict!('-')
+          fluffies.count.should == 0
+          fluffies.protector_subject?.should == true
+        end
+
+        it "fetches" do
+          Dummy.first.fluffies.count.should == 2
+          Dummy.first.restrict!('-').fluffies.length.should == 0
+          Dummy.first.fluffies.restrict!('-').length.should == 0
+        end
+      end
+
+      context "with active relation" do
+        it "checks existence" do
+          Dummy.first.fluffies.any?.should == true
+          Dummy.first.restrict!('+').fluffies.any?.should == true
+          Dummy.first.fluffies.restrict!('+').any?.should == true
+        end
+
+        it "counts" do
+          Dummy.first.fluffies.count.should == 2
+
+          fluffies = Dummy.first.restrict!('+').fluffies
+          fluffies.count.should == 1
+          fluffies.protector_subject?.should == true
+
+          fluffies = Dummy.first.fluffies.restrict!('+')
+          fluffies.count.should == 1
+          fluffies.protector_subject?.should == true
+        end
+
+        it "fetches" do
+          Dummy.first.fluffies.count.should == 2
+          Dummy.first.restrict!('+').fluffies.length.should == 1
+          Dummy.first.fluffies.restrict!('+').length.should == 1
+        end
+      end
+    end
+
     #
     # Eager loading
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-02 00:00:00.000000000 Z
+date: 2013-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -66,8 +66,10 @@ files:
 - lib/protector/adapters/active_record.rb
 - lib/protector/adapters/active_record/association.rb
 - lib/protector/adapters/active_record/base.rb
+- lib/protector/adapters/active_record/collection_proxy.rb
 - lib/protector/adapters/active_record/preloader.rb
 - lib/protector/adapters/active_record/relation.rb
+- lib/protector/adapters/active_record/singular_association.rb
 - lib/protector/adapters/active_record/strong_parameters.rb
 - lib/protector/adapters/sequel.rb
 - lib/protector/adapters/sequel/dataset.rb