.gitignore test/active_record/event_finders_test.rb test/db/database.yml test/db/schema.rb test/fixtures/events.yml test/views/month.html.erb test/views/month_builder.html.erb @@ -6,15 +6,15 @@ module CollectiveIdea end module SingletonMethods - def calendar_finders(options = {}) + def event_finders(options = {}) options = { :begin_at => 'begin_at', :end_at => 'end_at', :order => '' }.merge(options) - write_inheritable_attribute :calendar_finder_options, options - class_inheritable_reader :calendar_finder_options + write_inheritable_attribute :event_finder_options, options + class_inheritable_reader :event_finder_options include InstanceMethods include Helpers @@ -27,15 +27,18 @@ module CollectiveIdea def find_for_date(date=Date.today, *args) # we call date.to_date to ensure it is a Date (not a Time or CalendarBuilder::Proxy) - find_approved_for_date_range((date.to_date..date.to_date), *args) + find_for_date_range((date.to_date..date.to_date), *args) end # Find for a range of dates + # We use the beginning of day for the first date and the end of day for the last date + # so that we get the full range. # The event's # * end is always after the beginning of the range # * Beginning is before the range and ends after the beginning of the range # OR # * Beginning is inside the range. + # MySQL treats BETWEEN() strangely with dates, so we don't use it. def find_for_date_range(range=(Date.today..Date.today), *args) with_scope(:find => {:conditions => [" #{quoted_table_name}.#{quoted_end_at_column_name} >= :begin_at AND ( @@ -43,24 +46,28 @@ module CollectiveIdea OR (#{quoted_table_name}.#{quoted_begin_at_column_name} >= :begin_at AND :end_at >= #{quoted_table_name}.#{quoted_begin_at_column_name} ) )", { :begin_at => range.first.beginning_of_day, - :end_at => range.last.end_of_day}]}) { find_scoped(*args) } + :end_at => range.last.end_of_day}]}) { find_ordered(*args) } end def find_for_month(date=Date.today, *args) # we call date.to_date to ensure it is a Date (not a Time or CalendarBuilder::Proxy) with_scope(:find => {:conditions => ["DATE_FORMAT(#{quoted_table_name}.#{quoted_begin_at_column_name}, \"%Y-%m\") = :date OR DATE_FORMAT(#{quoted_table_name}.#{quoted_end_at_column_name}, \"%Y-%m\") = :date", {:date => date.strftime("%Y-%m")}]}) do - find_scoped(*args) + find_ordered(*args) end end def find_upcoming(*args) - with_scope(:find => {:conditions => ["#{quoted_table_name}.#{quoted_begin_at_column_name} > ? ", Time.now]}) { find_scoped(*args) } + with_scope(:find => {:conditions => ["#{quoted_table_name}.#{quoted_begin_at_column_name} > ?", Time.now]}) { find_ordered(*args) } end # Common ordering for all the other finders def find_ordered(*args) - with_scope(:find => {:order => calendar_finder_options[:order]}) do + if event_finder_options[:order].blank? find(*args) + else + with_scope(:find => {:order => event_finder_options[:order]}) do + find(*args) + end end end @@ -72,11 +79,11 @@ module CollectiveIdea # Mixed into both classes and instances module Helpers def begin_at_column_name - calendar_finder_options[:begin_at] + event_finder_options[:begin_at] end def end_at_column_name - calendar_finder_options[:end_at] + event_finder_options[:end_at] end def quoted_begin_at_column_name lib/active_record/event_finders.rb @@ -20,7 +20,7 @@ class CalendarController < ActionController::Base # Re-raise errors caught by the controller. def rescue_action(e) raise e end end -CalendarController.view_paths = [File.expand_path(File.dirname(__FILE__) + "/../fixtures")] +CalendarController.view_paths = [File.expand_path(File.dirname(__FILE__) + "/../views")] ActionController::Routing::Routes.draw {|m| m.connect ':controller/:action/:id' } class CalendarBuilderTest < Test::Unit::TestCase test/calendar/calendar_builder_test.rb @@ -2,6 +2,8 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') require 'rubygems' require 'action_controller' require 'action_view' +gem 'activerecord', '>= 1.99.1' +require 'active_record' require File.dirname(__FILE__) + '/../init.rb' @@ -9,3 +11,20 @@ require 'test/unit' require 'mocha' require 'action_controller/test_process' +require 'active_record/fixtures' + +ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log") + +ActiveRecord::Base.configurations = YAML::load(IO.read(File.dirname(__FILE__) + "/db/database.yml")) +ActiveRecord::Base.establish_connection(ENV["DB"] || "sqlite3") +ActiveRecord::Migration.verbose = false +load(File.join(File.dirname(__FILE__), "db", "schema.rb")) + +Dir["#{File.dirname(__FILE__)}/fixtures/*.rb"].each {|file| require file } + + +class Test::Unit::TestCase #:nodoc: + self.fixture_path = File.dirname(__FILE__) + "/fixtures/" + self.use_transactional_fixtures = true + self.use_instantiated_fixtures = false +end \ No newline at end of file test/test_helper.rb test/fixtures/month.html.erb test/fixtures/month_builder.html.erb f4e1c85a0584b7d1abf16d6e657fca85a8a945fb Daniel Morrison daniel@collectiveidea.com http://github.com/collectiveidea/calendar_builder/commit/e003ae845f35f38fcc2e1442d13fd2d67dc29d27 e003ae845f35f38fcc2e1442d13fd2d67dc29d27 2008-02-26T13:27:00-08:00 2008-02-26T13:27:00-08:00 Cleaned up and tested the event finders. 69c0923d09275941f50b1e5d5369e66051fb52a4 Daniel Morrison daniel@collectiveidea.com