Merge pull request #1 from FinalCAD/update_to_ar5

Update to working with activerecord 5 and rolify 5.1

.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p451
+ruby-2.2.2

.travis.yml

@@ -1,3 +1,3 @@
 language: ruby
 rvm:
-  - 2.0.0
+  - 2.2.2

lib/scoped_rolify/finders.rb

@@ -33,9 +33,9 @@ def rolify_constraints role_names, resource, options={}
       [].tap do |constraints|
         Array.wrap(role_names).each do |name|
           constraints << [].tap do |constraint|
-            constraint << table[:name].eq(name)
-            constraint << table[field_type].eq(resource.class.name)
-            constraint << table[field_id].eq(resource.id)
+            constraint << table[:name].eq(Arel::Nodes::Quoted.new(name))
+            constraint << table[field_type].eq(Arel::Nodes::Quoted.new(resource.class.base_class.name))
+            constraint << table[field_id].eq(Arel::Nodes::Quoted.new(resource.id))
           end.reduce(:and)
         end
       end.reduce(:or)

lib/scoped_rolify/role.rb

@@ -55,11 +55,11 @@ def add_role_with_root(role_name, resource, root_resource)
       else
         conditions = {
           name: role_name.to_s,
-          resource_type: resource.class.name,
+          resource_type: resource.class.base_class.name,
           resource_id: resource.id,
         }
         if root_resource
-          conditions.merge!({ root_resource_type: (root_resource.is_a?(Class) ? root_resource.to_s : root_resource.class.name) })
+          conditions.merge!({ root_resource_type: (root_resource.is_a?(Class) ? root_resource.to_s : root_resource.class.base_class.name) })
           unless root_resource.is_a?(Class) # Useless for the moment (Already false)
             conditions.merge!({ root_resource_id: root_resource.id })
           end

lib/scoped_rolify/version.rb

@@ -1,3 +1,3 @@
 module ScopedRolify
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

scoped_rolify.gemspec

@@ -17,12 +17,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'rolify', '~> 3.4'
+  spec.add_dependency 'rolify', '~> 5.1.0'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
   spec.add_development_dependency 'rake', '~> 10.1'
   spec.add_development_dependency 'rspec', '~> 2.14'
   spec.add_development_dependency 'rspec-rails', '~> 2.14'
 
-  spec.required_ruby_version = '~> 2.0'
+  spec.required_ruby_version = '>= 2.2.2'
 end

spec/scoped_rolify/role_spec.rb

@@ -44,9 +44,9 @@
         before { subject.add_scope_role(:admin, resource) }
         it('should retreive user') do
           expect(
-            User.joins(:roles).where(
+            User.joins(:roles).merge(
               Role.where(name: :admin, resource_type: 'Forum', resource_id: resource.id,
-                root_resource_type: 'Category', root_resource_id: root_resource.id).arel.constraints.first
+                root_resource_type: 'Category', root_resource_id: root_resource.id)
             ).to_a
           ).to eq([subject])
         end
@@ -68,4 +68,4 @@
       end
     end
   end
-end
+end

spec/spec_helper.rb

@@ -3,6 +3,7 @@
 require 'rolify'
 require 'scoped_rolify'
 require 'rails'
+require 'pry'
 
 require 'coveralls'
 Coveralls.wear!