Fix #70 with Rails 5.1 support.

hooopo · Apr 28, 2017 · b0ecd1a · b0ecd1a
1 parent 0d3eaa1
commit b0ecd1a
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem 'rails', '~> 5.0.0'
+gem 'rails', '~> 5.1.0'
diff --git a/gemfiles/Gemfile-5-1 b/gemfiles/Gemfile-5-1
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '..'
+
+gem 'rails', '5.1.0'
diff --git a/lib/second_level_cache/active_record/finder_methods.rb b/lib/second_level_cache/active_record/finder_methods.rb
@@ -19,7 +19,6 @@ def find_one(id)
         return super(id) unless select_all_column?
 
         id = id.id if ActiveRecord::Base == id
-
         if cachable?
           record = @klass.read_second_level_cache(id)
           if record
@@ -61,12 +60,13 @@ def first(limit = nil)
 
       private
 
+      # readonly_value - active_record/relation/query_methods.rb Rails 5.1 true/false
       def cachable?
         limit_one? &&
           order_values.blank? &&
           includes_values.blank? &&
           preload_values.blank? &&
-          readonly_value.nil? &&
+          !readonly_value &&
           joins_values.blank? &&
           !@klass.locking_enabled? &&
           where_clause_match_equality?

diff --git a/second_level_cache.gemspec b/second_level_cache.gemspec
@@ -30,8 +30,8 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
   gem.version       = SecondLevelCache::VERSION
 
-  gem.add_runtime_dependency 'activesupport', ['>= 5.0.0.beta3', '< 5.1.0']
-  gem.add_runtime_dependency 'activerecord', ['>= 5.0.0.beta3', '< 5.1.0']
+  gem.add_runtime_dependency 'activesupport', ['>= 5.0.0', '< 5.2']
+  gem.add_runtime_dependency 'activerecord', ['>= 5.0.0', '< 5.2']
 
   gem.add_development_dependency 'sqlite3'
   gem.add_development_dependency 'rake'