has_many_by_status 1.0.4 → 1.0.5

data/lib/has_many_by_status.rb

@@ -18,7 +18,10 @@ module ActiveRecord #:nodoc:
             self_class_name = self.to_s.downcase
           
             send :include, ActiveRecord::Has::ManyByStatus::ActMethods
+            
 
+            status_column_name = :status_id
+            status_column_name = (options[:status_column_name] || :status_id).to_sym if options.is_a?(Hash)
             # check to make sure if the user has overridden the class_name field in the model.
             # if they haven't then get it from the association_id.
             unless options.has_key? :class_name
@@ -31,6 +34,7 @@ module ActiveRecord #:nodoc:
             end
             status_class_name = h_options[:status_class_name] || "Status"
             h_options.delete(:status_class_name)
+            h_options.delete(:status_column_name)
             has_destroy = false
             if h_options.has_key? :dependent
               has_destroy = true
@@ -43,7 +47,7 @@ module ActiveRecord #:nodoc:
               # build default has_many as active
               #puts "association_id = #{association_id}"
               #puts "h_options = #{h_options.inspect}"
-              has_many "#{association_id}".to_sym, h_options.merge({:conditions => ["status_id = ?", eval("#{status_class_name}.active.id")]})
+              has_many "#{association_id}".to_sym, h_options.merge({:conditions => ["#{status_column_name} = ?", eval("#{status_class_name}.active.id")]})
               # build default has_many ALL
               has_many "all_#{association_id}".to_sym, h_options
 
@@ -60,7 +64,7 @@ module ActiveRecord #:nodoc:
               #puts "rows.size = #{rows.size}"
               rows.each do |status| #get all the statuses in the db.
                 unless STATUS_EXCLUDES.include?(status.name) # don't build a deleted method
-                  has_many "#{status.name}_#{association_id}".to_sym, h_options.merge({:conditions => ["status_id = ?", status.id]})
+                  has_many "#{status.name}_#{association_id}".to_sym, h_options.merge({:conditions => ["#{status_column_name} = ?", status.id]})
                 end
               end
             end
@@ -71,7 +75,7 @@ module ActiveRecord #:nodoc:
                 x_options = options
                 x_options.delete(:dependent)
                 define_method("deleted_#{association_id}") do
-                  eval("#{class_name}.find_with_deleted(:all, x_options.merge({:conditions => [\"#{self_class_name}_id = ? and status_id = ?\", self.id, Status.deleted.id]}))")
+                  eval("#{class_name}.find_with_deleted(:all, x_options.merge({:conditions => [\"#{self_class_name}_id = ? and #{status_column_name} = ?\", self.id, #{status_class_name}.deleted.id]}))")
                 end
                 
                 define_method("all_#{association_id}_with_deleted") do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: has_many_by_status
 version: !ruby/object:Gem::Version 
-  version: 1.0.4
-date: 2007-03-22 00:00:00 -04:00
+  version: 1.0.5
+date: 2007-04-06 00:00:00 -04:00
 summary: has_many_by_status
 require_paths: 
 - lib