role_play 1.0.1 → 1.1.2

data/.gitignore

@@ -1 +1,2 @@
-pkg/*
+pkg/*
+.rvmrc

data/{README → README.markdown}

@@ -1,11 +1,11 @@
 Install
 =======
+  
+    From gemcutter
+    $ gem install role_play
 
-    $ gem source -a http://gems.github.com/
-    $ sudo gem install mintdigital-has_roles
-
-    # environment.rb
-    config.gem 'mintdigital-has_roles', :lib => 'has_roles'
+    # or in your Gemfile
+    gem 'role_play'
 
 Example
 =======
@@ -16,7 +16,7 @@ In an ActiveRecord class:
 
 Then run:
 
-    ./script/generate has_roles && rake db:migrate
+    rails generate role_play_migration && rake db:migrate
 
 Now your model has these instance methods:
 
@@ -32,4 +32,6 @@ Now your model has these instance methods:
 
 ---
 
+Tested in Ruby 1.9.2 and Rails 3.0.3
+
 Copyright (c) 2008 Krzysztof Zylawy, released under the MIT license

data/Rakefile

@@ -1,44 +1,17 @@
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
-require File.join(File.dirname(__FILE__), %w[lib/role_play])
-
-# begin
-#   require 'echoe'
-#   Echoe.new('has_roles') do |a|
-#     a.version = HasRoles::Version::STRING
-#     a.summary = "Simple roles for ActiveRecord"
-#     a.author = "Krzysztof Zylawy"
-#     a.email = "krzysztof@mintdigital.com"
-#     a.runtime_dependencies = ['activerecord']
-#     a.development_dependencies = ['echoe']
-#     a.has_rdoc = false
-#     a.retain_gemspec = true
-#   end
-# rescue LoadError
-#   puts "Install 'echoe' if you want gem building-ness."
-# end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |s|
-    s.name = "role_play"
-    s.summary = "Simple roles for ActiveRecord"
-    s.email = "philnash@gmail.com"
-    s.homepage = "http://github.com/mintdigital/has_roles"
-    s.authors = ["Krzysztof Zylawy", "Mint Digital"]
-    s.add_dependency 'activerecord'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler, or one of its dependencies, is not available. Install it with: sudo gem install jeweler"
-end
 
+desc 'Default: run unit tests.'
+task :default => :test
 
 desc 'Default: Run Tests'
 Rake::TestTask.new do |t|
   t.warning = true
   t.pattern = 'test/**/*_test.rb'
+  t.libs << 'test'
+  t.libs << 'lib'
+  t.verbose = true
 end
 
 desc 'Generate documentation for the role_play plugin.'
@@ -49,3 +22,4 @@ Rake::RDocTask.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('README')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+

data/lib/generators/role_play_migration/role_play_migration_generator.rb

@@ -0,0 +1,12 @@
+class RolePlayMigrationGenerator < Rails::Generators::Base
+  include Rails::Generators::Migration
+  source_root File.expand_path("../templates", __FILE__)
+  
+  def self.next_migration_number(path)
+    Time.now.utc.strftime("%Y%m%d%H%M%S")
+  end
+  
+  def create_model_file
+    migration_template "migration.rb", "db/migrate/create_roles.rb"
+  end
+end

data/lib/role_play.rb

@@ -1,35 +1,29 @@
-module RolePlay
+require 'role'
+require 'role_assignment'
+require 'active_support/concern'
 
-  def self.included(base)
-    base.extend HasMethods
-  end
+module RolePlay
+  extend ActiveSupport::Concern
 
-  module HasMethods
+  module ClassMethods
     def has_roles(*roles)
       roles.flatten!
       write_inheritable_attribute(:available_roles, roles)
       class_inheritable_reader :available_roles
 
-      unless included_modules.include? InstanceMethods
-        has_many :role_assignments, :as => :roleable, :dependent => :destroy
-        has_many :roles, :through => :role_assignments
-
-        extend ClassMethods
-        include InstanceMethods
-        available_roles.each do |role|
-          self.class_eval do
-            define_method "#{role}?".to_sym do
-              has_role?(role)
-            end
+      has_many :role_assignments, :as => :roleable, :dependent => :destroy
+      has_many :roles, :through => :role_assignments
+
+      available_roles.each do |role|
+        self.class_eval do
+          define_method "#{role}?".to_sym do
+            has_role?(role)
           end
         end
       end
     end
   end
 
-  module ClassMethods
-  end
-
   module InstanceMethods
     def can_have_role?(role_name)
       available_roles.include?(role_name)
@@ -55,6 +49,8 @@ module RolePlay
     def clear_roles
       role_assignments.clear
     end
-    
+
   end
 end
+
+ActiveRecord::Base.send(:include, RolePlay) if defined?(ActiveRecord)

data/rails/init.rb

@@ -1,4 +1 @@
-require File.join(File.dirname(__FILE__), %w[.. lib role_play])
-
-ActiveRecord::Base.send(:include, RolePlay)
-
+require 'role_play'

data/role_play.gemspec

@@ -1,63 +1,17 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{role_play}
-  s.version = "1.0.1"
+  s.version = "1.1.2"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.name = 'role_play'
+  s.summary = %q{Simple roles for ActiveRecord}
+  s.description = 'Rails 3-ified version of the beloved plugin'
   s.authors = ["Krzysztof Zylawy", "Mint Digital"]
-  s.date = %q{2009-12-04}
-  s.email = %q{philnash@gmail.com}
-  s.extra_rdoc_files = [
-    "README"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "Manifest",
-     "README",
-     "Rakefile",
-     "VERSION",
-     "generators/role_play/USAGE",
-     "generators/role_play/role_play_generator.rb",
-     "generators/role_play/templates/migration.rb",
-     "install.rb",
-     "lib/role.rb",
-     "lib/role_assignment.rb",
-     "lib/role_play.rb",
-     "rails/init.rb",
-     "role_play.gemspec",
-     "tasks/has_roles_tasks.rake",
-     "test/assertions.rb",
-     "test/role_play_test.rb",
-     "test/test_helper.rb",
-     "uninstall.rb"
-  ]
-  s.homepage = %q{http://github.com/mintdigital/has_roles}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.email = 'hello@mintdigital.com'
+  s.homepage = %q{https://github.com/mintdigital/role_play}
+  s.files = `git ls-files`.split("\n")
+  s.test_files = `git ls-files -- {test}/*`.split("\n")
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Simple roles for ActiveRecord}
-  s.test_files = [
-    "test/assertions.rb",
-     "test/role_play_test.rb",
-     "test/test_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, [">= 0"])
-    else
-      s.add_dependency(%q<activerecord>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, [">= 0"])
-  end
+  s.platform = Gem::Platform::RUBY
+  s.add_dependency('activerecord', '3.0.3')
 end
-

data/test/migration_generator_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+require 'generators/role_play_migration/role_play_migration_generator'
+
+class MigrationGeneratorTest < Rails::Generators::TestCase
+  tests RolePlayMigrationGenerator
+  destination File.expand_path("../tmp", File.dirname(__FILE__))
+  setup :prepare_destination
+
+  test "migration file is created" do
+    run_generator
+    assert_migration "db/migrate/create_roles.rb" do |mig|
+      assert_class_method :up, mig do |upmeth|
+        assert_match(/create_table/, upmeth)
+      end
+      assert_class_method :down, mig do |downmeth|
+        assert_match(/drop_table/, downmeth)
+      end
+    end
+  end
+end

data/test/role_play_test.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), 'test_helper')
+require 'test_helper'
 
 class RoleableSample < ActiveRecord::Base
   has_roles [:sample_role_1, :sample_role_2]
@@ -8,7 +8,7 @@ class AnotherRoleable < ActiveRecord::Base
   has_roles :another1, :another2
 end
 
-class RolePlayTest < Test::Unit::TestCase
+class RolePlayTest < ActiveSupport::TestCase
 
   def setup
     @roleable_sample = RoleableSample.create

data/test/test_helper.rb

@@ -1,14 +1,16 @@
+#require 'rails/generators'
+#require 'rails/generators/test_case'
 require 'test/unit'
 require 'rubygems'
 require 'active_record'
-require File.join(File.dirname(__FILE__), 'assertions')
+
+ENV['RAILS_ENV'] = 'test'
+
+require 'rails/generators/test_case'
 require File.join(File.dirname(__FILE__), %w[.. rails init.rb])
-$LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'role'
 require 'role_assignment'
 
-Test::Unit::TestCase.send :include, ActiveSupport::Testing::Assertions
-
 ActiveRecord::Base.establish_connection(
   :adapter => 'sqlite3', :database => ':memory:'
 )

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: role_play
 version: !ruby/object:Gem::Version 
-  version: 1.0.1
+  prerelease: false
+  segments: 
+  - 1
+  - 1
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Krzysztof Zylawy
@@ -10,77 +15,82 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-04 00:00:00 +00:00
+date: 2011-01-31 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - "="
       - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
-description: 
-email: philnash@gmail.com
+        segments: 
+        - 3
+        - 0
+        - 3
+        version: 3.0.3
+  type: :runtime
+  version_requirements: *id001
+description: Rails 3-ified version of the beloved plugin
+email: hello@mintdigital.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README
+extra_rdoc_files: []
+
 files: 
 - .gitignore
 - MIT-LICENSE
-- Manifest
-- README
+- README.markdown
 - Rakefile
-- VERSION
-- generators/role_play/USAGE
-- generators/role_play/role_play_generator.rb
-- generators/role_play/templates/migration.rb
 - install.rb
+- lib/generators/role_play_migration/USAGE
+- lib/generators/role_play_migration/role_play_migration_generator.rb
+- lib/generators/role_play_migration/templates/migration.rb
 - lib/role.rb
 - lib/role_assignment.rb
 - lib/role_play.rb
 - rails/init.rb
 - role_play.gemspec
 - tasks/has_roles_tasks.rake
-- test/assertions.rb
+- test/migration_generator_test.rb
 - test/role_play_test.rb
 - test/test_helper.rb
 - uninstall.rb
 has_rdoc: true
-homepage: http://github.com/mintdigital/has_roles
+homepage: https://github.com/mintdigital/role_play
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Simple roles for ActiveRecord
-test_files: 
-- test/assertions.rb
-- test/role_play_test.rb
-- test/test_helper.rb
+test_files: []
+

data/Manifest

@@ -1,18 +0,0 @@
-generators/has_roles/has_roles_generator.rb
-generators/has_roles/templates/migration.rb
-generators/has_roles/USAGE
-has_roles.gemspec
-install.rb
-lib/has_roles.rb
-lib/role.rb
-lib/role_assignment.rb
-Manifest
-MIT-LICENSE
-rails/init.rb
-Rakefile
-README
-tasks/has_roles_tasks.rake
-test/assertions.rb
-test/has_roles_test.rb
-test/test_helper.rb
-uninstall.rb

data/VERSION

@@ -1 +0,0 @@
-1.0.1

data/generators/role_play/role_play_generator.rb

@@ -1,10 +0,0 @@
-class RolePlayGenerator < Rails::Generator::Base
-  def manifest
-    recorded_session = record do |m|
-      unless options[:skip_migration]
-        m.migration_template "migration.rb", "db/migrate",
-          :migration_file_name => 'create_roles'
-      end
-    end
-  end
-end

data/test/assertions.rb

@@ -1,82 +0,0 @@
-# Copyright (c) 2005-2009 David Heinemeier Hansson
-# 
-# Permission is hereby granted, free of charge, to any person obtaining
-# a copy of this software and associated documentation files (the
-# "Software"), to deal in the Software without restriction, including
-# without limitation the rights to use, copy, modify, merge, publish,
-# distribute, sublicense, and/or sell copies of the Software, and to
-# permit persons to whom the Software is furnished to do so, subject to
-# the following conditions:
-# 
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-# 
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-module ActiveSupport
-  module Testing
-    module Assertions
-      # Test numeric difference between the return value of an expression as a result of what is evaluated
-      # in the yielded block.
-      #
-      #   assert_difference 'Article.count' do
-      #     post :create, :article => {...}
-      #   end
-      #
-      # An arbitrary expression is passed in and evaluated.
-      #
-      #   assert_difference 'assigns(:article).comments(:reload).size' do
-      #     post :create, :comment => {...}
-      #   end
-      #
-      # An arbitrary positive or negative difference can be specified. The default is +1.
-      #
-      #   assert_difference 'Article.count', -1 do
-      #     post :delete, :id => ...
-      #   end
-      #
-      # An array of expressions can also be passed in and evaluated.
-      #
-      #   assert_difference [ 'Article.count', 'Post.count' ], +2 do
-      #     post :create, :article => {...}
-      #   end
-      #
-      # A error message can be specified.
-      #
-      #   assert_difference 'Article.count', -1, "An Article should be destroyed" do
-      #     post :delete, :id => ...
-      #   end
-      def assert_difference(expressions, difference = 1, message = nil, &block)
-        expression_evaluations = Array(expressions).collect{ |expression| lambda { eval(expression, block.send(:binding)) } }
-
-        original_values = expression_evaluations.inject([]) { |memo, expression| memo << expression.call }
-        yield
-        expression_evaluations.each_with_index do |expression, i|
-          assert_equal original_values[i] + difference, expression.call, message
-        end
-      end
-
-      # Assertion that the numeric result of evaluating an expression is not changed before and after
-      # invoking the passed in block.
-      #
-      #   assert_no_difference 'Article.count' do
-      #     post :create, :article => invalid_attributes
-      #   end
-      #
-      # A error message can be specified.
-      #
-      #   assert_no_difference 'Article.count', "An Article should not be destroyed" do
-      #     post :create, :article => invalid_attributes
-      #   end
-      def assert_no_difference(expressions, message = nil, &block)
-        assert_difference expressions, 0, message, &block
-      end
-    end
-  end
-end