paranoid_create 0.0.10 → 0.1.0

data/.gitignore

@@ -1,3 +1,7 @@
 paranoid.db
 .rvmrc
-Gemfile.lock
+Gemfile.lock
+pkg
+vendor
+nbproject
+.bundle

data/lib/paranoid/base.rb

@@ -9,7 +9,7 @@ module Paranoid
     #   end
     #
     #   Item < ActiveRecord::Base
-    #     paranoid :field => [:available, fales, true]
+    #     paranoid :field => [:available, false, true]
     #   end
     #
     # === Options
@@ -36,7 +36,7 @@ module Paranoid
       @paranoid = true
 
       opts[:field] ||= [:deleted_at, Proc.new{Time.now.utc}, nil]
-      class_inheritable_accessor :destroyed_field, :field_destroyed, :field_not_destroyed
+      class_attribute :destroyed_field, :field_destroyed, :field_not_destroyed
       if opts[:field].is_a?(Array)
         self.destroyed_field, self.field_destroyed, self.field_not_destroyed = opts[:field]
       else

data/lib/paranoid/join_association.rb

@@ -3,22 +3,21 @@ module Paranoid
     extend ActiveSupport::Concern
 
     included do
-      alias_method_chain :association_join, :paranoid
+      alias_method_chain :initialize, :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))
+    # Add conditions for eager loading
+    def initialize_with_paranoid(reflection, join_dependency, parent = nil)
+      result = initialize_without_paranoid(reflection, join_dependency, parent)
+      chain.reverse.each_with_index do |reflection, i|
+        if reflection.klass.paranoid?
+          conditions[i] << reflection.klass.paranoid_condition
+        end
       end
       result
     end
+
   end
 end
 
-ActiveRecord::Associations::ClassMethods::JoinDependency::JoinAssociation.class_eval { include Paranoid::JoinAssociation }
+ActiveRecord::Associations::JoinDependency::JoinAssociation.class_eval { include Paranoid::JoinAssociation }

data/lib/paranoid/paranoid_methods.rb

@@ -44,7 +44,7 @@ module Paranoid
       
       self.class.reflect_on_all_associations.each do |association|
         if association.options[:dependent] == :destroy && association.klass.paranoid?
-          restore_related(association.klass, association.primary_key_name, association.options[:primary_key] || 'id', association.options) if association.macro.to_s =~ /^has/
+          restore_related(association.klass, association.foreign_key, association.options[:primary_key] || 'id', association.options) if association.macro.to_s =~ /^has/
         end
       end
       

data/lib/paranoid/version.rb

@@ -1,3 +1,3 @@
 module Paranoid
-  VERSION = '0.0.10'
+  VERSION = '0.1.0'
 end

data/paranoid.gemspec

@@ -20,7 +20,8 @@ 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('rspec', ['>= 2.5.0'])
-  s.add_development_dependency('sqlite3-ruby', ['>= 1.3.3'])
-  s.add_development_dependency('activerecord', ['>= 3.0.5'])
+  s.add_development_dependency('rspec', ['>= 2.6.0'])
+  s.add_development_dependency('sqlite3', ['>= 1.3.4'])
+  s.add_development_dependency('activerecord', ['>= 3.1.0'])
+  s.add_development_dependency('rake', ['0.9.2'])
 end

data/spec/paranoid_spec.rb

@@ -219,6 +219,10 @@ describe Paranoid do
       @r2d2.dents.with_destroyed.to_a.should == @dents
     end
 
+    it 'should show all dents with destroyed in a "where chain"' do
+      @r2d2.dents.where("description LIKE '%hit%'").with_destroyed.to_a.should == [@dents[0], @dents[2]]
+    end
+
     it 'should show only soft deleted with destroyed_only' do
       @r2d2.dents.with_destroyed_only.to_a.should == [@dents[2]]
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: paranoid_create
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 27
+  prerelease: 
   segments: 
   - 0
+  - 1
   - 0
-  - 10
-  version: 0.0.10
+  version: 0.1.0
 platform: ruby
 authors: 
 - Philipp Ullmann
@@ -15,57 +15,72 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 +01:00
-default_executable: 
+date: 2011-09-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
+  type: :development
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 27
+        hash: 23
         segments: 
         - 2
-        - 5
+        - 6
         - 0
-        version: 2.5.0
-  type: :development
+        version: 2.6.0
+  name: rspec
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 29
+        hash: 19
         segments: 
         - 1
         - 3
-        - 3
-        version: 1.3.3
-  type: :development
+        - 4
+        version: 1.3.4
+  name: sqlite3
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 3
         segments: 
         - 3
+        - 1
         - 0
-        - 5
-        version: 3.0.5
-  type: :development
+        version: 3.1.0
+  name: activerecord
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 63
+        segments: 
+        - 0
+        - 9
+        - 2
+        version: 0.9.2
+  name: rake
+  version_requirements: *id004
 description: 
 email: philipp.ullmann@create.at
 executables: []
@@ -95,7 +110,6 @@ files:
 - spec/schema.rb
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/create-philipp-ullmann/paranoid/
 licenses: []
 
@@ -125,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: paranoid_create
-rubygems_version: 1.3.7
+rubygems_version: 1.8.8
 signing_key: 
 specification_version: 3
 summary: Enable soft delete of ActiveRecord records. Based off defunct ActsAsParanoid and IsParanoid