protector 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18a3586352df222ca67b0aa27be8711af98e9d44
-  data.tar.gz: 5a55e8b998ba4ec4af975d05adb0d8687e2c38d7
+  metadata.gz: 823427ab7061d2b26ab6835d3c4bbfd17abe6430
+  data.tar.gz: dfa3edc7c59fca658f81ef6f1d377890a6ac9c1a
 SHA512:
-  metadata.gz: 0dca6468a9b82c7e95615d46f2b93eab694b9ca9400a1c9b6dfbfea7d71320083c9b3731ec063c3078203e64d536c2a68704ce88845b071e13c1445bd89aa29b
-  data.tar.gz: ef7c2c455894bf6d96adbd224c7cdd4922485e34d7112f988ade24338f18e7b6e982063b7fa3ebdb006f2adc4e62e1b4e60605d6ef99fc06fd2fea9f8c3691e1
+  metadata.gz: 4897c4ccea8d4b074158ba15b33395ec04522c067dc3a4c065366a6c8ceb81a1b9133c3862ed1625818c2f4d260107483f078277403b5375f09456d02f8e24d1
+  data.tar.gz: c9229df3995d7d6f71e0d71d638e6d1273ca165977badcdec63f643074a4598dbd370ae446c58cfa9f4df6bd418f7959c577cf19d1b1c7cd611764d062043557

data/gemfiles/AR_3.2.gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: /Users/inossidabile/Repos/protector
   specs:
-    protector (0.5.2)
+    protector (0.5.3)
       activesupport
       i18n
 

data/gemfiles/AR_4.gemfile.lock

@@ -10,7 +10,7 @@ GIT
 PATH
   remote: /Users/inossidabile/Repos/protector
   specs:
-    protector (0.5.2)
+    protector (0.5.3)
       activesupport
       i18n
 

data/gemfiles/Rails_3.2.gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: /Users/inossidabile/Repos/protector
   specs:
-    protector (0.5.2)
+    protector (0.5.3)
       activesupport
       i18n
 

data/gemfiles/Rails_4.gemfile.lock

@@ -19,7 +19,7 @@ GIT
 PATH
   remote: /Users/inossidabile/Repos/protector
   specs:
-    protector (0.5.2)
+    protector (0.5.3)
       activesupport
       i18n
 

data/gemfiles/Sequel.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/inossidabile/Repos/protector
   specs:
-    protector (0.5.2)
+    protector (0.5.3)
       activesupport
       i18n
 

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

@@ -56,6 +56,15 @@ module Protector
         end
 
         module ClassMethods
+          # Storage of {Protector::DSL::Meta}
+          def protector_meta
+            @protector_meta ||= Protector::DSL::Meta.new(
+              Protector::Adapters::ActiveRecord,
+              self,
+              self.column_names
+            )
+          end
+
           # Wraps every `.field` method with a check against {Protector::DSL::Meta::Box#readable?}
           def define_method_attribute(name)
             super
@@ -79,13 +88,7 @@ module Protector
 
         # Storage for {Protector::DSL::Meta::Box}
         def protector_meta(subject=protector_subject)
-          @protector_meta ||= self.class.protector_meta.evaluate(
-            Protector::Adapters::ActiveRecord,
-            self.class,
-            subject,
-            self.class.column_names,
-            self
-          )
+          @protector_meta ||= self.class.protector_meta.evaluate(subject, self)
         end
 
         # Checks if current model can be selected in the context of current subject

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

@@ -31,11 +31,7 @@ module Protector
           def scope_with_protector(*args)
             return scope_without_protector unless protector_subject?
 
-            @meta ||= klass.protector_meta.evaluate(
-              Protector::Adapters::ActiveRecord,
-              klass,
-              protector_subject
-            )
+            @meta ||= klass.protector_meta.evaluate(protector_subject)
 
             scope_without_protector.merge(@meta.relation)
           end

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

@@ -28,12 +28,7 @@ module Protector
 
         # Gets {Protector::DSL::Meta::Box} of this relation
         def protector_meta(subject=protector_subject)
-          # We don't seem to require columns here as well
-          @klass.protector_meta.evaluate(
-            Protector::Adapters::ActiveRecord,
-            @klass,
-            subject
-          )
+          @klass.protector_meta.evaluate(subject)
         end
 
         # @note Unscoped relation drops properties and therefore should be re-restricted
@@ -124,11 +119,7 @@ module Protector
               # AR drops default_scope for eagerly loadable associations
               # https://github.com/inossidabile/protector/issues/3
               # and so should we
-              meta = klass.protector_meta.evaluate(
-                Protector::Adapters::ActiveRecord,
-                klass,
-                subject
-              )
+              meta = klass.protector_meta.evaluate(subject)
 
               if meta.scoped?
                 unscoped = klass.unscoped

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

@@ -32,11 +32,7 @@ module Protector
 
         # Gets {Protector::DSL::Meta::Box} of this dataset
         def protector_meta(subject=protector_subject)
-          model.protector_meta.evaluate(
-            Protector::Adapters::Sequel,
-            model,
-            subject
-          )
+          model.protector_meta.evaluate(subject)
         end
 
         # Substitutes `row_proc` with {Protector} and injects protection scope
@@ -57,11 +53,7 @@ module Protector
           @opts[:eager_graph][:reflections].each do |association, reflection|
             model = reflection[:cache][:class] if reflection[:cache].is_a?(Hash) && reflection[:cache][:class]
             model = reflection[:class_name].constantize unless model
-            meta  = model.protector_meta.evaluate(
-              Protector::Adapters::Sequel,
-              model,
-              subject
-            )
+            meta  = model.protector_meta.evaluate(subject)
 
             relation = relation.instance_eval(&meta.scope_proc) if meta.scoped?
           end

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

@@ -16,6 +16,15 @@ module Protector
         end
 
         module ClassMethods
+          # Storage of {Protector::DSL::Meta}
+          def protector_meta
+            @protector_meta ||= Protector::DSL::Meta.new(
+              Protector::Adapters::Sequel,
+              self,
+              self.columns
+            )
+          end
+
           # Gets default restricted `Dataset`
           def restrict!(*args)
             dataset.clone.restrict! *args
@@ -24,13 +33,7 @@ module Protector
 
         # Storage for {Protector::DSL::Meta::Box}
         def protector_meta(subject=protector_subject)
-          @protector_meta ||= self.class.protector_meta.evaluate(
-            Protector::Adapters::Sequel,
-            self.class,
-            subject,
-            self.class.columns,
-            self
-          )
+          @protector_meta ||= self.class.protector_meta.evaluate(subject, self)
         end
 
         # Checks if current model can be selected in the context of current subject

data/lib/protector/dsl.rb

@@ -202,6 +202,12 @@ module Protector
         end
       end
 
+      def initialize(adapter, model, fields)
+        @adapter = adapter
+        @model   = model
+        @fields  = fields
+      end
+
       # Storage for `protect` blocks
       def blocks
         @blocks ||= []
@@ -218,8 +224,8 @@ module Protector
       # @param subject [Object]           Restriction subject
       # @param fields [Array<String>]     All the fields the model has
       # @param entry [Object]             An instance of the model
-      def evaluate(adapter, model, subject, fields=[], entry=nil)
-        Box.new(adapter, model, fields, subject, entry, blocks)
+      def evaluate(subject, entry=nil)
+        Box.new(@adapter, @model, @fields, subject, entry, blocks)
       end
     end
 
@@ -269,11 +275,6 @@ module Protector
         def protect(&block)
           protector_meta << block
         end
-
-        # Storage of {Protector::DSL::Meta}
-        def protector_meta
-          @protector_meta ||= Meta.new
-        end
       end
     end
   end

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/lib/dsl_spec.rb

@@ -38,7 +38,13 @@ describe Protector::DSL do
 
   describe Protector::DSL::Entry do
     before :each do
-      @entry = Class.new{ include Protector::DSL::Entry }
+      @entry = Class.new do
+        include Protector::DSL::Entry
+
+        def self.protector_meta
+          @protector_meta ||= Protector::DSL::Meta.new nil, nil, []
+        end
+      end
     end
 
     it "instantiates meta entity" do
@@ -55,8 +61,7 @@ describe Protector::DSL do
       l = lambda {|x| x > 4 }
 
       before :each do
-        @meta = Protector::DSL::Meta.new
-
+        @meta = Protector::DSL::Meta.new nil, nil, %w(field1 field2 field3 field4 field5)
         @meta << lambda {
           can :view
         }
@@ -84,30 +89,30 @@ describe Protector::DSL do
       end
 
       it "evaluates" do
-        @meta.evaluate(nil, nil, 'user', [], 'entry')
+        @meta.evaluate('user', 'entry')
       end
 
       context "adequate", paranoid: false do
         it "sets scoped?" do
-          data = @meta.evaluate(nil, nil, nil, [], 'entry')
+          data = @meta.evaluate(nil, 'entry')
           data.scoped?.should == false
         end
       end
 
       context "paranoid", paranoid: true do
         it "sets scoped?" do
-          data = @meta.evaluate(nil, nil, nil, [], 'entry')
+          data = @meta.evaluate(nil, 'entry')
           data.scoped?.should == true
         end
       end
 
       it "sets relation" do
-        data = @meta.evaluate(nil, nil, 'user', [], 'entry')
+        data = @meta.evaluate('user', 'entry')
         data.relation.should == 'relation'
       end
 
       it "sets access" do
-        data = @meta.evaluate(nil, nil, 'user', %w(field1 field2 field3 field4 field5), 'entry')
+        data = @meta.evaluate('user', 'entry')
         data.access.should == {
           update: {
             "field1" => nil,
@@ -126,24 +131,24 @@ describe Protector::DSL do
       end
 
       it "marks destroyable" do
-        data = @meta.evaluate(nil, nil, 'user', [], 'entry')
+        data = @meta.evaluate('user', 'entry')
         data.destroyable?.should == true
       end
 
       it "marks updatable" do
-        data = @meta.evaluate(nil, nil, 'user', [], 'entry')
+        data = @meta.evaluate('user', 'entry')
         data.updatable?.should == true
       end
 
       it "marks creatable" do
-        data = @meta.evaluate(nil, nil, 'user', [], 'entry')
+        data = @meta.evaluate('user', 'entry')
         data.creatable?.should == false
       end
     end
 
     context "custom methods" do
       before :each do
-        @meta = Protector::DSL::Meta.new
+        @meta = Protector::DSL::Meta.new nil, nil, %w(field1 field2)
 
         @meta << lambda {
           can :drink, :field1
@@ -153,13 +158,13 @@ describe Protector::DSL do
       end
 
       it "sets field-level restriction" do
-        box = @meta.evaluate(nil, nil, 'user', %w(field1 field2), 'entry')
+        box = @meta.evaluate('user', 'entry')
         box.can?(:drink, :field1).should == true
         box.can?(:drink).should == true
       end
 
       it "sets field-level protection" do
-        box = @meta.evaluate(nil, nil, 'user', %w(field1 field2), 'entry')
+        box = @meta.evaluate('user', 'entry')
         box.can?(:eat, :field1).should == false
         box.can?(:eat).should == true
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport