cantango-core 0.1.2 → 0.1.3

data/Gemfile

@@ -4,7 +4,7 @@ group :default do
   gem 'rails',            '>= 3.0.1'
   gem 'cancan',           '>= 1.4'
   gem 'sugar-high',       '>= 0.6.0'
-  gem 'sweetloader',      '~> 0.1.0'
+  gem 'sweetloader',      '~> 0.1.5'
   gem 'hashie'  
 end
 
@@ -15,6 +15,12 @@ group :test do
   gem 'database_cleaner'
   gem 'factory_girl'
 
+  # Adapters
+  gem 'activerecord', '>= 3'
+  gem 'datamapper', '>= 1.1'
+  gem 'mongoid', '>= 2.2'
+  gem 'mongo_mapper', '>= 0.9'
+
   # Specs
   gem 'spork'
   gem 'capybara'

data/Gemfile.lock

@@ -33,6 +33,7 @@ GEM
     arel (2.2.1)
     babosa (0.3.5)
     bcrypt-ruby (3.0.1)
+    bson (1.4.0)
     builder (3.0.0)
     cancan (1.6.7)
     capybara (1.1.2)
@@ -42,7 +43,7 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.2.3)
       ffi (~> 1.0.6)
     code-spec (0.4.0)
       activesupport (>= 3.0.1)
@@ -54,15 +55,54 @@ GEM
       activesupport (>= 2.3.5)
       colorize (>= 0.5)
     database_cleaner (0.7.0)
+    datamapper (1.2.0)
+      dm-aggregates (~> 1.2.0)
+      dm-constraints (~> 1.2.0)
+      dm-core (~> 1.2.0)
+      dm-migrations (~> 1.2.0)
+      dm-serializer (~> 1.2.0)
+      dm-timestamps (~> 1.2.0)
+      dm-transactions (~> 1.2.0)
+      dm-types (~> 1.2.0)
+      dm-validations (~> 1.2.0)
     decent_exposure (1.0.1)
-    devise (1.5.1)
+    devise (1.5.2)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.1)
     diff-lcs (1.1.3)
+    dm-aggregates (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-constraints (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-core (1.2.0)
+      addressable (~> 2.2.6)
+    dm-migrations (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-serializer (1.2.1)
+      dm-core (~> 1.2.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.6.1)
+      json_pure (~> 1.6.1)
+      multi_json (~> 1.0.3)
+    dm-timestamps (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-transactions (1.2.0)
+      dm-core (~> 1.2.0)
+    dm-types (1.2.1)
+      bcrypt-ruby (~> 3.0.0)
+      dm-core (~> 1.2.0)
+      fastercsv (~> 1.5.4)
+      json (~> 1.6.1)
+      multi_json (~> 1.0.3)
+      stringex (~> 1.3.0)
+      uuidtools (~> 2.1.2)
+    dm-validations (1.2.0)
+      dm-core (~> 1.2.0)
     erubis (2.7.0)
-    factory_girl (2.3.1)
+    factory_girl (2.3.2)
       activesupport
+    fastercsv (1.5.4)
     ffi (1.0.11)
     file-spec (0.4.0)
       activesupport (>= 3.0.1)
@@ -86,7 +126,7 @@ GEM
       sugar-high (>= 0.6.0)
       test-unit (>= 2.0.1)
     git (1.2.5)
-    haml (3.1.3)
+    haml (3.1.4)
     hashie (1.2.0)
     hike (1.2.1)
     i18n (0.6.0)
@@ -94,7 +134,7 @@ GEM
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    json (1.6.1)
+    json (1.6.2)
     json_pure (1.6.1)
     launchy (2.0.5)
       addressable (~> 2.2.6)
@@ -111,9 +151,21 @@ GEM
     mime-types (1.17.2)
     mocha (0.10.0)
       metaclass (~> 0.0.1)
-    multi_json (1.0.3)
+    mongo (1.4.0)
+      bson (= 1.4.0)
+    mongo_mapper (0.10.1)
+      activemodel (~> 3.0)
+      activesupport (~> 3.0)
+      plucky (~> 0.4.0)
+    mongoid (2.3.4)
+      activemodel (~> 3.1)
+      mongo (~> 1.3)
+      tzinfo (~> 0.3.22)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     orm_adapter (0.0.5)
+    plucky (0.4.3)
+      mongo (~> 1.3)
     polyglot (0.3.3)
     rack (1.3.5)
     rack-cache (1.1)
@@ -169,11 +221,11 @@ GEM
       activesupport (~> 3.0)
       railties (~> 3.0)
       rspec (~> 2.7.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.13.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.14.0)
       childprocess (>= 0.2.1)
       ffi (~> 1.0.9)
-      json_pure
+      multi_json (~> 1.0.4)
       rubyzip
     spork (0.8.5)
     sprockets (2.0.3)
@@ -181,18 +233,20 @@ GEM
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     sqlite3 (1.3.4)
+    stringex (1.3.0)
     sugar-high (0.6.0)
       activesupport (>= 3.0.1)
-    sweetloader (0.1.1)
+    sweetloader (0.1.5)
       activesupport (>= 3.0.1)
       i18n
-    test-unit (2.4.1)
+    test-unit (2.4.2)
     thor (0.14.6)
     tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.31)
+    uuidtools (2.1.2)
     warden (1.1.0)
       rack (>= 1.0)
     xpath (0.1.4)
@@ -202,11 +256,13 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activerecord (>= 3)
   bundler (>= 1.1.rc)
   cancan (>= 1.4)
   capybara
   cutter
   database_cleaner
+  datamapper (>= 1.1)
   decent_exposure
   devise (>= 1.4)
   factory_girl
@@ -218,6 +274,8 @@ DEPENDENCIES
   jeweler (>= 1.6.4)
   launchy
   mocha
+  mongo_mapper (>= 0.9)
+  mongoid (>= 2.2)
   rails (>= 3.0.1)
   rails-app-spec (>= 0.5.0)
   rake (>= 0.9.2.2)
@@ -228,4 +286,4 @@ DEPENDENCIES
   spork
   sqlite3
   sugar-high (>= 0.6.0)
-  sweetloader (~> 0.1.0)
+  sweetloader (~> 0.1.5)

data/README.mdown

@@ -1,18 +1,10 @@
 # CanTango Core
 
-CanTango is an advanced Access Control (permissions) system for Rails 3. It:
+Core functionality for [CanTango](https://github.com/kristianmandrup/cantango)
 
-* extends "CanCan":http://github.com/ryanb/cancan and offers a more role oriented design
-* integrates with _role_ and _authentication_ systems in a non-intrusive manner
-* can _cache_ ability rules between requests for increased performance
-* can _store_ abilites in a permission store, including a YAML file, for easy administration
-* works well with multiple user accounts and sub applications
-* supports multiple "Devise":https://github.com/plataformatec/devise users
+## Status: Dec 1 2011
 
-*Will CanTango meet my Access Control (permission) requirements?*
-
-* "CanCan vs CanTango":https://github.com/kristianmandrup/cantango/wiki/CanCan-vs-CanTango
-* "CanTango overview":https://github.com/kristianmandrup/cantango/wiki
+The *core* CanTango component is now almost fully spec'ed and functional. Core should not dependencies to any other CanTango components but should stand on its own. All other CanTango components can rely on core for "core" functionality :)
 
 ## Installation
 
@@ -21,13 +13,13 @@ If you require ruby 1.8.7 support, please help patch it and make a pull request
 
 ### Install in Ruby environment (or gem set)
 
-`gem install cantango`
+`gem install cantango-core`
 
 ## Install in Rails application
 
 Insert into Gemfile of your Rails application:
 
-`gem 'cantango'`
+`gem 'cantango-core'`
 
 If you want to live on the edge and use the latest master branch, use the `:git` option. To designate a specific branch, use the `:branch` option. You can also clone this project and reference your local copy (easier to debug/fix) by using the `:path` option (see *Bundler* documentation).
 
@@ -39,15 +31,25 @@ Run bundler in a terminal/console from the folder of your Gemfile (root folder o
 
 CanTango has now been split up into these logical components:
 
+* [Cantango core](https://github.com/kristianmandrup/cantango-core)
 * [Cantango config](https://github.com/kristianmandrup/cantango-config)
 * [Cantango cache](https://github.com/kristianmandrup/cantango-cache)
 * [Cantango model](https://github.com/kristianmandrup/cantango-model)
 * [Cantango masquerade](https://github.com/kristianmandrup/cantango-masquerade)
+* [Cantango roles](https://github.com/kristianmandrup/cantango-roles)
+
+Engines (Ability executors):
 
-* [Cantango Permits](https://github.com/kristianmandrup/cantango-permits)
+* [Permits](https://github.com/kristianmandrup/cantango-permits)
 * [Permit store](https://github.com/kristianmandrup/cantango-permit_store)
 * [Permissions](https://github.com/kristianmandrup/cantango-permissions)
 
+Cantango:
+
+* [Cantango](https://github.com/kristianmandrup/cantango)
+
+Currently the _cantango-1x_ branch
+
 ## Quickstart
 
 See the [Quickstart guide](https://github.com/kristianmandrup/cantango/wiki/Quickstart) in the wiki.

data/VERSION

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

data/cantango-core.gemspec

@@ -4,17 +4,14 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{cantango-core}
-  s.version = "0.1.2"
+  s.name = "cantango-core"
+  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}, %q{Stanislaw Pankevich}]
-  s.date = %q{2011-11-25}
-  s.description = %q{Define your permission rules as role- or role group specific permits.
-Integrates well with multiple Devise user acounts.
-Includes rules caching.
-Store permissions in yaml file or key-value store}
-  s.email = %q{kmandrup@gmail.com, s.pankevich@gmail.com}
+  s.authors = ["Kristian Mandrup", "Stanislaw Pankevich"]
+  s.date = "2011-12-01"
+  s.description = "Define your permission rules as role- or role group specific permits.\nIntegrates well with multiple Devise user acounts.\nIncludes rules caching.\nStore permissions in yaml file or key-value store"
+  s.email = "kmandrup@gmail.com, s.pankevich@gmail.com"
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.mdown"
@@ -31,20 +28,28 @@ Store permissions in yaml file or key-value store}
     "cantango-core.gemspec",
     "lib/cantango/ability.rb",
     "lib/cantango/ability/base.rb",
+    "lib/cantango/ability/base/callbacks.rb",
     "lib/cantango/ability/cache.rb",
     "lib/cantango/ability/cache/simple_key.rb",
     "lib/cantango/ability/executor.rb",
     "lib/cantango/ability/executor/base.rb",
-    "lib/cantango/ability/executor/cache_mode.rb",
     "lib/cantango/ability/executor/modes.rb",
     "lib/cantango/ability/executor/no_cache_mode.rb",
     "lib/cantango/ability/helper.rb",
     "lib/cantango/ability/helper/account.rb",
     "lib/cantango/ability/helper/engine.rb",
-    "lib/cantango/ability/helper/role.rb",
-    "lib/cantango/ability/helper/role_group.rb",
     "lib/cantango/ability/helper/user.rb",
+    "lib/cantango/adaptor.rb",
+    "lib/cantango/adaptor/active_record.rb",
+    "lib/cantango/adaptor/data_mapper.rb",
+    "lib/cantango/adaptor/generic.rb",
+    "lib/cantango/adaptor/mongo.rb",
+    "lib/cantango/adaptor/mongo_mapper.rb",
+    "lib/cantango/adaptor/mongoid.rb",
+    "lib/cantango/adaptor/relational.rb",
+    "lib/cantango/cancan.rb",
     "lib/cantango/cancan/rule.rb",
+    "lib/cantango/cancan/rule_class.rb",
     "lib/cantango/core.rb",
     "lib/cantango/engine.rb",
     "lib/cantango/filter.rb",
@@ -53,28 +58,12 @@ Store permissions in yaml file or key-value store}
     "lib/cantango/helpers/debug.rb",
     "lib/cantango/loader.rb",
     "lib/cantango/loader/yaml.rb",
-    "lib/cantango/macros.rb",
-    "lib/cantango/macros/account.rb",
-    "lib/cantango/macros/user.rb",
     "lib/cantango/model.rb",
     "lib/cantango/model/guest.rb",
     "lib/cantango/rspec.rb",
     "lib/cantango/rspec/config.rb",
     "lib/cantango/rspec/matchers.rb",
     "lib/cantango/rspec/matchers/be_allowed_to.rb",
-    "lib/cantango/rules.rb",
-    "lib/cantango/rules/adaptor.rb",
-    "lib/cantango/rules/adaptor/active_record.rb",
-    "lib/cantango/rules/adaptor/data_mapper.rb",
-    "lib/cantango/rules/adaptor/generic.rb",
-    "lib/cantango/rules/adaptor/mongo.rb",
-    "lib/cantango/rules/adaptor/mongo_mapper.rb",
-    "lib/cantango/rules/adaptor/mongoid.rb",
-    "lib/cantango/rules/adaptor/relational.rb",
-    "lib/cantango/rules/dsl.rb",
-    "lib/cantango/rules/relation.rb",
-    "lib/cantango/rules/rule_class.rb",
-    "lib/cantango/rules/scope.rb",
     "lib/cantango/scope.rb",
     "lib/cantango/scope/ability.rb",
     "lib/generators/cantango/install/install_generator.rb",
@@ -82,41 +71,42 @@ Store permissions in yaml file or key-value store}
     "lib/generators/cantango/install/templates/categories.yml",
     "lib/generators/cantango/install/templates/permissions.yml",
     "spec/cantango/ability/base_spec.rb",
-    "spec/cantango/ability/cached_spec.rb",
-    "spec/cantango/ability/executor/base2.rb",
+    "spec/cantango/ability/cache/simple_key_spec.rb",
     "spec/cantango/ability/executor/base_spec.rb",
-    "spec/cantango/ability/executor/cache_mode_spec.rb",
+    "spec/cantango/ability/executor/custom_spec.rb",
     "spec/cantango/ability/executor/modes_spec.rb",
     "spec/cantango/ability/executor/no_cache_mode_spec.rb",
+    "spec/cantango/ability/helper/account_spec.rb",
+    "spec/cantango/ability/helper/engine_spec.rb",
+    "spec/cantango/ability/helper/user_spec.rb",
+    "spec/cantango/adaptor/active_record_spec.rb",
+    "spec/cantango/adaptor/data_mapper_spec.rb",
+    "spec/cantango/adaptor/mongo_mapper_spec.rb",
+    "spec/cantango/adaptor/mongoid_spec.rb",
     "spec/cantango/cancan/rule_spec.rb",
     "spec/cantango/core_spec.rb",
     "spec/cantango/engine_spec.rb",
     "spec/cantango/filter/base_spec.rb",
     "spec/cantango/helpers/debug_spec.rb",
     "spec/cantango/loader/yaml_spec.rb",
-    "spec/cantango/macros/account_spec.rb",
-    "spec/cantango/macros/user_spec.rb",
+    "spec/cantango/model/guest_spec.rb",
     "spec/cantango/rspec/be_allowed_to_spec.rb",
-    "spec/cantango/rules/adaptor/active_record_spec.rb",
-    "spec/cantango/rules/adaptor/data_mapper_spec.rb",
-    "spec/cantango/rules/adaptor/mongo_mapper_spec.rb",
-    "spec/cantango/rules/adaptor/mongoid_spec.rb",
-    "spec/cantango/rules/adaptor_spec.rb",
-    "spec/cantango/rules/dsl_spec.rb",
-    "spec/cantango/rules/relation_spec.rb",
-    "spec/cantango/rules/rule_class_spec.rb",
-    "spec/cantango/rules/scope_spec.rb",
-    "spec/cantango/rules_spec.rb",
     "spec/cantango/scope/ability_spec.rb",
     "spec/cantango_spec.rb",
+    "spec/fixtures/models.rb",
+    "spec/fixtures/models/account.rb",
+    "spec/fixtures/models/admin.rb",
+    "spec/fixtures/models/admin_account.rb",
+    "spec/fixtures/models/items.rb",
+    "spec/fixtures/models/user.rb",
     "spec/generators/cantango/install_generator_spec.rb",
     "spec/spec_helper.rb"
   ]
-  s.homepage = %q{http://github.com/kristianmandrup/cantango}
-  s.licenses = [%q{MIT}]
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{CanCan extension with role oriented permission management and more}
+  s.homepage = "http://github.com/kristianmandrup/cantango"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = "1.8.10"
+  s.summary = "CanCan extension with role oriented permission management and more"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
@@ -125,7 +115,7 @@ Store permissions in yaml file or key-value store}
       s.add_runtime_dependency(%q<rails>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<cancan>, [">= 1.4"])
       s.add_runtime_dependency(%q<sugar-high>, [">= 0.6.0"])
-      s.add_runtime_dependency(%q<sweetloader>, ["~> 0.1.0"])
+      s.add_runtime_dependency(%q<sweetloader>, ["~> 0.1.5"])
       s.add_runtime_dependency(%q<hashie>, [">= 0"])
       s.add_development_dependency(%q<rspec-rails>, [">= 2.6.1"])
       s.add_development_dependency(%q<forgery>, [">= 0.3"])
@@ -140,7 +130,7 @@ Store permissions in yaml file or key-value store}
       s.add_dependency(%q<rails>, [">= 3.0.1"])
       s.add_dependency(%q<cancan>, [">= 1.4"])
       s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
-      s.add_dependency(%q<sweetloader>, ["~> 0.1.0"])
+      s.add_dependency(%q<sweetloader>, ["~> 0.1.5"])
       s.add_dependency(%q<hashie>, [">= 0"])
       s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
       s.add_dependency(%q<forgery>, [">= 0.3"])
@@ -156,7 +146,7 @@ Store permissions in yaml file or key-value store}
     s.add_dependency(%q<rails>, [">= 3.0.1"])
     s.add_dependency(%q<cancan>, [">= 1.4"])
     s.add_dependency(%q<sugar-high>, [">= 0.6.0"])
-    s.add_dependency(%q<sweetloader>, ["~> 0.1.0"])
+    s.add_dependency(%q<sweetloader>, ["~> 0.1.5"])
     s.add_dependency(%q<hashie>, [">= 0"])
     s.add_dependency(%q<rspec-rails>, [">= 2.6.1"])
     s.add_dependency(%q<forgery>, [">= 0.3"])

data/lib/cantango/ability/base/callbacks.rb

@@ -0,0 +1,37 @@
+module CanTango::Ability
+  class Base
+    module Callbacks
+      module ClassMethods
+        [:after, :before].each do |type|
+          class_eval %{
+            def #{type}_execute_callbacks
+              @#{type}_execute_callbacks ||= []
+            end
+  
+            def #{type}_execute *callbacks
+              @#{type}_execute_callbacks = callbacks.flatten
+            end
+          }
+        end
+      end
+
+      # should execute :after_execute callbacks
+      def after_execute
+        execute_engines! if engines_on?
+
+        self.class.after_execute_callbacks.each {|callback| send(callback) }
+      end
+
+      # should execute :before_execute callbacks
+      def before_execute
+        self.class.before_execute_callbacks.each {|callback| send(callback) }
+      end
+
+      def within_callbacks &block
+        before_execute
+        yield
+        after_execute
+      end
+    end
+  end
+end

data/lib/cantango/ability/base.rb

@@ -1,6 +1,8 @@
 module CanTango
   module Ability
     class Base
+      autoload_modules :Callbacks
+      
       include CanCan::Ability
 
       attr_reader :options, :candidate
@@ -10,11 +12,23 @@ module CanTango
       def initialize candidate, options = {}
         raise "Candidate must be something!" if !candidate
         @candidate, @options = candidate, options
+        execute!
+      end
+      
+      def execute!
+        within_callbacks do
+          clear_rules!
+          permit_rules
+        end        
+      end
 
-        clear_rules!
-        permit_rules
+      def within_callbacks &block
+        yield
+      end
 
-        execute_engines! if engines_on?
+      # overriden by Engine helper
+      def engines_on?
+        false
       end
 
       def cached?
@@ -37,9 +51,8 @@ module CanTango
         @session = options[:session] || {} # seperate session cache for each type of user?
       end
 
+      # overriden by Masquerade helper
       def subject
-        return candidate.active_user if masquerade_user?
-        return candidate.active_account if masquerade_account?
         candidate
       end
 
@@ -47,9 +60,9 @@ module CanTango
         CanTango.config
       end
 
-      Helper.modules.each do |name|
-        include "CanTango::Ability::Helper::#{name.to_s.camelize}".constantize
-      end
+      # Helper.modules.each do |name|
+        # include "CanTango::Ability::Helper::#{name.to_s.camelize}".constantize
+      # end
     
       protected
 

data/lib/cantango/ability/cache.rb

@@ -1,7 +1,7 @@
 module CanTango
   module Ability
     module Cache
-      autoload_modules :Key
+      autoload_modules :SimpleKey
     end
   end
 end

data/lib/cantango/ability/executor/modes.rb

@@ -31,20 +31,20 @@ module CanTango
           rules.compact!
         end
 
-        def get_ability mode
-          ability_class_for(mode).new candidate, options
+        def ability_mode_executor_for mode
+          ability_mode_executor_class_for(mode).new candidate, options
         end
 
-        def ability_class_for mode
-          mode == :cache ? CanTango::Ability::Cached : CanTango::Ability::NonCached
+        def ability_mode_executor_class_for mode
+          "CanTango::Ability::Executor::#{mode.to_s.camelize}Mode".constantize
         end
 
         def mode? mode
           modes.include?(mode)
         end
-
+        
         def modes
-          CanTango.config.ability.modes
+          @modes ||= options[:modes] || []
         end
       end
     end

data/lib/cantango/ability/executor/no_cache_mode.rb

@@ -1,15 +1,11 @@
 module CanTango
   module Ability
     module Executor
-      class NonCachedMode < Base
+      class NoCacheMode < Base
         protected
 
         def start_execute
-          debug "Executing non-cached Ability"
-        end
-
-        def end_execute
-          debug "DONE"
+          debug "Executing Ability in :no_cache mode"
         end
       end
     end

data/lib/cantango/ability/executor.rb

@@ -1,7 +1,7 @@
 module CanTango
   module Ability
     module Executor
-      autoload_modules :Base, :CacheMode, :NoCacheMode, :Modes
+      autoload_modules :Base, :NoCacheMode, :Modes
     end
   end
 end

data/lib/cantango/ability/helper/account.rb

@@ -1,13 +1,9 @@
-module CanTango
-  class Ability
-    module Helper
-      module Account
-        def user_account
-          return subject.active_account if subject.respond_to? :active_account
-          subject
-        end
-        alias_method :account, :user_account
-      end
+module CanTango::Ability::Helper
+  module Account
+    def account
+      return subject.active_account if subject.respond_to? :active_account
+      return subject.account if subject.respond_to? :account
+      subject
     end
   end
 end