protector 0.7.4 → 0.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ab9ae6223aeaab08d8d948afabcda92ba575bb5
-  data.tar.gz: 78493baec6fb7bba08e88317786e0f6f67424c46
+  metadata.gz: 8d6e09054172469d5a87d231ad7f173504cb370d
+  data.tar.gz: 6711053459b16743c42b18192406bbda09a1bd45
 SHA512:
-  metadata.gz: 553c9be308ba628290f0e629674601e87cc6e0976c27fa04178129eac71a5dd29a1dac95508c93d316dc074029c29e7849ec274406b0ccf74d0cec74e4c616cf
-  data.tar.gz: 127203f58494490d56d711c6af3a30777b7ddab2fd6822f10a4a6d7838c054ded1163f84565b965fb034fa501f0c2186823079477d2b288d8577c27833b60170
+  metadata.gz: 73b84873fae0417524c733ccf96216e311923fc80fe69bf3bf690c26624a237297dd9c4166171830c2ed3e7978ce9dd5d28daf05e3e910f30e4b42ae48c12536
+  data.tar.gz: d7390a28c52aa295aa46fa295a8cd250e5548c5e8916b71c39db6e077fd1cccfbe345710bcf3292249672a5925f8948f5889d56b95b6af82654a99ba62547da7

data/Appraisals

@@ -8,6 +8,11 @@ appraise "AR_4" do
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby, github: "jruby/activerecord-jdbc-adapter"
 end
 
+appraise "AR_4.1" do
+  gem "activerecord", "4.1.0.rc1", require: "active_record"
+  gem "activerecord-jdbcsqlite3-adapter", platform: :jruby, github: "jruby/activerecord-jdbc-adapter"
+end
+
 appraise "AR_edge" do
   gem "activerecord", require: "active_record", github: "rails/rails"
   gem "activemodel", github: "rails/rails"

data/README.md

@@ -99,10 +99,21 @@ Article.restrict!(current_user).where(...)
 Article.where(...).restrict!(current_user)
 ```
 
-Note that you don't need to explicitly restrict models you get from a restricted scope – they born restricted.
+Be aware that if you already made the database query the scope has no effect on the already fatched data. This is because Protector is working on two levels: first during retrieval (scops are applied here) and after that on the level of fields. So for example `find` and `restrict!` calls are not commutative:
+```ruby
+# Should be used if you are using scops for visibility restriction 
+Article.restrict!(current_user).find(3)
+
+# not equal!
+# Will select the record with id: 3 regardless of any scops and only restrict on the field level
+Article.find(3).restrict!(current_user)
+```
+
+Note also that you don't need to explicitly restrict models you get from a restricted scope – they born restricted.
 
 **Important**: unlike fields, scopes follow black-list approach by default. It means that you will NOT restrict selection in any way if no scope was set within protection block! This arguably is the best default strategy. But it's not the only one – see `paranoid` at the [list of available options](https://github.com/inossidabile/protector#options) for details.
 
+
 ## Self-aware conditions
 
 Sometimes an access decision depends on the object we restrict. `protect` block accepts second argument to fulfill these cases. Keep in mind however that it's not always accessible: we don't have any instance for the restriction of relation and therefore `nil` is passed.
@@ -232,4 +243,4 @@ Protector features basic Rails integration so you can assign options using `conf
 
 It is free software, and may be redistributed under the terms of MIT license.
 
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/inossidabile/protector/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/inossidabile/protector/trend.png)](https://bitdeli.com/free "Bitdeli Badge")

data/gemfiles/AR_4.1.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "colored"
+gem "pry"
+gem "rspec"
+gem "simplecov", :require=>false
+gem "simplecov-summary"
+gem "appraisal", :github=>"thoughtbot/appraisal"
+gem "sqlite3", :platform=>:ruby
+gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3"
+gem "ruby-prof", :platform=>:ruby
+gem "activerecord", "4.1.0.rc1", :require=>"active_record"
+gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter"
+
+gemspec :path=>".././"

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

@@ -89,10 +89,7 @@ module Protector
         def new_with_protector(*args, &block)
           return new_without_protector(*args, &block) unless protector_subject?
 
-          # strong_parameters integration
-          if Protector.config.strong_parameters? && args.first.respond_to?(:permit)
-            Protector::ActiveRecord::Adapters::StrongParameters.sanitize! args, true, protector_meta
-          end
+          protector_permit_strong_params(args)
 
           unless block_given?
             new_without_protector(*args).restrict!(protector_subject)
@@ -106,10 +103,7 @@ module Protector
         def create_with_protector(*args, &block)
           return create_without_protector(*args, &block) unless protector_subject?
 
-          # strong_parameters integration
-          if Protector.config.strong_parameters? && args.first.respond_to?(:permit)
-            Protector::ActiveRecord::Adapters::StrongParameters.sanitize! args, true, protector_meta
-          end
+          protector_permit_strong_params(args)
 
           create_without_protector(*args) do |instance|
             instance.restrict!(protector_subject)
@@ -120,6 +114,8 @@ module Protector
         def create_with_protector!(*args, &block)
           return create_without_protector!(*args, &block) unless protector_subject?
 
+          protector_permit_strong_params(args)
+
           create_without_protector!(*args) do |instance|
             instance.restrict!(protector_subject)
             block.call(instance) if block
@@ -233,6 +229,14 @@ module Protector
 
         private
 
+        def protector_permit_strong_params(args)
+          # strong_parameters integration
+          if Protector.config.strong_parameters? && args.first.respond_to?(:permit)
+            Protector::ActiveRecord::Adapters::StrongParameters.sanitize! args, true, protector_meta
+          end
+        end
+
+
         def protector_expand_inclusion_hash(inclusion, results=[], base=[], klass=@klass)
           inclusion.each do |key, value|
             model = klass.reflect_on_association(key.to_sym).klass

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

@@ -97,7 +97,7 @@ module Protector
             (self.class.primary_key.is_a?(Array) && self.class.primary_key.include?(name)) ||
             protector_meta.readable?(name.to_s)
           )
-            @values[name]
+            @values[name.to_sym]
           else
             nil
           end

data/lib/protector/dsl.rb

@@ -159,7 +159,7 @@ module Protector
 
         # Checks whether given field of a model is readable in context of current subject
         def readable?(field)
-          @access[:read] && @access[:read].key?(field)
+          @access[:read] && @access[:read].key?(field.to_s)
         end
 
         # Checks whether you can create a model with given field in context of current subject

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = '0.7.4'
+  VERSION = '0.7.6'
 end

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

@@ -40,6 +40,15 @@ if defined?(ActiveRecord)
       Fluffy.all.each{|f| Loony.create! fluffy_id: f.id, string: 'zomgstring' }
     end
 
+    let(:dummy) do
+      Class.new(ActiveRecord::Base) do
+        def self.name; 'Dummy'; end
+        def self.model_name; ActiveModel::Name.new(self, nil, "dummy"); end
+        self.table_name = "dummies"
+        scope :none, where('1 = 0') unless respond_to?(:none)
+      end
+    end
+
     describe Protector::Adapters::ActiveRecord do
       it "finds out whether object is AR relation" do
         Protector::Adapters::ActiveRecord.is?(Dummy).should == true
@@ -55,15 +64,6 @@ if defined?(ActiveRecord)
     # Model instance
     #
     describe Protector::Adapters::ActiveRecord::Base do
-      let(:dummy) do
-        Class.new(ActiveRecord::Base) do
-          def self.name; 'Dummy'; end
-          def self.model_name; ActiveModel::Name.new(self, nil, "dummy"); end
-          self.table_name = "dummies"
-          scope :none, where('1 = 0') unless respond_to?(:none)
-        end
-      end
-
       it "includes" do
         Dummy.ancestors.should include(Protector::Adapters::ActiveRecord::Base)
       end
@@ -457,6 +457,37 @@ if defined?(ActiveRecord)
 
           expect { fluffy.restrict!('!').to_a }.to_not raise_error
         end
+
+        # https://github.com/inossidabile/protector/issues/42
+        if ActiveRecord::Base.respond_to?(:enum)
+          context "enums" do
+            before(:each) do
+              dummy.instance_eval do
+                enum number: [ :active, :archived ]
+              end
+            end
+
+            it "can be read" do
+              dummy.instance_eval do
+                protect do
+                  can :read, :number
+                  can :create, :number
+                  can :update, :number
+                end
+              end
+
+              d = dummy.new.restrict!('!')
+
+              expect { d.active! }.to_not raise_error
+
+              d.number.should == 'active'
+              d.active?.should == true
+              d.archived?.should == false
+
+              d.delete
+            end
+          end
+        end
       end
     end
   end

data/spec/lib/protector/engine_spec.rb

@@ -49,6 +49,7 @@ if defined?(Rails)
       it "creates" do
         expect{ dummy.restrict!.new params(string: 'test') }.to_not raise_error
         expect{ dummy.restrict!.create(params(string: 'test')).delete }.to_not raise_error
+        expect{ dummy.restrict!.create!(params(string: 'test')).delete }.to_not raise_error
         expect{ dummy.restrict!.new params(number: 1) }.to raise_error
       end
 

data/spec/spec_helpers/examples/model.rb

@@ -74,6 +74,20 @@ shared_examples_for "a model" do
       read_attribute(d, :number).should_not == nil
       d.string.should == 'zomgstring'
     end
+
+    it "shows fields" do
+      dummy.instance_eval do
+        protect do
+          can :read, :number
+        end
+      end
+
+      d = dummy.first.restrict!('!')
+      d.number.should_not == nil
+      d[:number].should_not == nil
+      d['number'].should_not == nil
+      read_attribute(d, :number).should_not == nil
+    end
   end
 
   #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.6
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-21 00:00:00.000000000 Z
+date: 2014-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -57,6 +57,7 @@ files:
 - README.md
 - Rakefile
 - gemfiles/AR_3.2.gemfile
+- gemfiles/AR_4.1.gemfile
 - gemfiles/AR_4.gemfile
 - gemfiles/AR_edge.gemfile
 - gemfiles/Rails_3.2.gemfile