protector-cancan 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24a492131115dea9a185a89b83c01e3fd3dde523
-  data.tar.gz: 0d0ef48a9f0e1ed21f0a0bc6d46c3fcb3d513dc3
+  metadata.gz: b34cee4a1e226310caecd062c57966b2b6885b6a
+  data.tar.gz: 8f487911a2246b9dc4fe62ba06c123e2ab9a9722
 SHA512:
-  metadata.gz: e98380fa0ecc0a8238304ba9716dffabdf634a3e5e9dc12ca806b6ca749032e0cb2610c213bab330241b76ac28db69f263cd676f7036fe1990b3b572117a8122
-  data.tar.gz: 956455e9fed66a3700a14d4ec3dcee8763a1a92da5f750e0d535f32e646ef54718d879b2ae4aae355bece3d1dcb6146d572b004915e5e9f7903d164ecde0476c
+  metadata.gz: ab8ff085f0c0a6a367c8d095b05d2b70dcebb65f8a0f270c2bed5dfd2d4c979d43acebdfac51e45fce11b0970e90b70c74a293d2b9c81f5571540f76fb206245
+  data.tar.gz: d474e2569e79ec413f90d9bbca6649e418d2117deb34ddf1fe36a2eedbcde666c352d5bf2ce84e9ba03005193b74bd8229b0ea03edbfa091ae6ed57edb944549

data/README.md

@@ -1,5 +1,9 @@
 # Protector::Cancan
 
+[![Gem Version](https://badge.fury.io/rb/protector-cancan.png)](http://badge.fury.io/rb/protector-cancan)
+[![Build Status](https://travis-ci.org/inossidabile/protector-cancan.png?branch=master)](https://travis-ci.org/inossidabile/protector-cancan)
+[![Code Climate](https://codeclimate.com/github/inossidabile/protector-cancan.png)](https://codeclimate.com/github/inossidabile/protector-cancan)
+
 Integrates [Protector](https://github.com/inossidabile/protector) and [CanCan](https://github.com/ryanb/cancan).
 
 Protector and CanCan are all about the same thing: access control. They however act on different fronts: Protector works on a model level and CanCan is all about controllers defense. With this gem you don't have to choose anymore: make them work together for the best result.
@@ -44,7 +48,7 @@ class Dummy < ActiveRecord::Base
 end
 ```
 
-If you call `can? :read, Dummy`, the gem will evaluate `Dummy` protection block against value passed to `import_protector` (by default it's `current_user`) and expand CanCan rules with resulting meta.
+If you call `can? :view, Dummy`, the gem will evaluate `Dummy` protection block against value passed to `import_protector` (by default it's `current_user`) and expand CanCan rules with resulting meta. Note that gem automatically converts `:read` to `:view` so you should use CanCan naming conventions when working with CanCan.
 
 So in this particular case we will get `true` if `current_user` is set and `false` otherwise.
 

data/lib/protector/cancan/ability.rb

@@ -20,7 +20,13 @@ module Protector
       def self.included(mod)
         mod.class_eval do
 
-          def can_with_protector?(action, entity, *extra_args)
+          def can_with_protector?(action, entity_set, *extra_args)
+            if entity_set.is_a? Hash
+              entity = entity_set.values.first
+            else
+              entity = entity_set
+            end
+
             if entity.respond_to?(:restrict!) && @protector_subject_defined
               @protector_models ||= Set.new
 
@@ -42,11 +48,10 @@ module Protector
               end
             end
 
-            can_without_protector? action, entity, *extra_args
+            can_without_protector? action, entity_set, *extra_args
           end
 
           alias_method_chain :can?, :protector
-
         end
       end
     end

data/lib/protector/cancan/resource.rb

@@ -2,34 +2,44 @@ module Protector
   module CanCan
     module Resource extend ActiveSupport::Concern
       included do
-        alias_method_chain :load_resource, :protector
+        alias_method_chain :resource_base, :protector
         alias_method_chain :load_collection, :protector
+        alias_method_chain :load_collection?, :protector
       end
 
-      def load_resource_with_protector(*args)
-        resource = load_resource_without_protector(*args)
+      def resource_base_with_protector
+        resource = resource_base_without_protector
 
-        if resource.respond_to?(:restrict!) \
-            && !resource.protector_subject? \
-            && current_ability.protector_subject?
-
-          resource = resource.restrict!(current_ability.protector_subject)
+        if resource_protectable? resource
+          resource.restrict!(current_ability.protector_subject)
+        else
+          resource
         end
-        
-        resource
       end
 
-      def load_collection_with_protector(*args)
-        collection = load_collection_without_protector(*args)
+      def load_collection_with_protector
+        resource = resource_base
 
-        if collection.respond_to?(:restrict!) \
-            && !collection.protector_subject? \
-            && current_ability.protector_subject?
+        if resource_protectable? resource
+          resource
+        else
+          load_collection_without_protector
+        end
+      end
 
-          collection = collection.restrict!(current_ability.protector_subject)
+      def load_collection_with_protector?
+        if resource_protectable? resource_base
+          true
+        else
+          load_collection_without_protector?
         end
-        
-        collection
+      end
+
+      private
+
+      def resource_protectable?(resource)
+        resource.respond_to?(:restrict!) &&
+        current_ability.protector_subject?
       end
     end
   end

data/lib/protector/cancan/version.rb

@@ -1,5 +1,5 @@
 module Protector
   module Cancan
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: protector-cancan
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Boris Staal
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-14 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: protector
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Integration layer between Protector and CanCan