roles_active_record 0.5.0 → 0.5.1

data/Gemfile

@@ -3,21 +3,20 @@ source :rubygems
 gem "activerecord",       ">= 3.0.1"
 gem "activesupport",      ">= 3.0.1"
 gem "arel",               ">= 2.0"
-gem "meta_where",         ">= 1.0.1"
-gem "sugar-high",         ">= 0.5.0"
+gem "sugar-high",         ">= 0.5.3"
 gem "require_all",        '~> 1.2.0'
 gem "roles_generic",      '>= 0.5.0'
 gem 'rails_artifactor',   '>= 0.4.0'
 
 group :development, :test do
-  gem "rspec",            '>= 2.5.0'
+  gem "rspec",            '>= 2.4.0'
   gem 'generator-spec',   '>= 0.7.5'
   gem 'database_cleaner', '>= 0.6.7'
 end
 
 group :development do
   gem "jeweler",  ">= 1.6.4"
-  gem "bundler",  ">= 1.0.10"
+  gem "bundler",  ">= 1.0.1"
   gem "rdoc"
 end
 

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/lib/roles_active_record.rb

@@ -1,10 +1,10 @@
 require 'roles_generic'
-require 'require_all'    
+require 'require_all'
 require 'set'
 require 'sugar-high/array'
 require 'rails'
 require 'arel'
-require 'meta_where'
+# require 'meta_where'
 require 'yaml'
 require 'logger'
 

data/lib/roles_active_record/base.rb

@@ -6,8 +6,8 @@ end
 
 module Roles::ActiveRecord
   mattr_accessor :warnings_on
-    
-  def self.included(base) 
+
+  def self.included(base)
     base.extend Roles::Base
     base.extend ClassMethods
     base.send :include, InstanceMethods
@@ -20,18 +20,19 @@ module Roles::ActiveRecord
     end
 
     def default_role
+      puts "inst - dr"
       self.class.default_role
     end
   end
 
-  module ClassMethods      
+  module ClassMethods
     def default_role
       self.to_s.gsub(/(.+)User$/, '\1').underscore.to_sym
-    end 
+    end
 
     def default_role= drole
       @default_role = drole
-    end 
+    end
 
     def valid_single_strategies
       [:admin_flag, :one_role, :role_string]
@@ -43,35 +44,35 @@ module Roles::ActiveRecord
 
     def strategies_with_role_class
       [:one_role, :many_roles]
-    end 
+    end
 
     def valid_strategies
       valid_single_strategies + valid_multi_strategies
     end
-    
+
     def strategy name, options = {}
       strategy_name = name.to_sym
       raise ArgumentError, "Unknown role strategy #{strategy_name}" if !valid_strategies.include? strategy_name
       use_roles_strategy strategy_name
-            
+
       set_role_class(strategy_name, options) if strategies_with_role_class.include? strategy_name
 
       # one_role reference
       if strategy_name == :one_role
         self.belongs_to :one_role, :foreign_key => 'role_id', :class_name => role_class_name.to_s
       end
-      
+
       # many_roles references
-      if strategy_name == :many_roles      
+      if strategy_name == :many_roles
         urc = user_roles_class options
         instance_eval many_roles_stmt(urc)
       end
-      
+
       set_role_strategy name, options
-    end    
-    
+    end
+
     private
-     
+
     def many_roles_stmt urc
       %{
         has_many :many_roles, :through => :#{urc}, :source => :#{role_class_name.to_s.underscore}
@@ -82,9 +83,17 @@ module Roles::ActiveRecord
     def role_class_name options = {}
       return @role_class_name if @role_class_name  
       return options[:role_class] if options.kind_of?(Hash) && options[:role_class] 
-      'Role'    
+      'Role'
+    end
+
+    def role_arel_table
+      Arel::Table.new role_table
     end
 
+    def role_table
+      role_class_name.to_s.underscore.pluralize
+    end 
+
     def user_roles_class options
       return options[:user_roles_class] if options.kind_of?(Hash) && options[:user_roles_class]
       'user_roles'
@@ -100,20 +109,9 @@ module Roles::ActiveRecord
 
     def default_role_class strategy_name
       require "roles_active_record/#{strategy_name}"
-      # if !defined? ::Role
-      #   require "roles_active_record/#{strategy_name}"
-      #   puts "Using default Role classes since they have not yet been defined" # if Roles::ActiveRecord.warnings_on
-      #   return ::Role 
-      # end
-      # if defined? ::Role      
-      #   
-      #   puts "Role is defined"
-      #   return ::Role
-      # end
-      # puts "Late binding!!!"
-      ::Role
-    end
-    
+     ::Role
+    end
+
     def get_role_class strategy_name, options
       options[:role_class] ? options[:role_class].to_s.camelize.constantize : default_role_class(strategy_name)
     end

data/lib/roles_active_record/many_roles.rb

@@ -1,5 +1,5 @@
 class Role < ActiveRecord::Base
-  scope :named, lambda{|role_names| where(:name.in => role_names.flatten)}
+  scope :named, lambda{|role_names| where(:name => role_names.flatten)}
   has_many :users, :through => :user_roles
   has_many :user_roles
   validates :name, :uniqueness => true

data/lib/roles_active_record/role.rb

@@ -15,8 +15,8 @@ end
 
 module RoleClass
   module ClassMethods
-    def find_roles(*role_names) 
-      where(:name.in => role_names.flatten)
+    def find_roles(*role_names)
+      where(:name => role_names.flatten)
     end
 
     def find_role role_name

data/lib/roles_active_record/strategy/multi.rb

@@ -4,22 +4,22 @@ module Roles::ActiveRecord
   module Strategy
     module Multi
       include Shared
-                 
+
       # assign multiple roles
       def roles=(*role_names)
         extracted_roles = extract_roles(role_names)
         return nil if extracted_roles.empty?
         set_roles(select_valid_roles extracted_roles)
-      end      
-      
+      end
+
       def add_roles *roles
         new_roles = select_valid_roles(roles)
         if !new_roles.empty?
           self.roles = self.roles + new_roles
           self.save
         end
-      end      
-      
+      end
+
       # should remove the current single role (set = nil) 
       # only if it is contained in the list of roles to be removed
       def remove_roles *role_names
@@ -40,18 +40,18 @@ module Roles::ActiveRecord
       def roles_list
         my_roles = [roles].flat_uniq
         return [] if my_roles.empty?
-        has_role_class? ? my_roles.map{|r| r.name.to_sym } : my_roles          
+        has_role_class? ? my_roles.map{|r| r.name.to_sym } : my_roles
       end
-      
+
       protected
-      
-      def set_roles *roles                      
+
+      def set_roles *roles
         self.send("#{role_attribute}=", new_roles(roles))
       end
 
       def get_roles
         self.send(role_attribute) || []
-      end      
+      end
     end
   end
-end
+end

data/lib/roles_active_record/strategy/multi/many_roles.rb

@@ -17,7 +17,7 @@ module RoleStrategy::ActiveRecord
       end
 
       def in_any_role(*role_names)
-        joins(:many_roles) & Role.named(role_names.to_strings)
+        joins(:many_roles).where(role_arel_table[:name].in(role_names.flatten.to_strings))
       end
     end
 

data/lib/roles_active_record/strategy/shared.rb

@@ -5,14 +5,14 @@ module Roles::ActiveRecord
       def set_default_role
         add_role default_role
       end
-                        
+
       def set_role role
         update_attributes(role_attribute => new_role(role))
       end
       alias_method :set_roles, :set_role
 
       def remove_all_roles!
-        set_empty_role        
+        set_empty_role
       end
 
       def has_no_roles?
@@ -31,7 +31,7 @@ module Roles::ActiveRecord
       def select_valid_roles *roles
         roles.flat_uniq.select{|role| valid_role? role }
         has_role_class? ? role_class.find_roles(roles).to_a.flat_uniq : roles.flat_uniq
-      end           
+      end
     end
   end
-end
+end

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Kristian Mandrup}]
-  s.date = %q{2011-08-17}
+  s.date = %q{2011-08-18}
   s.description = %q{Makes it easy to set a role strategy on your User model in Active Record}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [
@@ -107,47 +107,44 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<activerecord>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<activesupport>, [">= 3.0.1"])
       s.add_runtime_dependency(%q<arel>, [">= 2.0"])
-      s.add_runtime_dependency(%q<meta_where>, [">= 1.0.1"])
-      s.add_runtime_dependency(%q<sugar-high>, [">= 0.5.0"])
+      s.add_runtime_dependency(%q<sugar-high>, [">= 0.5.3"])
       s.add_runtime_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_runtime_dependency(%q<roles_generic>, [">= 0.5.0"])
       s.add_runtime_dependency(%q<rails_artifactor>, [">= 0.4.0"])
-      s.add_development_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_development_dependency(%q<rspec>, [">= 2.4.0"])
       s.add_development_dependency(%q<generator-spec>, [">= 0.7.5"])
       s.add_development_dependency(%q<database_cleaner>, [">= 0.6.7"])
       s.add_development_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_development_dependency(%q<bundler>, [">= 1.0.10"])
+      s.add_development_dependency(%q<bundler>, [">= 1.0.1"])
       s.add_development_dependency(%q<rdoc>, [">= 0"])
     else
       s.add_dependency(%q<activerecord>, [">= 3.0.1"])
       s.add_dependency(%q<activesupport>, [">= 3.0.1"])
       s.add_dependency(%q<arel>, [">= 2.0"])
-      s.add_dependency(%q<meta_where>, [">= 1.0.1"])
-      s.add_dependency(%q<sugar-high>, [">= 0.5.0"])
+      s.add_dependency(%q<sugar-high>, [">= 0.5.3"])
       s.add_dependency(%q<require_all>, ["~> 1.2.0"])
       s.add_dependency(%q<roles_generic>, [">= 0.5.0"])
       s.add_dependency(%q<rails_artifactor>, [">= 0.4.0"])
-      s.add_dependency(%q<rspec>, [">= 2.5.0"])
+      s.add_dependency(%q<rspec>, [">= 2.4.0"])
       s.add_dependency(%q<generator-spec>, [">= 0.7.5"])
       s.add_dependency(%q<database_cleaner>, [">= 0.6.7"])
       s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-      s.add_dependency(%q<bundler>, [">= 1.0.10"])
+      s.add_dependency(%q<bundler>, [">= 1.0.1"])
       s.add_dependency(%q<rdoc>, [">= 0"])
     end
   else
     s.add_dependency(%q<activerecord>, [">= 3.0.1"])
     s.add_dependency(%q<activesupport>, [">= 3.0.1"])
     s.add_dependency(%q<arel>, [">= 2.0"])
-    s.add_dependency(%q<meta_where>, [">= 1.0.1"])
-    s.add_dependency(%q<sugar-high>, [">= 0.5.0"])
+    s.add_dependency(%q<sugar-high>, [">= 0.5.3"])
     s.add_dependency(%q<require_all>, ["~> 1.2.0"])
     s.add_dependency(%q<roles_generic>, [">= 0.5.0"])
     s.add_dependency(%q<rails_artifactor>, [">= 0.4.0"])
-    s.add_dependency(%q<rspec>, [">= 2.5.0"])
+    s.add_dependency(%q<rspec>, [">= 2.4.0"])
     s.add_dependency(%q<generator-spec>, [">= 0.7.5"])
     s.add_dependency(%q<database_cleaner>, [">= 0.6.7"])
     s.add_dependency(%q<jeweler>, [">= 1.6.4"])
-    s.add_dependency(%q<bundler>, [">= 1.0.10"])
+    s.add_dependency(%q<bundler>, [">= 1.0.1"])
     s.add_dependency(%q<rdoc>, [">= 0"])
   end
 end

data/spec/fixtures/many_roles_setup.rb

@@ -1,12 +1,6 @@
-class User < ActiveRecord::Base    
+class User < ActiveRecord::Base
   include Roles::ActiveRecord
-  
+
   strategy :many_roles
   valid_roles_are :admin, :guest, :user
-  
-  def initialize attributes = {}
-    super
-#    role = default_role
-    add_role default_role
-  end  
 end

data/spec/roles_active_record/strategy/api_examples.rb

@@ -10,11 +10,11 @@ describe "Roles for Active Record: #{api_name}" do
   require "roles_active_record/strategy/user_setup.rb"
 
   before do
-    default_user_setup    
+    default_user_setup
   end
 
   describe '#in_role' do
-    it "should return first user matching role" do        
+    it "should return first user matching role" do
       if User.respond_to? :in_role
         User.in_role(:guest).first.name.should == 'Guest user'
         User.in_role(:admin).first.name.should == 'Admin user'
@@ -23,9 +23,9 @@ describe "Roles for Active Record: #{api_name}" do
   end
   
   describe '#in_any_role' do
-    it "should return first user matching role" do        
+    it "should return first user matching role" do
       if User.respond_to? :in_roles
-        User.in_any_role(:guest, :user).first.name.should == 'Guest user'      
+        User.in_any_role(:guest, :user).first.name.should == 'Guest user'
         User.in_any_role(:admin, :guest).should be_empty
       end
     end
@@ -318,4 +318,4 @@ describe "Roles for Active Record: #{api_name}" do
       end
     end        
   end 
-end
+end

data/spec/roles_active_record/strategy/user_setup.rb

@@ -1,20 +1,23 @@
 def default_user_setup
-  @empty_user = User.create(:name => 'Empty user')  
-  @empty_user.save     
-  
-  @guest_user = User.create(:name => 'Guest user')  
+  @empty_user = User.create(:name => 'Empty user')
+ #  @empty_user.add_role :user
+  @empty_user.save
+
+  @guest_user = User.create(:name => 'Guest user')
   @guest_user.add_roles :guest
-  @guest_user.save     
-  
+  @guest_user.save
+
   @normal_user = User.create(:name => 'Normal user')
   @normal_user.roles = :guest, :user
-  @normal_user.save  
-  
+  @normal_user.save
+
   @admin_user = User.create(:name => 'Admin user')
-  @admin_user.roles = :admin            
+  @admin_user.roles = :admin
   @admin_user.save
 
   @default_user = User.create(:name => 'def User')
+  @default_user.add_role :user
+
   @default_user.save
   # puts "Admin roles: #{@admin_user.roles_list}, #{@admin_user.inspect}, #{Role.all}"
 end

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@ require 'rspec'
 require 'rails'
 require 'active_record'
 require 'arel'
-require 'meta_where'
+# require 'meta_where'
 require 'yaml'
 require 'logger'
 require 'database_cleaner'
@@ -19,9 +19,9 @@ SPEC_DIR = File.dirname(__FILE__)
 
 path = SPEC_DIR + '/db/database.yml'
 dbfile = File.open(path)
-dbconfig = YAML::load(dbfile)  
+dbconfig = YAML::load(dbfile)
 ActiveRecord::Base.establish_connection(dbconfig)
-ActiveRecord::Base.logger = Logger.new(STDERR)
+#ActiveRecord::Base.logger = Logger.new(STDERR)
 
 # Attempts at trying to make database_cleaner accept another location for database.yml
 # ------------------------------------------------------------------------------------

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roles_active_record
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-17 00:00:00.000000000Z
+date: 2011-08-18 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2160638120 !ruby/object:Gem::Requirement
+  requirement: &2156459020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160638120
+  version_requirements: *2156459020
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2160637380 !ruby/object:Gem::Requirement
+  requirement: &2156458040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2160637380
+  version_requirements: *2156458040
 - !ruby/object:Gem::Dependency
   name: arel
-  requirement: &2160636680 !ruby/object:Gem::Requirement
+  requirement: &2156456460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,32 +43,21 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160636680
-- !ruby/object:Gem::Dependency
-  name: meta_where
-  requirement: &2160635280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: *2160635280
+  version_requirements: *2156456460
 - !ruby/object:Gem::Dependency
   name: sugar-high
-  requirement: &2160633100 !ruby/object:Gem::Requirement
+  requirement: &2156454320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *2160633100
+  version_requirements: *2156454320
 - !ruby/object:Gem::Dependency
   name: require_all
-  requirement: &2160625640 !ruby/object:Gem::Requirement
+  requirement: &2156442600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +65,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160625640
+  version_requirements: *2156442600
 - !ruby/object:Gem::Dependency
   name: roles_generic
-  requirement: &2160622440 !ruby/object:Gem::Requirement
+  requirement: &2156436340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +76,10 @@ dependencies:
         version: 0.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160622440
+  version_requirements: *2156436340
 - !ruby/object:Gem::Dependency
   name: rails_artifactor
-  requirement: &2160618640 !ruby/object:Gem::Requirement
+  requirement: &2156435000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +87,21 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *2160618640
+  version_requirements: *2156435000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160616920 !ruby/object:Gem::Requirement
+  requirement: &2156433700 !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: *2160616920
+  version_requirements: *2156433700
 - !ruby/object:Gem::Dependency
   name: generator-spec
-  requirement: &2160614940 !ruby/object:Gem::Requirement
+  requirement: &2156432420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +109,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *2160614940
+  version_requirements: *2156432420
 - !ruby/object:Gem::Dependency
   name: database_cleaner
-  requirement: &2160613260 !ruby/object:Gem::Requirement
+  requirement: &2156427860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +120,10 @@ dependencies:
         version: 0.6.7
   type: :development
   prerelease: false
-  version_requirements: *2160613260
+  version_requirements: *2156427860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2160612240 !ruby/object:Gem::Requirement
+  requirement: &2156419320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,21 +131,21 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2160612240
+  version_requirements: *2156419320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2160611620 !ruby/object:Gem::Requirement
+  requirement: &2156417160 !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: *2160611620
+  version_requirements: *2156417160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2160610960 !ruby/object:Gem::Requirement
+  requirement: &2156415140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +153,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160610960
+  version_requirements: *2156415140
 description: Makes it easy to set a role strategy on your User model in Active Record
 email: kmandrup@gmail.com
 executables: []
@@ -264,7 +253,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2048227676201246637
+      hash: 517076096296234959
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: