cantango-core 0.1.9.2 → 0.1.9.3

data/Gemfile

@@ -11,7 +11,6 @@ end
 group :test do
   gem 'require_all',    '~> 1.2.0'
 
-
   gem 'cancan',         '>= 1.4'
   
   # Data

data/VERSION

@@ -1 +1 @@
-0.1.9.2
+0.1.9.3

data/cantango-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{cantango-core}
-  s.version = "0.1.9.2"
+  s.version = "0.1.9.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-12-08}
+  s.date = %q{2011-12-09}
   s.description = %q{Define your permission rules as role- or role group specific permits.
 Integrates well with multiple Devise user acounts.
 Includes rules caching.
@@ -98,6 +98,7 @@ Store permissions in yaml file or key-value store}
     "spec/cantango/adaptor/data_mapper_spec.rb",
     "spec/cantango/adaptor/mongo_mapper_spec.rb",
     "spec/cantango/adaptor/mongoid_spec.rb",
+    "spec/cantango/adaptor_spec.rb",
     "spec/cantango/cancan/rule_class_spec.rb",
     "spec/cantango/cancan/rule_spec.rb",
     "spec/cantango/core_spec.rb",

data/lib/cantango/adaptor.rb

@@ -5,21 +5,27 @@ module CanTango
 
     # include adaptor depending on which ORM the object inherits from or includes
     def use_adaptor! base, object
-      orm_map.each_pair do |orm, const|
+      base.class.send :include, adaptor_for(object)
+    end
+
+    def adaptor_for object
+      "CanTango::Adaptor::#{orm_for(object).to_s.camelize}".constantize
+    end
+
+    def orm_for object
+      matching_orm(object) || :generic
+    end
+
+    def matching_orm object
+      orm = orm_map.select do |orm, const|
         begin
-          base.class.send :include, get_adapter(object, const.constantize, orm)
+          orm_const = const.constantize
+          object.kind_of?(orm_const)
         rescue
           next
         end
       end
-    end
-
-    def get_adapter object, adaptor_class, orm
-      object.kind_of?(adaptor_class) ? adaptor_for(orm) : adaptor_for(:generic)
-    end
-
-    def adaptor_for orm
-      "#{self.class}::#{orm.to_s.camelize}".constantize
+      orm.empty? ? nil : orm.keys.first
     end
 
     def orm_map

data/lib/cantango/adaptor/active_record.rb

@@ -1,6 +1,10 @@
 module CanTango::Adaptor
   module ActiveRecord
     include CanTango::Adaptor::Relational
+    
+    def adaptor_type
+      :active_record
+    end
   end
 end
 

data/lib/cantango/adaptor/data_mapper.rb

@@ -1,5 +1,9 @@
 module CanTango::Adaptor
   module DataMapper
     include CanTango::Adaptor::Relational
+    
+    def adaptor_type
+      :data_mapper
+    end
   end
 end

data/lib/cantango/adaptor/generic.rb

@@ -1,6 +1,5 @@
 module CanTango::Adaptor
   module Generic
-
     def attribute_condition attribute, candidate
       Proc.new { |model| model.send(attribute) == candidate }
     end
@@ -8,5 +7,9 @@ module CanTango::Adaptor
     def include_condition attribute, candidate
       Proc.new { |model| model.send(attribute).include? candidate }
     end
+    
+    def adaptor_type
+      :generic
+    end    
   end
 end

data/lib/cantango/adaptor/mongo_mapper.rb

@@ -1,5 +1,9 @@
 module CanTango::Adaptor
   module MongoMapper
     include CanTango::Adaptor::Mongo
+
+    def adaptor_type
+      :mongo_mapper
+    end
   end
 end

data/lib/cantango/adaptor/mongoid.rb

@@ -1,5 +1,9 @@
 module CanTango::Adaptor
   module Mongoid
     include CanTango::Adaptor::Mongo
+    
+    def adaptor_type
+      :mongoid
+    end
   end
 end

data/spec/cantango/adaptor/active_record_spec.rb

@@ -11,7 +11,6 @@ class User < ActiveRecord::Base
   has_many :posters
 end
 
-
 module CanTango::Ability
   class Base
     def calculate_rules

data/spec/cantango/adaptor_spec.rb

@@ -0,0 +1,96 @@
+require 'spec_helper'
+require 'fixtures/models'
+require 'migration_helper'
+
+class Poster < ActiveRecord::Base
+  belongs_to :owner, :class_name => "User", :foreign_key => "user_id"
+end
+
+class Adaptation
+  include CanTango::Adaptor
+end
+
+class GenericClazz
+end
+
+class ArClazz
+end
+
+
+describe CanTango::Adaptor do
+  before do
+    @post = Post.new
+    @poster = Poster.new
+    @generic_clazz = GenericClazz
+    @ar_class = ArClazz
+  end
+  subject { Adaptation.new }
+  
+  describe 'matching_orm(obj)' do
+    context 'Generic obj' do
+      specify { subject.matching_orm(@post).should == nil }
+    end
+
+    context 'Active Record obj' do
+      specify { subject.matching_orm(@poster).should == :active_record }
+    end
+  end
+
+  describe 'orm_for(obj)' do
+    context 'Generic obj' do
+      specify { subject.orm_for(@post).should == :generic }
+    end
+
+    context 'Active Record obj' do
+      specify { subject.orm_for(@poster).should == :active_record }
+    end
+  end
+
+  describe 'adaptor_for(obj)' do
+    context 'Generic obj' do
+      specify { subject.adaptor_for(@post).should == CanTango::Adaptor::Generic }
+    end
+
+    context 'Active Record obj' do
+      specify { subject.adaptor_for(@poster).should == CanTango::Adaptor::ActiveRecord }
+    end
+  end
+
+  describe 'use_adaptor! base, object' do
+    context 'Generic obj' do
+      before do
+        subject.use_adaptor!(@generic_clazz, @post)
+      end
+      specify { @generic_clazz.adaptor_type.should == :generic }
+    end
+
+    context 'Active Record obj' do
+      before do
+        subject.use_adaptor!(@ar_clazz, @poster)
+      end
+      specify { @ar_clazz.adaptor_type.should == :active_record }
+
+    end
+  end
+
+
+  # def use_adaptor! base, object
+  #   base.class.send :include, adaptor_for(object)
+  # end
+
+
+  # def use_adaptor! base, object
+  #   base.class.send :include, adaptor_for(object)
+  # end
+  # 
+  # def adaptor_for object
+  #   "#{self.class}::#{orm_for(object).to_s.camelize}".constantize
+  # end
+  # 
+  # def orm_for object
+  #   matching_orm(object) || :generic
+  # end
+  # 
+  # def matching_orm object
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cantango-core
 version: !ruby/object:Gem::Version
-  version: 0.1.9.2
+  version: 0.1.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000Z
+date: 2011-12-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70297625071360 !ruby/object:Gem::Requirement
+  requirement: &70359830605380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70297625071360
+  version_requirements: *70359830605380
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70297625070560 !ruby/object:Gem::Requirement
+  requirement: &70359830604820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70297625070560
+  version_requirements: *70359830604820
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &70297625069680 !ruby/object:Gem::Requirement
+  requirement: &70359830604140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70297625069680
+  version_requirements: *70359830604140
 - !ruby/object:Gem::Dependency
   name: sweetloader
-  requirement: &70297625068300 !ruby/object:Gem::Requirement
+  requirement: &70359830603220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.1.5
   type: :runtime
   prerelease: false
-  version_requirements: *70297625068300
+  version_requirements: *70359830603220
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70297625067480 !ruby/object:Gem::Requirement
+  requirement: &70359830602040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: '1.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70297625067480
+  version_requirements: *70359830602040
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70297625066020 !ruby/object:Gem::Requirement
+  requirement: &70359830600980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: 2.6.1
   type: :development
   prerelease: false
-  version_requirements: *70297625066020
+  version_requirements: *70359830600980
 - !ruby/object:Gem::Dependency
   name: forgery
-  requirement: &70297625063380 !ruby/object:Gem::Requirement
+  requirement: &70359830599920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *70297625063380
+  version_requirements: *70359830599920
 - !ruby/object:Gem::Dependency
   name: factory_girl
-  requirement: &70297625061920 !ruby/object:Gem::Requirement
+  requirement: &70359830599120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297625061920
+  version_requirements: *70359830599120
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70297625046360 !ruby/object:Gem::Requirement
+  requirement: &70359830598540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297625046360
+  version_requirements: *70359830598540
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70297625045440 !ruby/object:Gem::Requirement
+  requirement: &70359830597980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: *70297625045440
+  version_requirements: *70359830597980
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70297625044600 !ruby/object:Gem::Requirement
+  requirement: &70359830597480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70297625044600
+  version_requirements: *70359830597480
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70297625043700 !ruby/object:Gem::Requirement
+  requirement: &70359830596960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: 1.1.rc
   type: :development
   prerelease: false
-  version_requirements: *70297625043700
+  version_requirements: *70359830596960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70297625042260 !ruby/object:Gem::Requirement
+  requirement: &70359830596380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70297625042260
+  version_requirements: *70359830596380
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70297625040440 !ruby/object:Gem::Requirement
+  requirement: &70359830595900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70297625040440
+  version_requirements: *70359830595900
 description: ! 'Define your permission rules as role- or role group specific permits.
 
   Integrates well with multiple Devise user acounts.
@@ -258,6 +258,7 @@ files:
 - spec/cantango/adaptor/data_mapper_spec.rb
 - spec/cantango/adaptor/mongo_mapper_spec.rb
 - spec/cantango/adaptor/mongoid_spec.rb
+- spec/cantango/adaptor_spec.rb
 - spec/cantango/cancan/rule_class_spec.rb
 - spec/cantango/cancan/rule_spec.rb
 - spec/cantango/core_spec.rb
@@ -295,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3380786207970925537
+      hash: -1538863595410503402
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: