constant_table_saver 5.1.2 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 952a6f9f15aa9905df69f3dcb279391f55a5abde
-  data.tar.gz: ac94f3acbf0e194aad02e91fb4c45ed16f2594d3
+SHA256:
+  metadata.gz: 047fc14118f3907b7803464acb83fbf2675dcc8888b07dda5f5fdd9849a4fab3
+  data.tar.gz: bae7b8bee9a592941efec27891596c638ee8f4fe9dfa5fe37f6573824e07d370
 SHA512:
-  metadata.gz: 278138ada54ee955e1a29b58505959e772e4db8468d4835393502912e8d91ecd7766cc1347f40afcfece79892b3419ce93580a15f2a3f6ff57a177a7a42e6dcf
-  data.tar.gz: 6367660c3f7a614fa90357558fa93f8ced9a3a1b3a26a9486a48c05c496a96ff8a6acf661aac9990d8914220d17d835d3adf8dddf02be15a7601a0b3f3776982
+  metadata.gz: 7c664569302baa751ecf4b4fb3aff40fab9f003dce1a965c1d0cb927124faa9ef69c3a041ec243c01f810c307c00b3e37aec2fedf27d7afa35fe2659e06605b5
+  data.tar.gz: 5678f53bf835867af37b174ae9250e5457a4ebd0a1b5816ad44947497e69c56d2e5097cf4434aea9a8f99521a4a7ffc455afef1ebfd5806506747bd4a132bf33

data/Dockerfile

@@ -0,0 +1,46 @@
+# this Dockerfile is used only to get a consistent environment in which to run the tests (test_all.rb),
+# it has nothing to do with the actual gem that gets published.
+
+# use an older version of ubuntu so that we get a version of postgresql so is supported by the older rails
+# versions, or we won't be able to test out support for them.
+FROM ubuntu:16.04
+
+# this dockerfile builds kitchen sync on ubuntu and runs the test suite.
+
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+	DEBIAN_FRONTEND=noninteractive apt-get upgrade -y && \
+	DEBIAN_FRONTEND=noninteractive apt-get install -y build-essential git \
+		mysql-server libmysqlclient-dev postgresql-9.5 libpq-dev libsqlite3-dev \
+		ruby ruby-dev && \
+	rm -f /etc/apt/apt.conf.d/20auto-upgrades && \
+	apt-get clean -y && \
+	rm -rf /var/cache/apt/archives/*
+
+RUN gem install bundler --no-ri --no-rdoc
+
+# install a version of mysql2 that the older versions of rails are compatible with
+RUN gem install mysql2 -v 0.4.10
+
+WORKDIR /tmp
+ADD Gemfile Gemfile
+ADD constant_table_saver.gemspec constant_table_saver.gemspec
+ADD lib/constant_table_saver/version.rb lib/constant_table_saver/version.rb
+RUN bundle install -j 4
+
+ADD . .
+RUN echo 'starting postgresql' && \
+	service postgresql start && \
+	echo 'creating postgresql database' && \
+	su postgres -c 'createdb --encoding unicode --template template0 constant_table_saver_test' && \
+	echo 'creating postgresql user' && \
+	su postgres -c 'createuser --superuser root' && \
+	echo 'starting mysql' && \
+	mkdir -p /var/run/mysqld && \
+	chown mysql:mysql /var/run/mysqld && \
+	(/usr/sbin/mysqld --skip-grant-tables &) && \
+	echo 'waiting for mysql to start' && \
+	mysqladmin --wait=30 ping && \
+	echo 'creating mysql database' && \
+	mysqladmin create constant_table_saver_test && \
+	echo 'running tests' && \
+	./test_all.rb

data/README.md

@@ -11,7 +11,7 @@ named after the name field you specify.
 Compatibility
 =============
 
-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.
+Currently tested against Rails 5.2 (5.2.0), 5.1 (up to 5.1.6) and 5.0 (up to 5.0.6) and 4.2 (up to 4.2.10).
 
 For earlier versions of Rails, use an older version of the gem.
 

data/Rakefile

@@ -13,4 +13,5 @@ Rake::TestTask.new(:test) do |t|
   t.libs << 'test'
   t.pattern = 'test/*_test.rb'
   t.verbose = true
+  t.warning = false
 end

data/constant_table_saver.gemspec

@@ -16,7 +16,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.2 (5.2.0), 5.1 (up to 5.1.6) and 5.0 (up to 5.0.6) and 4.2 (up to 4.2.10).
 
 For earlier versions of Rails, use an older version of the gem.
 EOF

data/lib/constant_table_saver.rb

@@ -12,8 +12,10 @@ module ConstantTableSaver
       
       if ActiveRecord::VERSION::MAJOR == 4
         extend ActiveRecord4ClassMethods
-      else
+      elsif ActiveRecord::VERSION::MINOR == 0 || ActiveRecord::VERSION::MINOR == 1
         extend ActiveRecord5ClassMethods
+      else
+        extend ActiveRecord52ClassMethods
       end
       extend ClassMethods
       extend NameClassMethods if constant_table_options[:name]
@@ -52,16 +54,6 @@ module ConstantTableSaver
       @cached_records = @cached_records_by_id = @constant_record_methods = @cached_blank_scope = @find_by_sql = nil
     end
 
-    def _to_sql_with_binds(sql, binds)
-      if sql.respond_to?(:to_sql)
-        # an arel object
-        connection.to_sql(sql, binds)
-      else
-        # a plain string
-        sql
-      end
-    end
-
     def relation
       super.tap do |s|
         class << s
@@ -77,6 +69,40 @@ module ConstantTableSaver
     end
   end
 
+  module ActiveRecord52ClassMethods
+    def find_by_sql(sql, binds = [], preparable: nil, &block)
+      @cached_records ||= super(relation.to_sql).each(&:freeze).freeze
+
+      @cached_results ||= @cached_records.each_with_object({
+        # matches .all queries:
+        to_sql_and_binds(relation) => @cached_records,
+
+        # matches .first queries:
+        to_sql_and_binds(relation.order(relation.table[primary_key].asc).limit(1).arel) => [@cached_records.first].compact,
+
+        # matches .last queries:
+        to_sql_and_binds(relation.order(relation.table[primary_key].desc).limit(1).arel) => [@cached_records.last].compact,
+      }) do |record, results|
+        results[to_sql_and_binds(relation.where(relation.table[primary_key].eq(relation.predicate_builder.build_bind_attribute(primary_key, record.id))).limit(1).arel)] = [record]
+      end.freeze
+
+      sql_and_binds = to_sql_and_binds(sql, binds)
+      sql_and_binds = [sql_and_binds.first, []] unless connection.prepared_statements
+
+      if results = @cached_results[sql_and_binds]
+        results
+      else
+        super(sql, binds, preparable: preparable, &block)
+      end
+    end
+
+  private
+    def to_sql_and_binds(sql, binds = [])
+      sql = sql.arel if sql.respond_to?(:arel)
+      connection.send(:to_sql_and_binds, sql, binds)
+    end
+  end
+
   module ActiveRecord5ClassMethods
     def find_by_sql(sql, binds = [], preparable: nil, &block)
       @find_by_sql ||= {
@@ -114,6 +140,16 @@ module ConstantTableSaver
 
       super(sql, binds, preparable: preparable, &block)
     end
+
+    def _to_sql_with_binds(sql, binds)
+      if sql.respond_to?(:to_sql)
+        # an arel object
+        connection.to_sql(sql, binds)
+      else
+        # a plain string
+        sql
+      end
+    end
   end
 
   module ActiveRecord4ClassMethods
@@ -148,6 +184,16 @@ module ConstantTableSaver
 
       super
     end
+
+    def _to_sql_with_binds(sql, binds)
+      if sql.respond_to?(:to_sql)
+        # an arel object
+        connection.to_sql(sql, binds)
+      else
+        # a plain string
+        sql
+      end
+    end
   end
 
   module NameClassMethods

data/lib/constant_table_saver/version.rb

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

data/test/constant_table_saver_test.rb

@@ -152,6 +152,7 @@ class ConstantTableSaverTest < ActiveSupport::TestCase
     @pies = StandardPie.select("id").all.to_a
     @pie = StandardPie.select("id").find(1)
     @second_pie = StandardPie.select("id").find(2)
+    ConstantPie.first
     assert_queries(3) do
       assert_equal @pies.collect(&:attributes), ConstantPie.select("id").all.collect(&:attributes)
       assert_equal @pie.attributes, ConstantPie.select("id").find(1).attributes
@@ -177,10 +178,11 @@ class ConstantTableSaverTest < ActiveSupport::TestCase
     ConstantPie.all.to_a
     ConstantPie.reset_constant_record_cache!
 
-    assert_queries(1) do
-      @pies = ConstantPie.where(:filling => ["Tasty beef steak"]).retrieve_pies
-    end
+    # retrieve_pies here is to test the behavior of scoped class methods:
+    @pies = ConstantPie.where(:filling => ["Tasty beef steak"]).retrieve_pies
     assert_equal 1, @pies.size
+
+    assert_equal StandardPie.count, ConstantPie.all.to_a.size
   end
 
   test "it passes the options preventing caching to the underlying query methods" do

data/test_all.rb

@@ -2,7 +2,7 @@
 
 require 'yaml'
 
-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_versions = ["5.2.0", "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_versions.each do |version|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constant_table_saver
 version: !ruby/object:Gem::Version
-  version: 5.1.2
+  version: 5.2.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -105,7 +105,7 @@ description: |
   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.2 (5.2.0), 5.1 (up to 5.1.6) and 5.0 (up to 5.0.6) and 4.2 (up to 4.2.10).
 
   For earlier versions of Rails, use an older version of the gem.
 email: will.bryant@gmail.com
@@ -114,6 +114,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- Dockerfile
 - Gemfile
 - MIT-LICENSE
 - README.md
@@ -150,7 +151,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Caches the records from fixed tables, and provides convenience methods to
@@ -163,4 +164,3 @@ test_files:
 - test/fixtures/pies.yml
 - test/schema.rb
 - test/test_helper.rb
-has_rdoc: false