default_value_for 3.0.3 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d622d97fecd784ed09f1202e354a721fa02a7700
-  data.tar.gz: c0ee0dc2feeebeee11e63b246fe77a4e46260200
+  metadata.gz: 43f0cd7054b4c0efa902af18ce953a8acf6bb116
+  data.tar.gz: 21bfb3f957a7af4c6ce39b25678bc66c1c8ba1da
 SHA512:
-  metadata.gz: 68da2ccf0e955ad0c7c4daa68fea6607d0ba3da8521e7ecb5bcc0d42d750be6ec1b5ab93767939a74459ef6b1b7efa16c8c81c74036e0de2ac2cff88093b0ee8
-  data.tar.gz: 67c18c88f8f57429cf502f7c69efe38883ed286c8791e258bd3fc59fdb053814097f68ead33494a4ce00d76e3f672b2f2b9c8e599a43e38414fc4fb9ed5d0474
+  metadata.gz: 4a8535cf9d1197a5ae0a8f10681aee999acd6b95b54e11cb162310226d619f308adf5d4c1b2efc3994810f0f3dd705430d7fad4a43ec65f0f4be4b483aa58fc4
+  data.tar.gz: 7ba0a5fef07ba66e64d6260701ad8c6463be0703dc9677e31e29c05848088f0990ea15b7eccf2cd7c93d2ace569f506e676677257d772744ab25780f226c8982

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.0.5"
   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}

data/lib/default_value_for.rb

@@ -156,12 +156,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.detect { |c| c.name == 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

@@ -49,6 +49,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 +234,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 +362,14 @@ 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 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.0.5
 platform: ruby
 authors:
 - Hongli Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord