cantango 0.8.0 → 0.8.5.1

data/spec/dummy/config/initializers/cantango.rb

@@ -1,5 +1,3 @@
 CanTango.configure do |config|
-  config.cache.set :on
-  config.permits.set :on
-  config.permissions.set :on
+  config.enable_defaults!
 end

data/spec/dummy/config/{cantango_permissions.yml → permissions.yml}

@@ -1,9 +1,9 @@
-roles:
+user_types:
   admin:
     can:
       manage:
       - all
-
+roles:
   user:
     can:
       read:

data/spec/dummy_spec_helper.rb

@@ -17,6 +17,8 @@ require 'capybara/rspec'
 #require 'controller_macros'
 #Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
+CanTango.config.adapters.use :compiler
+
 #ActiveRecord::Base.logger = Logger.new(STDERR)
 DatabaseCleaner.strategy = :truncation
 def migration_folder(name)

data/spec/entire_suite_spec.rb

@@ -8,6 +8,8 @@ require_all "#{dir}/cantango/ability"
 require_all "#{dir}/cantango/api"
 require_all "#{dir}/cantango/permit_engine"
 
+require  "#{dir}/cantango/ability_spec"
+require  "#{dir}/cantango/ability_filters_spec"
 require "#{dir}/cantango/configuration_spec"
 require "#{dir}/cantango/rules_spec"
 require_all "#{dir}/cantango/configuration"

data/spec/factories/user.rb

@@ -0,0 +1,8 @@
+FactoryGirl.define do
+  factory :user do
+    name                        { Forgery(:name).full_name }
+    email                       { Forgery(:internet).email_address }
+    password                    'secret'
+  end
+end
+

data/spec/factories/user_account.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :user_account do
+    name 'susan'
+  end
+end
+

data/spec/fixtures/config/permissions.yml

@@ -1,19 +1,60 @@
---- 
-bloggers: 
-  can: 
-    read: 
-    - Article
-    - Comment
-  cannot: 
-    write: 
-    - Article
-    - Post
-editors: 
-  can: 
-    read: 
-    - Article
-    - Comment
-  cannot: 
-    write: 
-    - Article
-    - Post
+user_types:
+  admin:
+    can:
+      manage:
+        - all
+
+account_types:
+  editor:
+    can:
+      manage:
+        - all
+
+roles:
+  admin:
+    can:
+      manage:
+      - all
+
+  user:
+    can:
+      read:
+      - Comment
+      - Post
+      - Article
+      - User
+      write:
+      - Article
+      manage:
+      - Comment
+      - Post
+
+role_groups:
+  bloggers: 
+    can: 
+      read: 
+      - Article
+      - Comment
+    cannot: 
+      write: 
+      - Article
+      - Post
+  editors: 
+    can: 
+      read: 
+      - Article
+      - Comment
+    cannot: 
+      write: 
+      - Article
+      - Post
+
+licenses:
+  editors:
+    can:
+      manage:
+      - all
+users:
+  kris@gmail.com:
+    can:
+    cannot:

data/spec/fixtures/models/admin.rb

@@ -0,0 +1,2 @@
+class Admin < User
+end

data/spec/fixtures/models/admin_account.rb

@@ -0,0 +1,22 @@
+class AdminAccount
+  attr_accessor :user, :roles, :role_groups
+
+  def initialize user, options = {}
+    @user = user
+    @roles = options[:roles]
+    @role_groups = options[:role_groups]
+  end
+
+  def has_role? name
+    true
+  end
+
+  def roles_list
+    roles
+  end
+
+  def role_groups_list
+    role_groups
+  end
+end
+

data/spec/fixtures/models/simple_roles.rb

@@ -1,4 +1,9 @@
 module SimpleRoles
+  def self.included(base)
+    base.send :include, InstanceMethods
+    base.extend ClassMethods
+  end
+
   module ClassMethods
     def is_role_in_group?(role, group)
       raise "No group #{group} defined in User model" if !role_groups.has_key?(group)

data/spec/fixtures/models/user.rb

@@ -1,8 +1,12 @@
+require 'fixtures/models/simple_roles'
+
 class User
   attr_accessor :name, :account, :email
 
   # tango_user # see macros
 
+  include ::SimpleRoles
+
   def initialize name, email = nil, options = {}
     @name = name
     @email = email

data/spec/helpers/dummy_app_ability.rb

@@ -11,16 +11,13 @@ module CanTango
 
       @rules_cached = true and return if cached_rules?
 
-      # run permission evaluators
-      with(:permissions)  {|permission| permission.evaluate! user }
-      with(:permits)      {|permit| break if permit.execute == :break }
+      execute_engines!
 
       cache_rules!
     end
-  
+
     def rules_cached?
       @rules_cached || false
     end
   end
-  
 end

data/spec/integration/cache_using_moneta_spec.rb

@@ -4,12 +4,13 @@ require 'dummy_spec_helper'
 Cutter::Stamper.turn :off
 
 describe "Caching of the rules" do
-  
   before(:all) do
     @user = User.create! :name => 'stanislaw', :role => 'user', :email => 'stanislaw@mail.ru'
     Article.create!(:title => 'one')
   end
 
+=begin
+
   context 'CanTango::Ability::Cache::MonetaCache' do
     before do
       CanTango.configure do |config|
@@ -43,4 +44,5 @@ describe "Caching of the rules" do
       end
     end
   end
+=end
 end

data/spec/integration/cache_using_session_spec.rb

@@ -4,7 +4,7 @@ require 'dummy_spec_helper'
 Cutter::Stamper.turn :off
 
 describe "Caching of the rules" do
-  
+
   before(:all) do
     @user = User.create! :name => 'stanislaw', :role => 'user', :email => 'stanislaw@mail.ru'
     Article.create!(:title => 'one')
@@ -13,7 +13,7 @@ describe "Caching of the rules" do
   context 'CanTango::Ability::Cache::Session::Cache' do
     before do
       CanTango.configure do |config|
-        config.cache.store.default_class = CanTango::Ability::Cache::SessionCache
+        config.cache_engine.store.default_class = CanTango::Ability::Cache::SessionCache
       end
     end
 

data/spec/integration/user/articles_spec.rb

@@ -11,7 +11,7 @@ feature "Articles", %q{
     Article.create!(:title => 'two')
 
     @user = User.create! :name => 'stanislaw', :role => 'user', :email => 'stanislaw@mail.ru'
-    @editor = User.create! :name => 'editor', :role => 'editor', :email => 'editor@mail.ru'
+    @editor = Admin.create! :name => 'editor', :role => 'editor', :email => 'editor@mail.ru'
   end
 
   scenario "Article index" do

data/spec/integration/user/concerto_spec.rb

@@ -10,7 +10,7 @@ feature "Concertos", %q{
     Concerto.create!(:title => 'one')
     Concerto.create!(:title => 'two')
 
-    @composer = User.create!(:name => 'composer', :role_groups => 'composers', :email => 'stanislaw@mail.ru')
+    @composer = Admin.create!(:name => 'composer', :role_groups => 'composers', :email => 'stanislaw@mail.ru')
     @musician = User.create! :name => 'musician', :role_groups => 'musicians', :email => 'editor@mail.ru'
   end
 

data/spec/spec_helper.rb

@@ -3,9 +3,11 @@ require 'rspec'
 require 'cancan/matchers'
 require 'cantango'
 require 'cantango/rspec'
-require 'factory_girl'
 require 'mocha'
-require 'factories'
+require 'fixtures/models'
+
+require 'factory_girl'
+FactoryGirl.find_definitions
 
 require 'cutter'
 
@@ -16,7 +18,5 @@ require 'cutter'
 require 'simple_roles'
 
 CanTango.configure do |config|
-  config.permission.config_path File.dirname(__FILE__) + '/fixtures/config'
-  config.cache.set :off
+  config.permission_engine.config_path File.dirname(__FILE__) + '/fixtures/config'
 end
-#require_all File.dirname(__FILE__) + '/fixtures'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-15 00:00:00.000000000Z
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2152347860 !ruby/object:Gem::Requirement
+  requirement: &2158261060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2152347860
+  version_requirements: *2158261060
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &2152346720 !ruby/object:Gem::Requirement
+  requirement: &2158260560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,43 +33,32 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2152346720
+  version_requirements: *2158260560
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2152345860 !ruby/object:Gem::Requirement
+  requirement: &2158260080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152345860
+  version_requirements: *2158260080
 - !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: &2152344700 !ruby/object:Gem::Requirement
+  name: sweetloader
+  requirement: &2158259560 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *2152344700
-- !ruby/object:Gem::Dependency
-  name: hashie
-  requirement: &2152343380 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2152343380
+  version_requirements: *2158259560
 - !ruby/object:Gem::Dependency
-  name: sourcify
-  requirement: &2152337000 !ruby/object:Gem::Requirement
+  name: sqlite3
+  requirement: &2158259060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,65 +66,65 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152337000
+  version_requirements: *2158259060
 - !ruby/object:Gem::Dependency
-  name: dkastner-moneta
-  requirement: &2152332820 !ruby/object:Gem::Requirement
+  name: hashie
+  requirement: &2158258580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.4'
   type: :runtime
   prerelease: false
-  version_requirements: *2152332820
+  version_requirements: *2158258580
 - !ruby/object:Gem::Dependency
-  name: friendly_id
-  requirement: &2152331580 !ruby/object:Gem::Requirement
+  name: factory_girl
+  requirement: &2158258080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2152331580
+  version_requirements: *2158258080
 - !ruby/object:Gem::Dependency
-  name: meta_where
-  requirement: &2152330380 !ruby/object:Gem::Requirement
+  name: sourcify
+  requirement: &2158257580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
-  version_requirements: *2152330380
+  version_requirements: *2158257580
 - !ruby/object:Gem::Dependency
-  name: devise
-  requirement: &2152326040 !ruby/object:Gem::Requirement
+  name: dkastner-moneta
+  requirement: &2158257080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2152326040
+  version_requirements: *2158257080
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152321880 !ruby/object:Gem::Requirement
+  requirement: &2158256600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.4.0
   type: :development
   prerelease: false
-  version_requirements: *2152321880
+  version_requirements: *2158256600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152267200 !ruby/object:Gem::Requirement
+  requirement: &2158256100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,21 +132,21 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152267200
+  version_requirements: *2158256100
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152265340 !ruby/object:Gem::Requirement
+  requirement: &2158255580 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.10
+        version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: *2152265340
+  version_requirements: *2158255580
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152263620 !ruby/object:Gem::Requirement
+  requirement: &2158255080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +154,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152263620
+  version_requirements: *2158255080
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -193,24 +182,25 @@ files:
 - lib/cantango/ability.rb
 - lib/cantango/ability/cache.rb
 - lib/cantango/ability/cache/base_cache.rb
+- lib/cantango/ability/cache/key.rb
 - lib/cantango/ability/cache/kompiler.rb
 - lib/cantango/ability/cache/moneta_cache.rb
+- lib/cantango/ability/cache/reader.rb
+- lib/cantango/ability/cache/rules_cache.rb
 - lib/cantango/ability/cache/session_cache.rb
-- lib/cantango/ability/class_methods.rb
+- lib/cantango/ability/cache/writer.rb
+- lib/cantango/ability/cache_helpers.rb
 - lib/cantango/ability/masquerade_helpers.rb
 - lib/cantango/ability/permission_helpers.rb
 - lib/cantango/ability/permit_helpers.rb
 - lib/cantango/ability/role_helpers.rb
 - lib/cantango/ability/scope.rb
 - lib/cantango/ability/user_helpers.rb
+- lib/cantango/adapter/compiler.rb
+- lib/cantango/adapter/moneta.rb
 - lib/cantango/api.rb
 - lib/cantango/api/aliases.rb
-- lib/cantango/api/aliases/account_permit.rb
-- lib/cantango/api/aliases/license.rb
-- lib/cantango/api/aliases/permit.rb
-- lib/cantango/api/aliases/role_group_permit.rb
-- lib/cantango/api/aliases/role_permit.rb
-- lib/cantango/api/aliases/user_permit.rb
+- lib/cantango/api/attributes.rb
 - lib/cantango/api/common.rb
 - lib/cantango/api/options.rb
 - lib/cantango/api/user.rb
@@ -222,10 +212,12 @@ files:
 - lib/cantango/api/user_account/can.rb
 - lib/cantango/api/user_account/scope.rb
 - lib/cantango/cache.rb
+- lib/cantango/cache/hash_cache.rb
 - lib/cantango/cache/moneta_cache.rb
 - lib/cantango/cancan/rule.rb
 - lib/cantango/configuration.rb
 - lib/cantango/configuration/ability.rb
+- lib/cantango/configuration/adapters.rb
 - lib/cantango/configuration/autoload.rb
 - lib/cantango/configuration/categories.rb
 - lib/cantango/configuration/engines.rb
@@ -238,6 +230,8 @@ files:
 - lib/cantango/configuration/guest.rb
 - lib/cantango/configuration/hash_registry.rb
 - lib/cantango/configuration/models.rb
+- lib/cantango/configuration/permit_registry.rb
+- lib/cantango/configuration/permits.rb
 - lib/cantango/configuration/registry.rb
 - lib/cantango/configuration/role_groups.rb
 - lib/cantango/configuration/role_registry.rb
@@ -246,10 +240,14 @@ files:
 - lib/cantango/configuration/user_account.rb
 - lib/cantango/configuration/user_accounts.rb
 - lib/cantango/configuration/users.rb
+- lib/cantango/engine.rb
+- lib/cantango/filters.rb
+- lib/cantango/filters/filter.rb
+- lib/cantango/filters/role_filter.rb
+- lib/cantango/filters/role_group_filter.rb
 - lib/cantango/helpers.rb
 - lib/cantango/helpers/role_methods.rb
 - lib/cantango/permission_engine.rb
-- lib/cantango/permission_engine/builder.rb
 - lib/cantango/permission_engine/collector.rb
 - lib/cantango/permission_engine/compiler.rb
 - lib/cantango/permission_engine/evaluator.rb
@@ -270,19 +268,18 @@ files:
 - lib/cantango/permission_engine/parser/rule.rb
 - lib/cantango/permission_engine/permission.rb
 - lib/cantango/permission_engine/selector.rb
+- lib/cantango/permission_engine/selector/account_types.rb
 - lib/cantango/permission_engine/selector/base.rb
 - lib/cantango/permission_engine/selector/licenses.rb
 - lib/cantango/permission_engine/selector/role_groups.rb
 - lib/cantango/permission_engine/selector/roles.rb
+- lib/cantango/permission_engine/selector/user_types.rb
 - lib/cantango/permission_engine/selector/users.rb
 - lib/cantango/permission_engine/statement.rb
 - lib/cantango/permission_engine/statements.rb
 - lib/cantango/permission_engine/store.rb
 - lib/cantango/permission_engine/yaml_store.rb
 - lib/cantango/permit_engine.rb
-- lib/cantango/permit_engine/account_permit.rb
-- lib/cantango/permit_engine/account_permit/builder.rb
-- lib/cantango/permit_engine/account_permit/finder.rb
 - lib/cantango/permit_engine/builder.rb
 - lib/cantango/permit_engine/builder/base.rb
 - lib/cantango/permit_engine/builder/special_permits.rb
@@ -293,27 +290,33 @@ files:
 - lib/cantango/permit_engine/executor/system.rb
 - lib/cantango/permit_engine/factory.rb
 - lib/cantango/permit_engine/finder.rb
-- lib/cantango/permit_engine/license.rb
-- lib/cantango/permit_engine/license/loader.rb
-- lib/cantango/permit_engine/license/rules.rb
-- lib/cantango/permit_engine/permit.rb
-- lib/cantango/permit_engine/role_group_permit.rb
-- lib/cantango/permit_engine/role_group_permit/builder.rb
-- lib/cantango/permit_engine/role_group_permit/finder.rb
 - lib/cantango/permit_engine/role_matcher.rb
-- lib/cantango/permit_engine/role_permit.rb
-- lib/cantango/permit_engine/role_permit/builder.rb
-- lib/cantango/permit_engine/role_permit/finder.rb
-- lib/cantango/permit_engine/user_permit.rb
-- lib/cantango/permit_engine/user_permit/builder.rb
-- lib/cantango/permit_engine/user_permit/finder.rb
 - lib/cantango/permit_engine/util.rb
+- lib/cantango/permits.rb
+- lib/cantango/permits/account_permit.rb
+- lib/cantango/permits/account_permit/builder.rb
+- lib/cantango/permits/account_permit/finder.rb
+- lib/cantango/permits/license.rb
+- lib/cantango/permits/license/loader.rb
+- lib/cantango/permits/license/rules.rb
+- lib/cantango/permits/macros.rb
+- lib/cantango/permits/permit.rb
+- lib/cantango/permits/role_group_permit.rb
+- lib/cantango/permits/role_group_permit/builder.rb
+- lib/cantango/permits/role_group_permit/finder.rb
+- lib/cantango/permits/role_permit.rb
+- lib/cantango/permits/role_permit/builder.rb
+- lib/cantango/permits/role_permit/finder.rb
+- lib/cantango/permits/user_permit.rb
+- lib/cantango/permits/user_permit/builder.rb
+- lib/cantango/permits/user_permit/finder.rb
 - lib/cantango/rails.rb
-- lib/cantango/rails/base_helpers.rb
-- lib/cantango/rails/controller_helpers.rb
 - lib/cantango/rails/engine.rb
+- lib/cantango/rails/helpers/base_helper.rb
+- lib/cantango/rails/helpers/controller_helper.rb
+- lib/cantango/rails/helpers/rest_helper.rb
+- lib/cantango/rails/helpers/view_helper.rb
 - lib/cantango/rails/railtie.rb
-- lib/cantango/rails/view_helpers.rb
 - lib/cantango/rspec.rb
 - lib/cantango/rspec/config.rb
 - lib/cantango/rspec/matchers.rb
@@ -336,7 +339,14 @@ files:
 - lib/cantango/users/masquerade/session_active_user.rb
 - lib/cantango/users/user.rb
 - lib/cantango/users/user_account.rb
+- lib/generators/cantango/account_permit/account_permit_generator.rb
+- lib/generators/cantango/account_permit/templates/account_permit.erb
 - lib/generators/cantango/base.rb
+- lib/generators/cantango/basic.rb
+- lib/generators/cantango/install/install_generator.rb
+- lib/generators/cantango/install/templates/cantango.rb
+- lib/generators/cantango/install/templates/categories.yml
+- lib/generators/cantango/install/templates/permissions.yml
 - lib/generators/cantango/license/license_generator.rb
 - lib/generators/cantango/license/templates/license.erb
 - lib/generators/cantango/license_base.rb
@@ -347,6 +357,9 @@ files:
 - lib/generators/cantango/role_permit/templates/role_group_permit.erb
 - lib/generators/cantango/role_permit/templates/role_permit.erb
 - lib/generators/cantango/role_permits/role_permits_generator.rb
+- lib/generators/cantango/user_permit/templates/account_permit.erb
+- lib/generators/cantango/user_permit/templates/user_permit.erb
+- lib/generators/cantango/user_permit/user_permit_generator.rb
 - spec/Note_on_licenses.textile
 - spec/Refactor_into_engines.textile
 - spec/TODO
@@ -365,8 +378,8 @@ files:
 - spec/active_record/migrations/006_create_todo.rb
 - spec/active_record/migrations/007_create_user_todos.rb
 - spec/active_record/scenarios/SCENARIOS README.textile
-- spec/active_record/scenarios/engines/permission_engine/cantango_permissions.yml
 - spec/active_record/scenarios/engines/permission_engine/categories.yml
+- spec/active_record/scenarios/engines/permission_engine/permissions.yml
 - spec/active_record/scenarios/engines/permission_engine/tango_permission_yml_spec.rb
 - spec/active_record/scenarios/engines/permission_engine/users.rb
 - spec/active_record/scenarios/engines/permit_engine/licenses_spec.rb
@@ -380,7 +393,7 @@ files:
 - spec/active_record/scenarios/masquerading/masquerading_for_admin_account_spec.rb
 - spec/active_record/scenarios/masquerading/masquerading_for_admin_user_spec.rb
 - spec/active_record/scenarios/shared/api.rb
-- spec/active_record/scenarios/shared/can_tango.rb
+- spec/active_record/scenarios/shared/cantango.rb
 - spec/active_record/scenarios/shared/examples/user_accounts.rb
 - spec/active_record/scenarios/shared/examples/users.rb
 - spec/active_record/scenarios/shared/licenses/musicians_license.rb
@@ -388,7 +401,6 @@ files:
 - spec/active_record/scenarios/shared/models/todo.rb
 - spec/active_record/scenarios/shared/models/user_todo.rb
 - spec/active_record/scenarios/shared/models/users.rb
-- spec/active_record/scenarios/shared/permits/PERMITS README.textile
 - spec/active_record/scenarios/shared/permits/account_permits/admin_account_permit.rb
 - spec/active_record/scenarios/shared/permits/account_permits/guest_account_permit.rb
 - spec/active_record/scenarios/shared/permits/account_permits/user_account_permit.rb
@@ -402,9 +414,6 @@ files:
 - spec/active_record/scenarios/shared/permits/special/any_role_permit.rb
 - spec/active_record/scenarios/shared/permits/special/system_role_permit.rb
 - spec/active_record/scenarios/user_accounts/admin_account_spec.rb
-- spec/active_record/scenarios/user_accounts/config/account_permits.yml
-- spec/active_record/scenarios/user_accounts/docs/USER_ACCOUNTS_SCENARIO.textile
-- spec/active_record/scenarios/user_accounts/docs/basic_rules_spec_possible_samples.txt
 - spec/active_record/scenarios/user_accounts/guest_account_spec.rb
 - spec/active_record/scenarios/user_accounts/helpers.rb
 - spec/active_record/scenarios/user_accounts/helpers/account_setup.rb
@@ -415,11 +424,17 @@ files:
 - spec/active_record/scenarios/user_accounts/user_account_spec.rb
 - spec/active_record/spec_helper.rb
 - spec/cantango/README.textile
-- spec/cantango/ability/cache/compiler_spec.rb
+- spec/cantango/ability/cache/key_spec.rb
+- spec/cantango/ability/cache/kompiler_spec.rb
+- spec/cantango/ability/cache/reader_compile_spec.rb
+- spec/cantango/ability/cache/reader_spec.rb
+- spec/cantango/ability/cache/rules_cache_spec.rb
 - spec/cantango/ability/cache/session_cache_spec.rb
+- spec/cantango/ability/cache/writer_spec.rb
 - spec/cantango/ability/cache_spec.rb
 - spec/cantango/ability_filters_spec.rb
 - spec/cantango/ability_spec.rb
+- spec/cantango/api/attributes_spec.rb
 - spec/cantango/api/current_user_accounts.rb
 - spec/cantango/api/current_users.rb
 - spec/cantango/api/user/ability_api_spec.rb
@@ -431,6 +446,7 @@ files:
 - spec/cantango/api/user_account_api_spec.rb
 - spec/cantango/api/user_api_spec.rb
 - spec/cantango/configuration/ability_spec.rb
+- spec/cantango/configuration/adapter_spec.rb
 - spec/cantango/configuration/autoload_spec.rb
 - spec/cantango/configuration/categories_spec.rb
 - spec/cantango/configuration/engines/cache_spec.rb
@@ -444,6 +460,8 @@ files:
 - spec/cantango/configuration/guest/find_guest_default_way_spec.rb
 - spec/cantango/configuration/guest_spec.rb
 - spec/cantango/configuration/hash_registry_spec.rb
+- spec/cantango/configuration/permit_registry_spec.rb
+- spec/cantango/configuration/permits_spec.rb
 - spec/cantango/configuration/registry_spec.rb
 - spec/cantango/configuration/role_groups_spec.rb
 - spec/cantango/configuration/roles_spec.rb
@@ -474,6 +492,7 @@ files:
 - spec/cantango/permission_engine/store_spec.rb
 - spec/cantango/permission_engine/user_permission_store_spec.rb
 - spec/cantango/permission_engine/yaml_store_spec.rb
+- spec/cantango/permission_engine_spec.rb
 - spec/cantango/permit_engine/account_permit_spec.rb
 - spec/cantango/permit_engine/builder/role_group_permits_spec.rb
 - spec/cantango/permit_engine/builder/role_permits_spec.rb
@@ -485,7 +504,11 @@ files:
 - spec/cantango/permit_engine/role_group_permit_spec.rb
 - spec/cantango/permit_engine/role_permit_spec.rb
 - spec/cantango/permit_engine/user_permit_spec.rb
+- spec/cantango/permit_engine_spec.rb
+- spec/cantango/permits/macros_spec.rb
+- spec/cantango/permits/permit_spec.rb
 - spec/cantango/rules_spec.rb
+- spec/cantango_spec.rb
 - spec/devise-dummy/Rakefile
 - spec/devise-dummy/app/controllers/accounts_controller.rb
 - spec/devise-dummy/app/controllers/application_controller.rb
@@ -552,7 +575,6 @@ files:
 - spec/devise-dummy/config.ru
 - spec/devise-dummy/config/application.rb
 - spec/devise-dummy/config/boot.rb
-- spec/devise-dummy/config/cantango_permissions.yml
 - spec/devise-dummy/config/categories.yml
 - spec/devise-dummy/config/database.yml
 - spec/devise-dummy/config/environment.rb
@@ -569,6 +591,7 @@ files:
 - spec/devise-dummy/config/initializers/simple_roles.rb
 - spec/devise-dummy/config/locales/devise.en.yml
 - spec/devise-dummy/config/locales/en.yml
+- spec/devise-dummy/config/permissions.yml
 - spec/devise-dummy/config/routes.rb
 - spec/devise-dummy/db/migrate/002_create_comment.rb
 - spec/devise-dummy/db/migrate/003_create_post.rb
@@ -649,7 +672,6 @@ files:
 - spec/dummy/config.ru
 - spec/dummy/config/application.rb
 - spec/dummy/config/boot.rb
-- spec/dummy/config/cantango_permissions.yml
 - spec/dummy/config/categories.yml
 - spec/dummy/config/database.yml
 - spec/dummy/config/environment.rb
@@ -664,6 +686,7 @@ files:
 - spec/dummy/config/initializers/session_store.rb
 - spec/dummy/config/initializers/simple_roles.rb
 - spec/dummy/config/locales/en.yml
+- spec/dummy/config/permissions.yml
 - spec/dummy/config/routes.rb
 - spec/dummy/db/migrate/001_create_user.rb
 - spec/dummy/db/migrate/002_create_comment.rb
@@ -686,8 +709,8 @@ files:
 - spec/dummy/tmp/pids/server.pid
 - spec/dummy_spec_helper.rb
 - spec/entire_suite_spec.rb
-- spec/factories.rb
-- spec/fixtures/config/cantango_permissions.yml
+- spec/factories/user.rb
+- spec/factories/user_account.rb
 - spec/fixtures/config/categories.yml
 - spec/fixtures/config/evaluator_fixtures.yml
 - spec/fixtures/config/licenses.yml
@@ -696,6 +719,8 @@ files:
 - spec/fixtures/config/roles.yml
 - spec/fixtures/config/user_permissions.yml
 - spec/fixtures/models.rb
+- spec/fixtures/models/admin.rb
+- spec/fixtures/models/admin_account.rb
 - spec/fixtures/models/items.rb
 - spec/fixtures/models/simple_roles.rb
 - spec/fixtures/models/user.rb
@@ -772,7 +797,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2981871111333637393
+      hash: -2626615460253562025
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -781,7 +806,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: CanCan extension with role oriented permission management and more