dase 3.2.7 → 3.2.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0caefe9687496a603d4b8a1812f0a3a89320bc58
+  data.tar.gz: fe0dd23b22c989fefade0b8cd4555925083c19a3
+SHA512:
+  metadata.gz: 7cd235f4fa1de0ee5ea6c4c36cbe73beeb295d3665aa1532e4ac2740ab42c9008770c3627a3df30ab17535743ce4d6e77737f5df1a04b19ed4e6cdc51847d67b
+  data.tar.gz: 02d35d30617d7805da0ebc6f9b894b31594bf40c2a0af2622ce672f20e6c0eff410052ef621abdf25dde3d10f12dc366b0253cd293fc6432a59af51fe635f3bc

data/README.md

@@ -103,3 +103,7 @@ who was a mental calculator - he could count and multiply numbers very quickly.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+
+[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/vovayartsev/dase/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
+

data/dase.gemspec

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.name          = "dase"
   gem.version       = Dase::VERSION
   gem.authors       = ["Vladimir Yartsev"]
+  gem.licenses      = ["MIT"]
   gem.email         = ["vovayartsev@gmail.com"]
   gem.description   = %q{Dase gem creates includes_count_of method in ActiveRecord::Relation
                          to count associated records efficiently. See examples at https://github.com/vovayartsev/dase
@@ -24,7 +25,7 @@ Gem::Specification.new do |gem|
     gem.add_development_dependency 'sqlite3', '~> 1.3.3'
   end
 
-  # gem.add_development_dependency 'debugger'
+  # gem.add_development_dependency 'pry'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'rspec-core'
 

data/lib/dase/mp_active_record.rb

@@ -0,0 +1,59 @@
+module Dase
+  module ARRelationInstanceMethods
+    def dase_values
+      @dase_values ||= {}
+    end
+
+    def includes_count_of(*args)
+      options = args.extract_options!
+      sanitize_includes_count_of_options(args, options)
+      return self if args.empty?
+      clone.tap do |relation|
+        args.each do |arg|
+          counter_name = (options[:as] || "#{arg}_count").to_sym
+          relation.dase_values[counter_name] = options.merge(as: counter_name, association: arg.to_sym)
+        end
+      end
+    end
+
+    def merge(other)
+      super(other).tap do |result|
+        result.dase_values.merge!(other.dase_values || {}) if other # other == nil is fine too
+      end
+    end
+
+    private
+
+    def sanitize_includes_count_of_options(args, options)
+      options.assert_valid_keys(:proc, :as, :only, :conditions, :group, :having, :limit, :offset, :joins, :include, :from, :lock)
+      if options.present? and args.many?
+        raise ArgumentError, 'includes_count_of takes either multiple associations OR single association + options'
+      end
+    end
+
+    def attach_dase_counters_to_records
+      (dase_values || {}).each do |_, options|
+        Dase::Preloader.new(@records, options[:association], options).run
+      end
+    end
+  end
+end
+
+ActiveRecord::Relation.class_eval do
+  include Dase::ARRelationInstanceMethods
+
+  private
+
+  # why overwriting with include/extend doesn't work???
+  alias_method :exec_queries_before_dase, :exec_queries
+
+  def exec_queries
+    after_hook = loaded? ? proc {} : proc { attach_dase_counters_to_records }
+    exec_queries_before_dase.tap(&after_hook)
+  end
+end
+
+class << ActiveRecord::Base
+  delegate :includes_count_of, :to => :scoped
+end
+

data/lib/dase/preloader.rb

@@ -2,14 +2,16 @@ module Dase
   class Preloader < ::ActiveRecord::Associations::Preloader
 
     # custom preloaders for different association types
+
     class HasMany < ::ActiveRecord::Associations::Preloader::HasMany
       include Dase::PreloaderMethods
     end
+
     class HasAndBelongsToMany < ::ActiveRecord::Associations::Preloader::HasAndBelongsToMany
       include Dase::PreloaderMethods
     end
 
-    # Not implemented yet
+    # Not fully implemented yet
     class HasManyThrough < ::ActiveRecord::Associations::Preloader::HasManyThrough
       include Dase::PreloaderMethods
 

data/lib/dase/preloader_methods.rb

@@ -2,12 +2,9 @@ module Dase
   module PreloaderMethods
 
     def initialize(klass, owners, reflection, preload_options)
-      # grabbing our options
-      preload_options = preload_options.clone
-      @dase_association = preload_options.delete(:association)
+      preload_options = preload_options.reject { |k, _| k == :association }
       @dase_counter_name = preload_options.delete(:as)
       @dase_scope_to_merge = preload_options.delete(:only)
-      #@dase_proc = preload_options.delete(:proc)
       super(klass, owners, reflection, preload_options)
     end
 
@@ -20,20 +17,11 @@ module Dase
       ids = owners.map(&pk)
       scope = records_for(ids)
       scope = scope.merge(@dase_scope_to_merge) if @dase_scope_to_merge
-      #if @dase_proc # support for includes_count_of(...){ where(...) } syntax
-      #  case @dase_proc.arity
-      #    when 0
-      #      scope = scope.instance_eval &@dase_proc
-      #    when 1
-      #      scope = @dase_proc.call(scope)
-      #    else
-      #      raise ArgumentError, "The block passed to includes_count_of takes 0 or 1 arguments"
-      #  end
-      #end
-      counters_hash = scope.count(:group => prefixed_foreign_key)
+      counters_hash = scope.count(group: prefixed_foreign_key)
       owners.each do |owner|
-        value = counters_hash[owner[pk]] || 0 # 0 is "default count", when no records found
-        owner.set_dase_counter(@dase_counter_name, value)
+        owner.define_singleton_method(@dase_counter_name) do
+          counters_hash[owner[pk]] || 0
+        end
       end
     end
 

data/lib/dase/version.rb

@@ -1,3 +1,3 @@
 module Dase
-  VERSION = "3.2.7"
+  VERSION = '3.2.9'
 end

data/lib/dase.rb

@@ -1,10 +1,9 @@
 require "dase/version"
 require "dase/preloader_methods"
 require "dase/preloader"
-require "dase/mp_active_record_base"
-require "dase/mp_active_record_relation"
+require "dase/mp_active_record"
 
 module Dase
-  # take a look at mp_active_record_* files
+  # take a look at mp_active_record files
   # (there we monkey-patch Active Record)
 end

data/test/test_dase.rb

@@ -68,20 +68,7 @@ class TestBase < Test::Unit::TestCase
       assert_equal 3, Author.includes_count_of(:books).merge(nil).all.size
     end
 
-    #should "count using block conditions (arity: 0)" do
-    #  dase_counts = Author.includes_count_of(:books){where(:year => 2012)}.order(:name).map { |a| a.books_count }
-    #  # the order is: Bobby, Joe, Teddy - due to order(:name)
-    #  true_counts = [0, 1, 0] # see books.yml
-    #  assert_equal true_counts, dase_counts, "results mismatch"
-    #end
-    #
-    #should "count using block conditions (arity: 1)" do
-    #  @y = 2012
-    #  dase_counts = Author.includes_count_of(:books){ |books| books.where(:year => @y)}.order(:name).map { |a| a.books_count }
-    #  # the order is: Bobby, Joe, Teddy - due to order(:name)
-    #  true_counts = [0, 1, 0] # see books.yml
-    #  assert_equal true_counts, dase_counts, "results mismatch"
-    #end
+    # pending "apply: lambda {where...}"
 
     should "count likes" do
       dase_counts = Author.order(:name).includes_count_of(:scores).map { |a| a.scores_count }
@@ -103,6 +90,15 @@ class TestBase < Test::Unit::TestCase
       assert_equal 3, joe.books_count, "Invalid books_count"
       assert_equal 2, joe.old_books_count, "Invalid old_books_count"
     end
+  end
 
+  context 'test' do
+    should 'work with find_each' do
+      # the order is: Bobby, Joe, Teddy - due to sort_by(:name)
+      records = []
+      Author.includes_count_of(:books).find_each(batch_size: 2) { |r| records << r }
+      dase_count = records.sort_by(&:name).map { |a| a.books_count }
+      assert_equal [1, 3, 0], dase_count, "dase countings failed" # see books.yml
+    end
   end
 end

metadata

@@ -1,103 +1,117 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: dase
-version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 3.2.7
+version: !ruby/object:Gem::Version
+  version: 3.2.9
 platform: ruby
-authors: 
+authors:
 - Vladimir Yartsev
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-03-01 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-08-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: shoulda
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 3.2.0
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rspec-core
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: "Dase gem creates includes_count_of method in ActiveRecord::Relation\n                         to count associated records efficiently. See examples at https://github.com/vovayartsev/dase\n                      "
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "Dase gem creates includes_count_of method in ActiveRecord::Relation\n
+  \                        to count associated records efficiently. See examples at
+  https://github.com/vovayartsev/dase\n                      "
+email:
 - vovayartsev@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .gitignore
-- .travis.yml
+files:
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - dase.gemspec
 - lib/dase.rb
-- lib/dase/mp_active_record_base.rb
-- lib/dase/mp_active_record_relation.rb
+- lib/dase/mp_active_record.rb
 - lib/dase/preloader.rb
 - lib/dase/preloader_methods.rb
 - lib/dase/version.rb
@@ -113,33 +127,31 @@ files:
 - test/helper.rb
 - test/test_dase.rb
 homepage: https://github.com/vovayartsev/dase
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
-summary: Provides includes_count_of method on ActiveRecord::Relation to count associated records efficiently
-test_files: 
+specification_version: 4
+summary: Provides includes_count_of method on ActiveRecord::Relation to count associated
+  records efficiently
+test_files:
 - test/fixtures/author.rb
 - test/fixtures/authors.yml
 - test/fixtures/book.rb

data/lib/dase/mp_active_record_base.rb

@@ -1,47 +0,0 @@
-# Monkey-patching ActiveRecord::Base to add xxx_count methods to it
-
-module Dase
-  module ARBaseInstanceMethods
-    def set_dase_counter(name, value)
-      @dase_counters ||= {}
-      @dase_counters[name.to_sym] = value
-    end
-
-    def get_dase_counter(name)
-      @dase_counters[name]
-    end
-
-    def respond_to?(*args)
-      @dase_counters && @dase_counters.has_key?(args.first.to_sym) || super
-    end
-
-    def method_missing(name, *args)
-      if @dase_counters and @dase_counters.has_key?(name.to_sym)
-        get_dase_counter(name, *args)
-      else
-        super
-      end
-    end
-
-    # This method uses traditions counting method
-    # and stores the results in dase-compatible form
-    def refresh_dase_counters!(*associations)
-      associations.flatten.each do |assoc|
-        value = self.send(assoc).count   # i.e. book.quotes.count
-        set_dase_counter "#{column}_count", value   # i.e. book.quotes_count = value
-      end
-    end
-
-    private
-
-    def self.included(klass)
-      class << klass
-        delegate :includes_count_of, :to => :scoped
-      end
-    end
-  end
-end
-
-ActiveRecord::Base.class_eval do
-  include Dase::ARBaseInstanceMethods
-end

data/lib/dase/mp_active_record_relation.rb

@@ -1,59 +0,0 @@
-module Dase
-  module ARRelationInstanceMethods
-    attr_accessor :dase_values
-
-    def includes_count_of(*args)
-      args.reject! { |a| a.blank? }
-      options = args.extract_options!
-      options.assert_valid_keys(:proc, :as, :only, :conditions, :group, :having, :limit, :offset, :joins, :include, :from, :lock)
-      return self if args.empty?
-      if options.present? and args.many?
-        raise ArgumentError, "includes_count_of takes either multiple associations OR single association + options"
-      end
-      relation = clone
-      relation.dase_values ||= {}
-      #options[:proc] = block if block
-      args.each do |arg|
-        opts = options.clone
-        opts[:association] = arg.to_sym
-        opts[:as] = (opts[:as] || "#{arg}_count").to_sym
-        relation.dase_values[opts[:as]] = opts
-      end
-      relation
-    end
-
-    def attach_dase_counters_to_records
-      if dase_values.present? and !@has_dase_counters
-        dase_values.each do |name, options|
-          Dase::Preloader.new(@records, options[:association], options).run
-        end
-        @has_dase_counters = true
-      end
-    end
-
-    def merge(r)
-      super(r).tap do |result|
-        # it's ok to get nil here - ActiveRecord works fine in that case
-        if !r.nil? and r.dase_values.present?
-          result.dase_values ||= {}
-          result.dase_values.merge!(r.dase_values)
-        end
-      end
-    end
-  end
-end
-
-
-ActiveRecord::Relation.class_eval do
-  include Dase::ARRelationInstanceMethods
-
-  private
-
-  alias_method :exec_queries_before_dase, :exec_queries
-
-  def exec_queries
-    exec_queries_before_dase # original method from ActiveRecord
-    attach_dase_counters_to_records
-    @records
-  end
-end