rolify 3.4.0 → 3.4.1

data/spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -13,13 +13,14 @@ shared_examples_for Rolify::Role do
     Rolify.dynamic_shortcuts = false
     rolify_options = { :role_cname => role_class.to_s }
     rolify_options[:role_join_table_name] = join_table if defined? join_table
-    user_class.rolify rolify_options
+    silence_warnings { user_class.rolify rolify_options }
     role_class.destroy_all
     Forum.resourcify :roles, :role_cname => role_class.to_s
     Group.resourcify :roles, :role_cname => role_class.to_s
+    Organization.resourcify :roles, :role_cname => role_class.to_s
   end
 
-  context "in the Instance level" do 
+  context "in the Instance level" do
     before(:all) do
       admin = user_class.first
       admin.add_role :admin
@@ -32,7 +33,7 @@ shared_examples_for Rolify::Role do
       it { should respond_to(method_alias.to_sym).with(1).arguments }
       it { should respond_to(method_alias.to_sym).with(2).arguments }
     end
-    
+
     it { should respond_to(:has_role?).with(1).arguments }
     it { should respond_to(:has_role?).with(2).arguments }
 
@@ -49,18 +50,18 @@ shared_examples_for Rolify::Role do
 
     it { should_not respond_to(:is_admin?) }
     it { should_not respond_to(:is_moderator_of?) }
-    
-    describe "#has_role" do 
+
+    describe "#has_role" do
       it_should_behave_like "#add_role_examples", "String", :to_s
       it_should_behave_like "#add_role_examples", "Symbol", :to_sym
     end
 
-    describe "#has_role?" do    
+    describe "#has_role?" do
       it_should_behave_like "#has_role?_examples", "String", :to_s
       it_should_behave_like "#has_role?_examples", "Symbol", :to_sym
     end
-    
-    describe "#only_has_role?" do    
+
+    describe "#only_has_role?" do
       it_should_behave_like "#only_has_role?_examples", "String", :to_s
       it_should_behave_like "#only_has_role?_examples", "Symbol", :to_sym
     end
@@ -80,7 +81,7 @@ shared_examples_for Rolify::Role do
       it_should_behave_like "#remove_role_examples", "Symbol", :to_sym
     end
   end
-  
+
   context "with a new instance" do
     let(:user) { user_class.new }
 
@@ -90,13 +91,18 @@ shared_examples_for Rolify::Role do
     end
 
     subject { user }
-    
+
     it { should have_role :admin }
-    it { should have_role :moderator, Forum.first }    
-    it { subject.has_any_role?(:admin).should be_true }
-  end  
-  
-  context "on the Class level ", :scope => :mixed do  
+    # it { should have_role :admin, Forum }
+    # it { should have_role :admin, :any }
+    # it { should have_role :moderator, Forum.first }
+    # it { should have_role :moderator, :any }
+    # it { should_not have_role :moderator }
+    # it { should_not have_role :moderator, Forum }
+    it { subject.has_any_role?(:admin).should be_truthy }
+  end
+
+  context "on the Class level ", :scope => :mixed do
     it_should_behave_like :finders, "String", :to_s
     it_should_behave_like :finders, "Symbol", :to_sym
   end

data/spec/spec_helper.rb

@@ -4,18 +4,33 @@ require "bundler/setup"
 require 'rolify'
 require 'rolify/matchers'
 require 'rails'
-
+begin
+  require 'its'
+rescue LoadError
+end
 require 'coveralls'
 Coveralls.wear_merged!
 
 ENV['ADAPTER'] ||= 'active_record'
 
-load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"
+begin
+  load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"
+rescue NameError => e
+  if e.message =~ /uninitialized constant RSpec::Matchers::BuiltIn::MatchArray/
+    RSpec::Matchers::OperatorMatcher.register(
+      ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
+  end
+end
 load File.dirname(__FILE__) + '/support/data.rb'
 
+begin
+  require 'pry'
+rescue LoadError
+end
+
 def reset_defaults
   Rolify.use_defaults
-  Rolify.use_mongoid if ENV['ADAPTER'] == "mongoid"
+  Rolify.use_mongoid if ENV['ADAPTER'] == 'mongoid'
 end
 
 def provision_user(user, roles)
@@ -28,3 +43,11 @@ def provision_user(user, roles)
   end
   user
 end
+
+def silence_warnings(&block)
+  warn_level = $VERBOSE
+  $VERBOSE = nil
+  result = block.call
+  $VERBOSE = warn_level
+  result
+end

data/spec/support/adapters/active_record.rb

@@ -1,6 +1,6 @@
 require 'active_record'
 
-RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
+RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.extend Rolify
 
@@ -41,7 +41,7 @@ module Admin
   def self.table_name_prefix
     'admin_'
   end
-  
+
   class Moderator < ActiveRecord::Base
     rolify :role_cname => "Admin::Right", :role_join_table_name => "moderators_rights"
   end
@@ -51,7 +51,7 @@ module Admin
     belongs_to :resource, :polymorphic => true
 
     extend Rolify::Adapter::Scopes
-  end  
+  end
 end
 
 
@@ -71,6 +71,14 @@ end
 class Team < ActiveRecord::Base
   #resourcify done during specs setup to be able to use custom user classes
   self.primary_key = "team_code"
-  
+
   default_scope { order(:team_code) }
+end
+
+class Organization < ActiveRecord::Base
+
+end
+
+class Company < Organization
+
 end

data/spec/support/adapters/mongoid.rb

@@ -140,4 +140,12 @@ class Team
 
   field :team_code, :type => Integer
   field :name, :type => String
+end
+
+class Organization
+  include Mongoid::Document
+end
+
+class Company < Organization
+
 end

data/spec/support/data.rb

@@ -22,4 +22,7 @@ Group.create(:name => "group 1")
 Group.create(:name => "group 2")
 
 Team.create(:team_code => "1", :name => "PSG")
-Team.create(:team_code => "2", :name => "MU")
+Team.create(:team_code => "2", :name => "MU")
+
+Organization.create
+Company.create

data/spec/support/schema.rb

@@ -49,4 +49,8 @@ ActiveRecord::Schema.define do
     t.primary_key :team_code
     t.string :name
   end
+
+  create_table(:organizations) do |t|
+    t.string :type
+  end
 end

metadata

@@ -1,99 +1,112 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.4.1
+  prerelease: 
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-28 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 2.99.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.6.2
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.3
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.
@@ -103,8 +116,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
@@ -113,6 +126,7 @@ files:
 - UPGRADE.rdoc
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
+- gemfiles/Gemfile.rails-4.1
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb
@@ -174,26 +188,27 @@ files:
 homepage: http://eppo.github.com/rolify/
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Roles library with resource scoping
 test_files:
 - spec/README.rdoc

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 0230aba90b592f3e2873858db202652f0610e63a
-  data.tar.gz: 213155ee533962044ebe70808910f6a27fb40a35
-SHA512:
-  metadata.gz: 1ac7b0db9d222976eea090aa5fc8f91e4861e61175385316625e4d4cd85b11844f6b61013f655735895380e7fa908f629acda1f6a3dc8704837ea58d295f1703
-  data.tar.gz: 2f7a94b6bef880b5bad088fb66b5623677a631a8d1b0371f3f942fc821054a8807b1b1d622232f63548b841d1245bb8495b004dbb0a25b008f90f8c5e8d0f035