jchupp-is_paranoid 0.4.0 → 0.5.0

data/README.textile

@@ -94,7 +94,6 @@ h3. and you may ask yourself, where does that highway go to?
 If you find any bugs, have any ideas of features you think are missing, or find things you're like to see work differently, feel free to send me a message or a pull request.
 
 Currently on the todo list:
-* deal with validates_uniqueness_of issue
 * add options for merging additional default_scope options (i.e. order, etc.)
 
 h3. Thanks

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 4
-:patch: 0
 :major: 0
+:minor: 5
+:patch: 0

data/lib/is_paranoid.rb

@@ -1,32 +1,23 @@
 require 'activerecord'
 
 module IsParanoid
-  def self.included(base) # :nodoc:
-    base.extend SafetyNet
-  end
-
-  module SafetyNet
-    # Call this in your model to enable all the safety-net goodness
-    #
-    #  Example:
-    #
-    #  class Android < ActiveRecord::Base
-    #    is_paranoid
-    #  end
-    #
-    # If you want to include ActiveRecord::Calculations to include your
-    # destroyed models, do is_paranoid :with_calculations => true and you
-    # will get sum_with_deleted, count_with_deleted, etc.
-    def is_paranoid opts = {}
-      opts[:field] ||= [:deleted_at, Proc.new{Time.now.utc}, nil]
-      class_inheritable_accessor :destroyed_field, :field_destroyed, :field_not_destroyed
-      self.destroyed_field, self.field_destroyed, self.field_not_destroyed = opts[:field]
+  # Call this in your model to enable all the safety-net goodness
+  #
+  #  Example:
+  #
+  #  class Android < ActiveRecord::Base
+  #    is_paranoid
+  #  end
+  #
+  def is_paranoid opts = {}
+    opts[:field] ||= [:deleted_at, Proc.new{Time.now.utc}, nil]
+    class_inheritable_accessor :destroyed_field, :field_destroyed, :field_not_destroyed
+    self.destroyed_field, self.field_destroyed, self.field_not_destroyed = opts[:field]
 
-      include Work
-    end
+    include ClassAndInstanceMethods
   end
 
-  module Work
+  module ClassAndInstanceMethods
     def self.included(base)
       base.class_eval do
         # This is the real magic.  All calls made to this model will append
@@ -86,7 +77,7 @@ module IsParanoid
                 #  end
                 define_method name do |*args|
                   self.with_exclusive_scope do
-                    with_scope({:find => { :conditions => ["#{destroyed_field} IS NOT ?", field_not_destroyed] }}) do
+                    with_scope({:find => { :conditions => ["#{self.table_name}.#{destroyed_field} IS NOT ?", field_not_destroyed] }}) do
                       self.send($1, *args)
                     end
                   end
@@ -103,4 +94,4 @@ module IsParanoid
   end
 end
 
-ActiveRecord::Base.send(:include, IsParanoid)
+ActiveRecord::Base.send(:extend, IsParanoid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jchupp-is_paranoid
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jeffrey Chupp
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-29 00:00:00 -07:00
+date: 2009-04-12 00:00:00 -07:00
 default_executable: 
 dependencies: []