default_value_for 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d6dadd938f39257735190a992f22f3c7910d5f8a76a4167122a86375157059b
-  data.tar.gz: b9f8f24beaa2331030d27570880fefcb326a262e2124fe5fc338e0a1722274a2
+  metadata.gz: 0fc011401b53010c6cc35ec4b7d603ca7c25caf4c4f5602aaad7d5ac594e5d54
+  data.tar.gz: 19c64f2d05b114507c1aeb16745f2c9dd9559acf6a37643594c86eaf9a2e9165
 SHA512:
-  metadata.gz: 76c4f21ec9c11ce22085c457392955886b98e99aee8f386cf7fab0276a8d4ea21fe8071a586322a8ac2bec726b0a1a7ea11efb97d5f01b037ff43877e52ae1a0
-  data.tar.gz: bb1356e71b82a810c66d202a7e2798abd3c3320aa360eaa0ea23980b043a0a9b413468ca3d41a3a7128b0b5e09d65021a26c726295c607135e2fa0b7695f6c35
+  metadata.gz: 398b1ffc9a6c087f854e3779b73c3624f0e5da598f60b63c41c5c7a14943d4294c2031147110e998c60026e9bce09d50d68f73e1bff98e33d61a6915ade1078b
+  data.tar.gz: 422c73abf865cee8d4619f983a91d3a20850b1ee66393e1ed5b6e1667ffcbc3529e36dd88fff4b72a07712c33096b03a1c18618377c9d4961f6f5fef5fe2ce5c

data/default_value_for.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name                  = %q{default_value_for}
-  s.version               = "3.1.0"
+  s.version               = "3.2.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}
@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '>= 4.2'
   s.add_development_dependency 'minitest-around'
   s.add_development_dependency 'appraisal'
+  s.add_development_dependency 'actionpack', '>= 3.2.0', '< 6.0'
 end

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]
@@ -157,7 +158,7 @@ module DefaultValueFor
         connection_default_value_defined = new_record? && respond_to?("#{attribute}_changed?") && !__send__("#{attribute}_changed?")
 
         attribute_blank = if attributes.has_key?(attribute)
-                            column = self.class.columns.detect { |c| c.name == attribute }
+                            column = self.class.columns_hash[attribute]
                             if column && column.type == :boolean
                               attributes[attribute].nil?
                             else

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)
@@ -370,6 +404,38 @@ class DefaultValuePluginTest < TestCaseClass
     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.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2019-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -92,6 +92,26 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '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: '6.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: '6.0'
 description: The default_value_for plugin allows one to define default values for
   ActiveRecord models in a declarative manner
 email: software-signing@phusion.nl