protector 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f2e7f8f389acbad91383ebfd69716fb4f47f9ff
-  data.tar.gz: c0afd232c22534c7e98b5147c460d84497d2079d
+  metadata.gz: ce979a4af923d6268b9a931f6ef02c41a907f482
+  data.tar.gz: 4eeb250b2363f4cb0c00187a4f33bcdc0204c9a1
 SHA512:
-  metadata.gz: 513dc71a0f5555eacd2b6a70d03df9952803a6a2284cd7e3798d372550c3074169fb1bf8a4421944e97f791afa9454022c6bc0d7331e5fe56066959704dd8f9d
-  data.tar.gz: d7116a42ed32d2af53a90ed1e8a5db2c42a4431d9379875af5a58f4aa63aaaa90888f124553668f3223779d0fbe6b8d504c5b5081f4c05783c5e2daf5cad1f0b
+  metadata.gz: d790737a8c94f9c562f160b557a9d40b6e2503a9bf37a30b4a904df25cf1600dd4e0fe28b9c6b246a907e6cf495784abed60b4c7b64fb168660b3abaa6d4bbe2
+  data.tar.gz: 92cf86b82aaed28a4a1ea10be9a97c4fdb28b6d142758f4153564ae4e035e4059a99840a3b37477dec0e9a2eaffff1b8fdcc5e1fd2e5b18d22e5d70ad8fb3a25

data/README.md

@@ -36,7 +36,14 @@ This example is based on ActiveRecord but the code is mostly identical for any s
 class Article < ActiveRecord::Base          # Fields: title, text, user_id, hidden
   protect do |user|                         # `user` is a context of security
 
-    unless user.admin?
+    if user.admin?
+      scope { all }                         # Admins can retrieve anything
+
+      can :view                             # ... and view anything
+      can :create                           # ... and create anything
+      can :update                           # ... and update anything
+      can :destroy                          # ... and they can delete
+    else
       scope { where(hidden: false) }        # Non-admins can only read insecure data
 
       can :view                             # Allow to read any field
@@ -50,13 +57,6 @@ class Article < ActiveRecord::Base          # Fields: title, text, user_id, hidd
       }
 
       # In this setup non-admins can not destroy or update existing records.
-    else
-      scope { all }                         # Admins can retrieve anything
-
-      can :view                             # ... and view anything
-      can :create                           # ... and create anything
-      can :update                           # ... and update anything
-      can :destroy                          # ... and they can delete
     end
   end
 end

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

@@ -63,11 +63,9 @@ module Protector
         module ClassMethods
           # Storage of {Protector::DSL::Meta}
           def protector_meta
-            @protector_meta ||= Protector::DSL::Meta.new(
-              Protector::Adapters::ActiveRecord,
-              self,
+            @protector_meta ||= Protector::DSL::Meta.new(Protector::Adapters::ActiveRecord, self) do
               self.column_names
-            )
+            end
           end
 
           # Wraps every `.field` method with a check against {Protector::DSL::Meta::Box#readable?}

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

@@ -18,11 +18,9 @@ module Protector
         module ClassMethods
           # Storage of {Protector::DSL::Meta}
           def protector_meta
-            @protector_meta ||= Protector::DSL::Meta.new(
-              Protector::Adapters::Sequel,
-              self,
+            @protector_meta ||= Protector::DSL::Meta.new(Protector::Adapters::Sequel, self) do
               self.columns
-            )
+            end
           end
 
           # Gets default restricted `Dataset`

data/lib/protector/dsl.rb

@@ -214,10 +214,14 @@ module Protector
         end
       end
 
-      def initialize(adapter, model, fields)
-        @adapter = adapter
-        @model   = model
-        @fields  = fields
+      def initialize(adapter, model, &fields_proc)
+        @adapter     = adapter
+        @model       = model
+        @fields_proc = fields_proc
+      end
+
+      def fields
+        @fields ||= @fields_proc.call
       end
 
       # Storage for `protect` blocks
@@ -232,12 +236,10 @@ module Protector
 
       # Calculate protection at the context of subject
       #
-      # @param model [Class]              The class of protected entity
       # @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(subject, entry=nil)
-        Box.new(@adapter, @model, @fields, subject, entry, blocks)
+        Box.new(@adapter, @model, fields, subject, entry, blocks)
       end
     end
 

data/lib/protector/version.rb

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

data/migrations/active_record.rb

@@ -44,4 +44,7 @@ class Bobby < ActiveRecord::Base
 end
 
 class Loony < ActiveRecord::Base
+end
+
+class Rumba < ActiveRecord::Base
 end

data/migrations/sequel.rb

@@ -46,4 +46,7 @@ class Bobby < Sequel::Model
 end
 
 class Loony < Sequel::Model
+end
+
+class Rumba < Sequel::Model
 end

data/spec/lib/dsl_spec.rb

@@ -42,7 +42,7 @@ describe Protector::DSL do
         include Protector::DSL::Entry
 
         def self.protector_meta
-          @protector_meta ||= Protector::DSL::Meta.new nil, nil, []
+          @protector_meta ||= Protector::DSL::Meta.new(nil, nil){[]}
         end
       end
     end
@@ -61,7 +61,7 @@ describe Protector::DSL do
       l = lambda {|x| x > 4 }
 
       before :each do
-        @meta = Protector::DSL::Meta.new nil, nil, %w(field1 field2 field3 field4 field5)
+        @meta = Protector::DSL::Meta.new(nil, nil){%w(field1 field2 field3 field4 field5)}
         @meta << lambda {
           can :view
         }
@@ -159,7 +159,7 @@ describe Protector::DSL do
 
     context "custom methods" do
       before :each do
-        @meta = Protector::DSL::Meta.new nil, nil, %w(field1 field2)
+        @meta = Protector::DSL::Meta.new(nil, nil){%w(field1 field2)}
 
         @meta << lambda {
           can :drink, :field1

data/spec/spec_helpers/examples/model.rb

@@ -30,6 +30,14 @@ shared_examples_for "a model" do
     d.instance_variable_get('@protector_meta').should == nil
   end
 
+  it "doesn't get stuck with non-existing tables" do
+    Rumba.class_eval do
+      protect do
+        can
+      end
+    end
+  end
+
   describe "visibility" do
     it "marks blocked" do
       Dummy.first.restrict!('-').visible?.should == false

metadata

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