role_play 1.2.2 → 1.3.0

data/.gitignore

@@ -1,5 +1,6 @@
 pkg/*
 .rvmrc
+.DS_Store
 bin/
 tmp/
 Gemfile.lock

data/.travis.yml

@@ -1,7 +1,6 @@
 rvm:
-  - 1.9.2
   - 1.9.3
+  - 2.0.0
 gemfile:
-  - ci/Gemfile-3.0
-  - ci/Gemfile-3.1
   - ci/Gemfile-3.2
+  - ci/Gemfile-4.0

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 1.3.0 (2013.08.05)
+
+* Rails 4 support
+* removes support for Rails 3.0, Rails 3.1
+* removes support for Ruby 1.9.2
+
 == 1.2.2 (2013.03.08)
 
 * Use rdoc/task instead of obsolete rake/rdoctask

data/README.markdown

@@ -35,4 +35,6 @@ Now your model has these instance methods:
 Tested in Ruby 1.9 and Rails 3.x on Travis CI:
 <http://travis-ci.org/mintdigital/role_play>
 
+[![Build Status](https://travis-ci.org/mintdigital/role_play.png)](https://travis-ci.org/mintdigital/role_play)
+
 Copyright (c) 2008 Mint Digital, released under the MIT license

data/ci/Gemfile-3.2

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 gem 'sqlite3'
 gem 'rake', '>= 0.8.7'
 gem 'activerecord', '~> 3.2.0'

data/ci/Gemfile-4.0

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+gem 'sqlite3'
+gem 'rake', '>= 0.8.7'
+gem 'activerecord', '~> 4.0.0'
+gem 'railties', '~> 4.0.0'

data/lib/role_assignment.rb

@@ -2,5 +2,5 @@ class RoleAssignment < ActiveRecord::Base
   belongs_to :roleable, :polymorphic => true
   belongs_to :role
   validates_uniqueness_of :role_id, :scope => [:roleable_id, :roleable_type]
-  validates_presence_of :roleable, :roleable_type, :role
+  validates_presence_of :roleable, :role
 end

data/lib/role_play.rb

@@ -35,7 +35,7 @@ module RolePlay
   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.roles << Role.where(:name => rolename.to_s).first_or_create
   end
 
   def remove_role(name)

data/role_play.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.version = "1.2.2"
+  s.version = "1.3.0"
 
   s.name = 'role_play'
   s.summary = %q{Simple roles for ActiveRecord}
@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ["lib"]
   s.platform = Gem::Platform::RUBY
-  s.add_dependency('activerecord', '>= 3.0', '< 4.0')
-  s.add_dependency('railties', '>= 3.0', '< 4.0')
+  s.add_dependency('activerecord', '>= 3.0')
+  s.add_dependency('railties', '>= 3.0')
   s.add_development_dependency('rake', '>= 0.8.7')
   s.add_development_dependency('sqlite3')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: role_play
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000 Z
+date: 2013-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,9 +19,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,9 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -41,9 +35,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -52,9 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
-      - !ruby/object:Gem::Version
-        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -100,9 +88,8 @@ files:
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- ci/Gemfile-3.0
-- ci/Gemfile-3.1
 - ci/Gemfile-3.2
+- ci/Gemfile-4.0
 - install.rb
 - lib/generators/role_play_migration/USAGE
 - lib/generators/role_play_migration/role_play_migration_generator.rb
@@ -138,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple roles for ActiveRecord

data/ci/Gemfile-3.0

@@ -1,5 +0,0 @@
-source :rubygems
-gem 'sqlite3'
-gem 'rake', '>= 0.8.7'
-gem 'activerecord', '~> 3.0.0'
-gem 'railties', '~> 3.0.0'

data/ci/Gemfile-3.1

@@ -1,5 +0,0 @@
-source :rubygems
-gem 'sqlite3'
-gem 'rake', '>= 0.8.7'
-gem 'activerecord', '~> 3.1.0'
-gem 'railties', '~> 3.1.0'