cantango-api 0.1.2 → 0.1.3

data/Gemfile

@@ -7,7 +7,7 @@ group :default do
   gem 'hashie',           '~> 1.2'
   
   gem 'cantango-config',  '>= 0.1.9.2'
-  gem 'cantango-core',    '>= 0.1.9.2'
+  gem 'cantango-core',    '>= 0.1.9.3'
 end
 
 group :development do

data/Gemfile.lock

@@ -38,7 +38,7 @@ GEM
       rails (>= 3.1)
       sugar-high (>= 0.6.1)
       sweetloader (~> 0.1.6)
-    cantango-core (0.1.9.2)
+    cantango-core (0.1.9.3)
       cancan (>= 1.4)
       hashie (~> 1.2)
       rails (>= 3.0.1)
@@ -137,7 +137,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (>= 1.1.rc)
   cantango-config (>= 0.1.9.2)
-  cantango-core (>= 0.1.9.2)
+  cantango-core (>= 0.1.9.3)
   cantango-masquerade (>= 0.1.3.2)
   cutter
   database_cleaner

data/README.mdown

@@ -2,9 +2,10 @@
 
 The main API for [CanTango](https://github.com/kristianmandrup/cantango)
 
-## Status: Dec 1 2011
+## Status: Dec 9 2011
 
-The API is being spec'ed...
+The CanTango API has now been almost fully spec'ed. 
+All specs except for CanTango::Ability::Dsl now pass :) 
 
 ## Dependencies
 
@@ -12,29 +13,67 @@ This extension depends on the CanTango [core](https://github.com/kristianmandrup
 
 ## Core extensions
 
-* Macros
-  * User
+Macro modules
+
+* CanTango::Api::Macros::
   * Account
+  * User
+  * Clazz
 
-These macros allow registration os CanTango User and Account models.
+These macro modules allow registration of CanTango User and Account models.
 
-Usage example:
+Note: These should perhaps be wrapped in a `Model` namespace? See '-core'
+
+### Account model registration
+
+````ruby
+class UserAccount
+  tango_account
+end
+
+class AdminAccount
+  tango_account
+end
+
+# if masquerading enabled via 'cantango-masquerade' gem
+class PublisherAccount
+  tango_account :masquerade
+end
+```
+
+### User model registration
 
 ```ruby
 class User
-	tango_user 
+  tango_user 
 end
 
 class Admin
-	tango_user 
+  tango_user
+end
+
+# if masquerading enabled via 'cantango-masquerade' gem
+class Publisher
+  tango_user :masquerade
 end
+```
 
+### Generic model registration
+
+The `Clazz` macro module uses naming conventions to determine if the model is a User or Account model.
+
+````ruby
 class UserAccount
-	tango_account
+  cantango
 end
 
-class AdminAccount
-	tango_account
+class Admin
+  cantango
+end
+
+# if masquerading enabled via 'cantango-masquerade' gem
+class PublisherAccount
+  cantango :masquerade
 end
 ```
 
@@ -42,38 +81,244 @@ end
 
 The main API consists of the following:
 
-* Ability
-* Can
-* Model
-* Scope
-* Session
+* CanTango::Api::
+  * Ability
+  * Can
+  * Model
+  * Scope
+  * Session
 
 Each of these have a specific variant for both `Account` and `User`.
 
-### Can API
+## Ability
 
-* Dsl
+* CanTango::Api::Ability
+  * Account
+  * User
+  * Dsl
+    * Relationship
   * Relation
   * Scope
 
-The Dsl API extends the CanCan Ability API with Relation and Scope APIs.
 
-## Model APIs
+### Account
+
+```ruby
+account_ability(current_account)
+current_account_ability(:admin)
+```
+
+### User
 
-* Account
-* User
+```ruby
+user_ability(current_user)
+current_user_ability(:editor)
+```
 
-Use by including the `All` module
+### Dsl
 
-Usage example: 
+The Dsl API extends the Ability API with *Relation* and *Scope* APIs. 
+When The `Ability::Dsl` module is included, both these APIs are included into the target.
+
+### Dsl - Relation
 
 ```ruby
-class User
-  include Cantango::Api::User::All
+owner_of(Post).can :edit
+owner_of(Post).cannot :publish
+
+owner_of(Post). do |owner|
+  owner.can :edit
+  owner.cannot :publish
+end
+```
+
+This DSL creates a `Relation` object with #can and #cannot methods that delegate the wrapped ability.
+
+### Dsl - Scope
+
+Do relationship on Ability `#user` (also the default scope)
+
+```ruby
+scope :user do |user|
+  user.owner_of(Post).can :edit
+  user.owner_of(Post).cannot :publish
+
+  user.owner_of(Post). do |owner|
+    owner.can :edit
+    owner.cannot :publish
+  end
+end
+```
+
+This DSL creates a `Scope` object that wraps an ability. It also includes the Relation API.
+
+Do relationship on Ability `#account`
+
+```ruby
+scope :account do |account|
+  account.owner_of(Post) do |owner|
+    owner.can :edit
+  	owner.cannot :publish
+  end
+
+  account.can :create, [Blog, Article]
+  account.cannot [:create, :delete], User
+  # ...
 end
 ```
 
-Note: The `tango_user` and `tango_account` macros should include the relevant All module.
+## Can API
+
+* CanTango::Api::Can
+  * Account
+  * User
+
+### Account
+
+Assuming we have registered the following types of accounts:
+
+`CanTango.config.accounts.registered # => [:user, admin]`
+
+Then the following methods become available when this module is included:
+
+```ruby
+user_account_can? *args
+admin_account_can? *args
+
+user_account_cannot? *args
+admin_account_cannot? *args
+```
+
+The following methods are generated by this module, but by default simply forward to #current_user and #current_admin respectively. It is up to the developer to implement these methods to suit the application scenario. 
+
+```ruby
+current_user_account
+current_admin_account
+```
+
+### User
+
+Assuming we have registered the following types of accounts:
+
+`CanTango.config.users.registered # => [:user, admin]`
+
+Then the following methods become available when this module is included:
+
+```ruby
+user_can? *args
+admin_can? *args
+
+user_cannot? *args
+admin_cannot? *args
+```
+
+It is up to the developer to make the following methods available. 
+If Devise is used, methods of the form `#current_[user class]` are generated for each Devise user model.
+
+```ruby
+current_user
+current_admin
+```
+
+## Model APIs
+
+* CanTango::Api::Model
+  * Account
+  * User
+
+Note: The Macros for `User` and `Account` (tango_user, tango_account, ...) might be moved under this namespace later.
+
+### Account
+
+```ruby
+active_user
+active_account
+can?
+cannot?
+```
+
+### User
+
+```ruby
+active_user
+active_account
+can?
+cannot?
+```
+
+## Scope APIs
+
+* CanTango::Api::Scope
+  * Account
+  * User
+
+### Account
+
+```ruby
+scope_account scope, options, &block # alias: account_scope
+real_account scope, options, &block
+```
+
+`#scope_account` can be used to make multiple AC checks within a block on a specific account. This method will use the masqueraded account if an account being masqueraded.  
+
+`#real_account` is similar to `#scope_account`, but ignores any masquerading, applying the AC checks on the "real" account, not the one being masqueraded (faked).
+
+### User
+
+```ruby
+scope_user scope, options, &block # alias: user_scope
+real_user scope, options, &block
+```
+
+`#scope_user` can be used to make multiple AC checks within a block on a specific user. This method will use the masqueraded user if a user being masqueraded.  
+
+`#real_user` is similar to `#scope_user`, but ignores any masquerading, applying the AC checks on the "real" user, not the one being masqueraded (faked).
+
+## Session APIs
+
+* CanTango::Api::Session
+  * Account
+  * User
+
+### Account
+
+Assuming we have registered the following types of accounts:
+
+`CanTango.config.accounts.registered # => [:editor, admin]`
+
+Then the following methods become available when this module is included:
+
+```ruby
+session_editor_account
+session_admin_account
+any_account *names
+guest_account
+active_account
+active_account= account
+```
+
+`#any_account` will return the first account for which a name matches. If no account matches are found it will default to return the guest account. To find users, it will use the `#current_[account type]` methods.
+
+### User
+
+Assuming we have registered the following types of users:
+
+`CanTango.config.users.registered # => [:user, admin]`
+
+Then the following methods become available when this module is included:
+
+
+```ruby
+session_user
+session_admin
+any_account *names
+guest_user
+active_user
+active_user= user
+```
+
+`#any_user` will return the first user for which a name matches. If no user matches are found it will default to return the guest user. To find users, it will use the `#current_[user type]` methods.
+
 
 ## Contributing to cantango-api
  

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/cantango-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-api}
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
@@ -29,14 +29,15 @@ Gem::Specification.new do |s|
     "lib/cantango/api.rb",
     "lib/cantango/api/ability.rb",
     "lib/cantango/api/ability/account.rb",
+    "lib/cantango/api/ability/dsl.rb",
+    "lib/cantango/api/ability/dsl/relationship.rb",
+    "lib/cantango/api/ability/relation.rb",
+    "lib/cantango/api/ability/scope.rb",
     "lib/cantango/api/ability/user.rb",
     "lib/cantango/api/account.rb",
     "lib/cantango/api/attributes.rb",
     "lib/cantango/api/can.rb",
     "lib/cantango/api/can/account.rb",
-    "lib/cantango/api/can/dsl.rb",
-    "lib/cantango/api/can/dsl/relation.rb",
-    "lib/cantango/api/can/dsl/scope.rb",
     "lib/cantango/api/can/user.rb",
     "lib/cantango/api/common.rb",
     "lib/cantango/api/model.rb",
@@ -56,6 +57,11 @@ Gem::Specification.new do |s|
     "lib/cantango/api_ext/macros/clazz.rb",
     "lib/cantango/api_ext/macros/user.rb",
     "spec/cantango/api/ability/account_spec.rb",
+    "spec/cantango/api/ability/dsl/relationship_ex.rb",
+    "spec/cantango/api/ability/dsl/relationship_spec.rb",
+    "spec/cantango/api/ability/dsl_spec.rb",
+    "spec/cantango/api/ability/relation_spec.rb",
+    "spec/cantango/api/ability/scope_spec.rb",
     "spec/cantango/api/ability/user_spec.rb",
     "spec/cantango/api/account_spec.rb",
     "spec/cantango/api/attributes_spec.rb",
@@ -103,7 +109,7 @@ Gem::Specification.new do |s|
       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.9.2"])
-      s.add_runtime_dependency(%q<cantango-core>, [">= 0.1.9.2"])
+      s.add_runtime_dependency(%q<cantango-core>, [">= 0.1.9.3"])
       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"])
@@ -114,7 +120,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
       s.add_dependency(%q<hashie>, ["~> 1.2"])
       s.add_dependency(%q<cantango-config>, [">= 0.1.9.2"])
-      s.add_dependency(%q<cantango-core>, [">= 0.1.9.2"])
+      s.add_dependency(%q<cantango-core>, [">= 0.1.9.3"])
       s.add_dependency(%q<bundler>, [">= 1.1.rc"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
@@ -126,7 +132,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<sweetloader>, ["~> 0.1.6"])
     s.add_dependency(%q<hashie>, ["~> 1.2"])
     s.add_dependency(%q<cantango-config>, [">= 0.1.9.2"])
-    s.add_dependency(%q<cantango-core>, [">= 0.1.9.2"])
+    s.add_dependency(%q<cantango-core>, [">= 0.1.9.3"])
     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/ability.rb

@@ -1,5 +1,5 @@
 module CanTango::Api
   module Ability
-    autoload_modules :User, :Account
+    autoload_modules :User, :Account, :Dsl, :Relation, :Scope
   end
 end

data/lib/cantango/api/ability/dsl.rb

@@ -0,0 +1,14 @@
+module CanTango::Api::Ability
+  module Dsl
+    sweetload :Relationship
+    
+    include Relationship
+
+    # creates a scope that enforces either using the user or user_account 
+    # for determining relationship matches on the models
+    def scope name, &block
+      yield Scope.new name, self, &block
+    end
+  end
+end
+

data/lib/cantango/api/ability/dsl/relationship.rb

@@ -0,0 +1,17 @@
+module CanTango::Api::Ability::Dsl
+  module Relationship
+    def self.included(base)
+      ::CanTango.config.user.relations.each do |relationship|
+        base.class_eval %{
+          def #{relationship}_of *models, &block
+            options = models.extract_options!
+            scope = options[:scope] || :user
+            relation = CanTango::Api::Ability::Relation.new :#{relationship}, self, scope, *models, &block
+            yield relation if block
+            relation
+          end
+        }
+      end
+    end
+  end
+end

data/lib/cantango/api/ability/relation.rb

@@ -0,0 +1,72 @@
+require 'active_support/inflector'
+
+module CanTango::Api::Ability
+  class MissingRelationError < StandardError; end  
+  
+  class Relation
+    attr_reader :attribute, :abil, :scope, :models
+
+    include CanTango::Adaptor
+    include CanTango::CanCan::RuleClass
+
+    def initialize attribute, ability, scope, *models, &block
+      @attribute = attribute
+      @abil = ability
+      @scope = scope
+      @models = models
+
+      check_models
+      use_adaptor! self, user_scope
+    end
+
+    delegate :category, :any, :to => :ability
+
+    def can(action)
+      models.each do |model|
+        rules << rule_class.new(true, action, model, nil, condition_block(model))
+      end
+      self
+    end
+
+    def cannot(action)
+      models.each do |model|
+        rules << rule_class.new(false, action, model, nil, condition_block(model))
+      end
+      self
+    end
+
+    protected
+
+    def condition_block model
+      return attribute_condition(attribute, user_scope) if model.new.respond_to?(attribute)
+      return include_condition(plural_attribute, user_scope) if model.new.respond_to?(plural_attribute)
+    end
+
+    def user_scope
+      @user_scope ||= (scope == :account) ? ability.account : ability.user
+    end
+
+    def scope_key
+      @scope_key ||= (scope == :account) ? :user_account : :user
+    end
+
+    def ability
+      abil.respond_to?(:ability) ? abil.ability : abil
+    end
+
+    def rules
+      ability.send :rules
+    end
+
+    def plural_attribute
+      :"#{attribute.to_s.pluralize}"
+    end
+
+    def check_models
+      models.each do |model|
+        raise MissingRelationError, "#{model} has no :#{attribute} or :#{plural_attribute} defined" if !model.new.respond_to?(attribute) && !model.new.respond_to?(plural_attribute)
+      end
+    end
+  end
+end
+

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

@@ -0,0 +1,13 @@
+module CanTango::Api::Ability
+  class Scope
+    include CanTango::Api::Ability::Dsl::Relationship
+    
+    attr_reader :name, :ability
+
+    def initialize name, ability, &block
+      @name = name.to_sym
+      @ability = ability
+      yield self if block
+    end
+  end
+end

data/lib/cantango/api/can.rb

@@ -1,5 +1,5 @@
 module CanTango::Api
   module Can
-    autoload_modules :User, :Account, :Dsl
+    autoload_modules :User, :Account
   end
 end

data/spec/cantango/api/ability/dsl/relationship_ex.rb

@@ -0,0 +1,29 @@
+shared_examples_for 'CanTango::Api::Ability::Dsl::Relationship' do
+  describe 'owner_of(model)' do
+    describe 'can' do
+      before do
+        subject.owner_of(Project).can(:edit)
+      end
+      specify { subject.can?(:edit, Project).should be_true }
+    end
+
+    describe 'cannot' do
+      before do
+        subject.owner_of(Project).can(:edit)
+      end
+      specify { subject.can?(:edit, Project).should be_true }
+    end
+
+    describe 'block' do
+      before do
+        subject.owner_of(Project) do |owner|
+          owner.can(:edit)
+          owner.cannot(:publish)
+        end
+      end
+      specify { subject.can?(:edit, Project).should be_true }
+      specify { subject.can?(:publish, Project).should be_false }
+      specify { subject.cannot?(:publish, Project).should be_true }
+    end
+  end
+end

data/spec/cantango/api/ability/dsl/relationship_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'cantango/api/ability/dsl/relationship_ex'
+
+class User
+  cantango
+end
+
+module CanTango::Ability
+  class Base
+    include CanTango::Api::Ability::Dsl::Relationship
+
+    def user
+      candidate
+    end
+
+    def account
+      candidate
+    end
+  end
+end
+
+describe CanTango::Api::Ability::Dsl::Relationship do
+  it_should_behave_like 'CanTango::Api::Ability::Dsl::Relationship' do
+    before do
+      @user = User.new 'krisy', 'krisy@gmail.com'
+    end
+    subject { CanTango::Ability::Base.new @user }
+  end
+end

data/spec/cantango/api/ability/dsl_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'fixtures/models'
+require 'cantango/api/ability/dsl/relationship_ex'
+
+class User
+  cantango
+end
+
+module CanTango::Ability
+  class Base
+    include CanTango::Api::Ability::Dsl
+
+    def user
+      candidate
+    end
+
+    def account
+      candidate
+    end
+  end
+end
+
+describe CanTango::Api::Ability::Dsl do
+  before do
+    @user = User.new 'krisy', 'krisy@gmail.com'
+  end
+  subject { CanTango::Ability::Base.new @user }
+
+  it_should_behave_like 'CanTango::Api::Ability::Dsl::Relationship'
+  
+  describe 'scope name, &block' do
+    specify do
+      subject.scope :user do |scope|
+        scope.should be_a CanTango::Api::Ability::Scope
+      end
+    end
+  end
+end

data/spec/cantango/api/ability/relation_spec.rb

@@ -0,0 +1,90 @@
+require 'spec_helper'
+require 'fixtures/models'
+
+class User
+  include_and_extend SimpleRoles
+end
+
+class Admin < User
+end
+
+CanTango.configure do |config|
+  config.users.register     :user, User
+  config.users.register     :admin, Admin
+end
+
+require 'spec_helper'
+require 'helpers/current_user_accounts'
+
+module CanTango::Ability
+  class Base
+    def user
+      candidate
+    end
+
+    def account
+      candidate
+    end
+  end
+end
+
+class Context
+  include CanTango::Api::Ability::User
+
+  include_and_extend ::CurrentUsers
+end
+
+describe CanTango::Api::Ability::Relation do
+  before do
+    @user = User.new 'krisy', 'krisy@gmail.com'
+    @ability = CanTango::Ability::Base.new @user
+    @scope = CanTango::Api::Ability::Scope.new :user, @ability
+  end
+  
+  it 'should raise MissingRelation error when no ownership relation on model' do
+    lambda { 
+      CanTango::Api::Ability::Relation.new :owner, @ability, @scope, Post 
+    }.should raise_error(CanTango::Api::Ability::MissingRelationError)
+  end
+
+  it 'should NOT raise MissingRelation error when there is the ownership relation on the model' do
+    lambda { CanTango::Api::Ability::Relation.new :owner, @ability, @scope, Project }.should_not raise_error
+  end
+
+  subject { CanTango::Api::Ability::Relation.new :owner, @ability, @scope, Project }
+
+  describe 'Relation.new attribute, ability, scope, *models, &block'  do 
+    specify { subject.attribute.should == :owner }
+    specify { subject.abil.should == @ability }
+    specify { subject.scope.should == @scope }
+    specify { subject.models.should include Project }
+  end
+
+  describe 'using Adaptor' do
+    before do
+      @obj = subject.send :user_scope
+    end
+
+    specify { @obj.should == @user }
+    specify { subject.adaptor_for(@obj).should == CanTango::Adaptor::Generic }
+    specify { subject.adaptor_type.should == :generic }
+  end
+
+  describe 'can(action)' do
+    specify { subject.send(:rules).should be_empty }
+    specify { subject.can(:edit).send(:rules).should_not be_empty }    
+  end
+  
+  describe 'cannot(action)' do
+    specify { subject.send(:rules).should be_empty }
+    specify { subject.cannot(:edit).send(:rules).should_not be_empty }        
+  end
+
+  describe 'category(action)' do
+    pending
+  end
+
+  describe 'any(action)' do    
+    pending
+  end
+end

data/spec/cantango/api/ability/scope_spec.rb

@@ -0,0 +1,37 @@
+require 'cantango/config'
+require 'fixtures/models'
+
+class User
+  include_and_extend SimpleRoles
+end
+
+class Admin < User
+end
+
+CanTango.configure do |config|
+  config.users.register     :user, User
+  config.users.register     :admin, Admin
+end
+
+require 'spec_helper'
+require 'helpers/current_user_accounts'
+
+class Context
+  include CanTango::Api::Ability::User
+
+  include_and_extend ::CurrentUsers
+end
+
+describe CanTango::Api::Ability::Scope do
+  subject { CanTango::Api::Ability::Scope.new :user, @ability }
+
+  describe 'attributes set on init' do
+    specify { subject.name.should == :user }
+    specify { subject.ability.should == @ability }
+    it 'should yield the scope' do
+      CanTango::Api::Ability::Scope.new(:user, @ability) do |scope|
+        scope.should be_a CanTango::Api::Ability::Scope
+      end
+    end
+  end
+end

data/spec/fixtures/models/project.rb

@@ -1,2 +1,11 @@
 class Project #< ActiveRecord::Base
+  attr_accessor :user
+  
+  def create user
+    @user = user
+  end
+  
+  def owner
+    user
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-api
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70276899472420 !ruby/object:Gem::Requirement
+  requirement: &70107040049300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70276899472420
+  version_requirements: *70107040049300
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70276899471460 !ruby/object:Gem::Requirement
+  requirement: &70107040048740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.6.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276899471460
+  version_requirements: *70107040048740
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70276899469500 !ruby/object:Gem::Requirement
+  requirement: &70107040048000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.1.6
   type: :runtime
   prerelease: false
-  version_requirements: *70276899469500
+  version_requirements: *70107040048000
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70276899467420 !ruby/object:Gem::Requirement
+  requirement: &70107040047160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70276899467420
+  version_requirements: *70107040047160
 - !ruby/object:Gem::Dependency
   name: cantango-config
-  requirement: &70276899465860 !ruby/object:Gem::Requirement
+  requirement: &70107040046020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,21 +65,21 @@ dependencies:
         version: 0.1.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *70276899465860
+  version_requirements: *70107040046020
 - !ruby/object:Gem::Dependency
   name: cantango-core
-  requirement: &70276899461080 !ruby/object:Gem::Requirement
+  requirement: &70107040044920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.9.2
+        version: 0.1.9.3
   type: :runtime
   prerelease: false
-  version_requirements: *70276899461080
+  version_requirements: *70107040044920
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70276899459540 !ruby/object:Gem::Requirement
+  requirement: &70107040043960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70276899459540
+  version_requirements: *70107040043960
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70276899457320 !ruby/object:Gem::Requirement
+  requirement: &70107040042180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70276899457320
+  version_requirements: *70107040042180
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70276899456140 !ruby/object:Gem::Requirement
+  requirement: &70107040041300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70276899456140
+  version_requirements: *70107040041300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70276899455300 !ruby/object:Gem::Requirement
+  requirement: &70107040039440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +120,7 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70276899455300
+  version_requirements: *70107040039440
 description: Ability, Can, Scope, Session, User, Account and more APIs for CanTango
 email: kristian@unity3d.com
 executables: []
@@ -141,14 +141,15 @@ files:
 - lib/cantango/api.rb
 - lib/cantango/api/ability.rb
 - lib/cantango/api/ability/account.rb
+- lib/cantango/api/ability/dsl.rb
+- lib/cantango/api/ability/dsl/relationship.rb
+- lib/cantango/api/ability/relation.rb
+- lib/cantango/api/ability/scope.rb
 - lib/cantango/api/ability/user.rb
 - lib/cantango/api/account.rb
 - lib/cantango/api/attributes.rb
 - lib/cantango/api/can.rb
 - lib/cantango/api/can/account.rb
-- lib/cantango/api/can/dsl.rb
-- lib/cantango/api/can/dsl/relation.rb
-- lib/cantango/api/can/dsl/scope.rb
 - lib/cantango/api/can/user.rb
 - lib/cantango/api/common.rb
 - lib/cantango/api/model.rb
@@ -168,6 +169,11 @@ files:
 - lib/cantango/api_ext/macros/clazz.rb
 - lib/cantango/api_ext/macros/user.rb
 - spec/cantango/api/ability/account_spec.rb
+- spec/cantango/api/ability/dsl/relationship_ex.rb
+- spec/cantango/api/ability/dsl/relationship_spec.rb
+- spec/cantango/api/ability/dsl_spec.rb
+- spec/cantango/api/ability/relation_spec.rb
+- spec/cantango/api/ability/scope_spec.rb
 - spec/cantango/api/ability/user_spec.rb
 - spec/cantango/api/account_spec.rb
 - spec/cantango/api/attributes_spec.rb
@@ -214,7 +220,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1309343168374128705
+      hash: -3510704107702897300
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/cantango/api/can/dsl.rb

@@ -1,26 +0,0 @@
-module CanTango::Api
-  module Can
-    module Dsl
-      autoload_modules :Relation, :Scope
-      
-      def self.included(base)
-        ::CanTango.config.user.relations.each do |relationship|
-          base.class_eval %{
-            def #{relationship}_of *models, &block
-              options = models.extract_options!
-              scope = options[:scope] || :user_account
-              relation = Relation.new :#{relationship}, self, scope, *models, &block
-              yield relation if block
-              relation
-            end
-          }
-        end
-      end
-
-      # creates a scope that enforces either using the user or user_account for determining relationship matches on the models
-      def scope name, &block
-        yield Scope.new name, self, &block
-      end
-    end
-  end
-end

data/lib/cantango/api/can/dsl/relation.rb

@@ -1,67 +0,0 @@
-require 'active_support/inflector'
-
-module CanTango
-  module Dsl
-    class Relation
-      attr_reader :attribute, :permit, :scope, :models
-
-      include CanTango::Adaptor
-      include CanTango::CanCan::RuleClass
-
-      def initialize attribute, permit, scope, *models, &block
-        @attribute = attribute
-        @scope = scope
-        @permit = permit
-        @models = models
-
-        check_models
-        use_adaptor! self, user_scope
-      end
-
-      def can(action)
-        models.each do |model|
-          rules << rule_class.new(true, action, model, nil, condition_block(model))
-        end
-      end
-
-      def cannot(action)
-        models.each do |model|
-          rules << rule_class.new(false, action, model, nil, condition_block(model))
-        end
-      end
-
-      protected
-
-      def condition_block model
-        return attribute_condition(attribute, user_scope) if model.new.respond_to?(attribute)
-        return include_condition(plural_attribute, user_scope) if model.new.respond_to?(plural_attribute)
-      end
-
-      def user_scope
-        @user_scope ||= (scope == :account) ? permit.user_account : permit.user
-      end
-
-      def scope_key
-        @scope_key ||= (scope == :account) ? :user_account : :user
-      end
-
-      def ability
-        permit.ability
-      end
-
-      def rules
-        ability.send :rules
-      end
-
-      def plural_attribute
-        :"#{attribute.to_s.pluralize}"
-      end
-
-      def check_models
-        models.each do |model|
-          raise "#{model} has no :#{attribute} or :#{plural_attribute} defined" if !model.new.respond_to?(attribute) && !model.new.respond_to?(plural_attribute)
-        end
-      end
-    end
-  end
-end

data/lib/cantango/api/can/dsl/scope.rb

@@ -1,24 +0,0 @@
-module CanTango
-  module Dsl
-    class Scope
-      attr_reader :name, :permit
-
-      def initialize name, permit, &block
-        @name = name.to_sym
-        @permit = permit
-      end
-
-      ::CanTango.config.user.relations.each do |relationship|
-        class_eval %{
-          def #{relationship}_of *models, &block
-            options = models.extract_options!
-            scope = options[:scope] || name
-            relation = UserRelation.new :#{relationship}, permit, scope, models, &block
-            yield relation if block
-            relation
-          end
-        }
-      end
-    end
-  end
-end