lib/hobo/scopes/automatic_scopes.rb in hobo-0.8.8 vs lib/hobo/scopes/automatic_scopes.rb in hobo-0.8.9
- old
+ new
@@ -176,24 +176,24 @@
elsif name =~ /^not_(.*)$/ && (col = column($1)) && (col.type == :boolean)
def_scope :conditions => ["#{column_sql(col)} <> ?", true]
# published_before(time)
- elsif name =~ /^(.*)_before$/ && (col = column("#{$1}_at")) && col.type.in?([:date, :datetime, :time, :timestamp])
+ elsif name =~ /^(.*)_before$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
def_scope do |time|
{ :conditions => ["#{column_sql(col)} < ?", time] }
end
# published_after(time)
- elsif name =~ /^(.*)_after$/ && (col = column("#{$1}_at")) && col.type.in?([:date, :datetime, :time, :timestamp])
+ elsif name =~ /^(.*)_after$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
def_scope do |time|
{ :conditions => ["#{column_sql(col)} > ?", time] }
end
# published_between(time1, time2)
- elsif name =~ /^(.*)_between$/ && (col = column("#{$1}_at")) && col.type.in?([:date, :datetime, :time, :timestamp])
+ elsif name =~ /^(.*)_between$/ && (col = column("#{$1}_at") || column("#{$1}_date") || column("#{$1}_on")) && col.type.in?([:date, :datetime, :time, :timestamp])
def_scope do |time1, time2|
{ :conditions => ["#{column_sql(col)} >= ? AND #{column_sql(col)} <= ?", time1, time2] }
end