easy_roles 1.1.0 → 1.2.0

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/Gemfile.lock

@@ -0,0 +1,41 @@
+PATH
+  remote: .
+  specs:
+    easy_roles (1.2.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activemodel (3.0.10)
+      activesupport (= 3.0.10)
+      builder (~> 2.1.2)
+      i18n (~> 0.5.0)
+    activerecord (3.0.10)
+      activemodel (= 3.0.10)
+      activesupport (= 3.0.10)
+      arel (~> 2.0.10)
+      tzinfo (~> 0.3.23)
+    activesupport (3.0.10)
+    arel (2.0.10)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    i18n (0.5.0)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    sqlite3 (1.3.4)
+    tzinfo (0.3.29)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord
+  easy_roles!
+  rspec
+  sqlite3

data/Manifest

@@ -1,15 +1,16 @@
 CHANGELOG.rdoc
+Gemfile
+Gemfile.lock
 README.rdoc
 Rakefile
 easy_roles.gemspec
-generators/easy_bitmask_roles/USAGE
-generators/easy_bitmask_roles/easy_bitmask_roles_generator.rb
-generators/easy_bitmask_roles/templates/migration.rb
-generators/easy_roles/USAGE
-generators/easy_roles/easy_roles_generator.rb
-generators/easy_roles/templates/migration.rb
 init.rb
 lib/easy_roles.rb
+lib/generators/active_record/easy_roles_generator.rb
+lib/generators/active_record/templates/migration_bitmask.rb
+lib/generators/active_record/templates/migration_non_bitmask.rb
+lib/generators/easy_roles/easy_roles_generator.rb
+lib/generators/templates/README
 spec/easy_roles_spec.rb
 spec/spec_helper.rb
 Manifest

data/Rakefile

@@ -2,11 +2,11 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('easy_roles', '1.1.0') do |p|
+Echoe.new('easy_roles', '1.2.0') do |p|
   p.description    = "Easy role authorization in rails"
   p.url            = "http://github.com/platform45/easy_roles"
   p.author         = "Platform45"
   p.email          = "ryan@platform45.com"
   p.ignore_pattern = ["tmp/*", "script/*"]
-  p.development_dependencies = ["rspec", "active_record", "sqlite3-ruby"]
+  p.development_dependencies = ["rspec", "activerecord", "sqlite3"]
 end

data/easy_roles.gemspec

@@ -2,38 +2,37 @@
 
 Gem::Specification.new do |s|
   s.name = %q{easy_roles}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Platform45"]
-  s.date = %q{2010-09-06}
+  s.authors = [%q{Platform45}]
+  s.date = %q{2011-08-18}
   s.description = %q{Easy role authorization in rails}
   s.email = %q{ryan@platform45.com}
-  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "lib/easy_roles.rb"]
-  s.files = ["CHANGELOG.rdoc", "README.rdoc", "Rakefile", "easy_roles.gemspec", "generators/easy_bitmask_roles/USAGE", "generators/easy_bitmask_roles/easy_bitmask_roles_generator.rb", "generators/easy_bitmask_roles/templates/migration.rb", "generators/easy_roles/USAGE", "generators/easy_roles/easy_roles_generator.rb", "generators/easy_roles/templates/migration.rb", "init.rb", "lib/easy_roles.rb", "spec/easy_roles_spec.rb", "spec/spec_helper.rb", "Manifest"]
+  s.extra_rdoc_files = [%q{CHANGELOG.rdoc}, %q{README.rdoc}, %q{lib/easy_roles.rb}, %q{lib/generators/active_record/easy_roles_generator.rb}, %q{lib/generators/active_record/templates/migration_bitmask.rb}, %q{lib/generators/active_record/templates/migration_non_bitmask.rb}, %q{lib/generators/easy_roles/easy_roles_generator.rb}, %q{lib/generators/templates/README}]
+  s.files = [%q{CHANGELOG.rdoc}, %q{Gemfile}, %q{Gemfile.lock}, %q{README.rdoc}, %q{Rakefile}, %q{easy_roles.gemspec}, %q{init.rb}, %q{lib/easy_roles.rb}, %q{lib/generators/active_record/easy_roles_generator.rb}, %q{lib/generators/active_record/templates/migration_bitmask.rb}, %q{lib/generators/active_record/templates/migration_non_bitmask.rb}, %q{lib/generators/easy_roles/easy_roles_generator.rb}, %q{lib/generators/templates/README}, %q{spec/easy_roles_spec.rb}, %q{spec/spec_helper.rb}, %q{Manifest}]
   s.homepage = %q{http://github.com/platform45/easy_roles}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Easy_roles", "--main", "README.rdoc"]
-  s.require_paths = ["lib"]
+  s.rdoc_options = [%q{--line-numbers}, %q{--inline-source}, %q{--title}, %q{Easy_roles}, %q{--main}, %q{README.rdoc}]
+  s.require_paths = [%q{lib}]
   s.rubyforge_project = %q{easy_roles}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.8.8}
   s.summary = %q{Easy role authorization in rails}
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 0"])
-      s.add_development_dependency(%q<active_record>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_development_dependency(%q<activerecord>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, [">= 0"])
     else
       s.add_dependency(%q<rspec>, [">= 0"])
-      s.add_dependency(%q<active_record>, [">= 0"])
-      s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+      s.add_dependency(%q<activerecord>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, [">= 0"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 0"])
-    s.add_dependency(%q<active_record>, [">= 0"])
-    s.add_dependency(%q<sqlite3-ruby>, [">= 0"])
+    s.add_dependency(%q<activerecord>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, [">= 0"])
   end
 end

data/lib/easy_roles.rb

@@ -12,8 +12,11 @@ module EasyRoles
       
       if options[:method] == :serialize
         serialize name.to_sym, Array
-        respond_to?(:before_validation_on_create) ? before_validation_on_create(:make_default_roles) : before_validation(:make_default_roles, :on => :create)
-      
+        
+        ActiveSupport::Deprecation.silence do
+          respond_to?(:before_validation_on_create) ? before_validation_on_create(:make_default_roles) : before_validation(:make_default_roles, :on => :create)
+        end
+        
         class_eval <<-EOC
           def has_role?(role)
             #{name}.include?(role)

data/lib/generators/active_record/easy_roles_generator.rb

@@ -0,0 +1,26 @@
+require 'rails/generators/active_record'
+
+module ActiveRecord
+  module Generators
+    class EasyRolesGenerator < ActiveRecord::Generators::Base
+
+      argument :role_col, :type => :string, :required => false, :default => "roles", :banner => "role column"
+
+      class_option :use_bitmask_method, :type => :boolean, :required => false, :default => false, 
+        :desc => "Setup migration for Bitmask method"
+
+      desc "Internal use by easy_roles generator - use that instead"
+
+      source_root File.expand_path("../templates", __FILE__)
+
+      def copy_easy_roles_migration
+        if options.use_bitmask_method
+          migration_template "migration_bitmask.rb", "db/migrate/add_bitmask_roles_to_#{table_name}"
+        else
+          migration_template "migration_non_bitmask.rb", "db/migrate/add_easy_roles_to_#{table_name}"
+        end
+      end
+
+    end
+  end
+end

data/lib/generators/active_record/templates/migration_bitmask.rb

@@ -0,0 +1,9 @@
+class AddBitmaskRolesTo<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    add_column :<%= table_name %>, :<%= self.role_col %>, :integer, :default => 0
+  end
+
+  def self.down
+    remove_column :<%= table_name.to_sym %>, :<%= self.role_col %>
+  end
+end

data/lib/generators/active_record/templates/migration_non_bitmask.rb

@@ -0,0 +1,9 @@
+class AddEasyRolesTo<%= table_name.camelize %> < ActiveRecord::Migration
+  def self.up
+    add_column :<%= table_name %>, :<%= self.role_col %>, :string, :default => "--- []"
+  end
+
+  def self.down
+    remove_column :<%= table_name.to_sym %>, :<%= self.role_col %>
+  end
+end

data/lib/generators/easy_roles/easy_roles_generator.rb

@@ -0,0 +1,23 @@
+module EasyRoles
+  module Generators
+    class EasyRolesGenerator < Rails::Generators::NamedBase
+      namespace "easy_roles"
+
+      argument :role_col, :type => :string, :required => false, :default => "roles", :banner => "role column"
+
+      class_option :use_bitmask_method, :type => :boolean, :required => false, :default => false, 
+        :desc => "Setup migration for Bitmask method"
+
+      desc "Create ActiveRecord migration for easy_roles on NAME model using [ROLE] column -- defaults to 'roles'"
+
+      source_root File.expand_path('../../templates', __FILE__)
+
+      hook_for :orm
+
+      def show_readme
+        readme "README" if behavior == :invoke
+      end
+
+    end
+  end
+end

data/lib/generators/templates/README

@@ -0,0 +1,9 @@
+
+
+===============================================
+
+           Now run rake db:migrate 
+
+===============================================
+
+

data/spec/spec_helper.rb

@@ -4,11 +4,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'active_record'
 require 'easy_roles'
 
-require 'spec'
-require 'spec/autorun'
-
-
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 end
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")

metadata

@@ -1,130 +1,107 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: easy_roles
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 0
-  version: 1.1.0
+version: !ruby/object:Gem::Version
+  version: 1.2.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Platform45
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-06 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153550700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: active_record
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153550700
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &2153550220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153550220
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &2153549740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *2153549740
 description: Easy role authorization in rails
 email: ryan@platform45.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.rdoc
 - lib/easy_roles.rb
-files: 
+- lib/generators/active_record/easy_roles_generator.rb
+- lib/generators/active_record/templates/migration_bitmask.rb
+- lib/generators/active_record/templates/migration_non_bitmask.rb
+- lib/generators/easy_roles/easy_roles_generator.rb
+- lib/generators/templates/README
+files:
 - CHANGELOG.rdoc
+- Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - easy_roles.gemspec
-- generators/easy_bitmask_roles/USAGE
-- generators/easy_bitmask_roles/easy_bitmask_roles_generator.rb
-- generators/easy_bitmask_roles/templates/migration.rb
-- generators/easy_roles/USAGE
-- generators/easy_roles/easy_roles_generator.rb
-- generators/easy_roles/templates/migration.rb
 - init.rb
 - lib/easy_roles.rb
+- lib/generators/active_record/easy_roles_generator.rb
+- lib/generators/active_record/templates/migration_bitmask.rb
+- lib/generators/active_record/templates/migration_non_bitmask.rb
+- lib/generators/easy_roles/easy_roles_generator.rb
+- lib/generators/templates/README
 - spec/easy_roles_spec.rb
 - spec/spec_helper.rb
 - Manifest
-has_rdoc: true
 homepage: http://github.com/platform45/easy_roles
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --line-numbers
 - --inline-source
 - --title
 - Easy_roles
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 11
-      segments: 
-      - 1
-      - 2
-      version: "1.2"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '1.2'
 requirements: []
-
 rubyforge_project: easy_roles
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Easy role authorization in rails
 test_files: []
-

data/generators/easy_bitmask_roles/USAGE

@@ -1,11 +0,0 @@
-NAME
-    easy_bitmask_roles - generates migration for your bitmask roles authorization column
-     
-USAGE
-    ./script/generate easy_bitmask_roles Model Column_Name
-            
-EXAMPLE
-    ./script/generate easy_bitmask_roles user roles_mask
-
-MORE INFO
-	http://github.com/platform45/easy_roles

data/generators/easy_bitmask_roles/easy_bitmask_roles_generator.rb

@@ -1,8 +0,0 @@
-class EasyBitmaskRolesGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      m.class_collisions class_name
-      m.migration_template 'migration.rb', "db/migrate", :migration_file_name => "add_bitmask_roles_to_#{table_name}"
-    end
-  end
-end

data/generators/easy_bitmask_roles/templates/migration.rb

@@ -1,9 +0,0 @@
-class AddBitmaskRolesTo<%= class_name.pluralize %> < ActiveRecord::Migration
-  def self.up
-    add_column :<%= table_name %>, :<%= args.first %>, :integer, :default => 0
-  end
-
-  def self.down
-    remove_column :<%= table_name.to_sym %>, :<%= args.first.to_sym %>
-  end
-end

data/generators/easy_roles/USAGE

@@ -1,11 +0,0 @@
-NAME
-    easy_roles - generates migration for your roles authorization column
-     
-USAGE
-    ./script/generate easy_roles Model Column_Name
-            
-EXAMPLE
-    ./script/generate easy_roles user roles
-
-MORE INFO
-	http://github.com/platform45/easy_roles

data/generators/easy_roles/easy_roles_generator.rb

@@ -1,8 +0,0 @@
-class EasyRolesGenerator < Rails::Generator::NamedBase
-  def manifest
-    record do |m|
-      m.class_collisions class_name
-      m.migration_template 'migration.rb', "db/migrate", :migration_file_name => "add_roles_to_#{table_name}"
-    end
-  end
-end

data/generators/easy_roles/templates/migration.rb

@@ -1,9 +0,0 @@
-class AddRolesTo<%= class_name.pluralize %> < ActiveRecord::Migration
-  def self.up
-    add_column :<%= table_name %>, :<%= args.first %>, :string, :default => "--- []"
-  end
-
-  def self.down
-    remove_column :<%= table_name.to_sym %>, :<%= args.first.to_sym %>
-  end
-end