cantango-core 0.1.2 → 0.1.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-core
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2011-12-01 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70238708982740 !ruby/object:Gem::Requirement
+  requirement: &914770100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70238708982740
+  version_requirements: *914770100
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70238708981980 !ruby/object:Gem::Requirement
+  requirement: &914769860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70238708981980
+  version_requirements: *914769860
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70238708981400 !ruby/object:Gem::Requirement
+  requirement: &914769620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,21 +44,21 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70238708981400
+  version_requirements: *914769620
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70238708980740 !ruby/object:Gem::Requirement
+  requirement: &914769380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70238708980740
+  version_requirements: *914769380
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70238708980140 !ruby/object:Gem::Requirement
+  requirement: &914769140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70238708980140
+  version_requirements: *914769140
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70238708979540 !ruby/object:Gem::Requirement
+  requirement: &914768900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70238708979540
+  version_requirements: *914768900
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70238708978940 !ruby/object:Gem::Requirement
+  requirement: &914768660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70238708978940
+  version_requirements: *914768660
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70238708978340 !ruby/object:Gem::Requirement
+  requirement: &914768420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238708978340
+  version_requirements: *914768420
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70238708977740 !ruby/object:Gem::Requirement
+  requirement: &914768150 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238708977740
+  version_requirements: *914768150
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70238708977020 !ruby/object:Gem::Requirement
+  requirement: &914767910 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70238708977020
+  version_requirements: *914767910
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70238708976200 !ruby/object:Gem::Requirement
+  requirement: &914767660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70238708976200
+  version_requirements: *914767660
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70238708975360 !ruby/object:Gem::Requirement
+  requirement: &914767420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70238708975360
+  version_requirements: *914767420
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70238708974460 !ruby/object:Gem::Requirement
+  requirement: &914767180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70238708974460
+  version_requirements: *914767180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70238708973400 !ruby/object:Gem::Requirement
+  requirement: &914766940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70238708973400
+  version_requirements: *914766940
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -191,20 +191,28 @@ files:
 - 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
@@ -213,28 +221,12 @@ files:
 - 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
@@ -242,33 +234,34 @@ files:
 - 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
 homepage: http://github.com/kristianmandrup/cantango
@@ -286,7 +279,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3761620504174853267
+      hash: 472570963
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -295,7 +288,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: CanCan extension with role oriented permission management and more

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

@@ -1,33 +0,0 @@
-module CanTango
-  class Ability
-    module Executor
-      class CachedMode < Base
-        include CanTango::Ability::CacheHelpers
-
-        # FIX! no reason for double cache check!
-        def cached?
-          @rules = cached_rules if cached_rules? && caching_on?
-        end
-
-       def cache
-          @cache ||= cache_class.new self, :cache_key => cache_key, :key_method_names => key_method_names
-        end
-
-        protected
-
-        def cache_class
-          CanTango::Ability::Cache
-        end
-
-        def start_execute
-          debug "Executing cached ability"
-        end
-
-        def end_execute
-          cache_rules! if caching_on?
-          debug "DONE"
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module CanTango
-  class Ability
-    module Helper
-      module Role
-        include CanTango::Helpers::RoleMethods
-
-        # return list roles the user has
-        def roles
-          return [] if !subject.respond_to?(roles_list_meth) || roles_of(subject).blank?
-          roles_of(subject).flatten
-        end
-
-        protected
-
-        def roles_of subject
-          @subj_roles ||= subject.send(roles_list_meth)
-        end
-      end
-    end
-  end
-end

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

@@ -1,21 +0,0 @@
-module CanTango
-  class Ability
-    module Helper
-      module RoleGroup
-        include CanTango::Helpers::RoleMethods
-
-        # return list of symbols for role groups the user belongs to
-        def role_groups
-          return [] if !subject.respond_to?(role_groups_list_meth) || role_groups_of(subject).blank?
-          role_groups_of(subject).flatten
-        end
-
-        protected
-
-        def role_groups_of subject
-          @subj_role_groups ||= subject.send(role_groups_list_meth)
-        end
-      end
-    end
-  end
-end

data/lib/cantango/macros/account.rb

@@ -1,14 +0,0 @@
-module CanTango::Macros
-  module Account
-    def tango_user_account options = {}
-      self.send :include, CanTango::AccountApi
-      
-      if defined? CanTango::Macros::Masquerader
-        self.send :include, CanTango::Macros::Masquerader
-        masquerader if options[:masquerade]
-      end
-    end
-    alias_method :tango_account, :tango_user_account
-    alias_method :cantango_account, :tango_user_account
-  end  
-end

data/lib/cantango/macros/user.rb

@@ -1,16 +0,0 @@
-module CanTango::Macros
-  module User
-    def tango_user options = {}
-      self.send :include, CanTango::UserApi
-      self.send :include, CanTango::Masquerade::UserApi
-      masquerader if options[:masquerade]
-    end
-    alias_method :cantango_user, :tango_user
-
-    module Masquerader
-      def masquerader
-        self.send :include, CanTango::Masquerade::UserApi
-      end
-    end
-  end
-end

data/lib/cantango/macros.rb

@@ -1,11 +0,0 @@
-module CanTango
-  module Macros
-    autoload_modules :User, :Account
-  end
-end
-
-class Module
-  [:User, :Account].each do |macro|
-    self.send :include, "CanTango::Macros::#{macro.to_s.camelize}".constantize
-  end
-end

data/lib/cantango/rules/adaptor/active_record.rb

@@ -1,10 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module ActiveRecord
-        include CanTango::Rules::Adaptor::Relational
-      end
-    end
-  end
-end
-

data/lib/cantango/rules/adaptor/data_mapper.rb

@@ -1,11 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module DataMapper
-        include CanTango::Rules::Adaptor::Relational
-      end
-    end
-  end
-end
-
-

data/lib/cantango/rules/adaptor/generic.rb

@@ -1,16 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module Generic
-
-        def attribute_condition attribute, user_scope
-          Proc.new { |model| model.send(attribute) == user_scope }
-        end
-
-        def include_condition attribute, user_scope
-          Proc.new { |model| model.send(attribute).include? user_scope }
-        end
-      end
-    end
-  end
-end

data/lib/cantango/rules/adaptor/mongo.rb

@@ -1,19 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module Mongo
-        #include CanTango::Rules::Adaptor::Generic
-        # using #in on Hash (Mongoid query)
-        def include_condition attribute, user_scope
-          { attribute.to_sym.in => user_scope.send(attribute) }
-        end
-
-        def attribute_condition attribute, user_scope
-          { attribute.to_sym => user_scope.send(attribute) }
-        end
-      end
-    end
-  end
-end
-
-

data/lib/cantango/rules/adaptor/mongo_mapper.rb

@@ -1,10 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module MongoMapper
-        include module CanTango::Rules::Adaptor::Mongo
-      end
-    end
-  end
-end
-

data/lib/cantango/rules/adaptor/mongoid.rb

@@ -1,9 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module Mongoid
-        include module CanTango::Rules::Adaptor::Mongo
-      end
-    end
-  end
-end

data/lib/cantango/rules/adaptor/relational.rb

@@ -1,13 +0,0 @@
-module CanTango
-  module Rules
-    module Adaptor
-      module Relational
-        def attribute_condition attribute, user_scope
-          { attribute.to_sym => user_scope.send(attribute) }
-        end
-        alias_method :include_condition, :attribute_condition
-      end
-    end
-  end
-end
-

data/lib/cantango/rules/dsl.rb

@@ -1,24 +0,0 @@
-module CanTango
-  module Rules
-    module Dsl
-      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 = UserRelation.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 CanTango::Rules::Scope.new name, self, &block
-      end
-    end
-  end
-end

data/lib/cantango/rules/relation.rb

@@ -1,67 +0,0 @@
-require 'active_support/inflector'
-
-module CanTango
-  module Rules
-    class Relation
-      attr_reader :attribute, :permit, :scope, :models
-
-      include CanTango::Rules::Adaptor
-      include CanTango::Rules::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/rules/scope.rb

@@ -1,24 +0,0 @@
-module CanTango
-  module Rules
-    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|
-        base.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

data/lib/cantango/rules.rb

@@ -1,8 +0,0 @@
-module CanTango
-  module Rules
-    autoload_modules :Adaptor, :Dsl, :RuleClass, :Scope, :Relation
-
-    include Dsl
-    include CanCan::Ability
-  end
-end