rolify 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edae47a21706d1859520df05876acf68d95c0d48
-  data.tar.gz: 09dbd84321d04321d1ef889db0911fa86f1ccbe4
+  metadata.gz: 1e51b0a50895b89514d5f41266e0eb5373d47158
+  data.tar.gz: d99233b97fd7e18a79b0958ef9d359d8266b58b3
 SHA512:
-  metadata.gz: 910c97443cd78a0386a36f2d6645708c7f6eadf5b84815ca51f8b1cbd39f4a6e1236a16688c37ef99a48234deb44a25c684e7852ce146f7d0e75cc22817a841c
-  data.tar.gz: 4525bec755d35bb470d364088bdfe2c7f2a39b61cf140944363518ed5626de9f4c438c088d432002a7b41edc750dccc7a032b94f76d075d068f0770b762223cb
+  metadata.gz: 0846e497eac805c2bcbd8227ae96efe949e337c4872f9b6295c1df4c32df2699702ebcd957f516204d7c28948aca8557391b2b17da9d9db4da1079d130d8f144
+  data.tar.gz: 5ca314c4b2c63b9897f60e948c28310dcd9ebb5623614831fb1b5368a290090987829e31bc388d297a7665ee753cd2dd6e045c2c28d6eda4910f902ab79e7740

data/.travis.yml

@@ -1,7 +1,11 @@
 language: ruby
+sudo: false
 
 rvm:
+  - 2.2.2
   - 2.1.2
+  - 2.0.0
+  
 
 before_install:
   - gem update --system
@@ -19,31 +23,3 @@ services: mongodb
 addons:
   code_climate:
     repo_token: 6bd8d374b120a5449b9a4b7dfda40cc0609dbade48a1b6655f04a9bc8de3a3ee
-# language: ruby
-#
-# rvm:
-#   - 1.9.3
-#   - 2.0.0
-#   - 2.1.1
-#   - 2.1.2
-#   - rbx-2
-#   - jruby-19mode
-#
-# script: bundle exec rake
-#
-# gemfile:
-#   - gemfiles/Gemfile.rails-3.2
-#   - gemfiles/Gemfile.rails-4.0
-#   - gemfiles/Gemfile.rails-4.1
-#
-# env:
-#   - ADAPTER=active_record
-#   - ADAPTER=mongoid
-#
-# services: mongodb
-#
-# matrix:
-#   fast_finish: true
-#   exclude:
-#     - rvm: 1.9.3
-#       gemfile: gemfiles/Gemfile.rails-4.1

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+= 4.1.1 (Aug 06, 2015)
+* Fix a regression in the dynamic method loader.
+
 = 4.1.0 (Aug 04, 2015)
 * added `without_role` method for resources and classes
 * fix `has_role?` with :any and an unsaved user

data/README.md

@@ -183,7 +183,7 @@ Forum.with_role(:admin)
 # => [ list of Forum instances that has role "admin" binded to it ]
 Forum.with_role(:admin, current_user)
 # => [ list of Forum instances that has role "admin" binded to it and belongs to current_user roles ]
-Forum.with_all_roles([:admin, :user], current_user)
+Forum.with_roles([:admin, :user], current_user)
 # => [ list of Forum instances that has role "admin" or "user" binded to it and belongs to current_user roles ]
 
 User.with_any_role(:user, :admin)
@@ -192,6 +192,8 @@ User.with_role(:site_admin, current_site)
 # => [ list of User instances that have a scoped role of "site_admin" to a site instance ]
 User.with_role(:site_admin, :any)
 # => [ list of User instances that have a scoped role of "site_admin" for any site instances ]
+User.with_all_roles(:site_admin, :admin)
+# => [ list of User instances that have a role of "site_admin" and a role of "admin" binded to it ]
 
 Forum.find_roles
 # => [ list of roles that binded to any Forum instance or to the Forum class ]

data/lib/rolify/dynamic.rb

@@ -3,15 +3,14 @@ require "rolify/configure"
 module Rolify
   module Dynamic
     def load_dynamic_methods
-      if ENV['ADAPTER'] == 'mongoid'
-        # for compatibility with MongoidDB - does not support polymorphic includes
-        self.role_class.all.each do |r|
+      if ENV['ADAPTER'] == 'active_record'
+        # supported Rails version >= 3.2 with AR should use find_each, since use of .all.each is deprecated
+        self.role_class.includes(:resource).find_each do |r|
           define_dynamic_method(r.name, r.resource)
         end
       else
-        # otherwise should be able to support polymorphic includes.
-        # supported Rails version >= 3.2 with AR should use find_each, since use of .all.each is deprecated
-        self.role_class.includes(:resource).find_each do |r|
+        # for compatibility with MongoidDB and older Rails AR - does not support polymorphic includes
+        self.role_class.all.each do |r|
           define_dynamic_method(r.name, r.resource)
         end
       end

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter