rolify 3.5.0 → 3.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf5b355e4195b739b029a8567fd142b8e35bb12d
-  data.tar.gz: 9e9ed19d10b9eb0d41b1319602b69ded63bb16d6
+  metadata.gz: 471b087194de0b75fe7d666e1c60719121906402
+  data.tar.gz: e469f36315049f5407fe7a708af99831f721ebe2
 SHA512:
-  metadata.gz: f1d687a86a7050e389650808e2abb072e1c7aa4387d4a4d6465e9c57091198f196a0dc2b84a1d2e5c0ebbf95db14c8212ee19597f353bac5b803f6331310c34f
-  data.tar.gz: 3a7cc52b331ad63e658a9027385efc5bb60266112633d2d6e01d3146b6b01112e8c7e02489d2ac551da275e5e3187c0821da5f6283f1e6baf292cca7422af1ae
+  metadata.gz: 68c51c49f97c2b5f80ac4d0388cb3de18604d7a6f9ccc3ae6bf5b8fc568268416760d83eb9e438bba3f49e6547e158eb175fcaa76bb35ef2fc25b069cb45a0ba
+  data.tar.gz: e4a03eadae6ad21ecb3ec891436773d63db5492c21a52da3673c9da2f6ddc46338f1ac89e57796eb372e073c78feeb37fddd52fae2355c7a3c3a2abd609b2927

data/.travis.yml

@@ -3,6 +3,11 @@ language: ruby
 rvm:
   - 2.1.2
 
+before_install:
+  - gem update --system
+  - gem install bundler
+  - gem --version
+
 script: bundle exec rake
 
 env:

data/circle.yml

@@ -5,7 +5,9 @@ machine:
     CODECLIMATE_REPO_TOKEN: 6bd8d374b120a5449b9a4b7dfda40cc0609dbade48a1b6655f04a9bc8de3a3ee
     ADAPTER: active_record
     ADAPTER: mongoid
-
+dependencies:
+  pre:
+    - gem install bundler
 test:
   override:
     - bundle exec rake:spec_all

data/lib/rolify/role.rb

@@ -23,10 +23,13 @@ module Rolify
 
     def has_role?(role_name, resource = nil)
       if new_record?
-        self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) }
+        role_array = self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) }
       else
-        self.class.adapter.where(self.roles, name: role_name, resource: resource)
-      end.present?
+        role_array = self.class.adapter.where(self.roles, name: role_name, resource: resource)
+      end
+
+      return false if role_array.nil?
+      role_array != []
     end
 
     def has_all_roles?(*args)

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.5.0"
+  VERSION = "3.5.1"
 end

metadata

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