lazy_attributes 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b08ca4b2f37b3915592910de0ada36a9d246049
-  data.tar.gz: 00a2e4d07c7999591d9abc6b5c5d1dd81af5be5e
+  metadata.gz: 91e3b39b32b2e21093801b5c92dee0757adb35b9
+  data.tar.gz: f8a6109bb4345cb03fcb7f924a15fb39159508ee
 SHA512:
-  metadata.gz: bc2ef56348371beb13886ced937ef44802fc721f9ea0f889c00c9184681c399932a2d7325f1adcc368842c918ccea06bbc9ef1f6c3030454a689c119bd02d38c
-  data.tar.gz: bc3a80e96a5407302e72fb970d3ba1f97d5a5c5fb02eab1bf8006a71755027b33f9f1836ccb36c85cedc6e1805c8a5a628ce28bf958e1e0d13d8926131f91b6f
+  metadata.gz: ee23f503f47d864ccf4a8df06841e8c19931a5d47d565f2a8ff2c2787c4b600e95d66af3f419e387f293a457da8dee7eb1783b382b7ed9614e8bb46ca49988a3
+  data.tar.gz: c8848b82eac334456d31cd997a00135377ba6b304f54cdfa9af7c25afc8dfa63329cd6095f4cf5260d4c3afb4be3ce02482f36714abf9bef1a18da9d59f215cf

data/README.md

@@ -36,9 +36,17 @@ end
 ```
 
 When model with lazyly-loaded attributes is associated with another
-model, you need specify `select` option in association with
+model, you need specify scope for association with
 '.column_symbols_without_lazy'.
 
+```ruby
+class Group < ActiveRecord::Base
+  has_many :users, { select(User.column_symbols_without_lazy) }
+end
+```
+
+For Rails 3.2, use `select` option.
+
 ```ruby
 class Group < ActiveRecord::Base
   has_many :users, select: User.column_symbols_without_lazy

data/lazy_attributes.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "lazy_attributes"
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ["Eito Katagiri"]
   spec.email         = ["eitoball@gmail.com"]
   spec.summary       = %q{ActiveRecord plugin to load specified attributes lazyly}

data/lib/lazy_attributes/relation.rb

@@ -0,0 +1,17 @@
+module LazyAttributes
+  module Relation
+    def self.included(mod)
+      mod.class_eval do
+        alias_method :original_calculate, :calculate
+        alias_method :calculate, :calculate_without_select_values
+      end
+    end
+
+    def calculate_without_select_values(operation, column_name, options = {})
+      original_select_values, self.select_values = self.select_values, []
+      original_calculate(operation, column_name, options)
+    ensure
+      self.select_values = original_select_values
+    end
+  end
+end

data/lib/lazy_attributes.rb

@@ -1,54 +1,59 @@
 module LazyAttributes
-  extend ActiveSupport::Concern
+  module Base
+    extend ActiveSupport::Concern
 
-  included do
-    class_attribute :_lazy_attributes, instance_writer: false
-    self._lazy_attributes = []
-  end
-
-  def reload_but_keep_changes
-    return unless persisted?
-    changes_before_reload = changes.clone
-    reload
-    changes_before_reload.each do |attr_name, values|
-      send("#{attr_name}=", values[1])
+    included do
+      class_attribute :_lazy_attributes, instance_writer: false
+      self._lazy_attributes = []
     end
-  end
 
-  module ClassMethods
-    def lazy_attributes(*attrs)
-      if self._lazy_attributes.empty?
-        default_scope do
-          select(column_names_without_lazy.map do |column_name|
-            "#{table_name}.#{column_name}"
-          end)
-        end
+    def reload_but_keep_changes
+      return unless persisted?
+      changes_before_reload = changes.clone
+      reload
+      changes_before_reload.each do |attr_name, values|
+        send("#{attr_name}=", values[1])
       end
-      attrs = attrs.map(&:to_s)
-      attrs.each do |attr|
-        attr = attr.to_sym
-        define_method(attr) do
-          reload_but_keep_changes unless has_attribute?(attr)
-          read_attribute(attr)
+    end
+
+    module ClassMethods
+      def lazy_attributes(*attrs)
+        if self._lazy_attributes.empty?
+          default_scope do
+            select(column_names_without_lazy.map do |column_name|
+              "#{table_name}.#{column_name}"
+            end)
+          end
         end
-        define_method(:"#{attr}=") do |val|
-          reload_but_keep_changes unless has_attribute?(attr)
-          write_attribute(attr, val)
+        attrs = attrs.map(&:to_s)
+        attrs.each do |attr|
+          attr = attr.to_sym
+          define_method(attr) do
+            reload_but_keep_changes unless has_attribute?(attr)
+            read_attribute(attr)
+          end
+          define_method(:"#{attr}=") do |val|
+            reload_but_keep_changes unless has_attribute?(attr)
+            write_attribute(attr, val)
+          end
         end
+        self._lazy_attributes += attrs
       end
-      self._lazy_attributes += attrs
-    end
 
-    def column_names_without_lazy
-      column_names - self._lazy_attributes
-    end
+      def column_names_without_lazy
+        column_names - self._lazy_attributes
+      end
 
-    def column_symbols_without_lazy
-      column_names_without_lazy.map(&:to_sym)
+      def column_symbols_without_lazy
+        column_names_without_lazy.map(&:to_sym)
+      end
     end
   end
 end
 
+require_relative 'lazy_attributes/relation'
+
 ActiveSupport.on_load :active_record do
-  ActiveRecord::Base.send(:include, LazyAttributes)
+  ActiveRecord::Base.send(:include, LazyAttributes::Base)
+  ActiveRecord::Relation.send(:include, LazyAttributes::Relation)
 end

data/spec/lazy_attributes_spec.rb

@@ -21,4 +21,25 @@ describe LazyAttributes do
     expect(user.profile).to be_present
     expect(user.address).to eq('Somewhere over the rainbow')
   end
+
+  describe '.count' do
+    context 'when no user exists' do
+      subject { User.count }
+      it { is_expected.to eq(0) }
+    end
+
+    context 'when one user exists' do
+      before { User.create! }
+
+      subject { User.count }
+      it { is_expected.to eq(1) }
+    end
+
+    context 'when two users exist' do
+      before { 2.times { User.create! } }
+
+      subject { User.count }
+      it { is_expected.to eq(2) }
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lazy_attributes
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Eito Katagiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-07 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -136,6 +136,7 @@ files:
 - gemfiles/activerecord_4.1.1.gemfile.lock
 - lazy_attributes.gemspec
 - lib/lazy_attributes.rb
+- lib/lazy_attributes/relation.rb
 - spec/lazy_attributes_spec.rb
 - spec/spec_helper.rb
 homepage: ''