better_ar 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 926017a90171c61733ce212549ece6340d95fff4
-  data.tar.gz: e9344fe60c016fd8119d8452103a6b98b5e1fbbb
+  metadata.gz: c1b12ec6ea364b851a57f1eaea76dd5e9400d1d5
+  data.tar.gz: 61340f6365bca431263862be69a6806feab5cc9b
 SHA512:
-  metadata.gz: b3a7949ca8b5fda7c98d916e40a950748e976b3e5bf2075c49e6b23e82312aa1f921c9be709f29b9f4da9b55ce51ff8673dccc1089d32441ac8e9dede5b77d27
-  data.tar.gz: 53efcc54e276a00f4ea3145767d83a413d913bef2a5e93e6d481fb0226319a4b8af06978928f7349a1685008fd8aeda6b7c6e7fa9b06ddfd375df1ae89fbf939
+  metadata.gz: 46ff9adae2d5bc65c65a7b46b826d2bbcb2b2b1fdddd9e528b2f809966f2f053457a8e4240ed804f70996e8b15b715e8ffaaa3029f87969a9f89f70b2a0b716f
+  data.tar.gz: b71c56097afe92358badbe84a93352a397004df78d04a10a28c5734cc7a4ec0663b60291c5fa105af54b0f71ed5809f70a8d434cb5d1cd14604e8e082024f861

data/Gemfile

@@ -2,3 +2,6 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in better_ar.gemspec
 gemspec
+
+gem 'byebug'
+gem 'm'

data/better_ar.gemspec

@@ -19,8 +19,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency 'activerecord', ['~> 3.2.9']
+  s.add_development_dependency 'activerecord', ['~> 4.0.1']
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sqlite3'
-  s.add_development_dependency 'debugger'
 end

data/lib/better_ar/association_collection.rb

@@ -1,13 +1,5 @@
 module BetterAr
   module AssociationCollection
-
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :first, :better_ar
-        alias_method_chain :count, :better_ar
-      end
-    end
-
     # Allows for the same interface as {BetterAr::Relation#first} on association collections
     #
     # example:
@@ -16,11 +8,11 @@ module BetterAr
     # @param [Hash]
     #   Optional
     # @returns [ActiveRecord::Base]
-    def first_with_better_ar(opts = {})
+    def first(opts = {})
       if opts.empty?
-        first_without_better_ar
+        super
       elsif opts.key?(:conditions)
-        first_without_better_ar(opts)
+        super(opts)
       else
         scoped.first(opts)
       end
@@ -34,16 +26,24 @@ module BetterAr
     # @param [Hash]
     #   Optional
     # @returns [Integer]
-    def count_with_better_ar(opts = {}, attr = nil)
-      if opts.empty?
-        count_without_better_ar
-      elsif opts.key?(:conditions)
-        count_without_better_ar(opts, attr)
+    def count(column_name = nil, count_options = {})
+      if column_name.is_a?(Hash)
+        count_options = column_name
+        column_name = nil
+      end
+
+      if count_options.empty?
+       super
+      elsif count_options.key?(:conditions)
+        super(column_name, count_options)
       else
-        scoped.count(opts)
+        scope.where(count_options).count
       end
     end
   end
 end
 
-ActiveRecord::Associations::CollectionAssociation.send(:include, BetterAr::AssociationCollection)
+
+ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Associations::CollectionAssociation.send(:prepend, BetterAr::AssociationCollection)
+end

data/lib/better_ar/calculations.rb

@@ -13,16 +13,25 @@ module BetterAr
     # @param [Hash]
     #   Optional follows same convention as {#all}
     # @return [Integer]
-    def count(opts = {}, extra = {})
-      if opts.nil? || opts.empty?
-        super(nil, extra)
-      elsif opts.key?(:conditions)
-        super(opts, extra)
+    def count(column_name = nil, count_options = {})
+      if column_name.is_a?(Hash)
+        count_options = column_name
+        column_name = nil
+      end
+
+      if count_options.empty?
+       super
+      elsif count_options.key?(:conditions)
+        super(column_name, count_options)
       else
-        all(opts).count
+        all(count_options).count
       end
     end
   end
 end
 
-ActiveRecord::Relation.send(:include, BetterAr::Calculations)
+ActiveSupport.on_load(:active_record) do
+  class << ActiveRecord::Base
+    prepend BetterAr::Calculations
+  end
+end

data/lib/better_ar/finder_methods.rb

@@ -55,7 +55,7 @@ module BetterAr
     # @return [ActiveRecord::Base]
     def first(opts = {})
       if opts.empty?
-        super()
+        super
       elsif opts.key?(:conditions)
         super(opts)
       else
@@ -93,4 +93,10 @@ module BetterAr
   end
 end
 
-ActiveRecord::Relation.send(:include, BetterAr::FinderMethods)
+ActiveSupport.on_load(:active_record) do
+  class << ActiveRecord::Base
+    prepend BetterAr::FinderMethods
+  end
+
+  ActiveRecord::Associations::CollectionProxy::ActiveRecord_Associations_CollectionProxy_Record.send(:prepend, BetterAr::FinderMethods)
+end

data/lib/better_ar/version.rb

@@ -1,3 +1,3 @@
 module BetterAr
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/better_ar.rb

@@ -1,5 +1,9 @@
 module BetterAr; end
 
+require 'active_support'
+require 'active_support/core_ext'
+require 'active_record/deprecated_finders'
+require 'active_record'
 require 'better_ar/finder_methods'
 require 'better_ar/calculations'
 require 'better_ar/association_collection'

data/test/test_finder_methods.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require 'test_helper'
 
 describe 'ActiveRecord::Relation Finder Methods' do
   after do
@@ -44,7 +44,7 @@ describe 'ActiveRecord::Relation Finder Methods' do
     it 'calls #first on .all' do
       expected = User.create(:age => 10)
       User.create(:age => 11)
-      User.first(:age => 10).must_equal expected
+      User.first(:age => 10).age.must_equal expected.age
     end
   end
 

data/test/{helper.rb → test_helper.rb}

@@ -1,9 +1,7 @@
 require 'rubygems'
+require 'byebug'
 require 'minitest/autorun'
-require 'active_support/core_ext'
-require 'active_record'
 require 'better_ar'
-require 'debugger'
 
 class Object
   def must_be_like other

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_ar
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Brian Cardarella
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.2.9
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: debugger
-  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: Better Active Record finders
 email:
 - bcardarella@gmail.com
@@ -87,8 +73,8 @@ files:
 - lib/better_ar/calculations.rb
 - lib/better_ar/finder_methods.rb
 - lib/better_ar/version.rb
-- test/helper.rb
 - test/test_finder_methods.rb
+- test/test_helper.rb
 homepage: https://github.com/bcardarella/better_ar
 licenses: []
 metadata: {}
@@ -113,5 +99,5 @@ signing_key:
 specification_version: 4
 summary: Better Active Record finders
 test_files:
-- test/helper.rb
 - test/test_finder_methods.rb
+- test/test_helper.rb