columns_on_demand 5.1.1 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11669dc2b1270745b3daf5f0b4edd68a711edc45
-  data.tar.gz: 7e221c815f656f81f225fe0052c1acb22d4346dd
+  metadata.gz: a81ff04523e371ffc1da7110c2044fd3f4e02639
+  data.tar.gz: e139bc9d3ee903d15985e475d1e7d235c19c3a89
 SHA512:
-  metadata.gz: 1ce9b3fb616787002fa71b58c4dbc71a7d00795f2ac7c0cfd905326bcc32b0f444664b6e529488c8799d5054f5a78076f159f28b7b21130559cb8848dc92a58e
-  data.tar.gz: 31f75591d087e6e4e448c36ba99ebd8fd2ce186af13f7067f67bf2bef6fa5909d6b8b943214236f346ba36eff25f8708a9d772c066feb2006fcc05f142fafcc9
+  metadata.gz: 52869db49b76dc76722cdbe4a513f35d83cfb4f07da435c10ed1a7cf9b482ad0d6766087c3783eea97caf109b8dc4be1c02348eaad08e3af3c3095e18dedc1fb
+  data.tar.gz: b28d0a071c5d8826f82834191de82fd527574b372b89ca8e8ca9960c2b63e211656e62ad9c4657ca8854d6fed7bda62c8fdd6373a8356c8fcf2b9d325499c232

data/Gemfile

@@ -1,6 +1,6 @@
 source "http://rubygems.org"
 
-# Declare your gem's dependencies in transaction_isolation_level.gemspec.
+# Declare your gem's dependencies in columns_on_demand.gemspec.
 # Bundler will treat runtime dependencies like base dependencies, and
 # development dependencies will be added by default to the :development group.
 gemspec
@@ -11,4 +11,3 @@ gemspec
 # your gem to rubygems.org.
 
 gem 'rails', ENV['RAILS_VERSION']
-gem 'nokogiri', '~> 1.6.7.2'

data/README.md

@@ -21,7 +21,7 @@ Compatibility
 
 Supports mysql, mysql2, postgresql, and sqlite3.
 
-Currently tested against Rails 5.1 (up to 5.1.0beta1), 5.0 (up to 5.0.2), and 4.2 (up to 4.2.7), on Ruby 2.3.4.
+Currently tested against Rails 5.1 (up to 5.1.4), 5.0 (up to 5.0.6), and 4.2 (up to 4.2.10), on Ruby 2.3.4.
 
 For earlier versions of Rails, use an older version of the gem.
 
@@ -54,4 +54,4 @@ Thanks
 * Tobias Matthies (@tobmatth)
 * Phil Ross (@philr)
 
-Copyright (c) 2008-2015 Will Bryant, Sekuda Ltd, released under the MIT license
+Copyright (c) 2008-2017 Will Bryant, Sekuda Ltd, released under the MIT license

data/lib/columns_on_demand.rb

@@ -14,7 +14,7 @@ module ColumnsOnDemand
     end
     
     def reset_column_information_with_columns_on_demand
-      @columns_to_select = nil
+      @columns_to_select = @columns_to_load_by_default = nil
       reset_column_information_without_columns_on_demand
     end
 
@@ -29,13 +29,17 @@ module ColumnsOnDemand
   module ClassMethods
     # this is the method API as called by ActiveRecord 2.x.  we also call it ourselves above in our ActiveRecord 3 extensions.
     def default_select(qualified)
-      @columns_to_select ||= (columns.collect(&:name) - columns_to_load_on_demand).collect {|attr_name| connection.quote_column_name(attr_name)}
+      @columns_to_select ||= columns_to_load_by_default.collect {|attr_name| connection.quote_column_name(attr_name)}
       if qualified
         quoted_table_name + '.' + @columns_to_select.join(", #{quoted_table_name}.")
       else
         @columns_to_select.join(", ")
       end
     end
+
+    def columns_to_load_by_default
+      @columns_to_load_by_default ||= Set.new(columns.collect(&:name) - columns_to_load_on_demand)
+    end
   end
   
   module InstanceMethods
@@ -48,7 +52,11 @@ module ColumnsOnDemand
     end
 
     def attributes
-      load_attributes(*columns_to_load_on_demand.reject {|attr_name| column_loaded?(attr_name)})
+      loaded_attributes = @attributes.keys
+      if loaded_attributes.size == self.class.columns_to_load_by_default.size &&
+         loaded_attributes.size == (self.class.columns_to_load_by_default & loaded_attributes).size
+        load_attributes(*columns_to_load_on_demand.reject {|attr_name| column_loaded?(attr_name)})
+      end
       super
     end
 

data/lib/columns_on_demand/version.rb

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

data/test/columns_on_demand_test.rb

@@ -136,6 +136,18 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
       assert !attributes["processing_log"].blank?
     end
   end
+
+  test "it doesn't load the column when generating #attributes if not included in the select() list" do
+    attributes = Implicit.select("id, original_filename").first.attributes
+    assert_equal "somefile.txt", attributes["original_filename"]
+    assert !attributes.has_key?("file_data")
+  end
+
+  test "it loads the column when generating #attributes if included in the select() list" do
+    attributes = Implicit.select("id, original_filename, file_data").first.attributes
+    assert_equal "somefile.txt", attributes["original_filename"]
+    assert_equal "This is the file data!", attributes["file_data"]
+  end
   
   test "it loads the column when generating #to_json" do
     ActiveRecord::Base.include_root_in_json = true

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columns_on_demand
 version: !ruby/object:Gem::Version
-  version: 5.1.1
+  version: 5.1.2
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-09 00:00:00.000000000 Z
+date: 2018-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord