protector 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 480667a8c7e66f9afb9fa1e5de46a99edc0d0325
-  data.tar.gz: 39e9914aa30962eb6792a429b10fbde0fa08b141
+  metadata.gz: 68d28de469f168b9678e739b5a6193292163b33c
+  data.tar.gz: 059591c46f57f4331ba39df89bd75ed79e10df46
 SHA512:
-  metadata.gz: 36003bdd3337ee49372bc4cbb4e220e149ba902b47f0b5b987f31823d458cb114494f7b0b537358997fd1f73d8c1ca49fc7cfb074407f1f65e86e7f1589fa46c
-  data.tar.gz: 6874b536a5333f1e4fb4f45b08aced3c41fcd4618d7dc319ce6dcc103fd41396a8ff244d6ab34a57a9234100ee630a4dddc722fc79b48c3b92b3fec33d3c74bc
+  metadata.gz: 20e28e28708bcf3dca908672c2783b5c8e19bb40230c85bdb041fbc0e70392e363a68438a39bcdd98c3e40634d6240318d30bbb93c3c09559e191b5f86d99cf0
+  data.tar.gz: 6319e7cec8f0ead0ef55d4bdec193df10a59c153081cbe36c1174eb3914a7df31016369a48835610ccdc7a3c6dd6c742d6e283acc59f38423ef1daffaaacc008

data/Appraisals

@@ -4,7 +4,7 @@ appraise "AR_3.2" do
 end
 
 appraise "AR_4" do
-  gem "activerecord", "4.0.0.rc1", require: "active_record"
+  gem "activerecord", "4.0.0", require: "active_record"
   gem "activerecord-jdbcsqlite3-adapter", platform: :jruby, github: "jruby/activerecord-jdbc-adapter"
 end
 
@@ -14,4 +14,4 @@ end
 
 # appraise "Mongoid" do
 #   gem "mongoid", ">= 3.1.4"
-# end
+# end

data/README.md

@@ -3,7 +3,6 @@
 [![Gem Version](https://badge.fury.io/rb/protector.png)](http://badge.fury.io/rb/protector)
 [![Build Status](https://travis-ci.org/inossidabile/protector.png?branch=master)](https://travis-ci.org/inossidabile/protector)
 [![Code Climate](https://codeclimate.com/github/inossidabile/protector.png)](https://codeclimate.com/github/inossidabile/protector)
-<!-- [![Coverage Status](https://coveralls.io/repos/inossidabile/protector/badge.png?branch=master)](https://coveralls.io/r/inossidabile/protector?branch=master) -->
 
 Protector is a Ruby ORM extension for managing security restrictions on a field level. The gem favors white-listing over black-listing (everything is disallowed by default), convention over configuration and is duck-type compatible with most of existing code.
 
@@ -39,7 +38,7 @@ class Article < ActiveRecord::Base          # Fields: title, text, user_id, hidd
       end
 
       can :create, %w(title text)           # Non-admins can't set `hidden` flag
-      can :create, user_id: lamda{|x|       # ... and should correctly fill 
+      can :create, user_id: labmda{|x|      # ... and should correctly fill 
         x == user.id                        # ... the `user_id` association
       }
 
@@ -132,7 +131,7 @@ Each restricted model responds to the following methods:
 
 * `visible?` – determines if the model is visible through restriction scope
 * `creatable?` – determines if you pass validation on creation with the fields you set
-* `updateable?` – determines if you pass validation on update with the fields you changed
+* `updatable?` – determines if you pass validation on update with the fields you changed
 * `destroyable?` – determines if you can destroy the model
 
 In fact Protector does not limit you to `:view`, `:update` and `:create` actions. They are just used internally. You however can define any other to make custom roles and restrictions. All of them are able to work on a field level.

data/gemfiles/AR_4.gemfile

@@ -13,7 +13,7 @@ gem "sqlite3", :platform=>:ruby
 gem "jdbc-sqlite3", :platform=>:jruby, :require=>"jdbc/sqlite3"
 gem "coveralls", :require=>false
 gem "ruby-prof", :platform=>:ruby
-gem "activerecord", "4.0.0.rc1", :require=>"active_record"
+gem "activerecord", "4.0.0", :require=>"active_record"
 gem "activerecord-jdbcsqlite3-adapter", :platform=>:jruby, :github=>"jruby/activerecord-jdbc-adapter"
 
 gemspec :path=>"../"

data/gemfiles/AR_4.gemfile.lock

@@ -1,10 +1,7 @@
 GIT
   remote: git://github.com/jruby/activerecord-jdbc-adapter.git
-  revision: b1cb2cb59496a7c3ae22799f88c8c4789e6a8cce
+  revision: 178d6177ae874a00e07f514e293eaa58d26dca5d
   specs:
-    activerecord-jdbcsqlite3-adapter (1.3.0.DEV)
-      activerecord-jdbc-adapter (~> 1.3.0.DEV)
-      jdbc-sqlite3 (~> 3.7.2)
 
 PATH
   remote: /Users/inossidabile/Repos/protector
@@ -16,17 +13,16 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (4.0.0.rc1)
-      activesupport (= 4.0.0.rc1)
+    activemodel (4.0.0)
+      activesupport (= 4.0.0)
       builder (~> 3.1.0)
-    activerecord (4.0.0.rc1)
-      activemodel (= 4.0.0.rc1)
+    activerecord (4.0.0)
+      activemodel (= 4.0.0)
       activerecord-deprecated_finders (~> 1.0.2)
-      activesupport (= 4.0.0.rc1)
+      activesupport (= 4.0.0)
       arel (~> 4.0.0)
-    activerecord-deprecated_finders (1.0.2)
-    activerecord-jdbc-adapter (1.3.0.beta1)
-    activesupport (4.0.0.rc1)
+    activerecord-deprecated_finders (1.0.3)
+    activesupport (4.0.0)
       i18n (~> 0.6, >= 0.6.4)
       minitest (~> 4.2)
       multi_json (~> 1.3)
@@ -36,8 +32,7 @@ GEM
       bundler
       rake
     arel (4.0.0)
-    atomic (1.1.9)
-    atomic (1.1.9-java)
+    atomic (1.1.10)
     builder (3.1.4)
     coderay (1.0.9)
     colored (1.2)
@@ -49,39 +44,32 @@ GEM
       simplecov (>= 0.7)
       thor
     diff-lcs (1.2.4)
-    ffi (1.8.1)
-    ffi (1.8.1-java)
+    ffi (1.9.0)
     formatador (0.2.4)
-    guard (1.8.0)
+    guard (1.8.1)
       formatador (>= 0.2.4)
       listen (>= 1.0.0)
       lumberjack (>= 1.0.2)
       pry (>= 0.9.10)
       thor (>= 0.14.6)
-    guard-rspec (3.0.0)
+    guard-rspec (3.0.2)
       guard (>= 1.8)
       rspec (~> 2.13)
     i18n (0.6.4)
-    jdbc-sqlite3 (3.7.2)
-    listen (1.1.3)
+    listen (1.2.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    lumberjack (1.0.3)
+    lumberjack (1.0.4)
     method_source (0.8.1)
     mime-types (1.23)
-    minitest (4.7.4)
-    multi_json (1.7.3)
+    minitest (4.7.5)
+    multi_json (1.7.7)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry (0.9.12.2-java)
-      coderay (~> 1.0.5)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-      spoon (~> 0.0)
-    rake (10.0.4)
+    rake (10.1.0)
     rb-fsevent (0.9.3)
     rb-inotify (0.9.0)
       ffi (>= 0.5.0)
@@ -103,8 +91,6 @@ GEM
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.5)
-    spoon (0.0.4)
-      ffi
     sqlite3 (1.3.7)
     thor (0.18.1)
     thread_safe (0.1.0)
@@ -112,11 +98,10 @@ GEM
     tzinfo (0.3.37)
 
 PLATFORMS
-  java
   ruby
 
 DEPENDENCIES
-  activerecord (= 4.0.0.rc1)
+  activerecord (= 4.0.0)
   activerecord-jdbcsqlite3-adapter!
   appraisal
   colored

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

@@ -31,7 +31,7 @@ module Protector
             super
           end
 
-          if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0.rc1')
+          if Gem::Version.new(::ActiveRecord::VERSION::STRING) < Gem::Version.new('4.0.0')
             def self.restrict!(subject)
               scoped.restrict!(subject)
             end

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

@@ -96,7 +96,27 @@ module Protector
 
           if eager_loading?
             protector_expand_inclusion(includes_values + eager_load_values).each do |klass, path|
-              relation = relation.merge(klass.protector_meta.evaluate(klass, subject).relation)
+              # AR drops default_scope for eagerly loadable associations
+              # https://github.com/inossidabile/protector/issues/3
+              # and so should we
+              meta = klass.protector_meta.evaluate(klass, subject)
+
+              if meta.scoped?
+                unscoped = klass.unscoped
+
+                # AR 4 has awfull inconsistency when it comes to method `all`
+                # We have to mimic base class behaviour for relation we get from `unscoped`
+                if Gem::Version.new(::ActiveRecord::VERSION::STRING) >= Gem::Version.new('4.0.0')
+                  class <<unscoped
+                    def all
+                      self
+                    end
+                  end
+                end
+
+                # Finally we merge unscoped basic relation extended with protection scope
+                relation = relation.merge unscoped.instance_eval(&meta.scope_proc)
+              end
             end
           else
             relation.preload_values += includes_values

data/lib/protector/dsl.rb

@@ -5,7 +5,7 @@ module Protector
 
       # Single DSL evaluation result
       class Box
-        attr_accessor :access, :scope_proc, :relation, :destroyable
+        attr_accessor :access, :scope_proc, :destroyable
 
         # @param model [Class]              The class of protected entity
         # @param fields [Array<String>]     All the fields the model has
@@ -16,7 +16,7 @@ module Protector
           @model       = model
           @fields      = fields
           @access      = {update: {}, view: {}, create: {}}
-          @relation    = false
+          @scope_proc  = false
           @destroyable = false
 
           blocks.each do |b|
@@ -34,7 +34,7 @@ module Protector
         # Checks whether protection with given subject
         # has the selection scope defined
         def scoped?
-          !!@relation
+          !!@scope_proc
         end
 
         # @group Protection DSL
@@ -51,7 +51,15 @@ module Protector
         #   end
         def scope(&block)
           @scope_proc = block
-          @relation   = @model.instance_eval(&block)
+
+          @relation          = false
+          @unscoped_relation = false
+        end
+
+        def relation
+          return false unless scoped?
+
+          @relation ||= @model.instance_eval(&@scope_proc)
         end
 
         # Enables action for given fields.

data/lib/protector/version.rb

@@ -1,4 +1,4 @@
 module Protector
   # Gem version
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -109,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: 'Protector is a successor to the Heimdallr gem: it hits the same goals keeping