activerecord-tablefree 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdef3bd0f5c266b4321652f0316960c23cf83fcc3fc34daba89a0383878bb12d
-  data.tar.gz: 3e11bccff94e87fbde89840ce180bc9eae271f5b0c3b1bc26a703c5cac15b10a
+  metadata.gz: 7fc3c83aa280346d38cfe3b09e7a3844fe49c00533e882007303e29bba6518e6
+  data.tar.gz: a5b1df6f5f99f8d3eb745240132ae7b75ba909d69c57d675948406257bc07df3
 SHA512:
-  metadata.gz: 90f6e6aa84ae947cb8844f17bd79b4d4fcf77304004eeb9cefa7c1e5c031f50b8d04521a5a6b89d49a42ab9150eed246b4b7944ba99346e9928b4b4852c08ff7
-  data.tar.gz: 1c0604e1bd9950460a80319eeb0514fba293407c2832de65d77723d4db7774ba38cc51b59c20015be6e67559216da7ba387a300760df9227be71e8be5a223c37
+  metadata.gz: 1dd0aa35765e870c767e982bcce2dc60119fc62f753a7b86b75e7b33ddfc13d913cd0342117bce51861d8faa482efd003b8db82618df8748ec4ce50c9b236b0a
+  data.tar.gz: 57fca62e0b668891f893e16576699f549c996c482c8aaed479fb32bd619812657f35c19b26a2d4fddc6e4e64dc5551dc44b6165f581549c2ebb7d51d755a5803

data/.travis.yml

@@ -30,12 +30,10 @@ sudo: false
 
 rvm:
   # latest versions on travis-ci as of 2018.09.04
-  - jruby-9.1.9.0
   - ruby-2.2.10
   - ruby-2.3.7
   - ruby-2.4.4
   - ruby-2.5.1
-  - jruby-head
   - ruby-head
 gemfile:
   - gemfiles/rails50.gemfile
@@ -44,7 +42,6 @@ gemfile:
 
 matrix:
   allow_failures:
-  - rvm: jruby-head
   - rvm: ruby-head
   fast_finish: true
   exclude:
@@ -52,14 +49,6 @@ matrix:
   # ruby-2.3.7 tests on all versions
   # ruby-2.4.4 tests on all versions
   # ruby-2.5.1 tests on all versions
-  # jruby-9.1.9.0 only tests on rails 5.1+
-  - rvm: jruby-9.1.9.0
-    gemfile: gemfiles/rails_5_0.gemfile
-  # jruby-head only tests on rails 5.2+
-  - rvm: jruby-head
-    gemfile: gemfiles/rails_5_0.gemfile
-  - rvm: jruby-head
-    gemfile: gemfiles/rails_5_1.gemfile
   # ruby-head only tests on rails 5.2+
   - rvm: ruby-head
     gemfile: gemfiles/rails_5_0.gemfile

data/activerecord-tablefree.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rspec', '~> 3')
   gem.add_development_dependency('rspec-collection_matchers', '~> 1')
 
-  gem.add_development_dependency('capybara', '~> 2')
+  gem.add_development_dependency('capybara', '~> 3')
   gem.add_development_dependency('coveralls', '~> 0')
   gem.add_development_dependency('gem-release', '~> 2')
   gem.add_development_dependency('listen', '~> 3')

data/lib/activerecord/tablefree.rb

@@ -86,11 +86,15 @@ module ActiveRecord
       end
 
       # Register a new column.
-      def column(name, sql_type = nil, default = nil, null = true)
-        cast_class = "ActiveRecord::Type::#{sql_type.to_s.camelize}".constantize rescue nil
+      def column(name, sql_type = nil, default = nil, null = true, cast_class_params = nil)
+        cast_class = if sql_type.is_a?(Class) && sql_type < ActiveModel::Type::Value
+                       sql_type
+                     else
+                       "ActiveRecord::Type::#{sql_type.to_s.camelize}".constantize rescue nil
+                     end
         raise InvalidColumnType, "sql_type is #{sql_type} (#{sql_type.class}), which is not supported" unless cast_class.respond_to?(:new)
-        cast_type = cast_class.new
-        tablefree_options[:columns_hash][name.to_s] = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, cast_type, sql_type.to_s, null)
+        cast_type = cast_class.new(*cast_class_params)
+        tablefree_options[:columns_hash][name.to_s] = ActiveRecord::ConnectionAdapters::Column.new(name.to_s, default, cast_type, null)
       end
 
       # Register a set of columns with the same SQL type

data/lib/activerecord/tablefree/cast_type.rb

@@ -4,6 +4,11 @@ module ActiveRecord::Tablefree
       true
     end
 
+    # Needed for Rails 5.2 when using numericality validator
+    def value_constructed_by_mass_assignment?(_value)
+      false
+    end
+
     # Needed for Rails 5.0
     def serialize(args)
       args

data/lib/activerecord/tablefree/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Tablefree
-    VERSION = '3.1.7'.freeze
+    VERSION = '3.1.8'.freeze
   end
 end

data/spec/activerecord/tablefree_spec.rb

@@ -7,6 +7,7 @@ def make_tablefree_model(database = nil, nested = nil)
     #{database ? "has_no_table :database => :#{database}" : 'has_no_table'}
     column :id, :integer
     column :name, :string
+    column :not_nullable, :integer, 1, false
     #{if nested
         '
         has_many :arm_rests
@@ -162,6 +163,12 @@ describe 'Tablefree model with fail_fast' do
   before(:context) { make_tablefree_model(nil, nil) }
   after(:context) { remove_models }
   subject { Chair }
+  it 'has the expected null value for columns' do
+    name = subject.columns.detect { |column| column.name == 'name' }.null
+    not_nullable = subject.columns.detect { |column| column.name == 'not_nullable' }.null
+    expect(name).to be_truthy
+    expect(not_nullable).to be_falsy
+  end
   it_behaves_like 'a tablefree model with fail_fast'
   describe 'instance' do
     subject { Chair.new(name: 'Jarl') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-tablefree
 version: !ruby/object:Gem::Version
-  version: 3.1.7
+  version: 3.1.8
 platform: ruby
 authors:
 - Jarl Friis
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-08 00:00:00.000000000 Z
+date: 2018-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -157,14 +157,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement