sanction 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d9b7c911e6b858db458af6c2a1a1a2576831c6c
-  data.tar.gz: dfc5c0aa9ea471972fb4897649e195195b8d4002
+  metadata.gz: 54b4bc26ea4486d4933609a99ce9069cc9d0e006
+  data.tar.gz: 61e47caeb74f34362da54ca9e4fc4795502e0141
 SHA512:
-  metadata.gz: 627ca53b8f5c5d2d162b4035e792f94af8560e6f66cb6ab4030db8a646ccb909a9078a28c3e7d16c6f59254a3ef03cffd61c2fd9d38f48db93ea4b2ee550e7ed
-  data.tar.gz: 31e827b77feb6d04d471d54e08f260b833bf845d930fbab5cf401ecd4f2ea18d0936455d78f7c94c17fda1e043c673a30af6c6c094ac9653bf904165627b32b5
+  metadata.gz: eccc4a6e58d4c3db5ead80ef35479c329e64843eb6259096476a2c368b61cc902723ee917c3a6c5147ea94922fd1f0294f869d8abd1d451aa3287ccf8f09b656
+  data.tar.gz: e340fc3cb7f86837bf9bf2c5ff91206f7502dda29b0128da593e777de8ae863cefd5badf92d0617cfd91a9106618597761049444650c06f5667db67ca5ae7e21

data/lib/sanction/blacklist/node.rb

@@ -13,6 +13,10 @@ module Sanction
         true
       end
 
+      def scope
+        permitted? ? super : []
+      end
+
       def deny!
         false
       end

data/lib/sanction/node.rb

@@ -86,11 +86,21 @@ module Sanction
     end
 
     def scope
+      return @scope if (parent.blank? && root?)
       @scope.blank? ? parent.scope : @scope
     end
     
-    def scope=(scope)
-      @scope = [scope].flatten.compact.map(&:to_sym)
+    def scope=(attribute)
+      @scope = [attribute].flatten.compact.map(&:to_sym)
+    end
+
+    def add_scope(attribute)
+      @scope << attribute.to_sym
+      sanitize_scope!
+    end
+
+    def remove_scope(attribute)
+      @scope.reject! {|x| x == attribute.to_sym }
     end
 
     def resources
@@ -122,9 +132,13 @@ module Sanction
 
     private
 
+      def sanitize_scope!
+        @scope = @scope.flatten.compact.uniq.map(&:to_sym)
+      end
+
       def process_hash(hash)
         @id         = hash[:id]
-        @scope      = hash[:scope].map(&:to_sym) unless hash[:scope].blank?
+        @scope      = [hash[:scope]].flatten.compact.map(&:to_sym) 
         @type       = hash[:type].to_sym if hash[:type]
         @resources  = []
         @resources  += hash[:resources].map(&:to_sym) unless hash[:resources].blank?

data/lib/sanction/version.rb

@@ -1,3 +1,3 @@
 module Sanction
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/sanction/whitelist/node.rb

@@ -11,6 +11,10 @@ module Sanction
         false
       end
 
+      def scope
+        permitted? ? super : []
+      end
+
       def deny!
         @parent.resources << type
         @parent.resources.uniq!

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sanction
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Adam Carlile
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport