role_play 1.2.0 → 1.2.1

data/CHANGELOG

@@ -1,4 +1,9 @@
-== 1.2.0
+== 1.2.1 (2012.02.01)
+
+* Remove use of ActiveSupport::Concern.
+* Correct has_role? behavior after add_role on an invalid object.
+
+== 1.2.0 (2011.01.27)
 
 * Use class_attribute to provide Rails 3.1+ support.
 

data/lib/role_play.rb

@@ -1,9 +1,10 @@
 require 'role'
 require 'role_assignment'
-require 'active_support/concern'
 
 module RolePlay
-  extend ActiveSupport::Concern
+  def self.included(base)
+    base.extend ClassMethods
+  end
 
   module ClassMethods
     def has_roles(*roles)
@@ -23,32 +24,28 @@ module RolePlay
     end
   end
 
-  module InstanceMethods
-    def can_have_role?(role_name)
-      available_roles.include?(role_name)
-    end
-
-    def has_role?(rolename)
-      !self.roles.find_by_name(rolename.to_s).nil?
-    end
+  def can_have_role?(role_name)
+    available_roles.include?(role_name)
+  end
 
-    def add_role rolename
-      return false unless can_have_role?(rolename)
-      return true if has_role?(rolename)
-      self.roles << Role.find_or_create_by_name(rolename.to_s)
-      self.save
-    end
+  def has_role?(rolename)
+    self.roles.map(&:name).include?(rolename.to_s)
+  end
 
-    def remove_role name
-      return true if !has_role?(name)
-      role_assignment = self.role_assignments.detect { |x| x.role.name == name.to_s }
-      role_assignment.destroy if role_assignment
-    end
+  def add_role(rolename)
+    return false unless can_have_role?(rolename)
+    return true if has_role?(rolename)
+    self.roles << Role.find_or_create_by_name(rolename.to_s)
+  end
 
-    def clear_roles
-      role_assignments.clear
-    end
+  def remove_role(name)
+    return true if !has_role?(name)
+    role = self.roles.detect { |r| r.name == name.to_s }
+    self.roles.delete(role) if role
+  end
 
+  def clear_roles
+    role_assignments.clear
   end
 end
 

data/role_play.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.name = 'role_play'
   s.summary = %q{Simple roles for ActiveRecord}

data/test/invalid_record_role_play_test.rb

@@ -0,0 +1,58 @@
+require 'test_helper'
+
+class ValidatedRoleable < ActiveRecord::Base
+  has_roles :sample_role_1, :sample_role_2
+
+  validates :test_attr, :presence => true
+end
+
+class InvalidRecordRolePlayTest < ActiveSupport::TestCase
+  def setup
+    @record = ValidatedRoleable.new
+    assert !@record.valid?, "Precondition: record not valid"
+  end
+
+  def teardown
+    [Role, RoleAssignment, ValidatedRoleable].each {|klass| klass.delete_all }
+  end
+
+  def test_should_add_role_to_new_record
+    assert_difference "@record.roles.size", 1 do
+      @record.add_role(:sample_role_1)
+    end
+  end
+
+  # test that role? works on new records
+  def test_should_know_state_of_role_on_new_record
+    assert !@record.sample_role_1?, "Precondition: ? method is false"
+    @record.add_role(:sample_role_1)
+    assert @record.sample_role_1?, "? method should be correct now"
+  end
+
+  def test_should_save_association_when_saving_new_record
+    @record.add_role(:sample_role_1)
+    assert_equal 0, RoleAssignment.count, "nothing saved to DB yet"
+
+    @record.test_attr = 'foo'
+    assert @record.save, "save should succeed now"
+    assert_equal 1, RoleAssignment.count, "role assignment should save to DB"
+  end
+
+  def test_should_autosave_when_record_not_new_and_valid
+    @record.test_attr = 'foo'
+    assert @record.save, 'Precondition: record valid & saved'
+    assert_difference "RoleAssignment.count", 1 do
+      @record.add_role(:sample_role_1)
+    end
+  end
+
+  def test_should_autosave_when_record_not_new_and_ivalid
+    @record.test_attr = 'foo'
+    assert @record.save, 'Precondition: record valid'
+    @record.test_attr = nil
+    assert !@record.valid?, 'Precondition: back to an invalid state'
+    assert_difference "RoleAssignment.count", 1 do
+      @record.add_role(:sample_role_1)
+    end
+  end
+end

data/test/role_play_test.rb

@@ -140,7 +140,7 @@ class RolePlayTest < ActiveSupport::TestCase
       @roleable_sample.invalid_role?
     }
   end
-  
+
   def test_should_clear_roles
     @roleable_sample.add_role(:sample_role_1)
     assert_difference "RoleAssignment.count", -1 do

data/test/test_helper.rb

@@ -2,6 +2,7 @@
 #require 'rails/generators/test_case'
 require 'test/unit'
 require 'rubygems'
+require 'active_support/core_ext'
 require 'active_record'
 
 ENV['RAILS_ENV'] = 'test'
@@ -19,6 +20,10 @@ ActiveRecord::Schema.define(:version => 1) do
   create_table :roleable_samples do |t|
   end
 
+  create_table :validated_roleables do |t|
+    t.string :test_attr
+  end
+
   create_table :roles do |t|
     t.string :name
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: role_play
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70301719859880 !ruby/object:Gem::Requirement
+  requirement: &70267020196080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301719859880
+  version_requirements: *70267020196080
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70301719858760 !ruby/object:Gem::Requirement
+  requirement: &70267020195240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -38,10 +38,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70301719858760
+  version_requirements: *70267020195240
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70301719857620 !ruby/object:Gem::Requirement
+  requirement: &70267020194220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -49,10 +49,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70301719857620
+  version_requirements: *70267020194220
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70301719857080 !ruby/object:Gem::Requirement
+  requirement: &70267020193700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -60,7 +60,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301719857080
+  version_requirements: *70267020193700
 description: Rails 3-ified version of the beloved plugin
 email: hello@mintdigital.com
 executables: []
@@ -87,6 +87,7 @@ files:
 - rails/init.rb
 - role_play.gemspec
 - tasks/has_roles_tasks.rake
+- test/invalid_record_role_play_test.rb
 - test/migration_generator_test.rb
 - test/role_play_test.rb
 - test/test_helper.rb