remove monkey patch on has_role?, was fixed on Rolify

CHANGELOG.md

@@ -1,3 +1,8 @@
+### VERSION 0.0.8
+
+* bug fix
+  * remove monkey patch on has_role?, was fixed on Rolify
+
 ### VERSION 0.0.7
 
 * bug fix
@@ -70,4 +75,4 @@
 ### VERSION 0.0.1
 
 * Resctricted add_role method
-* Resctricted with_role method
+* Resctricted with_role method

lib/scoped_rolify/finders.rb

@@ -11,6 +11,8 @@ def with_any_scoped_role role_names, resource, options={}
       self.joins(:roles).where(rolify_constraints(role_names, resource, options))
     end
 
+    private
+
     def rolify_constraints role_names, resource, options={}
       raise 'You should give somes role' if role_names.nil? or Array(role_names).empty?
       ScopedRolify::Policy.new(self, resource).check_persisted!
@@ -21,9 +23,9 @@ def rolify_constraints role_names, resource, options={}
       field_type, field_id = begin
         case scope
         when :resource
-          [ :resource_type, :resource_id]
+          [ :resource_type, :resource_id ]
         when :root
-          [ :root_resource_type, :root_resource_id]
+          [ :root_resource_type, :root_resource_id ]
         end
       end
 
@@ -40,4 +42,4 @@ def rolify_constraints role_names, resource, options={}
     end
 
   end
-end
+end

lib/scoped_rolify/role.rb

@@ -11,19 +11,19 @@ def remove_scope_role(role_name, resource)
       remove_resourced_role(role_name, resource)
     end
 
-    def has_role?(role_name, resource = nil)
-      root_resource = resource.respond_to?(:root_resource) ? resource.send(resource.root_resource) : nil
+    private
+
+    def remove_resourced_role(role_name, resource)
       if self.new_record?
-        self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) && (r.root_resource == root_resource || root_resource.nil?) }
+        self.roles = self.roles - [self.roles.detect { |r| r.name.to_s == role_name.to_s && r.resource == resource }]
       else
-        self.class.adapter.where(self.roles, name: role_name, resource: resource, root_resource: root_resource)
-      end.present?
+        remove_role(role_name, resource)
+      end
     end
 
-    private
-
     def add_resourced_role(role_name, resource)
       root_resource = resource.respond_to?(:root_resource) ? resource.send(resource.root_resource) : nil
+
       if self.new_record?
         role = self.class.adapter.role_class.new(name: role_name, resource: resource, root_resource: root_resource).tap do |role|
           self.roles << role
@@ -68,13 +68,5 @@ def add_role_with_root(role_name, resource, root_resource)
       end
     end
 
-    def remove_resourced_role(role_name, resource)
-      if self.new_record?
-        self.roles = self.roles - [self.roles.detect { |r| r.name.to_s == role_name.to_s && r.resource == resource }]
-      else
-        remove_role(role_name, resource)
-      end
-    end
-
   end
-end
+end