cancan_namespace 0.1.1 → 0.1.2

data/lib/cancan_namespace/rule.rb

@@ -8,8 +8,14 @@ module CanCanNamespace
     # and subject respectively (such as :read, @project). The third argument is a hash
     # of conditions and the last one is the block passed to the "can" call.
     def initialize(base_behavior, action, subject, conditions, block)
+      if conditions.kind_of?(Hash) && conditions.has_key?(:context)
+        @contexts = [conditions.delete(:context)].flatten.map(&:to_s)
+        conditions = nil if conditions.keys.empty?
+      else
+        @contexts = []
+      end
+      
       super
-      @contexts = has_conditions? && @conditions.has_key?(:context) ? [@conditions.delete(:context)].flatten.map(&:to_s) : []
     end
     
     def has_conditions?

data/lib/cancan_namespace/version.rb

@@ -3,7 +3,7 @@ module CancanNamespace
   module Version
     MAJOR = 0
     MINOR = 1
-    RELEASE = 1
+    RELEASE = 2
 
     def self.dup
       "#{MAJOR}.#{MINOR}.#{RELEASE}"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: cancan_namespace
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: 
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Igor Galeta
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-29 00:00:00 +03:00
+date: 2011-04-09 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency