columns_on_demand 4.2.3 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf0790eaf4b1e42031300b89dc41c78c3e6d01dd
-  data.tar.gz: 565cac752b00dd851afae53693338830515ab54f
+  metadata.gz: 8ea8794dded2d78daf705ceaab6df85b8a150fcb
+  data.tar.gz: 0549493f7b65d99480413e6a24d5016d76984251
 SHA512:
-  metadata.gz: ef1f5f0953ae36e854ed4742d51d58e7535091946461f2ca8a9d6fe8df4a0b8efd58f74a9316c6279f30c0ccb0394b4ee401d03b61988ca6a1516669f194a598
-  data.tar.gz: b00570225d31a37086329a7a55de9c0b72c952e20d3398df241fa3b7b0bbd05d789ad863ebb7229997517a15f50eb4a8db9a651998180f7f4f4f67e624691ae6
+  metadata.gz: 7f984d613b9eeccb2d14fab83e1dd6948a970d3b482876e6095a6605674bf80b8878afd4ec19b8206a4c830341e3b05ac52a7fb30d40f08ff7edfb8198e630da
+  data.tar.gz: ae1a56951d46b3703d3156d2275a099a0de958139c6b978c5805064ce28f7b2ddb361458b6462388346cf580de233bfbc95d9f1228694bd5989e40095a80f70f

data/Gemfile

@@ -10,4 +10,5 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-gem 'rails', ENV['RAILS_VERSION']
+gem 'rails', ENV['RAILS_VERSION']
+gem 'nokogiri', '~> 1.6.7.2'

data/lib/columns_on_demand.rb

@@ -179,7 +179,7 @@ module ColumnsOnDemand
 
   module RelationMethodsArity2
     def build_select_with_columns_on_demand(arel, selects)
-      if selects.empty? && klass < ColumnsOnDemand::InstanceMethods
+      if (selects.empty? || selects == [table[Arel.star]] || selects == ['*']) && klass < ColumnsOnDemand::InstanceMethods
         build_select_without_columns_on_demand(arel, [default_select(true)])
       else
         build_select_without_columns_on_demand(arel, selects)
@@ -189,7 +189,7 @@ module ColumnsOnDemand
 
   module RelationMethodsArity1
     def build_select_with_columns_on_demand(arel)
-      if select_values.empty? && klass < ColumnsOnDemand::InstanceMethods
+      if (select_values.empty? || select_values == [table[Arel.star]] || select_values == ['*']) && klass < ColumnsOnDemand::InstanceMethods
         arel.project(*arel_columns([default_select(true)]))
       else
         build_select_without_columns_on_demand(arel)        

data/lib/columns_on_demand/version.rb

@@ -1,3 +1,3 @@
 module ColumnsOnDemand
-  VERSION = '4.2.3'
+  VERSION = '4.3.0'
 end

data/test/columns_on_demand_test.rb

@@ -166,6 +166,16 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
     end
     assert_loaded record, :file_data
   end
+
+  test "it doesn't load the on demand columns with select *" do
+    record = Implicit.select(Implicit.arel_table[Arel.star]).first
+    assert_not_loaded record, "file_data"
+    assert_not_loaded record, "processing_log"
+
+    record = Implicit.select('*').first
+    assert_not_loaded record, "file_data"
+    assert_not_loaded record, "processing_log"
+  end
   
   test "it raises normal ActiveRecord::RecordNotFound if the record is deleted before the column load" do
     record = Implicit.first
@@ -246,6 +256,20 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
     assert_equal "Here's some info.", parent.info
   end
   
+  test "it works on child records loaded from associations with includes" do
+    parent = Parent.includes(:children).first
+    child = parent.children.first
+    assert_not_loaded child, "test_data"
+    assert_equal "Some test data", child.test_data
+  end
+
+  test "it works on parent records loaded from associations with includes" do
+    child = Child.includes(:parent).first
+    parent = child.parent
+    assert_not_loaded parent, "info"
+    assert_equal "Here's some info.", parent.info
+  end
+
   test "it doesn't break validates_presence_of" do
     class ValidatedImplicit < ActiveRecord::Base
       self.table_name = "implicits"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columns_on_demand
 version: !ruby/object:Gem::Version
-  version: 4.2.3
+  version: 4.3.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord