@@ -56,14 +56,17 @@ module Shooter #:nodoc: def self.included(base) base.extend ClassMethods if base.respond_to?(:named_scope) - base.named_scope :by_date, lambda {|by_date| { :conditions => initial_conditions(by_date), :order => order }} - base.named_scope :recent, lambda {|length_of_time| length_of_time ||= 1.year; recent_options(length_of_time) } - base.named_scope :between, lambda {|start_date, end_date| { :conditions => between_conditions(start_date, end_date), :order => order }} + base.class_eval do + named_scope :by_date, lambda {|by_date| { :conditions => initial_conditions(by_date), :order => order }} + named_scope :recent, lambda {|*length_of_time| length_of_time = length_of_time.blank? ? 1.year: length_of_time; recent_options(length_of_time) } + named_scope :between, lambda {|start_date, end_date| { :conditions => between_conditions(start_date, end_date), :order => order }} + end else base.extend WithScopeMethods end end + module WithScopeMethods def by_date(by_date, options ={}) with_scope(:find => {:conditions => initial_conditions(by_date), :order => order}) do lib/acts_as_archivable.rb dd4ee1b869606b7dafff3e54c70826610aa5ae5a Joshua Clayton jclayton@fusionary.com http://github.com/joshuaclayton/acts_as_archivable/commit/3aced0f4f19de4f619a612a4af328996427b6236 3aced0f4f19de4f619a612a4af328996427b6236 2008-07-24T07:12:06-07:00 2008-07-24T07:12:06-07:00 Fixed AAA to use named_scope correctly 053a4563ad1f78dba850d044b6f2932c9f2a85bf Joshua Clayton jclayton@fusionary.com