constant_table_saver 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0a0f0466a9358d62172e153ae85c8a88a0e9a9
-  data.tar.gz: b6d62a665e5a4b179101924c320e3ca2dd773e35
+  metadata.gz: 952a6f9f15aa9905df69f3dcb279391f55a5abde
+  data.tar.gz: ac94f3acbf0e194aad02e91fb4c45ed16f2594d3
 SHA512:
-  metadata.gz: 350eef086260e755159c68fa837515eff1c50f79b90a6044fb3ecdc806b78955faa9ba5716e73ad0b92827e7bad2c3e11666a0914a872e7df086a195c9f7b205
-  data.tar.gz: 0d9a1eed230c95df417727e8693da32e9168b8dd428a49aee3cbf6d08e73e650824c9d453878d01a7de2461e31ad4b40792c142bf3a6267b0bd3c548de3ad4c9
+  metadata.gz: 278138ada54ee955e1a29b58505959e772e4db8468d4835393502912e8d91ecd7766cc1347f40afcfece79892b3419ce93580a15f2a3f6ff57a177a7a42e6dcf
+  data.tar.gz: 6367660c3f7a614fa90357558fa93f8ced9a3a1b3a26a9486a48c05c496a96ff8a6acf661aac9990d8914220d17d835d3adf8dddf02be15a7601a0b3f3776982

data/Gemfile

@@ -10,6 +10,4 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-# gem 'ruby-debug'
+gem 'rails', ENV['RAILS_VERSION']

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2010 Will Bryant, Sekuda Ltd
+Copyright (c) 2010-2018 Will Bryant, Sekuda Ltd
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -11,7 +11,7 @@ named after the name field you specify.
 Compatibility
 =============
 
-Currently tested against Rails 5.1 (5.1.0beta2) and 5.0 (up to 5.0.2) and 4.2 (up to 4.2.7), on Ruby 2.3.4.
+Currently tested against Rails 5.1 (up to 5.1.6), 5.0 (up to 5.0.6), and 4.2 (up to 4.2.10), on Ruby 2.3.6, 2.4.3, and 2.5.0.
 
 For earlier versions of Rails, use an older version of the gem.
 
@@ -82,4 +82,9 @@ Means you will also have methods returning those records:
 Optionally, you can specify a `:name_prefix` and/or `:name_suffix`.
 
 
-Copyright (c) 2010-2017 Will Bryant, Sekuda Ltd, released under the MIT license
+Thanks
+======
+
+* Marc Shaw (@marcshaw)
+
+Copyright (c) 2010-2018 Will Bryant, Sekuda Ltd, released under the MIT license

data/constant_table_saver.gemspec

@@ -33,5 +33,8 @@ EOF
 
   gem.add_dependency "activerecord"
   gem.add_development_dependency "rake"
+  gem.add_development_dependency "mysql2"
+  gem.add_development_dependency "pg"
   gem.add_development_dependency "sqlite3"
+  gem.add_development_dependency "byebug"
 end

data/lib/constant_table_saver.rb

@@ -80,7 +80,7 @@ module ConstantTableSaver
   module ActiveRecord5ClassMethods
     def find_by_sql(sql, binds = [], preparable: nil, &block)
       @find_by_sql ||= {
-        :all   => all.to_sql,
+        :all   => relation.to_sql,
         :id    => relation.where(relation.table[primary_key].eq(Arel::Nodes::BindParam.new)).limit(1).arel,
         :first => relation.order(relation.table[primary_key].asc).limit(1).arel,
         :last  => relation.order(relation.table[primary_key].desc).limit(1).arel,
@@ -119,7 +119,7 @@ module ConstantTableSaver
   module ActiveRecord4ClassMethods
     def find_by_sql(sql, binds = [])
       @find_by_sql ||= {
-        :all   => all.to_sql,
+        :all   => relation.to_sql,
         :id    => relation.where(relation.table[primary_key].eq(connection.substitute_at(columns_hash[primary_key], 0))).limit(1).
                     tap {|r| r.bind_values += [[columns_hash[primary_key], :undefined]]}. # work around AR 4.1.9-4.1.x (but not 4.2.x) calling nil.first if there's no bind_values
                     arel,

data/lib/constant_table_saver/version.rb

@@ -1,3 +1,3 @@
 module ConstantTableSaver
-  VERSION = '5.1.1'
+  VERSION = '5.1.2'
 end

data/test/constant_table_saver_test.rb

@@ -14,6 +14,10 @@ class ConstantPie < ActiveRecord::Base
   def self.with_unicorn_filling_scope
     with_scope(:find => {:conditions => {:filling => 'unicorn'}}) { yield }
   end
+
+  def self.retrieve_pies
+    all.map { |x| x }
+  end
 end
 
 class ConstantNamedPie < ActiveRecord::Base
@@ -160,6 +164,25 @@ class ConstantTableSaverTest < ActiveSupport::TestCase
     end
   end
   
+  test "it doesn't cache find queries on scoped methods, even when no binds are set, if the records have been cached" do
+    ConstantPie.all.to_a
+    assert_queries(1) do
+      @pies = ConstantPie.where(:filling => ["Tasty beef steak"]).retrieve_pies
+    end
+    assert_equal 1, @pies.size
+  end
+
+  test "it doesn't cache find queries on scoped methods, even when no binds are set, if the records have not been cached" do
+    # these two lines are needed to fix random test order failures when nothing has hit the ConstantPie schema before
+    ConstantPie.all.to_a
+    ConstantPie.reset_constant_record_cache!
+
+    assert_queries(1) do
+      @pies = ConstantPie.where(:filling => ["Tasty beef steak"]).retrieve_pies
+    end
+    assert_equal 1, @pies.size
+  end
+
   test "it passes the options preventing caching to the underlying query methods" do
     assert_nil ConstantPie.where(:filling => 'unicorn').first
     assert_equal [],  ConstantPie.where(:filling => 'unicorn').all

data/test/database.yml

@@ -1,10 +1,6 @@
 sqlite3:
   adapter: sqlite3
   database: test/constant_table_saver.db
-mysql:
-  adapter: mysql
-  database: constant_table_saver_test
-  username: root
 mysql2:
   adapter: mysql2
   database: constant_table_saver_test

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require 'active_support'
 require 'active_support/test_case'
 require 'active_record'
 require 'active_record/fixtures'
-require 'byebug' rescue nil
+require 'byebug'
 
 RAILS_ENV = ENV['RAILS_ENV'] ||= 'sqlite3'
 

data/test_all.rb

@@ -2,12 +2,15 @@
 
 require 'yaml'
 
-rails_versions = ["4.2.0".."4.2.3", "4.1.07".."4.1.12", "4.0.13", "3.2.18"].flat_map {|spec| Array(spec).collect {|v| v.gsub /.0(\d)/, '.\\1'}}
+rails_versions = ["5.1.1".."5.1.6", "5.0.2".."5.0.6", "4.2.10"].flat_map {|spec| Array(spec).collect {|v| v.gsub /.0(\d)/, '.\\1'}}
 rails_envs = YAML.load(File.read("test/database.yml")).keys
 
-rails_envs.each do |env|
-  rails_versions.each do |version|
-    puts "*"*40
-    system "RAILS_ENV=#{env} RAILS_VERSION=#{version} rake" or exit(1)
+rails_versions.each do |version|
+  puts "*"*40
+  system "RAILS_VERSION=#{version} bundle update rails" or exit(1)
+
+  rails_envs.each do |env|
+    puts "Rails #{version}, #{env}"
+    system "RAILS_ENV=#{env} bundle exec rake" or exit(2)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constant_table_saver
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2018-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Loads all records from the table on first use, and thereafter returns the
   cached (and frozen) records for all find calls.
@@ -121,3 +163,4 @@ test_files:
 - test/fixtures/pies.yml
 - test/schema.rb
 - test/test_helper.rb
+has_rdoc: false