columns_on_demand 4.1.1 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c360d877be5435f7217a91ab76ba418c519d9585
-  data.tar.gz: 968eb4b78136d091e6a60de3f6277e8ca6d41607
+  metadata.gz: 0e2af8b1aaf2ba19e065727ca50a8340e15ae2da
+  data.tar.gz: 42febaa5ebfdbf3ad1cbee5b6263ddc9593cfa18
 SHA512:
-  metadata.gz: 01a5390f5cd9a6ccfd8ee59bf5113b66c7babe1b03bbc5ea937ec027b210e6c45a2e7e00ba87a7646b469ea549688df36e40a2f0646e0e8cf73aac196b16fcc1
-  data.tar.gz: 94c39a5b6e1e2f64665d1e41f7092283efa4720b0ed324cd27ee9f6be4a98704e772eec835ce941b0953cc51871fc9534db0ebbabfc5c72a83640efc33e9f6fb
+  metadata.gz: 319c73384f3d7738430c69a5ca2c5c21c48f9c75ed1253e75c3b509b7793996607e383aaaecc9fb929dd3f3d9cd70a7f30f46b77412e93c7b392601943a51883
+  data.tar.gz: 392e3d12c891be2a2181994c50e53eb9c1d450f47f84c97f0ef7a65ca0a0ae8ebf9decce40029228e46265372d702e729b1d854468dcbb9f9420de148a69cbd5

data/README

@@ -21,7 +21,7 @@ Compatibility
 
 Supports mysql, mysql2, postgresql, and sqlite3.
 
-Currently tested against Rails 3.2.13 and 3.1.8, on Ruby 1.8.7 and 2.0.0p0.
+Currently tested against Rails 4.2.0, 4.1.5, 4.0.9, 3.2.18 and 3.1.8, on Ruby 2.0.0.
 Was also tested compatible with 2.3.14, 3.0.17.
 
 Note that 3.0 and 3.1 have ActiveRecord regressions that will affect sqlite users.
@@ -44,4 +44,4 @@ class Example
 end
 
 
-Copyright (c) 2008-2013 Will Bryant, Sekuda Ltd, released under the MIT license
+Copyright (c) 2008-2014 Will Bryant, Sekuda Ltd, released under the MIT license

data/lib/columns_on_demand.rb

@@ -8,9 +8,10 @@ module ColumnsOnDemand
       include InstanceMethods
 
       class <<self
-        unless ActiveRecord.const_defined?(:AttributeMethods) &&
+        unless ActiveRecord::VERSION::MAJOR > 3 ||
+              (ActiveRecord.const_defined?(:AttributeMethods) &&
                ActiveRecord::AttributeMethods::const_defined?(:Serialization) &&
-               ActiveRecord::AttributeMethods::Serialization::Attribute
+               ActiveRecord::AttributeMethods::Serialization::const_defined?(:Attribute))
           alias_method_chain :define_read_method_for_serialized_attribute, :columns_on_demand
         end
         alias_method_chain :reset_column_information,        :columns_on_demand
@@ -21,6 +22,7 @@ module ColumnsOnDemand
       alias_method_chain   :read_attribute_before_type_cast, :columns_on_demand
       alias_method_chain   :missing_attribute,               :columns_on_demand
       alias_method_chain   :reload,                          :columns_on_demand
+      alias_method_chain   :changed_in_place?,               :columns_on_demand if ActiveRecord::AttributeMethods::Dirty.instance_methods.include?(:changed_attributes)
     end
     
     def reset_column_information_with_columns_on_demand
@@ -60,7 +62,7 @@ module ColumnsOnDemand
     end
 
     def column_loaded?(attr_name)
-      !columns_to_load_on_demand.include?(attr_name) || !@attributes[attr_name].nil? || new_record? || columns_loaded.include?(attr_name)
+      !columns_to_load_on_demand.include?(attr_name) || @attributes.key?(attr_name) || new_record? || columns_loaded.include?(attr_name)
     end
 
     def attributes_with_columns_on_demand
@@ -74,16 +76,23 @@ module ColumnsOnDemand
     
     def load_attributes(*attr_names)
       return if attr_names.blank?
+
       values = self.class.connection.select_rows(
         "SELECT #{attr_names.collect {|attr_name| self.class.connection.quote_column_name(attr_name)}.join(", ")}" +
         "  FROM #{self.class.quoted_table_name}" +
         " WHERE #{self.class.connection.quote_column_name(self.class.primary_key)} = #{self.class.quote_value(id, self.class.columns_hash[self.class.primary_key])}")
       row = values.first || raise(ActiveRecord::RecordNotFound, "Couldn't find #{self.class.name} with ID=#{id}")
+
       attr_names.each_with_index do |attr_name, i|
         columns_loaded << attr_name
-        @attributes[attr_name] = row[i]
+        value = row[i]
 
-        if coder = self.class.serialized_attributes[attr_name]
+        if @attributes.respond_to?(:write_from_database)
+          # activerecord 4.2 or later, which make it easy to replicate the normal typecasting and deserialization logic
+          @attributes.write_from_database(attr_name, value)
+
+        elsif coder = self.class.serialized_attributes[attr_name]
+          # activerecord 4.1 or earlier, with a serialized column
           # for some database adapters, @column_types_override gets populated with type data from query used to load the record originally.
           # this is fine, but unfortunately some special-case "decorate_columns" code in ActiveRecord will wrap those types in serialization
           # objects, and it does this for each column listed in @serialized_column_names *even if they are not present in the query results*.
@@ -93,13 +102,19 @@ module ColumnsOnDemand
 
           if ActiveRecord.const_defined?(:AttributeMethods) &&
              ActiveRecord::AttributeMethods::const_defined?(:Serialization) &&
-             ActiveRecord::AttributeMethods::Serialization::Attribute
+             ActiveRecord::AttributeMethods::Serialization::const_defined?(:Attribute)
             # in 3.2 @attributes has a special Attribute struct to help cache both serialized and unserialized forms
-            @attributes[attr_name] = ActiveRecord::AttributeMethods::Serialization::Attribute.new(coder, @attributes[attr_name], :serialized)
+            @attributes[attr_name] = ActiveRecord::AttributeMethods::Serialization::Attribute.new(coder, value, :serialized)
           elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR == 1
-            # in 2.3 an 3.0, @attributes has the serialized form; from 3.1 it has the deserialized form
-            @attributes[attr_name] = coder.load @attributes[attr_name]
+            # from 3.1 it has the deserialized form
+            @attributes[attr_name] = coder.load value
+          else
+            # in 2.3 an 3.0, @attributes has the serialized form
+            @attributes[attr_name] = value
           end
+        else
+          # activerecord 4.1 or earlier, with a regular unserialized column
+          @attributes[attr_name] = value
         end
       end
     end
@@ -108,6 +123,10 @@ module ColumnsOnDemand
       load_attributes(attr_name.to_s) unless column_loaded?(attr_name.to_s)
     end
     
+    def changed_in_place_with_columns_on_demand?(attr_name)
+      column_loaded?(attr_name) && changed_in_place_without_columns_on_demand?(attr_name)
+    end
+
     def read_attribute_with_columns_on_demand(attr_name, &block)
       ensure_loaded(attr_name)
       read_attribute_without_columns_on_demand(attr_name, &block)
@@ -129,7 +148,15 @@ module ColumnsOnDemand
     def reload_with_columns_on_demand(*args)
       reload_without_columns_on_demand(*args).tap do
         columns_loaded.clear
-        columns_to_load_on_demand.each {|attr_name| @attributes.delete(attr_name)}
+        columns_to_load_on_demand.each do |attr_name|
+          if @attributes.respond_to?(:reset)
+            # 4.2 and above
+            @attributes.reset(attr_name)
+          else
+            # 4.1 and earlier
+            @attributes.delete(attr_name)
+          end
+        end
       end
     end
   end

data/lib/columns_on_demand/version.rb

@@ -1,3 +1,3 @@
 module ColumnsOnDemand
-  VERSION = '4.1.1'
+  VERSION = '4.2.0'
 end

data/test/columns_on_demand_test.rb

@@ -24,11 +24,11 @@ end
 
 class ColumnsOnDemandTest < ActiveSupport::TestCase
   def assert_not_loaded(record, attr_name)
-    assert !record.column_loaded?(attr_name.to_s)
+    assert !record.column_loaded?(attr_name.to_s), "Record should not have the #{attr_name} column loaded, but did"
   end
   
   def assert_loaded(record, attr_name)
-    assert record.column_loaded?(attr_name.to_s)
+    assert record.column_loaded?(attr_name.to_s), "Record should have the #{attr_name} column loaded, but didn't"
   end
   
   def assert_queries(num = 1)
@@ -271,11 +271,15 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
     assert_equal data, original_record.data
     
     record = Serializing.first
+    assert_not_loaded record, "data"
+    assert_equal false, record.data_changed?
+
     assert_not_loaded record, "data"
     assert_equal data, record.data
     assert_equal false, record.data_changed?
     assert_equal false, record.changed?
     assert_equal data, record.data
+    assert_equal data, record.data_was
     
     record.data = "replacement"
     assert_equal true, record.data_changed?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columns_on_demand
 version: !ruby/object:Gem::Version
-  version: 4.1.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Lazily loads large columns on demand.