directiverecord 0.1.9 → 0.1.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjVjYzQ4YmJiZjVmMmFhOGVlN2JjMzdlNWUwZTQxODNjMDRlODNlOA==
+    NDNjNWU1NTk0ZmM0MTViZDgyZDAxMmJkNmI5OWYwZTQ4MGUzNmIzZQ==
   data.tar.gz: !binary |-
-    YjRhYzE3ZThhYjFkNDI4MjQ2Y2FmNDY1ZTQ1ZDgwMjViZWFhYjYwNg==
+    MDEwNjA5YmQ2ZTRkM2Q2ZjFjZDY3MGViYTE0ZTJmN2YyZDQyMzQxOA==
 SHA512:
   metadata.gz: !binary |-
-    ZTUyZTliMzI1Zjg1MzA1ZjA3N2Q4NTA0ODZiZjU3ZTJlMGNmZjQ5YmM3NTMz
-    MzUxZDlmZmFlODcyMWM1NjgxODcxYmExYTc5MzE5MjQwZDVjMzUxMTg5YTUy
-    ZTMwZmQ4YmUzMTg2YzYyOWM1NGJjYTQ4M2RiNGVhYjQ4ZTlmNDk=
+    ZmE4ZjdjNzVhNzRhYjk4NjI5NjkzMzY0ZDQyZDE3OTAxMTM2YWVjODNmZDlm
+    NGRmN2RkMzBkMGFmZDUyMDc5ODk1YjlhNjUxNDU3NGU2NDE3YTFhNzkzZWRl
+    ZTkzNmE3YTJhODA0ZTIyMjBhZDY2OGI3ZmIxY2ZiZWYwOTUxY2I=
   data.tar.gz: !binary |-
-    NmYxMTAwYWEwY2U3NzI2ZmJmODhjYzNiNTZkMDk4YzFkOTVhODFlYzEyNWU1
-    N2RhOTlhZDJlNDAzNzhlNmJkMjUyNjVkMWYyNTRmNjZhOThkYjEwNTJmYWFi
-    ZThlZmQ2M2JiYzM3NTUyYmUzNDI4MmQ5OTE4MjRkNGI5Mjc1MDA=
+    NmNlNjkyZDE1NjRhZjI2NmZlNDk3MmM0M2IzYjJiZDUxY2ZhMjg3MWM0Mjc2
+    NjU4NjM0M2YwZWY3ZTY0MGZlZWRjN2VkN2M0ZjU0ZDBjOWVjYjdlY2NlMTE1
+    MDJjMWVmMmYwZDk1NTE0YTE4MDAwM2M0MDk3OTNiYzEyMDQ5MDc=

data/CHANGELOG.rdoc

@@ -1,5 +1,10 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.10 (March 5, 2015)
+
+* Overridden ActiveRecord::Relation#count(:all) to hook in DirectiveRecord query mechanism
+* Dropped ActiveRecord::Relation#size override
+
 == Version 0.1.9 (March 4, 2015)
 
 * Overridden ActiveRecord::Relation#size to hook in DirectiveRecord query mechanism

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.1.10

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

@@ -13,10 +13,14 @@ module ActiveRecord
       klass.qry qry_options(*args)
     end
 
-    alias :original_size :size
+    alias :original_count :count
 
-    def size
-      loaded? ? original_size : qry("COUNT(*)")[0][0]
+    def count(column_name = nil, options = {})
+      if !loaded? && (column_name == :all) && (options == {})
+        qry("COUNT(*)")[0][0]
+      else
+        original_count column_name, options
+      end
     end
 
   end

data/lib/directive_record/version.rb

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

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

@@ -35,19 +35,32 @@ module Unit
             end
           end
 
-          describe "#size" do
-            describe "when loaded" do
-              it "invokes the original size method" do
-                @relation.expects(:loaded?).returns(true)
-                @relation.expects(:original_size)
-                @relation.size
+          describe "#count" do
+            describe "when only passing :all" do
+              describe "when loaded" do
+                it "invokes the original count method" do
+                  @relation.expects(:loaded?).returns(true)
+                  @relation.expects(:original_count)
+                  @relation.count(:all)
+                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(*)").returns([[1982]])
+                  assert_equal 1982, @relation.count(:all)
+                end
               end
             end
-            describe "when not loaded" do
-              it "uses qry to count the records" do
+            describe "when otherwise" do
+              it "invokes the original count method" do
+                @relation.expects(:loaded?).returns(false)
+                @relation.expects(:original_count)
+                @relation.count(:foo)
+
                 @relation.expects(:loaded?).returns(false)
-                @relation.expects(:qry).with("COUNT(*)").returns([[1982]])
-                assert_equal 1982, @relation.size
+                @relation.expects(:original_count)
+                @relation.count(:all, {:foo => :bar})
               end
             end
           end

metadata

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