directiverecord 0.1.22 → 0.1.23

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MGRkZjA3NjA3YzdmY2IzZTkwODg3ZTcyNzczZDVkYmE4MzRlZjk4MA==
-  data.tar.gz: !binary |-
-    MGM1NjBkMDM2ZjRiMThiYTQ5NzAxNzIyN2NhM2IwM2QxZTY2OTlkOA==
+SHA1:
+  metadata.gz: beaaac82f30ff3e1c16a7c5844497500badcbbdb
+  data.tar.gz: 60eb917a702a908c1ac2930b805d8ab68758603b
 SHA512:
-  metadata.gz: !binary |-
-    OTNiYTViM2I0YjU5MjAyOWI1ZGFmYjU2MDMwMDhjMjRkYzcyYWVhNGJhNGE2
-    NTk2ZDkyYmE5YmExNDFmNGMwMWM0M2Q0OWZkMGU2MTQzZDQ3ZmNiNDdlZjQ4
-    NTc1NDRkNDFjNGRlZjA0NWM2MjUyYjU4YTM5N2UxMGYxYTkxNzg=
-  data.tar.gz: !binary |-
-    NGZjNTFmMTg3ZmFkN2Q0ZjE4MjY2OWMxYmMzNzVkMzk5YjA3NGFkYjdjMzAw
-    ZjdmYjgyOTMxY2UxMTMxNDJkZjM2MGVkMDJiMzA4ZGViNTJhZGIxNjNlNGQz
-    NDljNWEwZDllYzU3MjNkNWM3NWMxODJkYjZhZjBhZjc5MTNmMjM=
+  metadata.gz: de73729b955fe0d5df7e026b413fd4a425bd6f28232bd0ecc6c46bea53bdf52db0603e62dc62d0e6ee4b5ac4d1024efb40dfd5023727b3dfc55820f1418cf3b9
+  data.tar.gz: 981c5d1921382b87d20fc6f62293b6dbc62f20e05d0c92c7ce26b09844878ff664671486c4d1fa592a577b9931a42e4e4c4672c187989b170c419e0b1462f9a7

data/CHANGELOG.rdoc

@@ -1,5 +1,9 @@
 = DirectiveRecord CHANGELOG
 
+== Version 0.1.23 (April 9, 2015)
+
+* Extracted ActiveRecord::Relation#count override to separate (non-auto-required) source file
+
 == Version 0.1.22 (April 8, 2015)
 
 * Corrected deriving qry_options from habtm associations

data/VERSION

@@ -1 +1 @@
-0.1.22
+0.1.23

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

@@ -13,28 +13,5 @@ module ActiveRecord
       klass.qry qry_options(*args)
     end
 
-    alias :original_count :count
-
-    def count(column_name = nil, options = {})
-      if !loaded? && (column_name == :all) && (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
 end

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

@@ -0,0 +1,28 @@
+module ActiveRecord
+  class Relation
+
+    alias :original_count :count
+
+    def count(column_name = nil, options = {})
+      if !loaded? && (column_name == :all) && (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
+end

data/lib/directive_record/version.rb

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

data/test/test_helper.rb

@@ -6,6 +6,7 @@ require "mocha/setup"
 require "bundler"
 Bundler.require :default, :development
 
+require "directive_record/gem_ext/active_record/relation/count"
 require_relative "application/boot"
 
 def project_file(path)

metadata

@@ -1,139 +1,139 @@
 --- !ruby/object:Gem::Specification
 name: directiverecord
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Paul Engel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.2.13
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A layer on top of ActiveRecord for using paths within queries without
@@ -143,7 +143,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - CHANGELOG.rdoc
 - Gemfile
 - MIT-LICENSE
@@ -156,6 +156,7 @@ files:
 - lib/directive_record/gem_ext/active_record.rb
 - lib/directive_record/gem_ext/active_record/base.rb
 - lib/directive_record/gem_ext/active_record/relation.rb
+- lib/directive_record/gem_ext/active_record/relation/count.rb
 - lib/directive_record/query.rb
 - lib/directive_record/query/big_query.rb
 - lib/directive_record/query/mysql.rb
@@ -195,17 +196,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A layer on top of ActiveRecord for using paths within queries without thinking