directiverecord 0.1.15 → 0.1.16

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTRiYmVkOTVmOWQwNjg0NGNlYjllYjdkZWFmNDI2ZjU0N2FkYjE4ZA==
+    YmEyYjEwZjExYzg4OTE0ZjE2MTc5NjhmNTU4NzgyOGFhZGY5MzVhZA==
   data.tar.gz: !binary |-
-    NmU5MWY1NzM2OTI1ZTM4ZWIwNjEzZjJhNTg0YzJmMjc1ODJhMDAwNQ==
+    ZjQxZDk5OGUyMWU2MjkyZTcyNTA5Yzc3OTFhOTY5OWU0ZDU3YjQyYw==
 SHA512:
   metadata.gz: !binary |-
-    ZjdlZWY4NDg0NTRmMTRiYjViNWY5M2E4NTZkMWNkYjFiNmJkYTY2ZTU2YWNj
-    YjZlZDkzY2NhYzE4NTM5NDU1MjY3ZmNkZjBkNGE2NGIyN2M4YjJhM2M0Mjdk
-    YzYwZjRhZDc0NDQyMWZjNDdkOTBhYzY5MGM1YWFmMGM5YzAzOTA=
+    MTgzNDFjMGJmNTY5ZTcxN2Q5ZjRmNDhlMTIwZDA2Y2RjMTI0YTRjN2YzMmI0
+    Yjk0NjM5Zjc2ZmNhMmEwNzY2YjkxOThlZjA1YzBmYzQ4YmI4NDI4NTg3YjBh
+    MmZhZDliY2Y3YzBjMDM2NTNjMjZlMTVkZWRkYzllNjU2MGQ1ZTM=
   data.tar.gz: !binary |-
-    YTI5NjE0NGJiMGVlNzVmZGM5OThkODQwMGNlOTE1NGJhNWQxZTNlMDU1NzQ1
-    YmUzMzQxMjBmN2NiZDczZTE3ZjQ3ZjA5ZDQ1OGM1MzU0MDc4ZWUwNmEwN2U5
-    MzMxMjJhZDQ0MjEwNjFkYjEwMzczYWRhYzZhNjY0ZDNkZWY4ZmQ=
+    MWMwODE0ZjUxZTJiOGExMjhkODBjM2JlZjhkZjg0YWNkNmUzNTM2Mjc0YTYy
+    MDUxZWM1MmYzYWE1MDA5ZjA4NjYxMGUyNDhiNDZkYjA5YWEzNzcwMTBkZGJl
+    NGQxOTZhOWVkZmVhOGY5Y2E1NmVjOWMzODRlMTZjNzU4YTI1M2Q=

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.16 (March 12, 2015)
+
+* Made ActiveRecord::Relation#count(:all) override more strict: only overrule behavior when having detected a possible path in the query options
+
 == Version 0.1.15 (March 10, 2015)
 
 * Being able to include / exclude subselect options

data/VERSION

@@ -1 +1 @@
-0.1.15
+0.1.16

data/lib/directive_record/gem_ext/active_record/relation.rb

@@ -17,10 +17,23 @@ module ActiveRecord
 
     def count(column_name = nil, options = {})
       if !loaded? && (column_name == :all) && (options == {})
-        qry("COUNT(DISTINCT id)")[0][0]
-      else
-        original_count column_name, options
+        associations = klass.reflections.keys.collect(&:to_s)
+
+        contains_possible_paths = qry_options.any? do |key, value|
+          if value.is_a?(Array)
+            value.any? do |val|
+              val.to_s.scan(/(?:^|[^\.])([a-z_]+)\.[a-z_]+/).flatten.any? do |string|
+                associations.include?(string)
+              end
+            end
+          end
+        end
+
+        if contains_possible_paths
+          return qry("COUNT(DISTINCT id)")[0][0]
+        end
       end
+      original_count column_name, options
     end
 
   end

data/lib/directive_record/version.rb

@@ -1,7 +1,7 @@
 module DirectiveRecord
   MAJOR = 0
   MINOR = 1
-  TINY  = 15
+  TINY  = 16
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

data/test/unit/gem_ext/active_record/test_relation.rb

@@ -45,10 +45,26 @@ module Unit
                 end
               end
               describe "when not loaded" do
-                it "uses qry to count the records" do
-                  @relation.expects(:loaded?).returns(false)
-                  @relation.expects(:qry).with("COUNT(DISTINCT id)").returns([[1982]])
-                  assert_equal 1982, @relation.count(:all)
+                describe "when not having potential path query options" do
+                  it "invokes the original count method" do
+                    @relation.expects(:loaded?).returns(false)
+                    @relation.expects(:qry_options).returns({:where => ["foo = 12"]})
+                    @relation.expects(:original_count)
+                    @relation.count(:all)
+
+                    @relation.expects(:loaded?).returns(false)
+                    @relation.expects(:qry_options).returns({:where => ["foo.bar = 12"]})
+                    @relation.expects(:original_count)
+                    @relation.count(:all)
+                  end
+                end
+                describe "when having potential path query options" do
+                  it "uses #qry to count the records" do
+                    @relation.expects(:loaded?).returns(false)
+                    @relation.expects(:qry_options).returns({:where => ["employees.foo = 12"]})
+                    @relation.expects(:qry).with("COUNT(DISTINCT id)").returns([[1982]])
+                    assert_equal 1982, @relation.count(:all)
+                  end
                 end
               end
             end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-10 00:00:00.000000000 Z
+date: 2015-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord