columns_on_demand 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e2af8b1aaf2ba19e065727ca50a8340e15ae2da
-  data.tar.gz: 42febaa5ebfdbf3ad1cbee5b6263ddc9593cfa18
+  metadata.gz: b05f09b9906904849565691a625d04746a38abe5
+  data.tar.gz: 9050e528adabcb488dc0aaf1f987f9c49a346e3b
 SHA512:
-  metadata.gz: 319c73384f3d7738430c69a5ca2c5c21c48f9c75ed1253e75c3b509b7793996607e383aaaecc9fb929dd3f3d9cd70a7f30f46b77412e93c7b392601943a51883
-  data.tar.gz: 392e3d12c891be2a2181994c50e53eb9c1d450f47f84c97f0ef7a65ca0a0ae8ebf9decce40029228e46265372d702e729b1d854468dcbb9f9420de148a69cbd5
+  metadata.gz: dd71294a17d5ee86d403c7df62436f03dc48e2b2c1fb7b07b7198493239dbc643c797021a2e0e3041ef2796c415a304701eb0ec2a0395e40e7e0fd73a4548143
+  data.tar.gz: 189374aeae895a2e0a19d420e794ab545bf50ecae7f8734135d837dfc6f119eca4f9c79369b7d0f7a481b57fb928a1461bb7fc5422d0439ccfca80a88c18754e

data/Gemfile

@@ -10,8 +10,4 @@ gemspec
 # Git. Remember to move these dependencies to your gemspec before releasing
 # your gem to rubygems.org.
 
-# To use debugger
-# gem 'ruby-debug19', :require => 'ruby-debug'
-# gem 'ruby-debug'
-
 gem 'rails', ENV['RAILS_VERSION']

data/README

@@ -21,10 +21,10 @@ Compatibility
 
 Supports mysql, mysql2, postgresql, and sqlite3.
 
-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.
+Currently tested against Rails 4.2.1, 4.2.0, 4.1.5, 4.0.9, 3.2.18, on Ruby 2.1.5.
 
-Note that 3.0 and 3.1 have ActiveRecord regressions that will affect sqlite users.
+Was also previously tested compatible with 2.3.14, 3.0.17, and 3.1.8 on Ruby 2.0.0
+or 1.8.7 as appropriate, and may still work for them.
 
 
 Example
@@ -44,4 +44,4 @@ class Example
 end
 
 
-Copyright (c) 2008-2014 Will Bryant, Sekuda Ltd, released under the MIT license
+Copyright (c) 2008-2015 Will Bryant, Sekuda Ltd, released under the MIT license

data/lib/columns_on_demand/version.rb

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

data/lib/columns_on_demand.rb

@@ -20,9 +20,16 @@ module ColumnsOnDemand
       alias_method_chain   :attribute_names,                 :columns_on_demand
       alias_method_chain   :read_attribute,                  :columns_on_demand
       alias_method_chain   :read_attribute_before_type_cast, :columns_on_demand
+      if ActiveRecord::AttributeMethods::Read.instance_methods.include?(:_read_attribute)
+        alias_method_chain :_read_attribute,                 :columns_on_demand
+      end
       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)
+      if ActiveRecord::AttributeMethods::Dirty.instance_methods.include?(:changed_attributes)
+        alias_method_chain :attribute_changed_in_place?,     :columns_on_demand
+      elsif ActiveRecord::AttributeMethods::Dirty.instance_methods.include?(:changed_attributes)
+        alias_method_chain :changed_in_place?,               :columns_on_demand
+      end
     end
     
     def reset_column_information_with_columns_on_demand
@@ -118,15 +125,19 @@ module ColumnsOnDemand
         end
       end
     end
-    
+
     def ensure_loaded(attr_name)
       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 attribute_changed_in_place_with_columns_on_demand?(attr_name)
+      column_loaded?(attr_name) && attribute_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)
@@ -137,6 +148,11 @@ module ColumnsOnDemand
       read_attribute_before_type_cast_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)
+    end
+
     def missing_attribute_with_columns_on_demand(attr_name, *args)
       if columns_to_load_on_demand.include?(attr_name)
         load_attributes(attr_name)
@@ -144,7 +160,7 @@ module ColumnsOnDemand
         missing_attribute_without_columns_on_demand(attr_name, *args)
       end
     end
-    
+
     def reload_with_columns_on_demand(*args)
       reload_without_columns_on_demand(*args).tap do
         columns_loaded.clear
@@ -161,7 +177,7 @@ module ColumnsOnDemand
     end
   end
 
-  module RelationMethods
+  module RelationMethodsArity2
     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)])
@@ -170,10 +186,29 @@ module ColumnsOnDemand
       end
     end
   end
+
+  module RelationMethodsArity1
+    def build_select_with_columns_on_demand(arel)
+      if select_values.empty? && klass < ColumnsOnDemand::InstanceMethods
+        arel.project(*arel_columns([default_select(true)]))
+      else
+        build_select_without_columns_on_demand(arel)
+        arel.project(*arel_columns(select_values.uniq))
+      end
+    end
+  end
 end
 
 ActiveRecord::Base.send(:extend, ColumnsOnDemand::BaseMethods)
+
 if ActiveRecord.const_defined?(:Relation)
-  ActiveRecord::Relation.send(:include, ColumnsOnDemand::RelationMethods)
+  if ActiveRecord::Relation.instance_method(:build_select).arity == 1
+    # 4.2.1 and above
+    ActiveRecord::Relation.send(:include, ColumnsOnDemand::RelationMethodsArity1)
+  else
+    # 4.2.0 and below
+    ActiveRecord::Relation.send(:include, ColumnsOnDemand::RelationMethodsArity2)
+  end
+
   ActiveRecord::Relation.alias_method_chain :build_select, :columns_on_demand
 end

data/test/test_helper.rb

@@ -17,10 +17,9 @@ require 'active_record'
 require 'active_record/fixtures'
 
 begin
-  require 'ruby-debug'
-  Debugger.start
+  require 'byebug'
 rescue LoadError
-  # ruby-debug not installed, no debugging for you
+  # no debugging for you
 end
 
 ActiveRecord::Base.configurations = YAML::load(IO.read(File.join(File.dirname(__FILE__), "database.yml")))

metadata

@@ -1,97 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: columns_on_demand
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2015-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   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
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -121,7 +121,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - MIT-LICENSE
 - README
@@ -147,17 +147,17 @@ require_paths:
 - lib
 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: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Lazily loads large columns on demand.