columns_on_demand 5.1.0 → 5.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c49cd47105f630d84e2f6ad368006311ee60c3c3
-  data.tar.gz: c239c30034961fd54de59f856c101c027d21bb36
+  metadata.gz: 11669dc2b1270745b3daf5f0b4edd68a711edc45
+  data.tar.gz: 7e221c815f656f81f225fe0052c1acb22d4346dd
 SHA512:
-  metadata.gz: 3408bb8a756cd559c996ca3afdb7b7994a9137bc94ae19e97b365f12c845da1d154353e6b1900b28e631cee76d8cb73289bffe09f46bd71300d560a5be94ff17
-  data.tar.gz: 3ffd5d76e1fc8f8ce5a260927faa6dd022c6d151bea1c72e0fea4e7c8804f81443f265e6b89960747d38d4d7d4690e5d101a635fc5deb16e399c91b312adafa3
+  metadata.gz: 1ce9b3fb616787002fa71b58c4dbc71a7d00795f2ac7c0cfd905326bcc32b0f444664b6e529488c8799d5054f5a78076f159f28b7b21130559cb8848dc92a58e
+  data.tar.gz: 31f75591d087e6e4e448c36ba99ebd8fd2ce186af13f7067f67bf2bef6fa5909d6b8b943214236f346ba36eff25f8708a9d772c066feb2006fcc05f142fafcc9

data/README.md

@@ -52,5 +52,6 @@ Thanks
 
 * Tim Connor (@tlconnor)
 * Tobias Matthies (@tobmatth)
+* Phil Ross (@philr)
 
 Copyright (c) 2008-2015 Will Bryant, Sekuda Ltd, released under the MIT license

data/lib/columns_on_demand.rb

@@ -68,8 +68,6 @@ module ColumnsOnDemand
       attr_names.each_with_index do |attr_name, i|
         columns_loaded << attr_name
         value = row[i]
-
-        # activerecord 4.2 or later, which make it easy to replicate the normal typecasting and deserialization logic
         @attributes.write_from_database(attr_name, value)
       end
     end
@@ -138,3 +136,19 @@ end
 
 ActiveRecord::Base.send(:extend, ColumnsOnDemand::BaseMethods)
 ActiveRecord::Relation.send(:prepend, ColumnsOnDemand::RelationMethods)
+
+# work around ActiveRecord 5.0 and 5.1 converting uninitialized attributes to value nil on save
+# (due to dirty.rb mapping @attributes).  this is not only a problem for columns_on_demand as it
+# means that a MissingAttributeError will never be raised after save, but we suffer more.
+# ActiveRecord 4.2's Attribute doesn't have forgetting_assignment (or this problem).
+if ActiveRecord::Attribute.uninitialized(nil, nil).try(:forgetting_assignment).try(:initialized?)
+  module ActiveRecord
+    class Attribute # :nodoc:
+      class Uninitialized < Attribute # :nodoc:
+        def forgetting_assignment
+          dup
+        end
+      end
+    end
+  end
+end

data/lib/columns_on_demand/version.rb

@@ -1,3 +1,3 @@
 module ColumnsOnDemand
-  VERSION = '5.1.0'
+  VERSION = '5.1.1'
 end

data/test/columns_on_demand_test.rb

@@ -163,6 +163,26 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
     assert_not_equal old_object_id, record.file_data.object_id
   end
   
+  test "it does not think the column has been loaded if a reloaded instance that has not loaded the attribute is saved" do
+    record = Implicit.first
+    record.update_attributes!(:file_data => "New file data")
+
+    record.reload
+    record.save!
+
+    assert_equal "New file data", record.file_data
+  end
+
+  test "it does not think the column has been loaded if a fresh instance that has not loaded the attribute is saved" do
+    record = Implicit.first
+    record.update_attributes!(:file_data => "New file data")
+
+    record = Implicit.find(record.id)
+    record.save!
+
+    assert_equal "New file data", record.file_data
+  end
+
   test "it doesn't override custom select() finds" do
     record = Implicit.select("id, file_data").first
     klass = ActiveRecord.const_defined?(:MissingAttributeError) ? ActiveRecord::MissingAttributeError : ActiveModel::MissingAttributeError

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columns_on_demand
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.1.1
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-13 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -185,3 +185,4 @@ test_files:
 - test/fixtures/parents.yml
 - test/schema.rb
 - test/test_helper.rb
+has_rdoc: false