default_value_for 3.0.3 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d622d97fecd784ed09f1202e354a721fa02a7700
-  data.tar.gz: c0ee0dc2feeebeee11e63b246fe77a4e46260200
+SHA256:
+  metadata.gz: 15a799717c30677d582f0c87b7491f2a6a15206dd52018057e2df15db60fb21f
+  data.tar.gz: b884a6fbd0e6c679562a3765499514893649a8d3659318a92dbf009e1a1a43aa
 SHA512:
-  metadata.gz: 68da2ccf0e955ad0c7c4daa68fea6607d0ba3da8521e7ecb5bcc0d42d750be6ec1b5ab93767939a74459ef6b1b7efa16c8c81c74036e0de2ac2cff88093b0ee8
-  data.tar.gz: 67c18c88f8f57429cf502f7c69efe38883ed286c8791e258bd3fc59fdb053814097f68ead33494a4ce00d76e3f672b2f2b9c8e599a43e38414fc4fb9ed5d0474
+  metadata.gz: 1814019f12d56dcde794f9a70e530088ab1746976a99a8d076ef3b6858cb9c56410e85932f690a26a0d6ab8ee632c93634b81622e7b45548362c19d2551d548f
+  data.tar.gz: 73995f62cc25df268848f6630018dcba0f9fc8093d28382f2006919b08e32eda7b375de1359ae7506f5e074359db6839f1178e1446d52579ee69cb30d06c0ba6

data/README.md

@@ -22,12 +22,12 @@ u.last_seen  # => Mon Sep 22 17:28:38 +0200 2008
 
 ### Rails 3.2 - 4.2 / Ruby 1.9.3 and higher
 
-The current version of default_value_for (3.0.x) is compatible with Rails 3.2 or higher, and Ruby 1.9.3 and higher.
+The current version of default_value_for (3.x+) is compatible with Rails 3.2 or higher, and Ruby 1.9.3 and higher.
 
 Add it to your Gemfile:
 
 ```ruby
-gem "default_value_for", "~> 3.0.0"
+gem "default_value_for", "~> 3.0"
 ```
 
 This gem is signed using PGP with the Phusion Software Signing key: http://www.phusion.nl/about/gpg. That key in turn is signed by the rubygems-openpgp Certificate Authority: http://www.rubygems-openpgp-ca.org/.

data/Rakefile

@@ -5,7 +5,19 @@ task :test do
   ruby "test.rb"
 end
 
-['3.2', '4.0', '4.1', '4.2', '5.0', '5.1'].each do |version|
+rails_versions = %w(
+  3.2
+  4.0
+  4.1
+  4.2
+  5.0
+  5.1
+  5.2
+  6.0
+  6.1
+)
+
+rails_versions.each do |version|
   dotless = version.delete('.')
 
   namespace :bundle do
@@ -24,3 +36,14 @@ end
     end
   end
 end
+
+namespace :test do
+  desc "Test with all supported Rails versions"
+  task :railsall do
+    rails_versions.each do |version|
+      dotless = version.delete('.')
+      ENV['BUNDLE_GEMFILE'] = "gemfiles/rails_#{dotless}.gemfile"
+      ruby "test.rb"
+    end
+  end
+end

data/default_value_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = %q{default_value_for}
-  s.version               = "3.0.3"
+  s.version               = "3.4.0"
   s.summary               = %q{Provides a way to specify default values for ActiveRecord models}
   s.description           = %q{The default_value_for plugin allows one to define default values for ActiveRecord models in a declarative manner}
   s.email                 = %q{software-signing@phusion.nl}
@@ -14,8 +14,9 @@ Gem::Specification.new do |s|
     'lib/default_value_for.rb',
     'lib/default_value_for/railtie.rb'
   ]
-  s.add_dependency 'activerecord', '>= 3.2.0', '< 5.2'
-  s.add_development_dependency 'railties', '>= 3.2.0', '< 5.2'
+  s.add_dependency 'activerecord', '>= 3.2.0', '< 7.0'
+  s.add_development_dependency 'actionpack', '>= 3.2.0', '< 7.0'
+  s.add_development_dependency 'railties', '>= 3.2.0', '< 7.0'
   s.add_development_dependency 'minitest', '>= 4.2'
   s.add_development_dependency 'minitest-around'
   s.add_development_dependency 'appraisal'

data/lib/default_value_for.rb

@@ -124,6 +124,7 @@ module DefaultValueFor
 
   module InstanceMethods
     def initialize(attributes = nil, options = {})
+      attributes = attributes.to_h if attributes.respond_to?(:to_h)
       @initialization_attributes = attributes.is_a?(Hash) ? attributes.stringify_keys : {}
 
       unless options[:without_protection]
@@ -156,12 +157,18 @@ module DefaultValueFor
 
         connection_default_value_defined = new_record? && respond_to?("#{attribute}_changed?") && !__send__("#{attribute}_changed?")
 
-        column = self.class.columns.detect {|c| c.name == attribute}
-        attribute_blank = if column && column.type == :boolean
-          attributes[attribute].nil?
-        else
-          attributes[attribute].blank?
-        end
+        attribute_blank = if attributes.has_key?(attribute)
+                            column = self.class.columns_hash[attribute]
+                            if column && column.type == :boolean
+                              attributes[attribute].nil?
+                            else
+                              attributes[attribute].blank?
+                            end
+                          elsif respond_to?(attribute)
+                            send(attribute).nil?
+                          else
+                            instance_variable_get("@#{attribute}").nil?
+                          end
         next unless connection_default_value_defined || attribute_blank
 
         # allow explicitly setting nil through allow nil option

data/test.rb

@@ -22,11 +22,44 @@ require 'bundler/setup'
 require 'minitest/autorun'
 require 'minitest/around/unit'
 require 'active_record'
+require 'action_pack'
 
 if ActiveSupport::VERSION::MAJOR == 3
   require 'active_support/core_ext/logger'
 end
 
+if ActionPack::VERSION::MAJOR > 3
+  require 'action_controller'
+end
+
+# Handle an edge-case when using Arel 5 (i.e. Rails <= 4.1) with Ruby >= 2.4:
+# See: https://github.com/rails/arel/commit/dc85a6e9c74942945ad696f5da4d82490a85b865
+# See: https://stackoverflow.com/a/51481088
+rails_match_data = RUBY_VERSION.match(/\A(?<major>\d+).(?<minor>\d+)/)
+rails_2_4_or_newer = rails_match_data[:major].to_i > 2 || (rails_match_data[:major].to_i == 2 && rails_match_data[:minor].to_i >= 4)
+arel_match_data = Arel::VERSION.match(/\A(?<major>\d+).(?<minor>\d+)/)
+arel_older_than_7_1 = arel_match_data[:major].to_i < 7 || (arel_match_data[:major].to_i == 7 && arel_match_data[:minor].to_i < 1)
+
+if rails_2_4_or_newer && arel_older_than_7_1
+  module Arel
+    module Visitors
+      class DepthFirst < Arel::Visitors::Visitor
+        alias :visit_Integer :terminal
+      end
+
+      class Dot < Arel::Visitors::Visitor
+        alias :visit_Integer :visit_String
+      end
+
+      # The super class for ToSql changed with Arel 6
+      # See: https://github.com/rails/arel/commit/a6a7c75ff486657909e20e2f48764136caa5e87e#diff-3538aead5b80677372eea0e903ff728eR7
+      class ToSql < (Arel::VERSION[/\A\d+/].to_i >= 6 ? Arel::Visitors::Reduce : Arel::Visitors::Visitor)
+        alias :visit_Integer :literal
+      end
+    end
+  end
+end
+
 begin
   TestCaseClass = MiniTest::Test
 rescue NameError
@@ -35,7 +68,8 @@ end
 
 require 'default_value_for'
 
-puts "\nTesting with Active Record version #{ActiveRecord::VERSION::STRING}\n\n"
+puts "\nTesting with Active Record version #{ActiveRecord::VERSION::STRING}"
+puts "\nTesting with Action Pack version #{ActionPack::VERSION::STRING}\n\n"
 
 ActiveRecord::Base.default_timezone = :local
 ActiveRecord::Base.logger           = Logger.new(STDERR)
@@ -49,6 +83,7 @@ ActiveRecord::Base.establish_connection(
 ActiveRecord::Base.connection.create_table(:users, :force => true) do |t|
   t.string :username
   t.integer :default_number
+  t.text :settings
 end
 
 ActiveRecord::Base.connection.create_table(:books, :force => true) do |t|
@@ -233,6 +268,14 @@ class DefaultValuePluginTest < TestCaseClass
     assert_equal 'hi', Book.new.hello
   end
 
+  def test_works_on_attributes_that_only_have_writers
+    Book.class_eval do
+      default_value_for :hello, "hi"
+      attr_writer :hello
+    end
+    assert_equal 'hi', Book.new.instance_variable_get('@hello')
+  end
+
   def test_doesnt_conflict_with_overrided_initialize_method_in_model_class
     Book.class_eval do
       def initialize(attrs = {})
@@ -353,6 +396,46 @@ class DefaultValuePluginTest < TestCaseClass
     assert_equal 1, Book.all.first.number
   end
 
+  def test_works_with_stored_attribute_accessors_when_initializing_value_that_does_not_allow_nil
+    User.store :settings, :accessors => :bio
+    User.default_value_for :bio, :value => 'None given', :allows_nil => false
+
+    user = User.create!(:bio => 'This is a bio')
+    assert_equal 'This is a bio', user.bio
+  end
+
+  if ActionPack::VERSION::MAJOR > 3
+    def test_doesnt_overwrite_explicitly_provided_nil_values_in_mass_assignment_with_action_controller_parameters
+      Book.default_value_for :number, 1234
+
+      assert_nil Book.new(ActionController::Parameters.new(:number => nil).permit!).number
+    end
+
+    def test_overwrites_explicitly_provided_nil_values_in_mass_assignment_with_action_controller_parameters
+      Book.default_value_for :number, :value => 1234, :allows_nil => false
+
+      assert_equal 1234, Book.new(ActionController::Parameters.new(:number => nil).permit!).number
+    end
+
+    def test_works_with_nested_attributes_with_action_controller_parameters
+      User.accepts_nested_attributes_for :books
+      User.default_value_for :books do
+        [Book.create!(:number => 0)]
+      end
+
+      user = User.create!(ActionController::Parameters.new(:books_attributes => [{:number => 1}]).permit!)
+      assert_equal 1, Book.all.first.number
+    end
+
+    def test_works_with_stored_attribute_accessors_when_initializing_value_that_does_not_allow_nil_with_action_controller_parameters
+      User.store :settings, :accessors => :bio
+      User.default_value_for :bio, :value => 'None given', :allows_nil => false
+
+      user = User.create!(ActionController::Parameters.new(:bio => 'This is a bio').permit!)
+      assert_equal 'This is a bio', user.bio
+    end
+  end
+
   if ActiveRecord::VERSION::MAJOR == 3
     def test_constructor_ignores_forbidden_mass_assignment_attributes
       Book.class_eval do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: default_value_for
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.4.0
 platform: ruby
 authors:
 - Hongli Lai
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,27 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
+- !ruby/object:Gem::Dependency
+  name: actionpack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +59,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,7 +69,7 @@ dependencies:
         version: 3.2.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -111,7 +131,7 @@ homepage: https://github.com/FooBarWidget/default_value_for
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -126,9 +146,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Provides a way to specify default values for ActiveRecord models
 test_files: []