@@ -253,6 +253,19 @@ module Typus end condition = ["#{key} BETWEEN ? AND ?", interval.first.to_s(:db), interval.last.to_s(:db)] conditions = merge_conditions(conditions, condition) + when :date + interval = case value + when 'today' then nil + when 'last_few_days' then 3.days.ago.to_date..Date.tomorrow + when 'last_7_days' then 6.days.ago.midnight..Date.tomorrow + when 'last_30_days' then (Date.today << 1)..Date.tomorrow + end + if interval + condition = ["#{key} BETWEEN ? AND ?", interval.first.to_s, interval.last.to_s] + elsif value == 'today' + condition = ["#{key} = ?", Date.today.to_s] + end + conditions = merge_conditions(conditions, condition) when :integer, :string condition = { key => value } conditions = merge_conditions(conditions, condition) lib/typus/active_record.rb 372b5c923538b9ecc1cdfd74af6052f657ef2edc 6321a562f6d050a6c3245dfc279f505a0309f84e Francesc Esplugas francesc@intraducibles.com http://github.com/fesplugas/typus/commit/1d8c09b3b07411898edb18e0877309dcc83ee3e7 1d8c09b3b07411898edb18e0877309dcc83ee3e7 2009-11-02T22:40:53-08:00 2009-11-02T22:40:53-08:00 Merge branch 'master' of /Users/fesplugas/Documents/work/repos/typus 0a6451c64718adf310a2fd06afd15b8d7d0ef03a Francesc Esplugas francesc@intraducibles.com