cantango-masquerade 0.1.3.1 → 0.1.3.2

data/VERSION

@@ -1 +1 @@
-0.1.3.1
+0.1.3.2

data/cantango-masquerade.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-masquerade}
-  s.version = "0.1.3.1"
+  s.version = "0.1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-12-08}
+  s.date = %q{2011-12-09}
   s.description = %q{Masquerade extensions and macros for CanTango}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

data/lib/cantango/masquerade/ability/helper/masquerade.rb

@@ -2,16 +2,16 @@ module CanTango::Ability
   module Helper
     module Masquerade
       def masquerading?
-        candidate.respond_to?(:masquerading?) && candidate.masquerading?
+        candidate.respond_to?(:masquerading?) && candidate.masquerading? && !masquerading_off?
       end
       alias_method :masquerade?, :masquerading?
 
       def masquerade_user?
-        candidate.respond_to?(:active_user) && masquerading?
+        candidate.respond_to?(:active_user) && masquerading? && !masquerading_off?
       end
 
       def masquerade_account?
-        candidate.respond_to?(:active_account) && masquerading?
+        candidate.respond_to?(:active_account) && masquerading? && !masquerading_off?
       end
 
       def masquerading_off?

data/lib/cantango/masquerade/api/masquerade/account.rb

@@ -8,10 +8,12 @@ module CanTango
           raise "Must be a registered type of account, was: #{account}" unless valid_account? account
           @masquerading = true
           @active_account = account
+          self
         end
 
         def stop_masquerade
           @active_account, @masquerading = nil, nil
+          self
         end
 
         def masquerading?

data/lib/cantango/masquerade/api/masquerade/user.rb

@@ -5,12 +5,13 @@ module CanTango::Api::Masquerade
     def masquerade_as user
       raise "Must be a registered type of user, was: #{user}" unless valid_user? user
       @masquerading = true
-      user = user.kind_of?(String) ? ::User.find(user) : user
       @active_user = user
+      self
     end
 
     def stop_masquerade
       @active_user, @masquerading = nil, nil
+      self
     end
 
     def masquerading?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-masquerade
 version: !ruby/object:Gem::Version
-  version: 0.1.3.1
+  version: 0.1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70096695638660 !ruby/object:Gem::Requirement
+  requirement: &70110205501860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70096695638660
+  version_requirements: *70110205501860
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70096695637540 !ruby/object:Gem::Requirement
+  requirement: &70110205499280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70096695637540
+  version_requirements: *70110205499280
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70096695636100 !ruby/object:Gem::Requirement
+  requirement: &70110205496920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70096695636100
+  version_requirements: *70110205496920
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70096695627020 !ruby/object:Gem::Requirement
+  requirement: &70110205495480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70096695627020
+  version_requirements: *70110205495480
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70096695626120 !ruby/object:Gem::Requirement
+  requirement: &70110205494480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70096695626120
+  version_requirements: *70110205494480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70096695624800 !ruby/object:Gem::Requirement
+  requirement: &70110205493800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70096695624800
+  version_requirements: *70110205493800
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70096695623780 !ruby/object:Gem::Requirement
+  requirement: &70110205480520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70096695623780
+  version_requirements: *70110205480520
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70096695623060 !ruby/object:Gem::Requirement
+  requirement: &70110205479620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70096695623060
+  version_requirements: *70110205479620
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70096695622440 !ruby/object:Gem::Requirement
+  requirement: &70110205478540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70096695622440
+  version_requirements: *70110205478540
 description: Masquerade extensions and macros for CanTango
 email: kmandrup@gmail.com
 executables: []
@@ -180,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1483802857560660738
+      hash: -2925161978009257973
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: