columns_on_demand 3.0.2 → 4.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: c0959f01a0d8c87999c526ccdafd93755595d0fd
+  data.tar.gz: 397908ac37b04fa81afe558d14bfedbd5d4df1ca
+SHA512:
+  metadata.gz: ac93a58ae02e8b298c6652af9f82c123d6fe826fe4058903941b67010e0a77851dfe7096fc12648eade0de1bd3ca735825fa98c0b21c5fe86c62d6b000752b0a
+  data.tar.gz: cdc82b4b4e56b64bba76aebf01dffb9461b2caacc202360cbe2c60662daf0145f2dd959ebdb0d12b7b87577ea394b10aa3d3b5478ac103b7a10c33ea8aed1924

data/Gemfile

@@ -13,3 +13,5 @@ gemspec
 # To use debugger
 # gem 'ruby-debug19', :require => 'ruby-debug'
 # gem 'ruby-debug'
+
+gem 'rails', ENV['RAILS_VERSION']

data/columns_on_demand.gemspec

@@ -26,10 +26,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.
-Was also tested compatible with 2.3.14 and 3.0.17.
-
-Note that 3.0 and 3.1 have ActiveRecord regressions that will affect sqlite users.
+Currently tested against Rails 3.2.18, 4.0.8, and 4.1.4, on Ruby 2.0.0.
 EOF
   gem.has_rdoc     = false
   gem.author       = "Will Bryant"

data/lib/columns_on_demand.rb

@@ -74,10 +74,10 @@ module ColumnsOnDemand
     
     def load_attributes(*attr_names)
       return if attr_names.blank?
-      values = connection.select_rows(
-        "SELECT #{attr_names.collect {|attr_name| connection.quote_column_name(attr_name)}.join(", ")}" +
+      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 #{connection.quote_column_name(self.class.primary_key)} = #{quote_value(id, self.class.columns_hash[self.class.primary_key])}")
+        " 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
@@ -101,9 +101,9 @@ module ColumnsOnDemand
       load_attributes(attr_name.to_s) unless column_loaded?(attr_name.to_s)
     end
     
-    def read_attribute_with_columns_on_demand(attr_name)
+    def read_attribute_with_columns_on_demand(attr_name, &block)
       ensure_loaded(attr_name)
-      read_attribute_without_columns_on_demand(attr_name)
+      read_attribute_without_columns_on_demand(attr_name, &block)
     end
 
     def read_attribute_before_type_cast_with_columns_on_demand(attr_name)
@@ -130,7 +130,7 @@ module ColumnsOnDemand
   module RelationMethods
     def build_select_with_columns_on_demand(arel, selects)
       if selects.empty? && klass < ColumnsOnDemand::InstanceMethods
-        build_select_without_columns_on_demand(arel, default_select(true))
+        build_select_without_columns_on_demand(arel, [default_select(true)])
       else
         build_select_without_columns_on_demand(arel, selects)
       end

data/lib/columns_on_demand/version.rb

@@ -1,3 +1,3 @@
 module ColumnsOnDemand
-  VERSION = '3.0.2'
+  VERSION = '4.1.0'
 end

data/test/activerecord_count_queries.rb

@@ -1,19 +1,6 @@
-if ActiveRecord::VERSION::MAJOR < 3 || (ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 1)
-  # proudly stolen from ActiveRecord's test suite, with addition of BEGIN and COMMIT
-  ActiveRecord::Base.connection.class.class_eval do
-    IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /SHOW FIELDS/, /^BEGIN$/, /^COMMIT$/]
-
-    def execute_with_query_record(sql, name = nil, &block)
-      $queries_executed ||= []
-      $queries_executed << sql unless IGNORED_SQL.any? { |r| sql =~ r }
-      execute_without_query_record(sql, name, &block)
-    end
-
-    alias_method_chain :execute, :query_record
-  end
-elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 2
+if ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 2
   # this is from 3.1's test suite.  ugly.
-  class ActiveRecord::SQLCounter
+  class SQLCounter
     cattr_accessor :ignored_sql
     self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
 
@@ -21,10 +8,14 @@ elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 2
     # ignored SQL.  This ignored SQL is for Oracle.
     ignored_sql.concat [/^select .*nextval/i, /^SAVEPOINT/, /^ROLLBACK TO/, /^\s*select .* from all_triggers/im]
 
-    def initialize
+    def self.clear_log
       $queries_executed = []
     end
 
+    def initialize
+      $queries_executed.clear
+    end
+
     def call(name, start, finish, message_id, values)
       sql = values[:sql]
 
@@ -36,10 +27,10 @@ elsif ActiveRecord::VERSION::MAJOR == 3 && ActiveRecord::VERSION::MINOR < 2
       end
     end
   end
-  ActiveSupport::Notifications.subscribe('sql.active_record', ActiveRecord::SQLCounter.new)
+  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 else
   # this is from 3.2's test suite.  ugly.
-  class ActiveRecord::SQLCounter
+  class SQLCounter
     cattr_accessor :ignored_sql
     self.ignored_sql = [/^PRAGMA (?!(table_info))/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/, /^SAVEPOINT/, /^ROLLBACK TO SAVEPOINT/, /^RELEASE SAVEPOINT/, /^SHOW max_identifier_length/, /^BEGIN/, /^COMMIT/]
 
@@ -52,6 +43,10 @@ else
 
     attr_reader :ignore
 
+    def self.clear_log
+      self.log.clear
+    end
+
     def initialize(ignore = self.class.ignored_sql)
       @ignore   = ignore
     end
@@ -66,5 +61,5 @@ else
     end
   end
 
-  ActiveSupport::Notifications.subscribe('sql.active_record', ActiveRecord::SQLCounter.new)
+  ActiveSupport::Notifications.subscribe('sql.active_record', SQLCounter.new)
 end

data/test/columns_on_demand_test.rb

@@ -22,7 +22,7 @@ class Child < ActiveRecord::Base
   belongs_to :parent
 end
 
-class ColumnsOnDemandTest < ActiveRecord::TestCase
+class ColumnsOnDemandTest < ActiveSupport::TestCase
   def assert_not_loaded(record, attr_name)
     assert !record.column_loaded?(attr_name.to_s)
   end
@@ -31,6 +31,17 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
     assert record.column_loaded?(attr_name.to_s)
   end
   
+  def assert_queries(num = 1)
+    ::SQLCounter.clear_log
+    yield
+  ensure
+    assert_equal num, ::SQLCounter.log.size, "#{::SQLCounter.log.size} instead of #{num} queries were executed.#{::SQLCounter.log.size == 0 ? '' : "\nQueries:\n#{::SQLCounter.log.join("\n")}"}"
+  end
+
+  def assert_no_queries(&block)
+    assert_queries(0, &block)
+  end
+
   fixtures :all
   self.use_transactional_fixtures = true
   
@@ -51,35 +62,35 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   end
   
   test "it doesn't load the columns_to_load_on_demand straight away when finding the records" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_not_equal nil, record
     assert_not_loaded record, "file_data"
     assert_not_loaded record, "processing_log"
 
-    record = Implicit.find(:all).first
+    record = Implicit.all.to_a.first
     assert_not_equal nil, record
     assert_not_loaded record, "file_data"
     assert_not_loaded record, "processing_log"
   end
   
   test "it loads the columns when accessed as an attribute" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_equal "This is the file data!", record.file_data
     assert_equal "Processed 0 entries OK", record.results
     assert_equal record.results.object_id, record.results.object_id # should not have to re-find
 
-    record = Implicit.find(:all).first
+    record = Implicit.all.to_a.first
     assert_not_equal nil, record.file_data
   end
 
   test "it loads the columns only once even if nil" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_not_loaded record, "file_data"
     assert_equal "This is the file data!", record.file_data
     assert_loaded record, "file_data"
     Implicit.update_all(:file_data => nil)
 
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_not_loaded record, "file_data"
     assert_equal nil, record.file_data
     assert_loaded record, "file_data"
@@ -89,7 +100,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   end
   
   test "it loads the column when accessed using read_attribute" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_equal "This is the file data!", record.read_attribute(:file_data)
     assert_equal "This is the file data!", record.read_attribute("file_data")
     assert_equal "Processed 0 entries OK", record.read_attribute("results")
@@ -97,19 +108,19 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   end
   
   test "it loads the column when accessed using read_attribute_before_type_cast" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_equal "This is the file data!", record.read_attribute_before_type_cast("file_data")
     assert_equal "Processed 0 entries OK", record.read_attribute_before_type_cast("results")
     # read_attribute_before_type_cast doesn't tolerate symbol arguments as read_attribute does
   end
   
   test "it loads the column when generating #attributes" do
-    attributes = Implicit.find(:first).attributes
+    attributes = Implicit.first.attributes
     assert_equal "This is the file data!", attributes["file_data"]
   end
 
   test "loads all the columns in one query when generating #attributes" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     assert_queries(1) do
       attributes = record.attributes
       assert_equal "This is the file data!", attributes["file_data"]
@@ -119,20 +130,20 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   
   test "it loads the column when generating #to_json" do
     ActiveRecord::Base.include_root_in_json = true
-    json = Implicit.find(:first).to_json
+    json = Implicit.first.to_json
     assert_equal "This is the file data!", ActiveSupport::JSON.decode(json)["implicit"]["file_data"]
   end
   
   test "it loads the column for #clone" do
-    record = Implicit.find(:first).clone
+    record = Implicit.first.clone
     assert_equal "This is the file data!", record.file_data
 
-    record = Implicit.find(:first).clone.tap(&:save!)
+    record = Implicit.first.clone.tap(&:save!)
     assert_equal "This is the file data!", Implicit.find(record.id).file_data
   end
   
   test "it clears the column on reload, and can load it again" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     old_object_id = record.file_data.object_id
     Implicit.update_all(:file_data => "New file data")
 
@@ -142,8 +153,8 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
     assert_equal "New file data", record.file_data
   end
   
-  test "it doesn't override custom :select finds" do
-    record = Implicit.find(:first, :select => "id, file_data")
+  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
     assert_raise klass do
       record.processed_at # explicitly not loaded, overriding default
@@ -152,7 +163,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   end
   
   test "it raises normal ActiveRecord::RecordNotFound if the record is deleted before the column load" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     Implicit.delete_all
     
     assert_raise ActiveRecord::RecordNotFound do
@@ -161,7 +172,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   end
   
   test "it doesn't raise on column access if the record is deleted after the column load" do
-    record = Implicit.find(:first)
+    record = Implicit.first
     record.file_data
     Implicit.delete_all
     
@@ -218,7 +229,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   
   test "it works on child records loaded from associations" do
     parent = parents(:some_parent)
-    child = parent.children.find(:first)
+    child = parent.children.first
     assert_not_loaded child, "test_data"
     assert_equal "Some test data", child.test_data
   end
@@ -232,7 +243,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
   
   test "it doesn't break validates_presence_of" do
     class ValidatedImplicit < ActiveRecord::Base
-      set_table_name "implicits"
+      self.table_name = "implicits"
       columns_on_demand
       validates_presence_of :original_filename, :file_data, :results
     end
@@ -254,7 +265,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
     original_record = Serializing.create!(:data => data)
     assert_equal data, original_record.data
     
-    record = Serializing.find(:first)
+    record = Serializing.first
     assert_not_loaded record, "data"
     assert_equal data, record.data
     assert_equal false, record.data_changed?
@@ -266,7 +277,7 @@ class ColumnsOnDemandTest < ActiveRecord::TestCase
     assert_equal true, record.changed?
     record.save!
     
-    record = Serializing.find(:first)
+    record = Serializing.first
     assert_not_loaded record, "data"
     assert_equal "replacement", record.data
   end

data/test/test_helper.rb

@@ -9,7 +9,7 @@ puts "Rails: #{ENV['RAILS_VERSION'] || 'default'}"
 gem 'activesupport', ENV['RAILS_VERSION']
 gem 'activerecord',  ENV['RAILS_VERSION']
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'active_support'
 require 'active_support/test_case'
 require 'active_record'

metadata

@@ -1,140 +1,126 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: columns_on_demand
-version: !ruby/object:Gem::Version 
-  hash: 3
-  prerelease: 
-  segments: 
-  - 3
-  - 0
-  - 2
-  version: 3.0.2
+version: !ruby/object:Gem::Version
+  version: 4.1.0
 platform: ruby
-authors: 
+authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-04-21 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-07-15 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activerecord
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: mysql
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: mysql2
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: pg
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |
   Lazily loads large columns on demand.
-  
+
   By default, does this for all TEXT (:text) and BLOB (:binary) columns, but a list
   of specific columns to load on demand can be given.
-  
+
   This is useful to reduce the memory taken by Rails when loading a number of records
   that have large columns if those particular columns are actually not required most
   of the time.  In this situation it can also greatly reduce the database query time
   because loading large BLOB/TEXT columns generally means seeking to other database
   pages since they are not stored wholly in the record's page itself.
-  
+
   Although this plugin is mainly used for BLOB and TEXT columns, it will actually
   work on all types - and is just as useful for large string fields etc.
-  
-  
+
+
   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.
-  Was also tested compatible with 2.3.14 and 3.0.17.
-  
-  Note that 3.0 and 3.1 have ActiveRecord regressions that will affect sqlite users.
 
+  Currently tested against Rails 3.2.18, 4.0.8, and 4.1.4, on Ruby 2.0.0.
 email: will.bryant@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - MIT-LICENSE
@@ -154,38 +140,28 @@ files:
 - test/test_helper.rb
 homepage: http://github.com/willbryant/columns_on_demand
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Lazily loads large columns on demand.
-test_files: 
+test_files:
 - test/activerecord_count_queries.rb
 - test/columns_on_demand_test.rb
 - test/database.yml