rolify 3.5.2 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1f880185b9ba2cee1a8f6592ca4cccf3142bd60
-  data.tar.gz: 921ea280eaa82168aaf50850676d2cff42b9d2c8
+  metadata.gz: 5b9f204d757588d80887b2193a4eb9ea1b0fd471
+  data.tar.gz: 97030122590f294b06b595af6edc1dec44d13176
 SHA512:
-  metadata.gz: 27d2028c89d6c76de14e82f2181be9d18dde5d8d84b54ac87b28ac07d4af5089e81c6b85f862f4ac4019be61ee739a6995e6fd5765fcbdd1c852e256c1bafa3c
-  data.tar.gz: ab26fc4b78425f4305c31e2170b647acd75ad4d6d6f37c19c45a4bc1e759030a0c2f6631a35d598709e1d5194ff4579ab6a1bc29b8960f437b1b26e52f9c7fef
+  metadata.gz: 75dc73295700924357b77c4359f43939c3e44d0857015f7f30dc26e4f06c99e1667f7767977e1a9bb332028ee177cab6ba860538a4d1dd640da5175246989a68
+  data.tar.gz: 01e0a0874a8ded544155535b4b9cff68f643b20fce6e71e21615ef7c4a5f7ca47b68e4b6ea9de34ec13af5e51bce6fb781f52351483ede4e05e152f21a662c5e

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+= 4.0.0 (Feb 12, 2015)
+* Increasing version number to 4.0.0 for semantic versioning since `has_role` was removed in 3.5.0
+* Fix spec to pass.
+* Fix dynamic shortcuts being set before migration.
+
 = 3.5.2 (Jan 14, 2015)
 * Fixed regression in RolifyGenerator
 * Updated dependencies

data/CONTRIBUTORS

@@ -3,3 +3,4 @@ Wellington Cordeiro (@wldcordeiro)
 Joel Azemar (@joel)
 Alex Klim (@AlexKlim)
 Mauro George (@MauroGeorge)
+Cheri Allen(@cherimarie)

data/Gemfile

@@ -15,7 +15,8 @@ group :test do
 
   gem 'coveralls', :require => false
   gem 'its'
-  gem 'pry'
+  gem 'byebug'
+  gem 'pry-byebug'
   gem 'codeclimate-test-reporter', :require => nil
 end
 

data/lib/generators/rolify/templates/initializer.rb

@@ -1,8 +1,7 @@
 Rolify.configure<%= "(\"#{class_name.camelize.to_s}\")" if class_name != "Role" %> do |config|
   # By default ORM adapter is ActiveRecord. uncomment to use mongoid
   <%= "# " if options.orm == :active_record || !options.orm %>config.use_mongoid
-  
+
   # Dynamic shortcuts for User class (user.is_admin? like methods). Default is: false
-  # Enable this feature _after_ running rake db:migrate as it relies on the roles table
   # config.use_dynamic_shortcuts
 end

data/lib/rolify/configure.rb

@@ -30,6 +30,7 @@ module Rolify
     end
 
     def use_dynamic_shortcuts
+      return if !sanity_check([])
       self.dynamic_shortcuts = true
     end
 
@@ -65,7 +66,7 @@ module Rolify
     end
 
     def role_table_missing?(role_class)
-      role_class.connected? && !role_class.table_exists?
+      !role_class.table_exists?
     end
   end
 end

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.5.2"
+  VERSION = "4.0.0"
 end

data/rolify.gemspec

@@ -22,9 +22,7 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_development_dependency 'ammeter',     '~> 1.1.2' # Spec generator
-  s.add_development_dependency 'bundler',     '~> 1.7.12' # packaging feature
-  s.add_development_dependency 'fuubar',      '~> 2.0.0' # instafailing RSpec progress bar formatter
+  s.add_development_dependency 'bundler',     '>= 1.7.12' # packaging feature
   s.add_development_dependency 'rake',        '~> 10.4.2' # Tasks manager
-  s.add_development_dependency 'rspec',       '3.1.0' # Behavior Driven Development
-  s.add_development_dependency 'rspec-rails', '3.1.0' # Rspec for Rails
+  s.add_development_dependency 'rspec-rails', '2.99.0'
 end

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -46,7 +46,9 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should contain "class Role < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :users, :join_table => :users_roles" }
       it { should contain "belongs_to :resource, :polymorphic => true" }
-      it { should contain "validates :resource_type, :inclusion => { :in => Rolify.resource_types }, :allow_nil => true" }
+      it { should contain "validates :resource_type,\n"
+                          "          :inclusion => { :in => Rolify.resource_types },\n"
+                          "          :allow_nil => true" }
     end
 
     describe 'app/models/user.rb' do

data/spec/generators/rolify/rolify_mongoid_generator_spec.rb

@@ -56,7 +56,9 @@ RUBY
                           "      { :resource_id => 1 }\n"
                           "    },\n"
                           "    { unique => true })"}
-      it { should contain "validates :resource_type, :inclusion => { :in => Rolify.resource_types }, :allow_nil => true" }
+      it { should contain "validates :resource_type,\n"
+                          "          :inclusion => { :in => Rolify.resource_types },\n"
+                          "          :allow_nil => true" }
     end
 
     describe 'app/models/user.rb' do

data/spec/rolify/role_spec.rb

@@ -1,24 +1,8 @@
 require "spec_helper"
-require "rolify/shared_examples/shared_examples_for_roles"
-require "rolify/shared_examples/shared_examples_for_dynamic"
-require "rolify/shared_examples/shared_examples_for_scopes"
-require "rolify/shared_examples/shared_examples_for_callbacks"
 
 describe Rolify do
-  def user_class
-    User
-  end
-
-  def role_class
-    Role
-  end
-
-  it_behaves_like Rolify::Role
-  it_behaves_like "Role.scopes"
-  it_behaves_like Rolify::Dynamic
-  it_behaves_like "Rolify.callbacks"
 
-  context 'cache', pending: true do
+  context 'cache' do
     let(:user) { User.first }
     before { user.grant(:zombie) }
     specify do

data/spec/spec_helper.rb

@@ -16,14 +16,7 @@ Coveralls.wear_merged!
 
 ENV['ADAPTER'] ||= 'active_record'
 
-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/adapters/#{ENV['ADAPTER']}.rb"
 load File.dirname(__FILE__) + '/support/data.rb'
 
 begin

data/spec/support/adapters/active_record.rb

@@ -81,4 +81,4 @@ end
 
 class Company < Organization
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.5.2
+  version: 4.0.0
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -28,30 +28,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.12
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.7.12
-- !ruby/object:Gem::Dependency
-  name: fuubar
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -66,34 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 10.4.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.99.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 2.99.0
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.