better_ar 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0abd9c4a43817436d719c13997751ca837f7da7
-  data.tar.gz: 72f4114a37ef358ab72308ff1e88235527273df6
+  metadata.gz: 52a23877b85d47400e052e59fd302deb4b4da5fc
+  data.tar.gz: 56c8442e720ad9556476e504819cb575faf62f24
 SHA512:
-  metadata.gz: f4393b539e0f57df2987caa04c9bdfc55501dcc5362e48fcd942f3f91254d4301152a0dfb16bdcf1db842e9c79f8ad131f382e3119a98adff4d20839ba833673
-  data.tar.gz: 97695baa4aec0c7cd02b19061b217811526b5d5b7bfda2c2e4c6602bb3f0429caa3110c2d9982016b8889ca857340ebe4b688ca07c70843639fc4cdc1ab90151
+  metadata.gz: 5f0f2e515bde835506a7f9a878b18fefba8a61e57d8ec1cdaa3019518bdd79def8404583746f31771cd54385f218a4a87bd6414e4c425c39e9b91b337455b634
+  data.tar.gz: bb8f47dc62ff10d5d8ba6cf2255824ea5d9b296cd9f1e14837a605d404038bc4f23dd45f63f573b5e5fbf13d3606ead171e8c64f01935c3105ddfd09ccc69676

data/lib/better_ar.rb

@@ -6,4 +6,3 @@ require 'active_record/deprecated_finders'
 require 'active_record'
 require 'better_ar/finder_methods'
 require 'better_ar/calculations'
-require 'better_ar/association_collection'

data/lib/better_ar/calculations.rb

@@ -15,23 +15,19 @@ module BetterAr
     # @return [Integer]
     def count(column_name = nil, count_options = {})
       if column_name.is_a?(Hash)
-        count_options = column_name
+        count_options = column_name.clone
         column_name = nil
       end
 
-      if count_options.empty?
-       super
-      elsif count_options.key?(:conditions)
-        super(column_name, count_options)
-      else
-        all(count_options).count
-      end
+      all(count_options).calculate(:count, nil, {})
     end
   end
 end
 
 ActiveSupport.on_load(:active_record) do
+  ActiveRecord::Associations::CollectionProxy.send(:prepend, BetterAr::Calculations)
   class << ActiveRecord::Base
     prepend BetterAr::Calculations
   end
+  ActiveRecord::Relation.send(:prepend, BetterAr::Calculations)
 end

data/lib/better_ar/finder_methods.rb

@@ -23,21 +23,20 @@ module BetterAr
     #   Optional
     # @return [ActiveRecord::Relation]
     def all(opts = {})
+      unless relation = better_ar_get_relation
+        relation = super().clone
+      end
+
       if opts.is_a?(Hash)
         if opts.empty?
-          super()
-        elsif opts.key?(:conditions)
-          super(opts)
+          return relation
         else
-          relation = scoped.clone
           relation = better_ar_apply_sql_clauses(relation, opts)
           relation = better_ar_apply_associations(relation, opts)
-          relation.where(opts)
         end
-      else
-        relation = scoped.clone
-        relation.where(opts)
       end
+
+      relation.where(opts)
     end
 
     # Forces a limit of 1 on the collection
@@ -54,13 +53,7 @@ module BetterAr
     #   Optional follows same convention as {#all}
     # @return [ActiveRecord::Base]
     def first(opts = {})
-      if opts.empty?
-        super
-      elsif opts.key?(:conditions)
-        super(opts)
-      else
-        all(opts.merge(:limit! => 1)).first
-      end
+      all(opts.merge(:limit! => 1)).to_a.first
     end
 
     private
@@ -78,7 +71,7 @@ module BetterAr
     def better_ar_apply_associations(relation, opts = {})
       reflect_on_all_associations.select do |association|
         !association.options[:polymorphic] &&
-          better_ar_join_keys(opts).include?(association.table_name.to_sym)
+          better_ar_join_keys(opts).include?(association.table_name)
       end.each do |association|
         relation = relation.joins(association.name)
       end
@@ -87,7 +80,15 @@ module BetterAr
     end
 
     def better_ar_join_keys(opts = {})
-      opts.keys.select { |key| !opts[key].kind_of?(ActiveRecord::Base) }
+      opts.keys.select { |key| !opts[key].kind_of?(ActiveRecord::Base) }.map { |k| k.to_s.pluralize }
+    end
+
+    def better_ar_get_relation
+      if self.kind_of?(ActiveRecord::Associations::Association)
+        @association.scope
+      elsif self.kind_of?(ActiveRecord::Relation)
+        self.clone
+      end
     end
 
   end
@@ -97,6 +98,5 @@ ActiveSupport.on_load(:active_record) do
   class << ActiveRecord::Base
     prepend BetterAr::FinderMethods
   end
-
-  ActiveRecord::Associations::CollectionProxy::ActiveRecord_Associations_CollectionProxy_Record.send(:prepend, BetterAr::FinderMethods)
+  ActiveRecord::Relation.send(:prepend, BetterAr::FinderMethods)
 end

data/lib/better_ar/version.rb

@@ -1,3 +1,3 @@
 module BetterAr
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/test_finder_methods.rb

@@ -12,7 +12,13 @@ describe 'ActiveRecord::Relation Finder Methods' do
       test_sql.must_be_like expected_sql
     end
 
-    it 'finds implicit joins by reflection' do
+    it 'finds implicit joins by reflection on singular associations' do
+      test_sql = User.all(:profile => { :name => 'test' }).to_sql
+      expected_sql = User.joins(:profile).where(:profile => { :name => 'test' }).to_sql
+      test_sql.must_be_like expected_sql
+    end
+
+    it 'finds implicit joins by reflection on plural associations' do
       test_sql = User.all(:records => { :name => 'test' }).to_sql
       expected_sql = User.joins(:records).where(:records => { :name => 'test' }).to_sql
       test_sql.must_be_like expected_sql
@@ -55,42 +61,6 @@ describe 'ActiveRecord::Relation Finder Methods' do
       User.count(:age => 10).must_equal 1
     end
   end
-
-  describe 'hash contains :conditions' do
-    before do
-      @expected = User.create(:name => 'test')
-      @user = User.create(:name => 'no test')
-    end
-
-    describe 'with conditions' do
-      it 'falls back for .all' do
-        User.all(:conditions => "name = 'test'").must_equal [@expected]
-      end
-
-      it 'falls back for .first' do
-        User.first(:conditions => "name = 'test'").must_equal @expected
-      end
-
-      it 'falls back for .count' do
-        User.count(:conditions => "name = 'test'").must_equal 1
-      end
-    end
-
-    describe 'without conditions' do
-      it 'falls back for .all' do
-        User.all.must_equal [@expected, @user]
-      end
-
-      it 'falls back for .first' do
-        User.first.must_equal @expected
-      end
-
-      it 'falls back for .count' do
-        User.count.must_equal 2
-      end
-    end
-  end
-
 end
 
 describe 'ActiveRecord::Associations::AssociationCollection Finder Methods' do
@@ -130,36 +100,4 @@ describe 'ActiveRecord::Associations::AssociationCollection Finder Methods' do
       @user.records.count(:name => 'one').must_equal 1
     end
   end
-
-  describe 'hash contains :conditions' do
-    describe 'with conditions' do
-      it 'falls back for .all' do
-        @user.records.all(:conditions => "name = 'one'").must_equal [@record_1]
-      end
-
-      it 'falls back for .first' do
-        @user.records.create(:name => 'one')
-        @user.records.first(:conditions => "name = 'one'").must_equal @record_1
-      end
-
-      # Note a valid test... need to rewrite.
-      # it 'falls back for .count' do
-      #   @user.records.count(:conditions => "name = 'one'").must_equal 1
-      # end
-    end
-
-    describe 'without conditions' do
-      it 'falls back for .all' do
-        @user.records.all.must_equal [@record_1, @record_2]
-      end
-
-      it 'falls back for .first' do
-        @user.records.first.must_equal @record_1
-      end
-
-      it 'falls back for .count' do
-        @user.records.count.must_equal 2
-      end
-    end
-  end
 end

data/test/test_helper.rb

@@ -17,12 +17,14 @@ ActiveRecord::Base.establish_connection(
 users_table = %{CREATE TABLE users (id INTEGER PRIMARY KEY, age INTEGER, name TEXT, object_type TEXT, object_id INTEGER);}
 records_table = %{CREATE TABLE records (id INTEGER PRIMARY KEY, user_id INTEGER, name TEXT);}
 reports_table = %{CREATE TABLE reports (id INTEGER PRIMARY KEY, record_id INTEGER, name TEXT);}
+profiles_table = %{CREATE TABLE profiles (id INTEGER PRIMARY KEY, user_id INTEGER, title TEXT);}
 ActiveRecord::Base.connection.execute(users_table)
 ActiveRecord::Base.connection.execute(records_table)
 ActiveRecord::Base.connection.execute(reports_table)
 
 class User < ActiveRecord::Base
   has_many :records
+  has_one :profile
   belongs_to :object, :polymorphic => true
 end
 
@@ -35,3 +37,6 @@ class Report < ActiveRecord::Base
   belongs_to :record
 end
 
+class Profile < ActiveRecord::Base
+  belongs_to :user
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_ar
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Brian Cardarella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-11 00:00:00.000000000 Z
+date: 2013-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -69,7 +69,6 @@ files:
 - TODO
 - better_ar.gemspec
 - lib/better_ar.rb
-- lib/better_ar/association_collection.rb
 - lib/better_ar/calculations.rb
 - lib/better_ar/finder_methods.rb
 - lib/better_ar/version.rb

data/lib/better_ar/association_collection.rb

@@ -1,49 +0,0 @@
-module BetterAr
-  module AssociationCollection
-    # Allows for the same interface as {BetterAr::Relation#first} on association collections
-    #
-    # example:
-    #  User.first.records.first(:level => 2, :order! => :name)
-    #
-    # @param [Hash]
-    #   Optional
-    # @returns [ActiveRecord::Base]
-    def first(opts = {})
-      if opts.empty?
-        super
-      elsif opts.key?(:conditions)
-        super(opts)
-      else
-        scoped.first(opts)
-      end
-    end
-
-    # Allows for the same interface as {BetterAr::Relation#count} on association collections
-    #
-    # example:
-    #  User.first.records.count(:level => 2)
-    #
-    # @param [Hash]
-    #   Optional
-    # @returns [Integer]
-    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
-        scope.where(count_options).count
-      end
-    end
-  end
-end
-
-
-ActiveSupport.on_load(:active_record) do
-  ActiveRecord::Associations::CollectionAssociation.send(:prepend, BetterAr::AssociationCollection)
-end