Update Active Record and Ruby requirements

Author: byroot

.travis.yml

@@ -1,39 +1,33 @@
+sudo: false
 language: ruby
+cache: bundler
 
 before_install:
   - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
   - gem install bundler -v '< 2'
 
 rvm:
-  - 2.3.8
-  - 2.4.6
-  - 2.5.5
-  - 2.6.2
+  - "2.5"
+  - "2.6"
 gemfile:
-  - gemfiles/Gemfile.ar-4.2
-  - gemfiles/Gemfile.ar-5.0
-  - gemfiles/Gemfile.ar-5.1
   - gemfiles/Gemfile.ar-5.2
+  - gemfiles/Gemfile.ar-6.0
   - gemfiles/Gemfile.ar-master
 
 env:
-  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1
-  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1
-  - TIMEZONE_AWARE=1 POSTGRES=1 POSTGRES_JSON=1
-  - TIMEZONE_AWARE=0 POSTGRES=1 POSTGRES_JSON=1
+  - TIMEZONE_AWARE=1 POSTGRES=1 MYSQL=1 POSTGRES_JSON=1
+  - TIMEZONE_AWARE=0 POSTGRES=1 MYSQL=1 POSTGRES_JSON=1
 
 matrix:
   exclude:
-    - rvm: 2.3.8
-      gemfile: 'gemfiles/Gemfile.ar-master'
-    - rvm: 2.4.6
+    - rvm: "2.6"
+      gemfile: 'gemfiles/Gemfile.6-0'
+    - rvm: "2.6"
       gemfile: 'gemfiles/Gemfile.ar-master'
 
-addons:
-  postgresql: 9.3
-
-sudo: false
-cache: bundler
+services:
+  - mysql
+  - postgresql
 
 before_script:
   - mysql -e 'create database typed_store_test;'

activerecord-typedstore.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activerecord', '>= 4.2'
+  spec.add_dependency 'activerecord', '>= 5.2'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake', '~> 10'

gemfiles/Gemfile.ar-4.2

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 
 gemspec path: '..'
 
-gem 'activerecord', '~> 5.1.0'
+gem 'activerecord', '~> 6.0.0'

gemfiles/Gemfile.ar-5.1 gemfiles/Gemfile.ar-6.0gemfiles/Gemfile.ar-5.1 renamed to gemfiles/Gemfile.ar-6.0

@@ -70,20 +70,11 @@
       }.to change { !!model.age_changed? }.from(true).to(false)
     end
 
-    if AR_VERSION >= AR_4_2
-      it 'can be restored individually' do
-        model.age = 24
-        expect {
-          model.restore_age!
-        }.to change { model.age }.from(24).to(12)
-      end
-    else
-      it 'can be reset individually' do
-        model.age = 24
-        expect {
-          model.reset_age!
-        }.to change { model.age }.from(24).to(12)
-      end
+    it 'can be restored individually' do
+      model.age = 24
+      expect {
+        model.restore_age!
+      }.to change { model.age }.from(24).to(12)
     end
 
     it 'does not dirty track assigning the same boolean' do
@@ -432,48 +423,26 @@
     let(:time) { time_string.respond_to?(:in_time_zone) ? time_string.in_time_zone : Time.parse(time_string) }
 
     context "with ActiveRecord #{ActiveRecord::VERSION::STRING}" do
-      if AR_VERSION < AR_4_0
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.published_at).to be == time
-        end
+      it 'has the defined default as initial value' do
+        model.save
+        expect(model.reload.published_at).to be == time
+      end
 
+      it 'retreive a time instance' do
+        model.update(published_at: time)
+        expect(model.reload.published_at).to be == time
+      end
+
+      if ActiveRecord::Base.time_zone_aware_attributes
         it 'properly cast assigned value to time' do
           model.remind_at = time_string
           expect(model.remind_at).to be == time
         end
-        it 'properly cast assigned value to time on save' do
+      else
+        it 'properly cast assigned value to time' do
           model.remind_at = time_string
-          model.save
-          model.reload
           expect(model.remind_at).to be == time
         end
-        it 'retreive a Time instance' do
-          model.update(published_at: time)
-          expect(model.reload.published_at).to be == time
-        end
-      else
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.reload.published_at).to be == time
-        end
-
-        it 'retreive a time instance' do
-          model.update(published_at: time)
-          expect(model.reload.published_at).to be == time
-        end
-
-        if ActiveRecord::Base.time_zone_aware_attributes
-          it 'properly cast assigned value to time' do
-            model.remind_at = time_string
-            expect(model.remind_at).to be == time
-          end
-        else
-          it 'properly cast assigned value to time' do
-            model.remind_at = time_string
-            expect(model.remind_at).to be == time
-          end
-        end
       end
     end
   end
@@ -485,61 +454,27 @@
     let(:time) { datetime_string.respond_to?(:in_time_zone) ? datetime_string.in_time_zone : Time.parse(datetime_string) }
 
     context "with ActiveRecord #{ActiveRecord::VERSION::STRING}" do
+      it 'has the defined default as initial value' do
+        model.save
+        expect(model.reload.published_at).to be == datetime
+      end
 
-      if AR_VERSION < AR_4_0
-
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.published_at).to be == time
-        end
+      it 'retreive a DateTime instance' do
+        model.update(published_at: datetime)
+        expect(model.reload.published_at).to be == datetime
+      end
 
+      if ActiveRecord::Base.time_zone_aware_attributes
         it 'properly cast assigned value to time' do
           model.remind_at = datetime_string
           expect(model.remind_at).to be == time
         end
-
-        it 'properly cast assigned value to time on save' do
-          model.remind_at = datetime_string
-          model.save
-          model.reload
-          expect(model.remind_at).to be == time
-        end
-
-        it 'retreive a Time instance' do
-          model.update(published_at: datetime)
-          expect(model.reload.published_at).to be == time
-        end
-
       else
-
-        it 'has the defined default as initial value' do
-          model.save
-          expect(model.reload.published_at).to be == datetime
-        end
-
-        it 'retreive a DateTime instance' do
-          model.update(published_at: datetime)
-          expect(model.reload.published_at).to be == datetime
-        end
-
-        if ActiveRecord::Base.time_zone_aware_attributes
-
-          it 'properly cast assigned value to time' do
-            model.remind_at = datetime_string
-            expect(model.remind_at).to be == time
-          end
-
-        else
-
-          it 'properly cast assigned value to datetime' do
-            model.remind_at = datetime_string
-            expect(model.remind_at).to be == datetime
-          end
-
+        it 'properly cast assigned value to datetime' do
+          model.remind_at = datetime_string
+          expect(model.remind_at).to be == datetime
         end
-
       end
-
     end
 
     it 'nillify unparsable datetimes' do
@@ -896,15 +831,6 @@
   it_should_behave_like 'a model supporting arrays', true
 end if defined?(PostgresqlRegularARModel)
 
-describe PostgresHstoreTypedStoreModel do
-  if AR_VERSION >= AR_4_1
-    pending('TODO: Rails edge HStore compatibiliy')
-  else
-    it_should_behave_like 'any model'
-    it_should_behave_like 'a store', false
-  end
-end if defined?(PostgresHstoreTypedStoreModel)
-
 describe PostgresJsonTypedStoreModel do
   it_should_behave_like 'any model'
   it_should_behave_like 'a store', true, :json

spec/active_record/typed_store_spec.rb

@@ -2,12 +2,6 @@
 require 'json'
 require 'yaml'
 
-AR_VERSION = Gem::Version.new(ActiveRecord::VERSION::STRING)
-AR_4_0 = Gem::Version.new('4.0')
-AR_4_1 = Gem::Version.new('4.1.0.beta')
-AR_4_2 = Gem::Version.new('4.2.0-rc1')
-AR_5_0 = Gem::Version.new('5.0.0')
-
 ActiveRecord::Base.time_zone_aware_attributes = ENV['TIMEZONE_AWARE'] != '0'
 ActiveRecord::Base.configurations = {
   'test_sqlite3' => { 'adapter' => 'sqlite3', 'database' => '/tmp/typed_store.db' },
@@ -80,7 +74,7 @@ def define_store_with_attributes(**options)
   end
 end
 
-MigrationClass = AR_VERSION >= AR_5_0 ? ActiveRecord::Migration["5.0"] : ActiveRecord::Migration
+MigrationClass = ActiveRecord::Migration["5.0"]
 class CreateAllTables < MigrationClass
 
   def self.recreate_table(name, *args, &block)
@@ -98,13 +92,11 @@ def self.up
       ActiveRecord::Base.establish_connection(ENV['POSTGRES_URL'] || :test_postgresql)
       recreate_table(:postgresql_regular_ar_models) { |t| define_columns(t); t.text :untyped_settings }
 
-      if AR_VERSION >= AR_4_0
-        execute "create extension if not exists hstore"
-        recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
+      execute "create extension if not exists hstore"
+      recreate_table(:postgres_hstore_typed_store_models) { |t| t.hstore :settings; t.text :untyped_settings }
 
-        if ENV['POSTGRES_JSON']
-          recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
-        end
+      if ENV['POSTGRES_JSON']
+        recreate_table(:postgres_json_typed_store_models) { |t| t.json :settings; t.text :explicit_settings; t.text :partial_settings; t.text :untyped_settings }
       end
     end
 
@@ -163,45 +155,15 @@ class PostgresqlRegularARModel < ActiveRecord::Base
     store :untyped_settings, accessors: [:title]
   end
 
-  if AR_VERSION >= AR_4_0
-
-    class PostgresHstoreTypedStoreModel < ActiveRecord::Base
+  if ENV['POSTGRES_JSON']
+    class PostgresJsonTypedStoreModel < ActiveRecord::Base
       establish_connection ENV['POSTGRES_URL'] || :test_postgresql
       store :untyped_settings, accessors: [:title]
 
       define_store_with_attributes(coder: ColumnCoder.new(AsJson))
       define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
       define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
     end
-
-    if ENV['POSTGRES_JSON']
-
-      if AR_VERSION >= AR_4_2
-
-        class PostgresJsonTypedStoreModel < ActiveRecord::Base
-          establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-          store :untyped_settings, accessors: [:title]
-
-          define_store_with_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
-        end
-
-      else
-
-        class PostgresJsonTypedStoreModel < ActiveRecord::Base
-          establish_connection ENV['POSTGRES_URL'] || :test_postgresql
-          store :untyped_settings, accessors: [:title]
-
-          define_store_with_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_no_attributes(coder: ColumnCoder.new(AsJson))
-          define_store_with_partial_attributes(coder: ColumnCoder.new(AsJson))
-        end
-
-      end
-
-    end
-
   end
 end
 
@@ -267,5 +229,4 @@ class MarshalTypedStoreModel < ActiveRecord::Base
 ]
 Models << MysqlRegularARModel if defined?(MysqlRegularARModel)
 Models << PostgresqlRegularARModel if defined?(PostgresqlRegularARModel)
-Models << PostgresHstoreTypedStoreModel if defined?(PostgresHstoreTypedStoreModel)
 Models << PostgresJsonTypedStoreModel if defined?(PostgresJsonTypedStoreModel)