protector 0.5.5 → 0.6.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce979a4af923d6268b9a931f6ef02c41a907f482
-  data.tar.gz: 4eeb250b2363f4cb0c00187a4f33bcdc0204c9a1
+  metadata.gz: 8246af354a37e155b5bfbcb3df55fb001b10d3a4
+  data.tar.gz: c0d84e8e3ab4a909a693397a420bbd60ede12e2c
 SHA512:
-  metadata.gz: d790737a8c94f9c562f160b557a9d40b6e2503a9bf37a30b4a904df25cf1600dd4e0fe28b9c6b246a907e6cf495784abed60b4c7b64fb168660b3abaa6d4bbe2
-  data.tar.gz: 92cf86b82aaed28a4a1ea10be9a97c4fdb28b6d142758f4153564ae4e035e4059a99840a3b37477dec0e9a2eaffff1b8fdcc5e1fd2e5b18d22e5d70ad8fb3a25
+  metadata.gz: 9d4ce7f662b483d145d390082f6457168b1c2823fce888c09393d0dfd942a15c72ed0efe231393544949ff92f12b6550262c6378d65af96a0d858ac32f5f48b4
+  data.tar.gz: 773f20d60bbbd7f62e6023fcff64aa686b1f4706a5c5716575559a3b0778b304e9ba277eb3df350ce6c8fb889f3cfe20c514cc6cddadfbeccc20225e996ff122

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

@@ -130,7 +130,7 @@ module Protector
                 unscoped.protector_mimic_base!
 
                 # Finally we merge unscoped basic relation extended with protection scope
-                relation = relation.merge unscoped.instance_eval(&meta.scope_proc)
+                relation = relation.merge meta.eval_scope_procs(unscoped)
               end
             end
           else

data/lib/protector/adapters/sequel/dataset.rb

@@ -40,7 +40,7 @@ module Protector
           return each_without_protector(*args, &block) unless protector_subject?
 
           relation = protector_defend_graph(clone, protector_subject)
-          relation = relation.instance_eval(&protector_meta.scope_proc) if protector_meta.scoped?
+          relation = protector_meta.eval_scope_procs(relation) if protector_meta.scoped?
 
           relation.row_proc = Restrictor.new(protector_subject, relation.row_proc)
           relation.each_without_protector(*args, &block)
@@ -55,7 +55,7 @@ module Protector
             model = reflection[:class_name].constantize unless model
             meta  = model.protector_meta.evaluate(subject)
 
-            relation = relation.instance_eval(&meta.scope_proc) if meta.scoped?
+            relation = meta.eval_scope_procs(relation) if meta.scoped?
           end
 
           relation

data/lib/protector/dsl.rb

@@ -17,7 +17,7 @@ module Protector
           @model       = model
           @fields      = fields
           @access      = {update: {}, view: {}, create: {}}
-          @scope_proc  = false
+          @scope_procs = []
           @destroyable = false
 
           Protector.insecurely do
@@ -37,7 +37,7 @@ module Protector
         # Checks whether protection with given subject
         # has the selection scope defined
         def scoped?
-          Protector.config.paranoid? || !!@scope_proc
+          Protector.config.paranoid? || @scope_procs.length > 0
         end
 
         # @group Protection DSL
@@ -53,25 +53,25 @@ module Protector
         #     scope { none }
         #   end
         def scope(&block)
-          @scope_proc = block
-
-          @relation          = false
-          @unscoped_relation = false
+          @scope_procs << block
+          @relation = false
         end
 
-        def scope_proc
-          unless Protector.config.paranoid?
-            @scope_proc
-          else
-            @scope_proc || @adapter.null_proc
-          end
+        def scope_procs
+          return [@adapter.null_proc] if @scope_procs.empty? && Protector.config.paranoid?
+          @scope_procs
         end
 
         def relation
           return false unless scoped?
 
-          @relation ||= @model.instance_eval(&scope_proc)
-          @relation
+          @relation ||= eval_scope_procs @model
+        end
+
+        def eval_scope_procs(instance)
+          return scope_procs.reduce(instance) do |relation, scope_proc|
+            relation.instance_eval(&scope_proc)
+          end
         end
 
         # Enables action for given fields.

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = "0.5.5"
+  VERSION = "0.6.0.beta.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0.beta.1
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -102,9 +102,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.6