spec/controllers/page_events_controller_spec.rb spec/models/page_extensions_spec.rb spec/scenarios/pages_scenario.rb spec/scenarios/users_scenario.rb spec/spec.opts spec/spec_helper.rb @@ -1,15 +1,102 @@ +# I think this is the one that should be moved to the extension Rakefile template + +# In rails 1.2, plugins aren't available in the path until they're loaded. +# Check to see if the rspec plugin is installed first and require +# it if it is. If not, use the gem version. + +# Determine where the RSpec plugin is by loading the boot +unless defined? RADIANT_ROOT + ENV["RAILS_ENV"] = "test" + case + when ENV["RADIANT_ENV_FILE"] + require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot" + when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions} + require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot" + else + require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot" + end +end + require 'rake' -require 'rake/testtask' require 'rake/rdoctask' +require 'rake/testtask' -desc 'Default: run unit tests.' -task :default => :test +rspec_base = File.expand_path(RADIANT_ROOT + '/vendor/plugins/rspec/lib') +$LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base) +require 'spec/rake/spectask' +# require 'spec/translator' -desc 'Test the page_event extension.' -Rake::TestTask.new(:test) do |t| - t.libs << 'lib' - t.pattern = 'test/**/*_test.rb' - t.verbose = true +# Cleanup the RADIANT_ROOT constant so specs will load the environment +Object.send(:remove_const, :RADIANT_ROOT) + +extension_root = File.expand_path(File.dirname(__FILE__)) + +task :default => :spec +task :stats => "spec:statsetup" + +desc "Run all specs in spec directory" +Spec::Rake::SpecTask.new(:spec) do |t| + t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] + t.spec_files = FileList['spec/**/*_spec.rb'] +end + +namespace :spec do + desc "Run all specs in spec directory with RCov" + Spec::Rake::SpecTask.new(:rcov) do |t| + t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] + t.spec_files = FileList['spec/**/*_spec.rb'] + t.rcov = true + t.rcov_opts = ['--exclude', 'spec', '--rails'] + end + + desc "Print Specdoc for all specs" + Spec::Rake::SpecTask.new(:doc) do |t| + t.spec_opts = ["--format", "specdoc", "--dry-run"] + t.spec_files = FileList['spec/**/*_spec.rb'] + end + + [:models, :controllers, :views, :helpers].each do |sub| + desc "Run the specs under spec/#{sub}" + Spec::Rake::SpecTask.new(sub) do |t| + t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""] + t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"] + end + end + + # Hopefully no one has written their extensions in pre-0.9 style + # desc "Translate specs from pre-0.9 to 0.9 style" + # task :translate do + # translator = ::Spec::Translator.new + # dir = RAILS_ROOT + '/spec' + # translator.translate(dir, dir) + # end + + # Setup specs for stats + task :statsetup do + require 'code_statistics' + ::STATS_DIRECTORIES << %w(Model\ specs spec/models) + ::STATS_DIRECTORIES << %w(View\ specs spec/views) + ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers) + ::STATS_DIRECTORIES << %w(Helper\ specs spec/views) + ::CodeStatistics::TEST_TYPES << "Model specs" + ::CodeStatistics::TEST_TYPES << "View specs" + ::CodeStatistics::TEST_TYPES << "Controller specs" + ::CodeStatistics::TEST_TYPES << "Helper specs" + ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/} + end + + namespace :db do + namespace :fixtures do + desc "Load fixtures (from spec/fixtures) into the current environment's database. Load specific fixtures using FIXTURES=x,y" + task :load => :environment do + require 'active_record/fixtures' + ActiveRecord::Base.establish_connection(RAILS_ENV.to_sym) + (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(RAILS_ROOT, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file| + Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*')) + end + end + end + end end desc 'Generate documentation for the page_event extension.' @@ -21,5 +108,13 @@ Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_files.include('lib/**/*.rb') end +# For extensions that are in transition +desc 'Test the page_event extension.' +Rake::TestTask.new(:test) do |t| + t.libs << 'lib' + t.pattern = 'test/**/*_test.rb' + t.verbose = true +end + # Load any custom rakefiles for extension Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f } \ No newline at end of file Rakefile @@ -1,7 +1,7 @@ module PageEvent::CalendarSupport def events_for(selected_date) - events = Page.events_by_month(selected_date) + events = Page.events_by_month(selected_date, Status['published'].id) events_by_date = {} events.map do |e| event_date = e.event_datetime.to_date lib/page_event/calendar_support.rb @@ -5,9 +5,12 @@ module PageEvent::PageExtensions end module ClassMethods - def events_by_month(date = Time.now) + def events_by_month(date = Time.now, status = nil) month_start = date.at_beginning_of_month - Page.find(:all,:conditions => "event_datetime #{(month_start .. month_start.next_month - 1.minute).to_s(:db)}") + condition_str = "event_datetime #{(month_start .. month_start.next_month - 1.minute).to_s(:db)}" + condition_str << " AND status_id = #{status}" if status + + Page.find(:all,:conditions => condition_str) end def event_count_by_month(date = Time.now) lib/page_event/page_extensions.rb @@ -1,32 +1,80 @@ module PageEventTags include Radiant::Taggable include PageEvent::CalendarSupport + + desc %{ + Will conditionally output its content if the current page has an event. + + *Usage:* + <pre><code><r:event>...</r:event></code></pre> + } tag "event" do |tag| tag.expand if tag.locals.page.event_datetime end +# TODO do we need a to_date for any reason? + desc %{ + Will output the current event's date in the default format of MM/DD/YYYY, such as 07/15/2008 + + *Usage:* + <pre><code><r:event:date /></code></pre> + } tag "event:date" do |tag| tag.locals.page.event_datetime.strftime("%m/%d/%Y") if tag.locals.page.event_datetime end + + desc %{ + Will output the current event's time in the default format of HH:MM PM, such as 08:30 PM + *Usage:* + <pre><code><r:event:time /></code></pre> + } tag "event:time" do |tag| tag.locals.page.event_datetime.strftime("%I:%M %p") if tag.locals.page.event_datetime end + tag "events" do |tag| + tag.expand + end + + desc %{ + Returns the page with the next occurring event. Inside this tag all page attribute tags are mapped to + the this page. + + *Usage:* + <pre><code><r:events:next>...</r:events:next></code></pre> + } tag "events:next" do |tag| if next_event = Page.next_event tag.locals.page = next_event tag.expand end end - + + desc %{ + Gives access to next three upcoming events' pages. + + *Usage:* + <pre><code><r:events:upcoming>...</r:events:upcoming></code></pre> + } tag "events:upcoming" do |tag| tag.locals.events = Page.upcoming_events tag.expand end - + + desc %{ + Cycles through each of the upcoming events. Inside this tag all page attribute tags + are mapped to the current event's page. + + *Usage:* + <pre><code><r:events:upcoming:each> + ... + </r:events:upcoming:each> + </code></pre> + } tag "events:upcoming:each" do |tag| + result = [] tag.locals.events.each do |event| tag.locals.event = event tag.locals.page = event @@ -40,7 +88,15 @@ module PageEventTags tag.expand end - + desc %{ + Displays a monthly calendar with any published events displayed on the date the event occurs + + *Usage:* + <pre><code><r:events:upcoming:each> + ... + </r:events:upcoming:each> + </code></pre> + } tag "events:calendar" do |tag| params = tag.locals.page.request.parameters @@ -54,7 +110,7 @@ module PageEventTags prev_month = selected_date - 1.month next_month = selected_date + 1.month - events_by_date = events_for(selected_date) # TODO - needs to limit events to the published status + events_by_date = events_for(selected_date) Date::MONTHNAMES[selected_date.mon] @@ -111,50 +167,4 @@ module PageEventTags end end end - - private - - def event_find_options(tag) - attr = tag.attr.symbolize_keys - - options = {} - - [:limit, :offset].each do |symbol| - if number = attr[symbol] - if number =~ /^\d{1,4}$/ - options[symbol] = number.to_i - else - raise TagError.new("`#{symbol}' attribute of `each' tag must be a positive number between 1 and 4 digits") - end - end - end - - by = (attr[:by] || 'published_at').strip - order = (attr[:order] || 'asc').strip - order_string = '' - if self.attributes.keys.include?(by) - order_string << by - else - raise TagError.new("`by' attribute of `each' tag must be set to a valid field name") - end - if order =~ /^(asc|desc)$/i - order_string << " #{$1.upcase}" - else - raise TagError.new(%{`order' attribute of `each' tag must be set to either "asc" or "desc"}) - end - options[:order] = order_string - - status = (attr[:status] || 'published').downcase - unless status == 'all' - stat = Status[status] - unless stat.nil? - options[:conditions] = ["(virtual = ?) and (status_id = ?)", false, stat.id] - else - raise TagError.new(%{`status' attribute of `each' tag must be set to a valid status}) - end - else - options[:conditions] = ["virtual = ?", false] - end - options - end end \ No newline at end of file lib/page_event_tags.rb @@ -1,6 +1,6 @@ class PageEventExtension < Radiant::Extension - version "0.1" + version "0.2" description "Allows you to add event dates to your pages that can be viewed on a site-wide calendar" url "http://martyhaught.com" page_event_extension.rb test/fixtures/page_events.yml test/fixtures/pages.yml test/functional/page_event_extension_test.rb test/functional/page_events_controller_test.rb test/test_helper.rb test/unit/page_event_test.rb 0280b13bad24438a0b7fa0668b4abec7a18e9141 Marty Haught mghaught@gmail.com http://github.com/mghaught/radiant-page-event/commit/a508af0cbc8160221f624037f944e59cab5367fe a508af0cbc8160221f624037f944e59cab5367fe 2008-07-12T21:34:44-07:00 2008-07-12T21:34:44-07:00 Remove Test:Unit and moved to Rspec and scenarios Added <r:events:next> and <r:events:upcoming> tags Calendar tag now only displays published events Added doc for tag use. 7174d36c5fe40f3ed378fa18fba4baa195de8ad4 Marty Haught mghaught@gmail.com