dase 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa21a89c14adc39b8906ec72c7b4b4c53dfefbe2
-  data.tar.gz: 1742ddc3cfa7c83952d008ec7d3421e9946883c7
+  metadata.gz: b1a4d6f990d789d3a9a7a7d79995e3bd9177c98a
+  data.tar.gz: 5c4be473b6ddc9a2c8933207044ae224d8ebe1bc
 SHA512:
-  metadata.gz: 4a3383ce22ef7a04bc1363a09b15037dd7b92417bf4a65abb12a4f7027a4895c8e7dd3d62e4cd52687acd93d3653c02a18c8301530a986d1ce2a2de80da3e5af
-  data.tar.gz: ce0941ab55f4c38e9fe21b3e559f93640d9e0b61920d3ff744158a91fa1da524ecbf17b202b7d54bba61a3728dc2f7add3519de7dd551fc2ebdf630b0042e2cc
+  metadata.gz: 1b41222641e271a29db1a2c7d9283d00d005f9ebdca0317d13d2bb8a11daa1d16e3c490afd3ca86ddbceb5bb0b58bbc3d870ed057d09c40c6f2d5596b3b07fa3
+  data.tar.gz: 4790d98c1bcfd56ba5e8334b0841814f5f4936163449a3c09b8d90682caa390f006fff51c3a59f28af127443f72f044f95212d2ceba9f3b13e38c1dc1565d846

data/lib/dase/mp_active_record.rb

@@ -6,6 +6,7 @@ module Dase
 
     def includes_count_of(*args)
       options = args.extract_options!
+      extract_proc_argument(args, options)
       sanitize_dase_options(args, options)
       apply_synonyms(options)
       return self if args.empty?
@@ -17,6 +18,13 @@ module Dase
       end
     end
 
+    def extract_proc_argument(args, options)
+      if args.last.is_a?(Proc)
+        raise "Can't use :proc option together with ->{} syntax" if options.has_key?(:proc)
+        options[:proc] = args.pop
+      end
+    end
+
     def merge(other)
       super(other).tap do |result|
         result.dase_values.merge!(other.dase_values || {}) if other # other == nil is fine too

data/lib/dase/preloader_methods.rb

@@ -25,7 +25,7 @@ module Dase
       proc = options.delete(:proc)
 
       # applying proc syntax: -> {...}
-      scope = scope.instance_eval(&proc) if proc
+      scope = scope.instance_exec(&proc) if proc
 
       options.slice(*VALID_ASSOCIATION_OPTIONS).each do |key, value|
         scope = scope.send(key, value)

data/lib/dase/version.rb

@@ -1,3 +1,3 @@
 module Dase
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/test/test_dase.rb

@@ -63,6 +63,14 @@ describe 'includes_count_of' do
     compare_counts(traditional_counts, dase_counts, true_counts)
   end
 
+  it 'should support lambda syntax (where year 1990)' do
+    traditional_counts = Author.order(:name).map { |a| a.books.where(:year => 1990).count }
+    dase_counts = Author.includes_count_of(:books, lambda { where(:year => 1990) }).order(:name).map { |a| a.books_count }
+    # the order is: Bobby, Joe, Teddy - due to order(:name)
+    true_counts = [1, 2, 0] # see books.yml
+    compare_counts(traditional_counts, dase_counts, true_counts)
+  end
+
   it 'should count books for year 2012 using :only option' do
     dase_counts = Author.includes_count_of(:books, :only => Book.year2012).order(:name).map { |a| a.books_count }
     # the order is: Bobby, Joe, Teddy - due to order(:name)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dase
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Vladimir Yartsev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-30 00:00:00.000000000 Z
+date: 2014-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport