cantango-api 0.1.1 → 0.1.2

data/VERSION

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

data/cantango-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-api}
-  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}]

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

@@ -1,6 +1,8 @@
 module CanTango::Api
   module Scope
     module User
+      include CanTango::Api::Ability::User
+      
       def scope_user scope, options = {}, &block
         user = scoped_user(scope)
         ab_scope = user_ability_scope(user, options)
@@ -16,7 +18,7 @@ module CanTango::Api
       protected
 
       def user_ability_scope user, options = {}
-        CanTango::Ability::Scope.new user_ability(user, options)
+        CanTango::Scope::Ability.new user_ability(user, options)
       end
 
       def scoped_user scope

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

@@ -15,11 +15,13 @@ module CanTango::Api
       # give me any logged in user or the guest user
       def any_account *types
         types = types.flatten.select_labels.map(&:to_sym)
-        c_account = ::CanTango.config.user_accounts.registered.each do |type|
+        types = types & ::CanTango.config.accounts.registered
+        accounts = types.map do |type|
           meth = :"current_#{type}_account"
-          send(meth) if respond_to?(meth) && (types.empty? || types.include?(user))
-        end.compact.first
-        c_account || guest_account
+          send(meth) if respond_to?(meth) && (types.empty? || types.include?(type))
+        end
+        chosen_account = accounts.compact.first
+        chosen_account || guest_account
       end
 
       def guest_account

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

@@ -15,11 +15,13 @@ module CanTango::Api
       # give me any logged in user or the guest user
       def any_user *types
         types = types.flatten.select_labels.map(&:to_sym)
-        c_user = ::CanTango.config.users.registered.each do |user|
-          meth = :"current_#{user}"
-          send(meth) if respond_to?(meth) && (types.empty? || types.include?(user))
-        end.compact.first
-        c_user || guest_user
+        types = types & ::CanTango.config.users.registered
+        users = types.map do |type|
+          meth = :"current_#{type}"
+          send(meth) if respond_to?(meth) && (types.empty? || types.include?(type))
+        end
+        chosen_user = users.compact.first
+        chosen_user || guest_user
       end
 
       def guest_user

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

@@ -3,13 +3,21 @@ module CanTango::Macros
     include CanTango::Macros::Account
     include CanTango::Macros::User
     
-    def cantango type = nil
+    def cantango options = {}
+      type = case options
+      when Array
+        options.first
+      when Symbol
+        options
+      when Hash
+        options[:type]
+      end
       # determine if user or account
       if !type
-        (name =~ /.+Account$/) ? tango_account : tango_user
+        (name =~ /.+Account$/) ? tango_account(options) : tango_user(options)
       else
-        tango_account and return if type.to_s == 'account'
-        tango_user and return if type.to_s == 'user'
+        tango_account(options) and return if type.to_s == 'account'
+        tango_user(options) and return if type.to_s == 'user'
         raise ArgumentError, "Unable to determine type of class to register; Please specify :user or :account as argument"
       end
     end

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

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

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

@@ -30,7 +30,7 @@ describe CanTango::Api::Scope::Account do
   describe 'scope_account(scope, options)' do 
     specify do
       subject.scope_account :user do |ability|
-        ability.subject.class.should == subject.current_user_account.class
+        ability.subject.should == subject.current_user_account
       end
     end
   end
@@ -38,7 +38,7 @@ describe CanTango::Api::Scope::Account do
   describe 'real_account(scope, options)' do
     specify do
       subject.real_account :admin do |ability|
-        ability.subject.class.should == subject.current_admin_account.class
+        ability.subject.should == subject.current_admin_account
       end
     end
   end

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

@@ -12,21 +12,21 @@ class User
   cantango
 end
 
-class AdminUser
-  cantango
+class Admin
+  tango_user :masquerade
 end
 
 describe CanTango::Api::Scope::User do
   subject { Context.new }
 
   before do
-    subject.current_user.active_account = subject.current_admin
+    subject.current_admin.masquerade_as subject.current_user
   end
 
   describe 'scope_user(scope, options)' do 
     specify do
       subject.scope_user :user do |user|
-        user.candidate.should == subject.current_admin
+        user.subject.should == subject.current_user
       end
     end
   end
@@ -34,7 +34,7 @@ describe CanTango::Api::Scope::User do
   describe 'real_user(scope, options)' do
     specify do
       subject.real_user :user do |user|
-        user.candidate.should == subject.current_user
+        user.subject.should == subject.current_user
       end
     end
   end

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

@@ -0,0 +1,75 @@
+require 'spec_helper'
+require 'fixtures/models'
+require 'helpers/current_user_accounts'
+
+class SessionContext
+  include Singleton
+  include CanTango::Api::Session::Account
+
+  include_and_extend ::CurrentUserAccounts
+  
+  attr_writer :session
+  def session
+    @session ||= {}
+  end
+end
+
+# mock
+module CanTango::Api
+  module Session
+    module Account
+      def guest_account
+        SessionContext.instance.current_guest_account
+      end
+    end
+  end
+end
+
+class UserAccount
+  tango_account
+end
+
+class AdminAccount
+  tango_account
+end
+
+describe CanTango::Api::Session::Account do
+  subject { SessionContext.instance }
+
+  describe 'registered accounts' do
+    specify { CanTango.config.accounts.registered.should include(:user, :admin) }
+  end
+
+  describe 'any_account' do
+    describe 'default to :guest if none found' do
+      specify do 
+        subject.any_account(:unknown).should == subject.guest_account
+      end
+    end
+
+    describe 'find :admin' do
+      specify do 
+        subject.any_account(:admin, :user).should == subject.current_admin_account
+      end
+    end
+  end
+  
+  describe 'guest_account' do
+    specify do 
+      subject.guest_account.role?(:guest).should be_true
+    end    
+  end
+
+  describe 'active_account' do
+    specify do 
+      subject.active_account.should == nil
+    end    
+  end
+
+  describe 'active_account=' do
+    specify do 
+      subject.active_account = subject.current_admin_account
+      subject.active_account.should == subject.current_admin_account
+    end    
+  end
+end

data/spec/fixtures/models/user_account.rb

@@ -1,7 +1,17 @@
 class UserAccount
-  attr_accessor :user
+  attr_accessor :user, :roles
 
   def initialize user, options = {}
     @user = user
+    @options = options
+    @roles = options[:roles]
+  end
+  
+  def role? name
+    roles.include? name
+  end
+  
+  def roles
+    @roles ||= []
   end
 end

data/spec/helpers/current_user_accounts.rb

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

data/spec/helpers/current_users.rb

@@ -3,8 +3,12 @@ module CurrentUsers
     @current_user ||= ::User.new 'stan', 'stan@mail.ru', :role => 'user'
   end
 
+  def current_guest
+    @current_guest ||= ::User.new 'guest', 'guest@mail.ru', :role => 'guest'
+  end
+
   def current_admin
-    @current_admin ||= ::User.new 'admin', 'admin@mail.ru', :role => 'admin'
+    @current_admin ||= ::Admin.new 'admin', 'admin@mail.ru', :role => 'admin'
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-api
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70206619585940 !ruby/object:Gem::Requirement
+  requirement: &70276899472420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70206619585940
+  version_requirements: *70276899472420
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70206619584480 !ruby/object:Gem::Requirement
+  requirement: &70276899471460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70206619584480
+  version_requirements: *70276899471460
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70206619583740 !ruby/object:Gem::Requirement
+  requirement: &70276899469500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70206619583740
+  version_requirements: *70276899469500
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70206619583100 !ruby/object:Gem::Requirement
+  requirement: &70276899467420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70206619583100
+  version_requirements: *70276899467420
 - !ruby/object:Gem::Dependency
   name: cantango-config
-  requirement: &70206619582400 !ruby/object:Gem::Requirement
+  requirement: &70276899465860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70206619582400
+  version_requirements: *70276899465860
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70206619581180 !ruby/object:Gem::Requirement
+  requirement: &70276899461080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: 0.1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70206619581180
+  version_requirements: *70276899461080
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70206619579920 !ruby/object:Gem::Requirement
+  requirement: &70276899459540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70206619579920
+  version_requirements: *70276899459540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70206619577860 !ruby/object:Gem::Requirement
+  requirement: &70276899457320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70206619577860
+  version_requirements: *70276899457320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70206619575720 !ruby/object:Gem::Requirement
+  requirement: &70276899456140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206619575720
+  version_requirements: *70276899456140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206619573580 !ruby/object:Gem::Requirement
+  requirement: &70276899455300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70206619573580
+  version_requirements: *70276899455300
 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: -2854044970758451050
+      hash: -1309343168374128705
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: