paranoid 0.0.2 → 0.0.3

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :minor: 0
-:patch: 2
+:patch: 3
 :major: 0
 :build: 

data/lib/paranoid.rb

@@ -2,3 +2,4 @@ require 'active_record'
 require 'paranoid/base'
 require 'paranoid/paranoid_methods'
 require 'paranoid/relation'
+require 'paranoid/join_association'

data/lib/paranoid/join_association.rb

@@ -0,0 +1,24 @@
+module Paranoid
+  module JoinAssociation
+    extend ActiveSupport::Concern
+
+    included do
+      alias_method_chain :association_join, :paranoid
+    end
+
+    # Overrides ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation#association_join
+    # adding paranoid conditions when necessary
+    def association_join_with_paranoid
+      return @join if @join
+      result = association_join_without_paranoid
+      if reflection.klass.paranoid?
+        aliased_table = Arel::Table.new(table_name, :as => @aliased_table_name, :engine => arel_engine)
+        pb = ActiveRecord::PredicateBuilder.new(arel_engine)
+        result.concat(pb.build_from_hash(reflection.klass.paranoid_condition, aliased_table))
+      end
+      result
+    end
+  end
+end
+
+ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.class_eval { include Paranoid::JoinAssociation }

data/paranoid.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{paranoid}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["David Genord II"]
-  s.date = %q{2010-02-19}
+  s.date = %q{2010-02-22}
   s.description = %q{}
   s.email = %q{github@xspond.com}
   s.extra_rdoc_files = [
@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
      "init.rb",
      "lib/paranoid.rb",
      "lib/paranoid/base.rb",
+     "lib/paranoid/join_association.rb",
      "lib/paranoid/paranoid_methods.rb",
      "lib/paranoid/relation.rb",
      "paranoid.gemspec",

data/spec/paranoid_spec.rb

@@ -139,4 +139,57 @@ describe Paranoid do
       Ninja.with_destroyed_only.count.should == 1
     end
   end
+
+  describe 'has_many association' do
+    before(:each) do
+      Android.delete_all
+      Dent.delete_all
+
+      @r2d2 = Android.create(:name => 'R2D2')
+      @dents = Dent.create([
+        {:android => @r2d2, :description => 'Hit by debris'},
+        {:android => @r2d2, :description => 'Dropped while loading into X-Wing'},
+        {:android => @r2d2, :description => 'Blaster hit'}
+      ])
+
+      @dents[2].destroy
+    end
+
+    it 'should hide the soft deleted dent' do
+      @r2d2.dents.to_a.should == @dents[0,2]
+    end
+
+    it 'should show all dents with_destroyed' do
+      @r2d2.dents.with_destroyed.to_a.should == @dents
+    end
+
+    it 'should show only soft deleted with destroyed_only' do
+      @r2d2.dents.with_destroyed_only.to_a.should == [@dents[2]]
+    end
+
+    it 'should show the correct counts' do
+      @r2d2.dents.size.should == 2
+      @r2d2.dents.with_destroyed.size.should == 3
+      @r2d2.dents.with_destroyed_only.size.should == 1
+    end
+
+    it 'should load correctly through an eager load' do
+      @r2d2 = Android.eager_load(:dents).first
+      @r2d2.dents.loaded?.should be_true
+      @r2d2.dents.size.should == 2
+      @r2d2.dents.to_a.should == @dents[0,2]
+    end
+
+    it 'should load correctly through an include' do
+      @r2d2 = Android.includes(:dents).first
+      @r2d2.dents.loaded?.should be_true
+      @r2d2.dents.size.should == 2
+      @r2d2.dents.to_a.should == @dents[0,2]
+    end
+
+    it 'should work correctly for a include dependency' do
+      @nil = Android.includes(:dents).where('dents.description' => 'Blaster hit').first
+      @nil.should be_nil
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - David Genord II
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-19 00:00:00 -05:00
+date: 2010-02-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -38,6 +38,7 @@ files:
 - init.rb
 - lib/paranoid.rb
 - lib/paranoid/base.rb
+- lib/paranoid/join_association.rb
 - lib/paranoid/paranoid_methods.rb
 - lib/paranoid/relation.rb
 - paranoid.gemspec