cantango-masquerade 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/cantango-masquerade.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-masquerade}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
@@ -37,6 +37,8 @@ Gem::Specification.new do |s|
     "lib/cantango/masquerade/macros/masquerader.rb",
     "lib/cantango/masquerade/macros/masquerader/account.rb",
     "lib/cantango/masquerade/macros/masquerader/user.rb",
+    "lib/cantango/masquerade/scope.rb",
+    "lib/cantango/masquerade/scope/ability.rb",
     "lib/cantango/masquerade_ext.rb",
     "lib/cantango/masquerade_ext/macros.rb",
     "lib/cantango/masquerade_ext/macros/account.rb",
@@ -49,6 +51,7 @@ Gem::Specification.new do |s|
     "spec/cantango/masquerade_ext/macros/admin_account_spec.rb",
     "spec/cantango/masquerade_ext/macros/admin_user_spec.rb",
     "spec/cantango/masquerade_spec.rb",
+    "spec/cantango/scope/ability_spec.rb",
     "spec/fixtures/models.rb",
     "spec/fixtures/models/admin.rb",
     "spec/fixtures/models/admin_account.rb",

data/lib/cantango/masquerade.rb

@@ -7,7 +7,7 @@ SweetLoader.mode = :require
 
 module CanTango
   sweet_scope :ns => {:CanTango => 'cantango/masquerade'} do 
-    sweetload :Ability, :Api, :Macros
+    sweetload :Ability, :Api, :Macros, :Scope
   end
 end
 

data/lib/cantango/masquerade/ability.rb

@@ -1 +1 @@
-require 'cantango/masquerade/ability/helper/masquerade'
+require 'cantango/masquerade/ability/helper/masquerade'

data/lib/cantango/masquerade/scope.rb

@@ -0,0 +1,7 @@
+module CanTango
+  module Scope
+    sweet_scope :ns => {:CanTango => 'cantango/masquerade'} do
+      sweetload :Ability
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module CanTango
+  module Scope
+    class Ability
+      include CanTango::Ability::Helper::Masquerade
+    end
+  end
+end

data/lib/cantango/masquerade_ext/macros/account.rb

@@ -1,13 +1,13 @@
 module CanTango::Macros
   module Account
     def tango_account options = {}
-      self.send :include, CanTango::Api::Account
+      self.send :include, CanTango::Api::Model::Account
       options = CanTango::Macros.extract(options) if options.kind_of? Array
 
       if defined? CanTango::Macros::Masquerader::Account
         self.send :include, CanTango::Macros::Masquerader::Account
         masquerader if options[:masquerade]
       end
-    end    
+    end
   end
 end

data/lib/cantango/masquerade_ext/macros/user.rb

@@ -1,7 +1,7 @@
 module CanTango::Macros
   module User
     def tango_user options = {}
-      self.send :include, CanTango::Api::User
+      self.send :include, CanTango::Api::Model::User
       options = CanTango::Macros.extract(options) if options.kind_of? Array
 
       if defined? CanTango::Macros::Masquerader::User

data/spec/cantango/scope/ability_spec.rb

@@ -0,0 +1,81 @@
+require 'cantango/config'
+require 'fixtures/models'
+require 'spec_helper'
+
+class EditorUser
+  include CanTango::Api::Masquerade::User
+end
+
+class AdminUser
+  include CanTango::Api::Masquerade::User
+end
+
+CanTango.config.users do |u|
+  u.register :editor, EditorUser
+  u.register :admin, AdminUser
+end
+
+describe CanTango::Scope::Ability do
+  before do
+    @editor = EditorUser.new
+    @admin  = AdminUser.new 'admin'
+    @ability = CanTango::Ability::Base.new @admin
+  end
+  
+  # subject { CanTango::Scope::Ability.new @ability, :masquerade => false }
+  subject { CanTango::Scope::Ability.new @ability }
+  
+  context 'NOT masquerading' do
+    before do
+      @admin.stop_masquerade
+    end
+    
+    describe 'masquerading?' do
+      specify { subject.masquerading?.should be_false }
+    end
+
+    describe 'masquerade_user?' do
+      specify { subject.masquerade_user?.should be_false }
+    end
+
+    describe 'masquerade_account?' do
+      specify { subject.masquerade_account?.should be_false }
+    end
+
+    # describe 'masquerading_off?' do
+    #   specify { subject.masquerade_off?.should be_true }
+    # end
+
+    describe 'subject' do
+      specify { subject.send(:subject).should == @admin }
+    end
+  end
+
+  context 'IS masquerading' do
+    before do
+      @admin.masquerade_as @editor
+    end
+
+    specify { @admin.active_user.should == @editor }
+
+    describe 'masquerading?' do
+      specify { subject.masquerading?.should be_true }
+    end
+
+    # describe 'masquerading_off?' do
+    #   specify { subject.masquerade_off?.should be_true }
+    # end
+
+    describe 'masquerade_user?' do
+      specify { subject.masquerade_user?.should be_true }
+    end
+
+    describe 'masquerade_account?' do
+      specify { subject.masquerade_account?.should be_false }
+    end
+
+    describe 'subject' do
+      specify { subject.send(:subject).should == @editor }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-masquerade
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-08 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70205428633780 !ruby/object:Gem::Requirement
+  requirement: &70314881220300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70205428633780
+  version_requirements: *70314881220300
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70205428632360 !ruby/object:Gem::Requirement
+  requirement: &70314881219060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70205428632360
+  version_requirements: *70314881219060
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70205428630840 !ruby/object:Gem::Requirement
+  requirement: &70314881218300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70205428630840
+  version_requirements: *70314881218300
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70205428628440 !ruby/object:Gem::Requirement
+  requirement: &70314881216320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70205428628440
+  version_requirements: *70314881216320
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70205428627420 !ruby/object:Gem::Requirement
+  requirement: &70314881131800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.9.1
   type: :runtime
   prerelease: false
-  version_requirements: *70205428627420
+  version_requirements: *70314881131800
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70205428626420 !ruby/object:Gem::Requirement
+  requirement: &70314881129180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70205428626420
+  version_requirements: *70314881129180
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70205428625380 !ruby/object:Gem::Requirement
+  requirement: &70314881124480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70205428625380
+  version_requirements: *70314881124480
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70205428623420 !ruby/object:Gem::Requirement
+  requirement: &70314881119540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70205428623420
+  version_requirements: *70314881119540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70205428622440 !ruby/object:Gem::Requirement
+  requirement: &70314881116660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70205428622440
+  version_requirements: *70314881116660
 description: Masquerade extensions and macros for CanTango
 email: kmandrup@gmail.com
 executables: []
@@ -138,6 +138,8 @@ files:
 - lib/cantango/masquerade/macros/masquerader.rb
 - lib/cantango/masquerade/macros/masquerader/account.rb
 - lib/cantango/masquerade/macros/masquerader/user.rb
+- lib/cantango/masquerade/scope.rb
+- lib/cantango/masquerade/scope/ability.rb
 - lib/cantango/masquerade_ext.rb
 - lib/cantango/masquerade_ext/macros.rb
 - lib/cantango/masquerade_ext/macros/account.rb
@@ -150,6 +152,7 @@ files:
 - spec/cantango/masquerade_ext/macros/admin_account_spec.rb
 - spec/cantango/masquerade_ext/macros/admin_user_spec.rb
 - spec/cantango/masquerade_spec.rb
+- spec/cantango/scope/ability_spec.rb
 - spec/fixtures/models.rb
 - spec/fixtures/models/admin.rb
 - spec/fixtures/models/admin_account.rb
@@ -177,7 +180,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 725092924563287622
+      hash: 1941294774198972126
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: