acts_as_role 0.2.0 → 0.3.1

data/Gemfile

@@ -3,11 +3,11 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
-gem "rails", ">= 3.0.0"
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
+  gem "rails", "~> 3.1.0.rc4"
   gem "rspec-rails"
   gem "sqlite3"
   gem "bundler", "~> 1.0.0"

data/Gemfile.lock

@@ -107,7 +107,7 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.5.2)
-  rails (>= 3.0.0)
+  rails (~> 3.1.0.rc4)
   rcov
   rspec-rails
   sqlite3

data/README.rdoc

@@ -9,7 +9,7 @@ This is a minimalist implementation of roles using a database column to store th
 Use role field to store the user roles. 
 
   user = User.new
-  user.role = "user"
+  user.role => "user"
   user.has_role?(:user) => true 
 
 Test roles using has_#{role_column.singularize}? or has_#{role_column.pluralize}? 
@@ -19,7 +19,7 @@ Test roles using has_#{role_column.singularize}? or has_#{role_column.pluralize}
   user.add_roles :owner
   user.has_roles?(:user, :owner) => true
 
-Roles are stores using text
+Roles are stored using plain text
 
   user.roles => "user_owner"
 
@@ -27,7 +27,7 @@ Roles are stores using text
   user.has_role?(:user) => false
   user.roles => "owner"
 
-Validation - internally there is a roles validator
+Validation - internally there is a roles validator, you can add a :message to customize the validation message
 
   user.add_roles :not_specified
   user.valid? => false
@@ -40,7 +40,7 @@ You can use a different field with different syntax
   end
 
   access = Access.new
-  access.flag => nil
+  access.flag => "" (no default role specified)
   access.add_flags(:owner)
   access.has_flag?(:owner) => true
   access.add_flags(:manager)
@@ -50,7 +50,20 @@ You can use a different field with different syntax
   access.valid? => false
   access.errors[:flag] => "invalid role"
 
-== Contributing to has_roles
+Also you can use is_role to query a custom role
+
+  user = User.new
+  user.is_user? => true
+  user.is_admin? => false
+
+  access = Access.new
+  access.is_owner? => false
+  access.is_manager? => false
+  access.add_roles :manager
+  access.is_manager? => true
+
+
+== Contributing to acts_as_roles
  
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.1

data/acts_as_role.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{acts_as_role}
-  s.version = "0.2.0"
+  s.version = "0.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Carlos Segura"]
-  s.date = %q{2011-07-25}
+  s.date = %q{2011-07-26}
   s.description = %q{Use a field to store plain-text roles and manage them easily}
   s.email = %q{csegura@ideseg.com}
   s.extra_rdoc_files = [
@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "acts_as_role.gemspec",
+    "lib/active_model/validations/roles_validator.rb",
     "lib/acts_as_role.rb",
-    "lib/roles_validator.rb",
     "spec/access_spec.rb",
     "spec/models/access.rb",
     "spec/models/user.rb",
@@ -53,14 +53,14 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_development_dependency(%q<rails>, ["~> 3.1.0.rc4"])
       s.add_development_dependency(%q<rspec-rails>, [">= 0"])
       s.add_development_dependency(%q<sqlite3>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, [">= 3.0.0"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0.rc4"])
       s.add_dependency(%q<rspec-rails>, [">= 0"])
       s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
@@ -68,7 +68,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0.rc4"])
     s.add_dependency(%q<rspec-rails>, [">= 0"])
     s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])

data/lib/active_model/validations/roles_validator.rb

@@ -0,0 +1,23 @@
+require 'active_model/validations'
+
+module ActiveModel
+  module Validations
+    extend ActiveSupport::Autoload
+    
+    autoload 'RolesValidator'
+    
+    class RolesValidator < ActiveModel::EachValidator 
+      def initialize(options)
+        @roles = options[:roles]
+        super 
+      end
+      def validate_each(record, attribute, value) 
+        unless value.split("_").all? {|x| @roles.include?(x) }
+          record.errors[attribute] << (options[:message] || "contains an invalid role")
+        end
+      end
+    end
+  end
+  module HelperMethods
+  end
+end

data/lib/acts_as_role.rb

@@ -1,3 +1,5 @@
+require 'active_model/validations/roles_validator'
+
 module ActsAsRole
 
   module Role

data/spec/access_spec.rb

@@ -7,6 +7,7 @@ describe Access do
     end
     it "should have default role :Access" do
       @access.flag.should be_empty
+      @access.flag.should_not be_nil
     end
   end
   

data/spec/spec_helper.rb

@@ -7,7 +7,6 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rspec'
 require 'rails/all'
 require 'acts_as_role'
-require 'roles_validator'
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.

metadata

@@ -2,7 +2,7 @@
 name: acts_as_role
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Carlos Segura
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-25 00:00:00 +02:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -18,10 +18,10 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.0.0
-  type: :runtime
+        version: 3.1.0.rc4
+  type: :development
   prerelease: false
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -98,8 +98,8 @@ files:
 - Rakefile
 - VERSION
 - acts_as_role.gemspec
+- lib/active_model/validations/roles_validator.rb
 - lib/acts_as_role.rb
-- lib/roles_validator.rb
 - spec/access_spec.rb
 - spec/models/access.rb
 - spec/models/user.rb
@@ -120,7 +120,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3469102273411357801
+      hash: 1760841836674811335
       segments: 
       - 0
       version: "0"

data/lib/roles_validator.rb

@@ -1,12 +0,0 @@
-
-class RolesValidator < ActiveModel::EachValidator 
-  def initialize(options)
-    @roles = options[:roles]
-    super 
-  end
-  def validate_each(record, attribute, value) 
-    unless value.split("_").all? {|x| @roles.include?(x) }
-      record.errors[attribute] << (options[:message] || "contains an invalid role")
-    end
-  end
-end