cantango-api 0.1.0 → 0.1.1

data/Gemfile

@@ -6,8 +6,8 @@ group :default do
   gem 'sweetloader',      '~> 0.1.6'
   gem 'hashie',           '~> 1.2'
   
-  gem 'cantango-config',  '>= 0.1.8.1'
-  gem 'cantango-core',    '>= 0.1.9.1'
+  gem 'cantango-config',  '>= 0.1.9.2'
+  gem 'cantango-core',    '>= 0.1.9.2'
 end
 
 group :development do
@@ -19,7 +19,7 @@ end
 group :test do
   gem 'require_all', '~> 1.2.0'
 
-  # gem 'cantango-masquerade', :git => 'git://github.com/kristianmandrup/cantango-masquerade.git'
+  gem 'cantango-masquerade', '>= 0.1.3.2'
 
   gem 'forgery'
   gem 'sqlite3'

data/Gemfile.lock

@@ -44,6 +44,12 @@ GEM
       rails (>= 3.0.1)
       sugar-high (>= 0.6.0)
       sweetloader (~> 0.1.5)
+    cantango-masquerade (0.1.3.2)
+      cantango-core (>= 0.1.9.1)
+      hashie (~> 1.2)
+      rails (>= 3.1)
+      sugar-high (~> 0.6.2)
+      sweetloader (~> 0.1.6)
     colorize (0.5.8)
     cutter (0.8.2)
       activesupport (>= 2.3.5)
@@ -130,8 +136,9 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (>= 1.1.rc)
-  cantango-config (>= 0.1.8.1)
-  cantango-core (>= 0.1.9.1)
+  cantango-config (>= 0.1.9.2)
+  cantango-core (>= 0.1.9.2)
+  cantango-masquerade (>= 0.1.3.2)
   cutter
   database_cleaner
   factory_girl

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/cantango-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-api}
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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{Ability, Can, Scope, Session, User, Account and more APIs for CanTango}
   s.email = %q{kristian@unity3d.com}
   s.extra_rdoc_files = [
@@ -102,8 +102,8 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<sugar-high>, ["~> 0.6.2"])
       s.add_runtime_dependency(%q<sweetloader>, ["~> 0.1.6"])
       s.add_runtime_dependency(%q<hashie>, ["~> 1.2"])
-      s.add_runtime_dependency(%q<cantango-config>, [">= 0.1.8.1"])
-      s.add_runtime_dependency(%q<cantango-core>, [">= 0.1.9.1"])
+      s.add_runtime_dependency(%q<cantango-config>, [">= 0.1.9.2"])
+      s.add_runtime_dependency(%q<cantango-core>, [">= 0.1.9.2"])
       s.add_development_dependency(%q<bundler>, [">= 1.1.rc"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
@@ -113,8 +113,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sugar-high>, ["~> 0.6.2"])
       s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
       s.add_dependency(%q<hashie>, ["~> 1.2"])
-      s.add_dependency(%q<cantango-config>, [">= 0.1.8.1"])
-      s.add_dependency(%q<cantango-core>, [">= 0.1.9.1"])
+      s.add_dependency(%q<cantango-config>, [">= 0.1.9.2"])
+      s.add_dependency(%q<cantango-core>, [">= 0.1.9.2"])
       s.add_dependency(%q<bundler>, [">= 1.1.rc"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -125,8 +125,8 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sugar-high>, ["~> 0.6.2"])
     s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
     s.add_dependency(%q<hashie>, ["~> 1.2"])
-    s.add_dependency(%q<cantango-config>, [">= 0.1.8.1"])
-    s.add_dependency(%q<cantango-core>, [">= 0.1.9.1"])
+    s.add_dependency(%q<cantango-config>, [">= 0.1.9.2"])
+    s.add_dependency(%q<cantango-core>, [">= 0.1.9.2"])
     s.add_dependency(%q<bundler>, [">= 1.1.rc"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
     s.add_dependency(%q<rcov>, [">= 0"])

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

@@ -5,7 +5,7 @@ module CanTango::Api
       
       def scope_account scope, options = {}, &block
         account = scoped_account(scope)
-        ab_scope = account_ability_scope(account, options.merge(:masquerade => true))
+        ab_scope = account_ability_scope(account, options)
         yield ab_scope if block
         ab_scope
       end

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

@@ -3,6 +3,5 @@ module CanTango::Macros
     def tango_account options = {}
       self.send :include, CanTango::Api::Model::Account
     end
-    alias_method :cantango_account, :tango_account
   end
 end

data/spec/cantango/api/scope/account_spec.rb

@@ -4,7 +4,6 @@ require 'helpers/current_user_accounts'
 
 class Context
   include CanTango::Api::Scope::Account
-  include CanTango::Api::Masquerade::Account
 
   include_and_extend ::CurrentUserAccounts
 end
@@ -14,29 +13,32 @@ class UserAccount
 end
 
 class AdminAccount
-  cantango_account
+  tango_account :masquerade
 end
 
 describe CanTango::Api::Scope::Account do
   subject { Context.new }
 
   before do
-    subject.masquerade_as subject.current_admin_account
+    subject.current_admin_account.masquerade_as(subject.current_user_account)
+  end
+
+  describe 'registered accounts' do
+    specify { CanTango.config.accounts.registered.should include(:user, :admin) }
   end
 
   describe 'scope_account(scope, options)' do 
     specify do
-      subject.scope_account :user do |user|
-        user.candidate.class.should == subject.current_admin_account.class
+      subject.scope_account :user do |ability|
+        ability.subject.class.should == subject.current_user_account.class
       end
     end
   end
 
   describe 'real_account(scope, options)' do
     specify do
-      subject.real_account :user do |user|
-        user.candidate.class.should == subject.current_user_account.class
-        user.candidate.user.should == subject.current_user_account.user
+      subject.real_account :admin do |ability|
+        ability.subject.class.should == subject.current_admin_account.class
       end
     end
   end

data/spec/helpers/current_user_accounts.rb

@@ -10,11 +10,11 @@ module CurrentUserAccounts
   end
 
   def current_user_account
-    ::UserAccount.new(current_user, :roles => [:user])
+    @current_user_account ||= ::UserAccount.new(current_user, :roles => [:user])
   end
   
   def current_admin_account
-    ::AdminAccount.new(current_admin, :roles => [:admin])
+    @current_admin_account ||= ::AdminAccount.new(current_admin, :roles => [:admin])
   end
 end
 

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require 'require_all'
 require 'cantango/core'
 require 'cantango/configuration'
 require 'cantango/api'
+require 'cantango/masquerade'
 
 # require_all File.join("#{File.dirname(__FILE__)}", "support")
 require_all File.join("#{File.dirname(__FILE__)}", "fixtures")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-api
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   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: &70114366393220 !ruby/object:Gem::Requirement
+  requirement: &70206619585940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70114366393220
+  version_requirements: *70206619585940
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70114366392120 !ruby/object:Gem::Requirement
+  requirement: &70206619584480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70114366392120
+  version_requirements: *70206619584480
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70114366390820 !ruby/object:Gem::Requirement
+  requirement: &70206619583740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70114366390820
+  version_requirements: *70206619583740
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70114366388960 !ruby/object:Gem::Requirement
+  requirement: &70206619583100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,32 +54,32 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70114366388960
+  version_requirements: *70206619583100
 - !ruby/object:Gem::Dependency
   name: cantango-config
-  requirement: &70114366386640 !ruby/object:Gem::Requirement
+  requirement: &70206619582400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.8.1
+        version: 0.1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70114366386640
+  version_requirements: *70206619582400
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70114366385140 !ruby/object:Gem::Requirement
+  requirement: &70206619581180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9.1
+        version: 0.1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70114366385140
+  version_requirements: *70206619581180
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70114366384140 !ruby/object:Gem::Requirement
+  requirement: &70206619579920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70114366384140
+  version_requirements: *70206619579920
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70114366382760 !ruby/object:Gem::Requirement
+  requirement: &70206619577860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70114366382760
+  version_requirements: *70206619577860
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70114366381860 !ruby/object:Gem::Requirement
+  requirement: &70206619575720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70114366381860
+  version_requirements: *70206619575720
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70114366380620 !ruby/object:Gem::Requirement
+  requirement: &70206619573580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70114366380620
+  version_requirements: *70206619573580
 description: Ability, Can, Scope, Session, User, Account and more APIs for CanTango
 email: kristian@unity3d.com
 executables: []
@@ -214,7 +214,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3829316605648255715
+      hash: -2854044970758451050
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: