Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-17 07:40:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

first pass at restoring tag functionality

Browse source
This commit is contained in:
Reinier Balt 2008-12-22 20:55:32 +01:00
parent c0dbabf226
commit c618d35d3a
8 changed files with 1943 additions and 1942 deletions
Download patch file Download diff file Expand all files Collapse all files

536
app/controllers/application.rb
View file

@ -1,268 +1,268 @@
# The filters added to this controller will be run for all controllers in the # The filters added to this controller will be run for all controllers in the
# application. Likewise will all the methods added be available for all # application. Likewise will all the methods added be available for all
# controllers. # controllers.
require_dependency "login_system" require_dependency "login_system"
require_dependency "tracks/source_view" require_dependency "tracks/source_view"
require "redcloth" require "redcloth"
require 'date' require 'date'
require 'time' require 'time'
# Commented the following line because of #744. It prevented rake db:migrate to # Commented the following line because of #744. It prevented rake db:migrate to
# run because this tag went looking for the taggings table that did not exist # run because this tag went looking for the taggings table that did not exist
# when you feshly create a new database Old comment: We need this in development # when you feshly create a new database Old comment: We need this in development
# mode, or you get 'method missing' errors # mode, or you get 'method missing' errors
# #
# Tag # Tag
class CannotAccessContext < RuntimeError; end class CannotAccessContext < RuntimeError; end
class ApplicationController < ActionController::Base class ApplicationController < ActionController::Base
protect_from_forgery :secret => SALT protect_from_forgery :secret => SALT
helper :application helper :application
include LoginSystem include LoginSystem
helper_method :current_user, :prefs helper_method :current_user, :prefs
layout proc{ |controller| controller.mobile? ? "mobile" : "standard" } layout proc{ |controller| controller.mobile? ? "mobile" : "standard" }
before_filter :set_session_expiration before_filter :set_session_expiration
before_filter :set_time_zone before_filter :set_time_zone
prepend_before_filter :login_required prepend_before_filter :login_required
prepend_before_filter :enable_mobile_content_negotiation prepend_before_filter :enable_mobile_content_negotiation
after_filter :set_charset after_filter :set_charset
include ActionView::Helpers::TextHelper include ActionView::Helpers::TextHelper
include ActionView::Helpers::SanitizeHelper include ActionView::Helpers::SanitizeHelper
extend ActionView::Helpers::SanitizeHelper::ClassMethods extend ActionView::Helpers::SanitizeHelper::ClassMethods
helper_method :format_date, :markdown helper_method :format_date, :markdown
# By default, sets the charset to UTF-8 if it isn't already set # By default, sets the charset to UTF-8 if it isn't already set
def set_charset def set_charset
headers["Content-Type"] ||= "text/html; charset=UTF-8" headers["Content-Type"] ||= "text/html; charset=UTF-8"
end end
def set_session_expiration def set_session_expiration
# http://wiki.rubyonrails.com/rails/show/HowtoChangeSessionOptions # http://wiki.rubyonrails.com/rails/show/HowtoChangeSessionOptions
unless session == nil unless session == nil
return if @controller_name == 'feed' or session['noexpiry'] == "on" return if @controller_name == 'feed' or session['noexpiry'] == "on"
# If the method is called by the feed controller (which we don't have # If the method is called by the feed controller (which we don't have
# under session control) or if we checked the box to keep logged in on # under session control) or if we checked the box to keep logged in on
# login don't set the session expiry time. # login don't set the session expiry time.
if session if session
# Get expiry time (allow ten seconds window for the case where we have # Get expiry time (allow ten seconds window for the case where we have
# none) # none)
expiry_time = session['expiry_time'] || Time.now + 10 expiry_time = session['expiry_time'] || Time.now + 10
if expiry_time < Time.now if expiry_time < Time.now
# Too late, matey... bang goes your session! # Too late, matey... bang goes your session!
reset_session reset_session
else else
# Okay, you get another hour # Okay, you get another hour
session['expiry_time'] = Time.now + (60*60) session['expiry_time'] = Time.now + (60*60)
end end
end end
end end
end end
def render_failure message, status = 404 def render_failure message, status = 404
render :text => message, :status => status render :text => message, :status => status
end end
# def rescue_action(exception) # def rescue_action(exception)
# log_error(exception) if logger # log_error(exception) if logger
# respond_to do |format| # respond_to do |format|
# format.html do # format.html do
# notify :warning, "An error occurred on the server." # notify :warning, "An error occurred on the server."
# render :action => "index" # render :action => "index"
# end # end
# format.js { render :action => 'error' } # format.js { render :action => 'error' }
# format.xml { render :text => 'An error occurred on the server.' + $! } # format.xml { render :text => 'An error occurred on the server.' + $! }
# end # end
# end # end
# Returns a count of next actions in the given context or project The result # Returns a count of next actions in the given context or project The result
# is count and a string descriptor, correctly pluralised if there are no # is count and a string descriptor, correctly pluralised if there are no
# actions or multiple actions # actions or multiple actions
# #
def count_undone_todos_phrase(todos_parent, string="actions") def count_undone_todos_phrase(todos_parent, string="actions")
count = count_undone_todos(todos_parent) count = count_undone_todos(todos_parent)
if count == 1 if count == 1
word = string.singularize word = string.singularize
else else
word = string.pluralize word = string.pluralize
end end
return count.to_s + "&nbsp;" + word return count.to_s + "&nbsp;" + word
end end
def count_undone_todos(todos_parent) def count_undone_todos(todos_parent)
if todos_parent.nil? if todos_parent.nil?
count = 0 count = 0
elsif (todos_parent.is_a?(Project) && todos_parent.hidden?) elsif (todos_parent.is_a?(Project) && todos_parent.hidden?)
count = eval "@project_project_hidden_todo_counts[#{todos_parent.id}]" count = eval "@project_project_hidden_todo_counts[#{todos_parent.id}]"
else else
count = eval "@#{todos_parent.class.to_s.downcase}_not_done_counts[#{todos_parent.id}]" count = eval "@#{todos_parent.class.to_s.downcase}_not_done_counts[#{todos_parent.id}]"
end end
count || 0 count || 0
end end
# Convert a date object to the format specified in the user's preferences in # Convert a date object to the format specified in the user's preferences in
# config/settings.yml # config/settings.yml
# #
def format_date(date) def format_date(date)
if date if date
date_format = prefs.date_format date_format = prefs.date_format
formatted_date = date.in_time_zone(prefs.time_zone).strftime("#{date_format}") formatted_date = date.in_time_zone(prefs.time_zone).strftime("#{date_format}")
else else
formatted_date = '' formatted_date = ''
end end
formatted_date formatted_date
end end
# Uses RedCloth to transform text using either Textile or Markdown Need to # Uses RedCloth to transform text using either Textile or Markdown Need to
# require redcloth above RedCloth 3.0 or greater is needed to use Markdown, # require redcloth above RedCloth 3.0 or greater is needed to use Markdown,
# otherwise it only handles Textile # otherwise it only handles Textile
# #
def markdown(text) def markdown(text)
RedCloth.new(text).to_html RedCloth.new(text).to_html
end end
def build_default_project_context_name_map(projects) def build_default_project_context_name_map(projects)
Hash[*projects.reject{ |p| p.default_context.nil? }.map{ |p| [p.name, p.default_context.name] }.flatten].to_json Hash[*projects.reject{ |p| p.default_context.nil? }.map{ |p| [p.name, p.default_context.name] }.flatten].to_json
end end
# Here's the concept behind this "mobile content negotiation" hack: In # Here's the concept behind this "mobile content negotiation" hack: In
# addition to the main, AJAXy Web UI, Tracks has a lightweight low-feature # addition to the main, AJAXy Web UI, Tracks has a lightweight low-feature
# 'mobile' version designed to be suitablef or use from a phone or PDA. It # 'mobile' version designed to be suitablef or use from a phone or PDA. It
# makes some sense that tne pages of that mobile version are simply alternate # makes some sense that tne pages of that mobile version are simply alternate
# representations of the same Todo resources. The implementation goal was to # representations of the same Todo resources. The implementation goal was to
# treat mobile as another format and be able to use respond_to to render both # treat mobile as another format and be able to use respond_to to render both
# versions. Unfortunately, I ran into a lot of trouble simply registering a # versions. Unfortunately, I ran into a lot of trouble simply registering a
# new mime type 'text/html' with format :m because :html already is linked to # new mime type 'text/html' with format :m because :html already is linked to
# that mime type and the new registration was forcing all html requests to be # that mime type and the new registration was forcing all html requests to be
# rendered in the mobile view. The before_filter and after_filter hackery # rendered in the mobile view. The before_filter and after_filter hackery
# below accomplishs that implementation goal by using a 'fake' mime type # below accomplishs that implementation goal by using a 'fake' mime type
# during the processing and then setting it to 'text/html' in an # during the processing and then setting it to 'text/html' in an
# 'after_filter' -LKM 2007-04-01 # 'after_filter' -LKM 2007-04-01
def mobile? def mobile?
return params[:format] == 'm' return params[:format] == 'm'
end end
def enable_mobile_content_negotiation def enable_mobile_content_negotiation
if mobile? if mobile?
request.format = :m request.format = :m
end end
end end
def create_todo_from_recurring_todo(rt, date=nil) def create_todo_from_recurring_todo(rt, date=nil)
# create todo and initialize with data from recurring_todo rt # create todo and initialize with data from recurring_todo rt
todo = current_user.todos.build( { :description => rt.description, :notes => rt.notes, :project_id => rt.project_id, :context_id => rt.context_id}) todo = current_user.todos.build( { :description => rt.description, :notes => rt.notes, :project_id => rt.project_id, :context_id => rt.context_id})
# set dates # set dates
todo.recurring_todo_id = rt.id todo.recurring_todo_id = rt.id
todo.due = rt.get_due_date(date) todo.due = rt.get_due_date(date)
show_from_date = rt.get_show_from_date(date) show_from_date = rt.get_show_from_date(date)
if show_from_date.nil? if show_from_date.nil?
todo.show_from=nil todo.show_from=nil
else else
# make sure that show_from is not in the past # make sure that show_from is not in the past
todo.show_from = show_from_date < Time.zone.now ? nil : show_from_date todo.show_from = show_from_date < Time.zone.now ? nil : show_from_date
end end
saved = todo.save saved = todo.save
if saved if saved
todo.tag_with(rt.tag_list, current_user) todo.tag_with(rt.tag_list)
todo.tags.reload todo.tags.reload
end end
# increate number of occurences created from recurring todo # increate number of occurences created from recurring todo
rt.inc_occurences rt.inc_occurences
# mark recurring todo complete if there are no next actions left # mark recurring todo complete if there are no next actions left
checkdate = todo.due.nil? ? todo.show_from : todo.due checkdate = todo.due.nil? ? todo.show_from : todo.due
rt.toggle_completion! unless rt.has_next_todo(checkdate) rt.toggle_completion! unless rt.has_next_todo(checkdate)
return saved ? todo : nil return saved ? todo : nil
end end
protected protected
def admin_login_required def admin_login_required
unless User.find_by_id_and_is_admin(session['user_id'], true) unless User.find_by_id_and_is_admin(session['user_id'], true)
render :text => "401 Unauthorized: Only admin users are allowed access to this function.", :status => 401 render :text => "401 Unauthorized: Only admin users are allowed access to this function.", :status => 401
return false return false
end end
end end
def redirect_back_or_home def redirect_back_or_home
respond_to do |format| respond_to do |format|
format.html { redirect_back_or_default home_url } format.html { redirect_back_or_default home_url }
format.m { redirect_back_or_default mobile_url } format.m { redirect_back_or_default mobile_url }
end end
end end
def boolean_param(param_name) def boolean_param(param_name)
return false if param_name.blank? return false if param_name.blank?
s = params[param_name] s = params[param_name]
return false if s.blank? || s == false || s =~ /^false$/i return false if s.blank? || s == false || s =~ /^false$/i
return true if s == true || s =~ /^true$/i return true if s == true || s =~ /^true$/i
raise ArgumentError.new("invalid value for Boolean: \"#{s}\"") raise ArgumentError.new("invalid value for Boolean: \"#{s}\"")
end end
def self.openid_enabled? def self.openid_enabled?
Tracks::Config.openid_enabled? Tracks::Config.openid_enabled?
end end
def openid_enabled? def openid_enabled?
self.class.openid_enabled? self.class.openid_enabled?
end end
private private
def parse_date_per_user_prefs( s ) def parse_date_per_user_prefs( s )
prefs.parse_date(s) prefs.parse_date(s)
end end
def init_data_for_sidebar def init_data_for_sidebar
@completed_projects = current_user.projects.completed @completed_projects = current_user.projects.completed
@hidden_projects = current_user.projects.hidden @hidden_projects = current_user.projects.hidden
@active_projects = current_user.projects.active @active_projects = current_user.projects.active
@active_contexts = current_user.contexts.active @active_contexts = current_user.contexts.active
@hidden_contexts = current_user.contexts.hidden @hidden_contexts = current_user.contexts.hidden
init_not_done_counts init_not_done_counts
if prefs.show_hidden_projects_in_sidebar if prefs.show_hidden_projects_in_sidebar
init_project_hidden_todo_counts(['project']) init_project_hidden_todo_counts(['project'])
end end
end end
def init_not_done_counts(parents = ['project','context']) def init_not_done_counts(parents = ['project','context'])
parents.each do |parent| parents.each do |parent|
eval("@#{parent}_not_done_counts = @#{parent}_not_done_counts || current_user.todos.active.count(:group => :#{parent}_id)") eval("@#{parent}_not_done_counts = @#{parent}_not_done_counts || current_user.todos.active.count(:group => :#{parent}_id)")
end end
end end
def init_project_hidden_todo_counts(parents = ['project','context']) def init_project_hidden_todo_counts(parents = ['project','context'])
parents.each do |parent| parents.each do |parent|
eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || current_user.todos.count(:conditions => ['state = ? or state = ?', 'project_hidden', 'active'], :group => :#{parent}_id)") eval("@#{parent}_project_hidden_todo_counts = @#{parent}_project_hidden_todo_counts || current_user.todos.count(:conditions => ['state = ? or state = ?', 'project_hidden', 'active'], :group => :#{parent}_id)")
end end
end end
# Set the contents of the flash message from a controller Usage: notify # Set the contents of the flash message from a controller Usage: notify
# :warning, "This is the message" Sets the flash of type 'warning' to "This is # :warning, "This is the message" Sets the flash of type 'warning' to "This is
# the message" # the message"
def notify(type, message) def notify(type, message)
flash[type] = message flash[type] = message
logger.error("ERROR: #{message}") if type == :error logger.error("ERROR: #{message}") if type == :error
end end
def set_time_zone def set_time_zone
Time.zone = current_user.prefs.time_zone if logged_in? Time.zone = current_user.prefs.time_zone if logged_in?
end end
end end

536
app/controllers/recurring_todos_controller.rb
View file

@ -1,268 +1,268 @@
class RecurringTodosController < ApplicationController class RecurringTodosController < ApplicationController
helper :todos, :recurring_todos helper :todos, :recurring_todos
append_before_filter :init, :only => [:index, :new, :edit] append_before_filter :init, :only => [:index, :new, :edit]
append_before_filter :get_recurring_todo_from_param, :only => [:destroy, :toggle_check, :toggle_star, :edit, :update] append_before_filter :get_recurring_todo_from_param, :only => [:destroy, :toggle_check, :toggle_star, :edit, :update]
def index def index
find_and_inactivate find_and_inactivate
@recurring_todos = current_user.recurring_todos.active @recurring_todos = current_user.recurring_todos.active
@completed_recurring_todos = current_user.recurring_todos.completed @completed_recurring_todos = current_user.recurring_todos.completed
@no_recurring_todos = @recurring_todos.size == 0 @no_recurring_todos = @recurring_todos.size == 0
@no_completed_recurring_todos = @completed_recurring_todos.size == 0 @no_completed_recurring_todos = @completed_recurring_todos.size == 0
@count = @recurring_todos.size @count = @recurring_todos.size
@page_title = "TRACKS::Recurring Actions" @page_title = "TRACKS::Recurring Actions"
end end
def new def new
end end
def show def show
end end
def edit def edit
respond_to do |format| respond_to do |format|
format.js format.js
end end
end end
def update def update
@recurring_todo.tag_with(params[:tag_list], current_user) if params[:tag_list] @recurring_todo.tag_with(params[:tag_list]) if params[:tag_list]
@original_item_context_id = @recurring_todo.context_id @original_item_context_id = @recurring_todo.context_id
@original_item_project_id = @recurring_todo.project_id @original_item_project_id = @recurring_todo.project_id
# we needed to rename the recurring_period selector in the edit form because # we needed to rename the recurring_period selector in the edit form because
# the form for a new recurring todo and the edit form are on the same page. # the form for a new recurring todo and the edit form are on the same page.
# Same goes for start_from and end_date # Same goes for start_from and end_date
params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period'] params['recurring_todo']['recurring_period']=params['recurring_edit_todo']['recurring_period']
params['recurring_todo']['end_date']=parse_date_per_user_prefs(params['recurring_todo_edit_end_date']) params['recurring_todo']['end_date']=parse_date_per_user_prefs(params['recurring_todo_edit_end_date'])
params['recurring_todo']['start_from']=parse_date_per_user_prefs(params['recurring_todo_edit_start_from']) params['recurring_todo']['start_from']=parse_date_per_user_prefs(params['recurring_todo_edit_start_from'])
# update project # update project
if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil? if params['recurring_todo']['project_id'].blank? && !params['project_name'].nil?
if params['project_name'] == 'None' if params['project_name'] == 'None'
project = Project.null_object project = Project.null_object
else else
project = current_user.projects.find_by_name(params['project_name'].strip) project = current_user.projects.find_by_name(params['project_name'].strip)
unless project unless project
project = current_user.projects.build project = current_user.projects.build
project.name = params['project_name'].strip project.name = params['project_name'].strip
project.save project.save
@new_project_created = true @new_project_created = true
end end
end end
params["recurring_todo"]["project_id"] = project.id params["recurring_todo"]["project_id"] = project.id
end end
# update context # update context
if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank? if params['recurring_todo']['context_id'].blank? && !params['context_name'].blank?
context = current_user.contexts.find_by_name(params['context_name'].strip) context = current_user.contexts.find_by_name(params['context_name'].strip)
unless context unless context
context = current_user.contexts.build context = current_user.contexts.build
context.name = params['context_name'].strip context.name = params['context_name'].strip
context.save context.save
@new_context_created = true @new_context_created = true
end end
params["recurring_todo"]["context_id"] = context.id params["recurring_todo"]["context_id"] = context.id
end end
params["recurring_todo"]["weekly_return_monday"]=' ' if params["recurring_todo"]["weekly_return_monday"].nil? params["recurring_todo"]["weekly_return_monday"]=' ' if params["recurring_todo"]["weekly_return_monday"].nil?
params["recurring_todo"]["weekly_return_tuesday"]=' ' if params["recurring_todo"]["weekly_return_tuesday"].nil? params["recurring_todo"]["weekly_return_tuesday"]=' ' if params["recurring_todo"]["weekly_return_tuesday"].nil?
params["recurring_todo"]["weekly_return_wednesday"]=' ' if params["recurring_todo"]["weekly_return_wednesday"].nil? params["recurring_todo"]["weekly_return_wednesday"]=' ' if params["recurring_todo"]["weekly_return_wednesday"].nil?
params["recurring_todo"]["weekly_return_thursday"]=' ' if params["recurring_todo"]["weekly_return_thursday"].nil? params["recurring_todo"]["weekly_return_thursday"]=' ' if params["recurring_todo"]["weekly_return_thursday"].nil?
params["recurring_todo"]["weekly_return_friday"]=' ' if params["recurring_todo"]["weekly_return_friday"].nil? params["recurring_todo"]["weekly_return_friday"]=' ' if params["recurring_todo"]["weekly_return_friday"].nil?
params["recurring_todo"]["weekly_return_saturday"]=' ' if params["recurring_todo"]["weekly_return_saturday"].nil? params["recurring_todo"]["weekly_return_saturday"]=' ' if params["recurring_todo"]["weekly_return_saturday"].nil?
params["recurring_todo"]["weekly_return_sunday"]=' ' if params["recurring_todo"]["weekly_return_sunday"].nil? params["recurring_todo"]["weekly_return_sunday"]=' ' if params["recurring_todo"]["weekly_return_sunday"].nil?
@saved = @recurring_todo.update_attributes params["recurring_todo"] @saved = @recurring_todo.update_attributes params["recurring_todo"]
respond_to do |format| respond_to do |format|
format.js format.js
end end
end end
def create def create
p = RecurringTodoCreateParamsHelper.new(params) p = RecurringTodoCreateParamsHelper.new(params)
p.attributes['end_date']=parse_date_per_user_prefs(p.attributes['end_date']) p.attributes['end_date']=parse_date_per_user_prefs(p.attributes['end_date'])
p.attributes['start_from']=parse_date_per_user_prefs(p.attributes['start_from']) p.attributes['start_from']=parse_date_per_user_prefs(p.attributes['start_from'])
@recurring_todo = current_user.recurring_todos.build(p.selector_attributes) @recurring_todo = current_user.recurring_todos.build(p.selector_attributes)
@recurring_todo.update_attributes(p.attributes) @recurring_todo.update_attributes(p.attributes)
if p.project_specified_by_name? if p.project_specified_by_name?
project = current_user.projects.find_or_create_by_name(p.project_name) project = current_user.projects.find_or_create_by_name(p.project_name)
@new_project_created = project.new_record_before_save? @new_project_created = project.new_record_before_save?
@recurring_todo.project_id = project.id @recurring_todo.project_id = project.id
end end
if p.context_specified_by_name? if p.context_specified_by_name?
context = current_user.contexts.find_or_create_by_name(p.context_name) context = current_user.contexts.find_or_create_by_name(p.context_name)
@new_context_created = context.new_record_before_save? @new_context_created = context.new_record_before_save?
@recurring_todo.context_id = context.id @recurring_todo.context_id = context.id
end end
@recurring_saved = @recurring_todo.save @recurring_saved = @recurring_todo.save
unless (@recurring_saved == false) || p.tag_list.blank? unless (@recurring_saved == false) || p.tag_list.blank?
@recurring_todo.tag_with(p.tag_list, current_user) @recurring_todo.tag_with(p.tag_list)
@recurring_todo.tags.reload @recurring_todo.tags.reload
end end
if @recurring_saved if @recurring_saved
@message = "The recurring todo was saved" @message = "The recurring todo was saved"
@todo_saved = create_todo_from_recurring_todo(@recurring_todo).nil? == false @todo_saved = create_todo_from_recurring_todo(@recurring_todo).nil? == false
if @todo_saved if @todo_saved
@message += " / created a new todo" @message += " / created a new todo"
else else
@message += " / did not create todo" @message += " / did not create todo"
end end
@count = current_user.recurring_todos.active.count @count = current_user.recurring_todos.active.count
else else
@message = "Error saving recurring todo" @message = "Error saving recurring todo"
end end
respond_to do |format| respond_to do |format|
format.js format.js
end end
end end
def destroy def destroy
# remove all references to this recurring todo # remove all references to this recurring todo
@todos = @recurring_todo.todos @todos = @recurring_todo.todos
@number_of_todos = @todos.size @number_of_todos = @todos.size
@todos.each do |t| @todos.each do |t|
t.recurring_todo_id = nil t.recurring_todo_id = nil
t.save t.save
end end
# delete the recurring todo # delete the recurring todo
@saved = @recurring_todo.destroy @saved = @recurring_todo.destroy
@remaining = current_user.recurring_todos.count @remaining = current_user.recurring_todos.count
respond_to do |format| respond_to do |format|
format.html do format.html do
if @saved if @saved
notify :notice, "Successfully deleted recurring action", 2.0 notify :notice, "Successfully deleted recurring action", 2.0
redirect_to :action => 'index' redirect_to :action => 'index'
else else
notify :error, "Failed to delete the recurring action", 2.0 notify :error, "Failed to delete the recurring action", 2.0
redirect_to :action => 'index' redirect_to :action => 'index'
end end
end end
format.js do format.js do
render render
end end
end end
end end
def toggle_check def toggle_check
@saved = @recurring_todo.toggle_completion! @saved = @recurring_todo.toggle_completion!
@count = current_user.recurring_todos.active.count @count = current_user.recurring_todos.active.count
@remaining = @count @remaining = @count
if @recurring_todo.active? if @recurring_todo.active?
@remaining = current_user.recurring_todos.completed.count @remaining = current_user.recurring_todos.completed.count
# from completed back to active -> check if there is an active todo # from completed back to active -> check if there is an active todo
# current_user.todos.count(:all, {:conditions => ["state = ? AND recurring_todo_id = ?", 'active',params[:id]]}) # current_user.todos.count(:all, {:conditions => ["state = ? AND recurring_todo_id = ?", 'active',params[:id]]})
@active_todos = @recurring_todo.todos.active.count @active_todos = @recurring_todo.todos.active.count
# create todo if there is no active todo belonging to the activated # create todo if there is no active todo belonging to the activated
# recurring_todo # recurring_todo
@new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo) if @active_todos == 0 @new_recurring_todo = create_todo_from_recurring_todo(@recurring_todo) if @active_todos == 0
end end
respond_to do |format| respond_to do |format|
format.js format.js
end end
end end
def toggle_star def toggle_star
@recurring_todo.toggle_star! @recurring_todo.toggle_star!
@saved = @recurring_todo.save! @saved = @recurring_todo.save!
respond_to do |format| respond_to do |format|
format.js format.js
end end
end end
class RecurringTodoCreateParamsHelper class RecurringTodoCreateParamsHelper
def initialize(params) def initialize(params)
@params = params['request'] || params @params = params['request'] || params
@attributes = params['request'] && params['request']['recurring_todo'] || params['recurring_todo'] @attributes = params['request'] && params['request']['recurring_todo'] || params['recurring_todo']
# make sure all selectors (recurring_period, recurrence_selector, # make sure all selectors (recurring_period, recurrence_selector,
# daily_selector, monthly_selector and yearly_selector) are first in hash # daily_selector, monthly_selector and yearly_selector) are first in hash
# so that they are processed first by the model # so that they are processed first by the model
@selector_attributes = { @selector_attributes = {
'recurring_period' => @attributes['recurring_period'], 'recurring_period' => @attributes['recurring_period'],
'daily_selector' => @attributes['daily_selector'], 'daily_selector' => @attributes['daily_selector'],
'monthly_selector' => @attributes['monthly_selector'], 'monthly_selector' => @attributes['monthly_selector'],
'yearly_selector' => @attributes['yearly_selector'] 'yearly_selector' => @attributes['yearly_selector']
} }
end end
def attributes def attributes
@attributes @attributes
end end
def selector_attributes def selector_attributes
return @selector_attributes return @selector_attributes
end end
def project_name def project_name
@params['project_name'].strip unless @params['project_name'].nil? @params['project_name'].strip unless @params['project_name'].nil?
end end
def context_name def context_name
@params['context_name'].strip unless @params['context_name'].nil? @params['context_name'].strip unless @params['context_name'].nil?
end end
def tag_list def tag_list
@params['tag_list'] @params['tag_list']
end end
def project_specified_by_name? def project_specified_by_name?
return false unless @attributes['project_id'].blank? return false unless @attributes['project_id'].blank?
return false if project_name.blank? return false if project_name.blank?
return false if project_name == 'None' return false if project_name == 'None'
true true
end end
def context_specified_by_name? def context_specified_by_name?
return false unless @attributes['context_id'].blank? return false unless @attributes['context_id'].blank?
return false if context_name.blank? return false if context_name.blank?
true true
end end
end end
private private
def init def init
@days_of_week = [ ['Sunday',0], ['Monday',1], ['Tuesday', 2], ['Wednesday',3], ['Thursday',4], ['Friday',5], ['Saturday',6]] @days_of_week = [ ['Sunday',0], ['Monday',1], ['Tuesday', 2], ['Wednesday',3], ['Thursday',4], ['Friday',5], ['Saturday',6]]
@months_of_year = [ @months_of_year = [
['January',1], ['Februari',2], ['March', 3], ['April',4], ['May',5], ['June',6], ['January',1], ['Februari',2], ['March', 3], ['April',4], ['May',5], ['June',6],
['July',7], ['August',8], ['September',9], ['October', 10], ['November', 11], ['December',12]] ['July',7], ['August',8], ['September',9], ['October', 10], ['November', 11], ['December',12]]
@xth_day = [['first',1],['second',2],['third',3],['fourth',4],['last',5]] @xth_day = [['first',1],['second',2],['third',3],['fourth',4],['last',5]]
@projects = current_user.projects.find(:all, :include => [:default_context]) @projects = current_user.projects.find(:all, :include => [:default_context])
@contexts = current_user.contexts.find(:all) @contexts = current_user.contexts.find(:all)
@default_project_context_name_map = build_default_project_context_name_map(@projects).to_json @default_project_context_name_map = build_default_project_context_name_map(@projects).to_json
end end
def get_recurring_todo_from_param def get_recurring_todo_from_param
@recurring_todo = current_user.recurring_todos.find(params[:id]) @recurring_todo = current_user.recurring_todos.find(params[:id])
end end
def find_and_inactivate def find_and_inactivate
# find active recurring todos without active todos and inactivate them # find active recurring todos without active todos and inactivate them
recurring_todos = current_user.recurring_todos.active recurring_todos = current_user.recurring_todos.active
recurring_todos.each { |rt| rt.toggle_completion! if rt.todos.not_completed.count == 0} recurring_todos.each { |rt| rt.toggle_completion! if rt.todos.not_completed.count == 0}
end end
end end

1864
app/controllers/todos_controller.rb
View file

File diff suppressed because it is too large Load diff

4
app/models/recurring_todo.rb
View file

@ -623,10 +623,10 @@ class RecurringTodo < ActiveRecord::Base
def toggle_star! def toggle_star!
if starred? if starred?
delete_tags Todo::STARRED_TAG_NAME _remove_tags Todo::STARRED_TAG_NAME
tags.reload tags.reload
else else
add_tag Todo::STARRED_TAG_NAME _add_tags(Todo::STARRED_TAG_NAME)
tags.reload tags.reload
end end
starred? starred?

4
app/models/todo.rb
View file

@ -118,10 +118,10 @@ class Todo < ActiveRecord::Base
def toggle_star! def toggle_star!
if starred? if starred?
delete_tags STARRED_TAG_NAME _remove_tags STARRED_TAG_NAME
tags.reload tags.reload
else else
add_tag STARRED_TAG_NAME _add_tags(STARRED_TAG_NAME)
tags.reload tags.reload
end end
starred? starred?

13
lib/tagging_extensions.rb
View file

@ -7,11 +7,11 @@ class ActiveRecord::Base #:nodoc:
# Add tags to <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, an array of ids, or an array of Tags. # Add tags to <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, an array of ids, or an array of Tags.
# #
# We need to avoid name conflicts with the built-in ActiveRecord association methods, thus the underscores. # We need to avoid name conflicts with the built-in ActiveRecord association methods, thus the underscores.
def _add_tags incoming, user def _add_tags incoming
taggable?(true) taggable?(true)
tag_cast_to_string(incoming).each do |tag_name| tag_cast_to_string(incoming).each do |tag_name|
begin begin
tag = Tag.find_or_create_by_name(tag_name).on(self,user) tag = Tag.find_or_create_by_name(tag_name)
raise Tag::Error, "tag could not be saved: #{tag_name}" if tag.new_record? raise Tag::Error, "tag could not be saved: #{tag_name}" if tag.new_record?
tag.taggables << self tag.taggables << self
rescue ActiveRecord::StatementInvalid => e rescue ActiveRecord::StatementInvalid => e
@ -21,7 +21,7 @@ class ActiveRecord::Base #:nodoc:
end end
# Removes tags from <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, an array of ids, or an array of Tags. # Removes tags from <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, an array of ids, or an array of Tags.
def _remove_tags outgoing, user def _remove_tags outgoing
taggable?(true) taggable?(true)
outgoing = tag_cast_to_string(outgoing) outgoing = tag_cast_to_string(outgoing)
@ -36,7 +36,7 @@ class ActiveRecord::Base #:nodoc:
end end
# Replace the existing tags on <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, an array of ids, or an array of Tags. # Replace the existing tags on <tt>self</tt>. Accepts a string of tagnames, an array of tagnames, an array of ids, or an array of Tags.
def tag_with list, user def tag_with list
#:stopdoc: #:stopdoc:
taggable?(true) taggable?(true)
list = tag_cast_to_string(list) list = tag_cast_to_string(list)
@ -44,8 +44,8 @@ class ActiveRecord::Base #:nodoc:
# Transactions may not be ideal for you here; be aware. # Transactions may not be ideal for you here; be aware.
Tag.transaction do Tag.transaction do
current = tags.map(&:name) current = tags.map(&:name)
_add_tags(list - current, user) _add_tags(list - current)
_remove_tags(current - list, user) _remove_tags(current - list)
end end
self self
@ -78,6 +78,7 @@ class ActiveRecord::Base #:nodoc:
when String when String
obj = obj.split(Tag::DELIMITER).map do |tag_name| obj = obj.split(Tag::DELIMITER).map do |tag_name|
tag_name.strip.squeeze(" ") tag_name.strip.squeeze(" ")
puts "tn=#{tag_name.strip.squeeze(" ")}"
end end
else else
raise "Invalid object of class #{obj.class} as tagging method parameter" raise "Invalid object of class #{obj.class} as tagging method parameter"

566
test/unit/recurring_todo_test.rb
View file

@ -1,283 +1,283 @@
require File.dirname(__FILE__) + '/../test_helper' require File.dirname(__FILE__) + '/../test_helper'
class RecurringTodoTest < Test::Rails::TestCase class RecurringTodoTest < Test::Rails::TestCase
fixtures :todos, :users, :contexts, :preferences, :tags, :taggings, :recurring_todos fixtures :todos, :users, :contexts, :preferences, :tags, :taggings, :recurring_todos
def setup def setup
@every_day = RecurringTodo.find(1).reload @every_day = RecurringTodo.find(1).reload
@every_workday = RecurringTodo.find(2).reload @every_workday = RecurringTodo.find(2).reload
@weekly_every_day = RecurringTodo.find(3).reload @weekly_every_day = RecurringTodo.find(3).reload
@monthly_every_last_friday = RecurringTodo.find(4).reload @monthly_every_last_friday = RecurringTodo.find(4).reload
@yearly = RecurringTodo.find(5).reload @yearly = RecurringTodo.find(5).reload
@today = Time.now.utc @today = Time.now.utc
@tomorrow = @today + 1.day @tomorrow = @today + 1.day
@in_three_days = Time.now.utc + 3.days @in_three_days = Time.now.utc + 3.days
@in_four_days = @in_three_days + 1.day # need a day after start_from @in_four_days = @in_three_days + 1.day # need a day after start_from
@friday = Time.zone.local(2008,6,6) @friday = Time.zone.local(2008,6,6)
@saturday = Time.zone.local(2008,6,7) @saturday = Time.zone.local(2008,6,7)
@sunday = Time.zone.local(2008,6,8) # june 8, 2008 was a sunday @sunday = Time.zone.local(2008,6,8) # june 8, 2008 was a sunday
@monday = Time.zone.local(2008,6,9) @monday = Time.zone.local(2008,6,9)
@tuesday = Time.zone.local(2008,6,10) @tuesday = Time.zone.local(2008,6,10)
@wednesday = Time.zone.local(2008,6,11) @wednesday = Time.zone.local(2008,6,11)
@thursday = Time.zone.local(2008,6,12) @thursday = Time.zone.local(2008,6,12)
end end
def test_pattern_text def test_pattern_text
assert_equal "every day", @every_day.recurrence_pattern assert_equal "every day", @every_day.recurrence_pattern
assert_equal "on work days", @every_workday.recurrence_pattern assert_equal "on work days", @every_workday.recurrence_pattern
assert_equal "every last Friday of every 2 months", @monthly_every_last_friday.recurrence_pattern assert_equal "every last Friday of every 2 months", @monthly_every_last_friday.recurrence_pattern
assert_equal "every year on June 8", @yearly.recurrence_pattern assert_equal "every year on June 8", @yearly.recurrence_pattern
end end
def test_daily_every_day def test_daily_every_day
# every_day should return todays date if there was no previous date # every_day should return todays date if there was no previous date
due_date = @every_day.get_due_date(nil) due_date = @every_day.get_due_date(nil)
# use strftime in compare, because milisec / secs could be different # use strftime in compare, because milisec / secs could be different
assert_equal @today.strftime("%d-%m-%y"), due_date.strftime("%d-%m-%y") assert_equal @today.strftime("%d-%m-%y"), due_date.strftime("%d-%m-%y")
# when the last todo was completed today, the next todo is due tomorrow # when the last todo was completed today, the next todo is due tomorrow
due_date =@every_day.get_due_date(@today) due_date =@every_day.get_due_date(@today)
assert_equal @tomorrow, due_date assert_equal @tomorrow, due_date
# do something every 14 days # do something every 14 days
@every_day.every_other1=14 @every_day.every_other1=14
due_date = @every_day.get_due_date(@today) due_date = @every_day.get_due_date(@today)
assert_equal @today+14.days, due_date assert_equal @today+14.days, due_date
end end
def test_daily_work_days def test_daily_work_days
assert_equal @monday, @every_workday.get_due_date(@friday) assert_equal @monday, @every_workday.get_due_date(@friday)
assert_equal @monday, @every_workday.get_due_date(@saturday) assert_equal @monday, @every_workday.get_due_date(@saturday)
assert_equal @monday, @every_workday.get_due_date(@sunday) assert_equal @monday, @every_workday.get_due_date(@sunday)
assert_equal @tuesday, @every_workday.get_due_date(@monday) assert_equal @tuesday, @every_workday.get_due_date(@monday)
end end
def test_show_from_date def test_show_from_date
# assume that target due_date works fine, i.e. don't do the same tests over # assume that target due_date works fine, i.e. don't do the same tests over
@every_day.target='show_from_date' @every_day.target='show_from_date'
# when recurrence is targeted on show_from, due date shoult remain nil # when recurrence is targeted on show_from, due date shoult remain nil
assert_equal nil, @every_day.get_due_date(nil) assert_equal nil, @every_day.get_due_date(nil)
assert_equal nil, @every_day.get_due_date(@today-3.days) assert_equal nil, @every_day.get_due_date(@today-3.days)
# check show from get the next day # check show from get the next day
assert_equal @today, @every_day.get_show_from_date(@today-1.days) assert_equal @today, @every_day.get_show_from_date(@today-1.days)
assert_equal @today+1.day, @every_day.get_show_from_date(@today) assert_equal @today+1.day, @every_day.get_show_from_date(@today)
@every_day.target='due_date' @every_day.target='due_date'
# when target on due_date, show_from is relative to due date unless delta=0 # when target on due_date, show_from is relative to due date unless delta=0
assert_equal nil, @every_day.get_show_from_date(@today-1.days) assert_equal nil, @every_day.get_show_from_date(@today-1.days)
@every_day.show_from_delta=10 @every_day.show_from_delta=10
assert_equal @today, @every_day.get_show_from_date(@today+9.days) #today+1+9-10 assert_equal @today, @every_day.get_show_from_date(@today+9.days) #today+1+9-10
# TODO: show_from has no use case for daily pattern. Need to test on # TODO: show_from has no use case for daily pattern. Need to test on
# weekly/monthly/yearly # weekly/monthly/yearly
end end
def test_end_date_on_recurring_todo def test_end_date_on_recurring_todo
assert_equal true, @every_day.has_next_todo(@in_three_days) assert_equal true, @every_day.has_next_todo(@in_three_days)
assert_equal true, @every_day.has_next_todo(@in_four_days) assert_equal true, @every_day.has_next_todo(@in_four_days)
@every_day.end_date = @in_four_days @every_day.end_date = @in_four_days
assert_equal false, @every_day.has_next_todo(@in_four_days) assert_equal false, @every_day.has_next_todo(@in_four_days)
end end
def test_weekly_every_day_setters def test_weekly_every_day_setters
@weekly_every_day.every_day = ' ' @weekly_every_day.every_day = ' '
@weekly_every_day.weekly_return_sunday=('s') @weekly_every_day.weekly_return_sunday=('s')
assert_equal 's ', @weekly_every_day.every_day assert_equal 's ', @weekly_every_day.every_day
@weekly_every_day.weekly_return_monday=('m') @weekly_every_day.weekly_return_monday=('m')
assert_equal 'sm ', @weekly_every_day.every_day assert_equal 'sm ', @weekly_every_day.every_day
@weekly_every_day.weekly_return_tuesday=('t') @weekly_every_day.weekly_return_tuesday=('t')
assert_equal 'smt ', @weekly_every_day.every_day assert_equal 'smt ', @weekly_every_day.every_day
@weekly_every_day.weekly_return_wednesday=('w') @weekly_every_day.weekly_return_wednesday=('w')
assert_equal 'smtw ', @weekly_every_day.every_day assert_equal 'smtw ', @weekly_every_day.every_day
@weekly_every_day.weekly_return_thursday=('t') @weekly_every_day.weekly_return_thursday=('t')
assert_equal 'smtwt ', @weekly_every_day.every_day assert_equal 'smtwt ', @weekly_every_day.every_day
@weekly_every_day.weekly_return_friday=('f') @weekly_every_day.weekly_return_friday=('f')
assert_equal 'smtwtf ', @weekly_every_day.every_day assert_equal 'smtwtf ', @weekly_every_day.every_day
@weekly_every_day.weekly_return_saturday=('s') @weekly_every_day.weekly_return_saturday=('s')
assert_equal 'smtwtfs', @weekly_every_day.every_day assert_equal 'smtwtfs', @weekly_every_day.every_day
# test remove # test remove
@weekly_every_day.weekly_return_wednesday=(' ') @weekly_every_day.weekly_return_wednesday=(' ')
assert_equal 'smt tfs', @weekly_every_day.every_day assert_equal 'smt tfs', @weekly_every_day.every_day
end end
def test_weekly_pattern def test_weekly_pattern
assert_equal true, @weekly_every_day.has_next_todo(nil) assert_equal true, @weekly_every_day.has_next_todo(nil)
due_date = @weekly_every_day.get_due_date(@sunday) due_date = @weekly_every_day.get_due_date(@sunday)
assert_equal @monday, due_date assert_equal @monday, due_date
# saturday is last day in week, so the next date should be sunday + n_weeks # saturday is last day in week, so the next date should be sunday + n_weeks
due_date = @weekly_every_day.get_due_date(@saturday) due_date = @weekly_every_day.get_due_date(@saturday)
assert_equal @sunday + 2.weeks, due_date assert_equal @sunday + 2.weeks, due_date
# remove tuesday and wednesday # remove tuesday and wednesday
@weekly_every_day.weekly_return_tuesday=(' ') @weekly_every_day.weekly_return_tuesday=(' ')
@weekly_every_day.weekly_return_wednesday=(' ') @weekly_every_day.weekly_return_wednesday=(' ')
assert_equal 'sm tfs', @weekly_every_day.every_day assert_equal 'sm tfs', @weekly_every_day.every_day
due_date = @weekly_every_day.get_due_date(@monday) due_date = @weekly_every_day.get_due_date(@monday)
assert_equal @thursday, due_date assert_equal @thursday, due_date
@weekly_every_day.every_other1 = 1 @weekly_every_day.every_other1 = 1
@weekly_every_day.every_day = ' tw ' @weekly_every_day.every_day = ' tw '
due_date = @weekly_every_day.get_due_date(@tuesday) due_date = @weekly_every_day.get_due_date(@tuesday)
assert_equal @wednesday, due_date assert_equal @wednesday, due_date
due_date = @weekly_every_day.get_due_date(@wednesday) due_date = @weekly_every_day.get_due_date(@wednesday)
assert_equal @tuesday+1.week, due_date assert_equal @tuesday+1.week, due_date
end end
def test_monthly_pattern def test_monthly_pattern
due_date = @monthly_every_last_friday.get_due_date(@sunday) due_date = @monthly_every_last_friday.get_due_date(@sunday)
assert_equal Time.zone.local(2008,6,27), due_date assert_equal Time.zone.local(2008,6,27), due_date
friday_is_last_day_of_month = Time.zone.local(2008,10,31) friday_is_last_day_of_month = Time.zone.local(2008,10,31)
due_date = @monthly_every_last_friday.get_due_date(friday_is_last_day_of_month-1.day ) due_date = @monthly_every_last_friday.get_due_date(friday_is_last_day_of_month-1.day )
assert_equal friday_is_last_day_of_month , due_date assert_equal friday_is_last_day_of_month , due_date
@monthly_every_third_friday = @monthly_every_last_friday @monthly_every_third_friday = @monthly_every_last_friday
@monthly_every_third_friday.every_other3=3 #third @monthly_every_third_friday.every_other3=3 #third
due_date = @monthly_every_last_friday.get_due_date(@sunday) # june 8th 2008 due_date = @monthly_every_last_friday.get_due_date(@sunday) # june 8th 2008
assert_equal Time.zone.local(2008, 6, 20), due_date assert_equal Time.zone.local(2008, 6, 20), due_date
# set date past third friday of this month # set date past third friday of this month
due_date = @monthly_every_last_friday.get_due_date(Time.zone.local(2008,6,21)) # june 21th 2008 due_date = @monthly_every_last_friday.get_due_date(Time.zone.local(2008,6,21)) # june 21th 2008
assert_equal Time.zone.local(2008, 8, 15), due_date # every 2 months, so aug assert_equal Time.zone.local(2008, 8, 15), due_date # every 2 months, so aug
@monthly = @monthly_every_last_friday @monthly = @monthly_every_last_friday
@monthly.recurrence_selector=0 @monthly.recurrence_selector=0
@monthly.every_other1 = 8 # every 8th day of the month @monthly.every_other1 = 8 # every 8th day of the month
@monthly.every_other2 = 2 # every 2 months @monthly.every_other2 = 2 # every 2 months
due_date = @monthly.get_due_date(@saturday) # june 7th due_date = @monthly.get_due_date(@saturday) # june 7th
assert_equal @sunday, due_date # june 8th assert_equal @sunday, due_date # june 8th
due_date = @monthly.get_due_date(@sunday) # june 8th due_date = @monthly.get_due_date(@sunday) # june 8th
assert_equal Time.zone.local(2008,8,8), due_date # aug 8th assert_equal Time.zone.local(2008,8,8), due_date # aug 8th
end end
def test_yearly_pattern def test_yearly_pattern
# beginning of same year # beginning of same year
due_date = @yearly.get_due_date(Time.zone.local(2008,2,10)) # feb 10th due_date = @yearly.get_due_date(Time.zone.local(2008,2,10)) # feb 10th
assert_equal @sunday, due_date # june 8th assert_equal @sunday, due_date # june 8th
# same month, previous date # same month, previous date
due_date = @yearly.get_due_date(@saturday) # june 7th due_date = @yearly.get_due_date(@saturday) # june 7th
show_from_date = @yearly.get_show_from_date(@saturday) # june 7th show_from_date = @yearly.get_show_from_date(@saturday) # june 7th
assert_equal @sunday, due_date # june 8th assert_equal @sunday, due_date # june 8th
assert_equal @sunday-5.days, show_from_date assert_equal @sunday-5.days, show_from_date
# same month, day after # same month, day after
due_date = @yearly.get_due_date(@monday) # june 9th due_date = @yearly.get_due_date(@monday) # june 9th
assert_equal Time.zone.local(2009,6,8), due_date # june 8th next year assert_equal Time.zone.local(2009,6,8), due_date # june 8th next year
# very overdue # very overdue
due_date = @yearly.get_due_date(@monday+5.months-2.days) # november 7 due_date = @yearly.get_due_date(@monday+5.months-2.days) # november 7
assert_equal Time.zone.local(2009,6,8), due_date # june 8th next year assert_equal Time.zone.local(2009,6,8), due_date # june 8th next year
@yearly.recurrence_selector = 1 @yearly.recurrence_selector = 1
@yearly.every_other3 = 2 # second @yearly.every_other3 = 2 # second
@yearly.every_count = 3 # wednesday @yearly.every_count = 3 # wednesday
# beginning of same year # beginning of same year
due_date = @yearly.get_due_date(Time.zone.local(2008,2,10)) # feb 10th due_date = @yearly.get_due_date(Time.zone.local(2008,2,10)) # feb 10th
assert_equal Time.zone.local(2008,6,11), due_date # june 11th assert_equal Time.zone.local(2008,6,11), due_date # june 11th
# same month, before second wednesday # same month, before second wednesday
due_date = @yearly.get_due_date(@saturday) # june 7th due_date = @yearly.get_due_date(@saturday) # june 7th
assert_equal Time.zone.local(2008,6,11), due_date # june 11th assert_equal Time.zone.local(2008,6,11), due_date # june 11th
# same month, after second wednesday # same month, after second wednesday
due_date = @yearly.get_due_date(Time.zone.local(2008,6,12)) # june 7th due_date = @yearly.get_due_date(Time.zone.local(2008,6,12)) # june 7th
assert_equal Time.zone.local(2009,6,10), due_date # june 10th assert_equal Time.zone.local(2009,6,10), due_date # june 10th
# test handling of nil # test handling of nil
due_date1 = @yearly.get_due_date(nil) due_date1 = @yearly.get_due_date(nil)
due_date2 = @yearly.get_due_date(Time.now.utc + 1.day) due_date2 = @yearly.get_due_date(Time.now.utc + 1.day)
assert_equal due_date1, due_date2 assert_equal due_date1, due_date2
end end
def test_last_sunday_of_march def test_last_sunday_of_march
@yearly.recurrence_selector = 1 @yearly.recurrence_selector = 1
@yearly.every_other2 = 3 # march @yearly.every_other2 = 3 # march
@yearly.every_other3 = 5 # last @yearly.every_other3 = 5 # last
@yearly.every_count = 0 # sunday @yearly.every_count = 0 # sunday
due_date = @yearly.get_due_date(Time.zone.local(2008,10,1)) # oct 1st due_date = @yearly.get_due_date(Time.zone.local(2008,10,1)) # oct 1st
assert_equal Time.zone.local(2009,3,29), due_date # march 29th assert_equal Time.zone.local(2009,3,29), due_date # march 29th
end end
def test_start_from_in_future def test_start_from_in_future
# every_day should return start_day if it is in the future # every_day should return start_day if it is in the future
@every_day.start_from = @in_three_days @every_day.start_from = @in_three_days
due_date = @every_day.get_due_date(nil) due_date = @every_day.get_due_date(nil)
assert_equal @in_three_days, due_date assert_equal @in_three_days, due_date
due_date = @every_day.get_due_date(@tomorrow) due_date = @every_day.get_due_date(@tomorrow)
assert_equal @in_three_days, due_date assert_equal @in_three_days, due_date
# if we give a date in the future for the previous todo, the next to do # if we give a date in the future for the previous todo, the next to do
# should be based on that future date. # should be based on that future date.
due_date = @every_day.get_due_date(@in_four_days) due_date = @every_day.get_due_date(@in_four_days)
assert_equal @in_four_days+1.day, due_date assert_equal @in_four_days+1.day, due_date
@weekly_every_day.start_from = Time.zone.local(2020,1,1) @weekly_every_day.start_from = Time.zone.local(2020,1,1)
assert_equal Time.zone.local(2020,1,1), @weekly_every_day.get_due_date(nil) assert_equal Time.zone.local(2020,1,1), @weekly_every_day.get_due_date(nil)
assert_equal Time.zone.local(2020,1,1), @weekly_every_day.get_due_date(Time.zone.local(2019,10,1)) assert_equal Time.zone.local(2020,1,1), @weekly_every_day.get_due_date(Time.zone.local(2019,10,1))
assert_equal Time.zone.local(2020,1,10), @weekly_every_day.get_due_date(Time.zone.local(2020,1,9)) assert_equal Time.zone.local(2020,1,10), @weekly_every_day.get_due_date(Time.zone.local(2020,1,9))
@monthly_every_last_friday.start_from = Time.zone.local(2020,1,1) @monthly_every_last_friday.start_from = Time.zone.local(2020,1,1)
assert_equal Time.zone.local(2020,1,31), @monthly_every_last_friday.get_due_date(nil) # last friday of jan assert_equal Time.zone.local(2020,1,31), @monthly_every_last_friday.get_due_date(nil) # last friday of jan
assert_equal Time.zone.local(2020,1,31), @monthly_every_last_friday.get_due_date(Time.zone.local(2019,12,1)) # last friday of jan assert_equal Time.zone.local(2020,1,31), @monthly_every_last_friday.get_due_date(Time.zone.local(2019,12,1)) # last friday of jan
assert_equal Time.zone.local(2020,2,28), @monthly_every_last_friday.get_due_date(Time.zone.local(2020,2,1)) # last friday of feb assert_equal Time.zone.local(2020,2,28), @monthly_every_last_friday.get_due_date(Time.zone.local(2020,2,1)) # last friday of feb
# start from after june 8th 2008 # start from after june 8th 2008
@yearly.start_from = Time.zone.local(2020,6,12) @yearly.start_from = Time.zone.local(2020,6,12)
assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(nil) # jun 8th next year assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(nil) # jun 8th next year
assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(Time.zone.local(2019,6,1)) # also next year assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(Time.zone.local(2019,6,1)) # also next year
assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(Time.zone.local(2020,6,15)) # also next year assert_equal Time.zone.local(2021,6,8), @yearly.get_due_date(Time.zone.local(2020,6,15)) # also next year
this_year = Time.now.utc.year this_year = Time.now.utc.year
@yearly.start_from = Time.zone.local(this_year+1,6,12) @yearly.start_from = Time.zone.local(this_year+1,6,12)
due_date = @yearly.get_due_date(nil) due_date = @yearly.get_due_date(nil)
assert_equal due_date.year, this_year+2 assert_equal due_date.year, this_year+2
end end
def test_toggle_completion def test_toggle_completion
t = @yearly t = @yearly
assert_equal :active, t.current_state assert_equal :active, t.current_state
t.toggle_completion! t.toggle_completion!
assert_equal :completed, t.current_state assert_equal :completed, t.current_state
t.toggle_completion! t.toggle_completion!
assert_equal :active, t.current_state assert_equal :active, t.current_state
end end
def test_starred def test_starred
@yearly.tag_with("1, 2, starred", User.find(@yearly.user_id)) @yearly.tag_with("1, 2, starred")
@yearly.tags.reload @yearly.tags.reload
assert_equal true, @yearly.starred? assert_equal true, @yearly.starred?
assert_equal false, @weekly_every_day.starred? assert_equal false, @weekly_every_day.starred?
@yearly.toggle_star! @yearly.toggle_star!
assert_equal false, @yearly.starred? assert_equal false, @yearly.starred?
@yearly.toggle_star! @yearly.toggle_star!
assert_equal true, @yearly.starred? assert_equal true, @yearly.starred?
end end
def test_occurence_count def test_occurence_count
@every_day.number_of_occurences = 2 @every_day.number_of_occurences = 2
assert_equal true, @every_day.has_next_todo(@in_three_days) assert_equal true, @every_day.has_next_todo(@in_three_days)
@every_day.inc_occurences @every_day.inc_occurences
assert_equal true, @every_day.has_next_todo(@in_three_days) assert_equal true, @every_day.has_next_todo(@in_three_days)
@every_day.inc_occurences @every_day.inc_occurences
assert_equal false, @every_day.has_next_todo(@in_three_days) assert_equal false, @every_day.has_next_todo(@in_three_days)
# after completion, when you reactivate the recurring todo, the occurences # after completion, when you reactivate the recurring todo, the occurences
# count should be reset # count should be reset
assert_equal 2, @every_day.occurences_count assert_equal 2, @every_day.occurences_count
@every_day.toggle_completion! @every_day.toggle_completion!
@every_day.toggle_completion! @every_day.toggle_completion!
assert_equal true, @every_day.has_next_todo(@in_three_days) assert_equal true, @every_day.has_next_todo(@in_three_days)
assert_equal 0, @every_day.occurences_count assert_equal 0, @every_day.occurences_count
end end
end end

362
test/unit/todo_test.rb
View file

@ -1,181 +1,181 @@
require File.dirname(__FILE__) + '/../test_helper' require File.dirname(__FILE__) + '/../test_helper'
require 'date' require 'date'
class TodoTest < Test::Rails::TestCase class TodoTest < Test::Rails::TestCase
fixtures :todos, :users, :contexts, :preferences, :tags, :taggings fixtures :todos, :users, :contexts, :preferences, :tags, :taggings
def setup def setup
@not_completed1 = Todo.find(1).reload @not_completed1 = Todo.find(1).reload
@not_completed2 = Todo.find(2).reload @not_completed2 = Todo.find(2).reload
@completed = Todo.find(8).reload @completed = Todo.find(8).reload
end end
# Test loading a todo item # Test loading a todo item
def test_load def test_load
assert_kind_of Todo, @not_completed1 assert_kind_of Todo, @not_completed1
assert_equal 1, @not_completed1.id assert_equal 1, @not_completed1.id
assert_equal 1, @not_completed1.context_id assert_equal 1, @not_completed1.context_id
assert_equal 2, @not_completed1.project_id assert_equal 2, @not_completed1.project_id
assert_equal "Call Bill Gates to find out how much he makes per day", @not_completed1.description assert_equal "Call Bill Gates to find out how much he makes per day", @not_completed1.description
assert_nil @not_completed1.notes assert_nil @not_completed1.notes
assert @not_completed1.completed? == false assert @not_completed1.completed? == false
assert_equal 1.week.ago.beginning_of_day.strftime("%Y-%m-%d %H:%M"), @not_completed1.created_at.strftime("%Y-%m-%d %H:%M") assert_equal 1.week.ago.beginning_of_day.strftime("%Y-%m-%d %H:%M"), @not_completed1.created_at.strftime("%Y-%m-%d %H:%M")
assert_equal 2.week.from_now.beginning_of_day.strftime("%Y-%m-%d"), @not_completed1.due.strftime("%Y-%m-%d") assert_equal 2.week.from_now.beginning_of_day.strftime("%Y-%m-%d"), @not_completed1.due.strftime("%Y-%m-%d")
assert_nil @not_completed1.completed_at assert_nil @not_completed1.completed_at
assert_equal 1, @not_completed1.user_id assert_equal 1, @not_completed1.user_id
end end
def test_completed def test_completed
assert_kind_of Todo, @completed assert_kind_of Todo, @completed
assert @completed.completed? assert @completed.completed?
assert_not_nil @completed.completed_at assert_not_nil @completed.completed_at
end end
def test_completed_at_cleared_after_toggle_to_active def test_completed_at_cleared_after_toggle_to_active
assert_kind_of Todo, @completed assert_kind_of Todo, @completed
assert @completed.completed? assert @completed.completed?
@completed.toggle_completion! @completed.toggle_completion!
assert @completed.active? assert @completed.active?
assert_nil @completed.completed_at assert_nil @completed.completed_at
end end
# Validation tests # Validation tests
# #
def test_validate_presence_of_description def test_validate_presence_of_description
assert_equal "Call dinosaur exterminator", @not_completed2.description assert_equal "Call dinosaur exterminator", @not_completed2.description
@not_completed2.description = "" @not_completed2.description = ""
assert !@not_completed2.save assert !@not_completed2.save
assert_equal 1, @not_completed2.errors.count assert_equal 1, @not_completed2.errors.count
assert_equal "can't be blank", @not_completed2.errors.on(:description) assert_equal "can't be blank", @not_completed2.errors.on(:description)
end end
def test_validate_length_of_description def test_validate_length_of_description
assert_equal "Call dinosaur exterminator", @not_completed2.description assert_equal "Call dinosaur exterminator", @not_completed2.description
@not_completed2.description = generate_random_string(101) @not_completed2.description = generate_random_string(101)
assert !@not_completed2.save assert !@not_completed2.save
assert_equal 1, @not_completed2.errors.count assert_equal 1, @not_completed2.errors.count
assert_equal "is too long (maximum is 100 characters)", @not_completed2.errors.on(:description) assert_equal "is too long (maximum is 100 characters)", @not_completed2.errors.on(:description)
end end
def test_validate_length_of_notes def test_validate_length_of_notes
assert_equal "Ask him if I need to hire a skip for the corpses.", @not_completed2.notes assert_equal "Ask him if I need to hire a skip for the corpses.", @not_completed2.notes
@not_completed2.notes = generate_random_string(60001) @not_completed2.notes = generate_random_string(60001)
assert !@not_completed2.save assert !@not_completed2.save
assert_equal 1, @not_completed2.errors.count assert_equal 1, @not_completed2.errors.count
assert_equal "is too long (maximum is 60000 characters)", @not_completed2.errors.on(:notes) assert_equal "is too long (maximum is 60000 characters)", @not_completed2.errors.on(:notes)
end end
def test_validate_show_from_must_be_a_date_in_the_future def test_validate_show_from_must_be_a_date_in_the_future
t = @not_completed2 t = @not_completed2
t[:show_from] = 1.week.ago # we have to set this via the indexer because show_from=() updates the state t[:show_from] = 1.week.ago # we have to set this via the indexer because show_from=() updates the state
# and actual show_from value appropriately based on the date # and actual show_from value appropriately based on the date
assert !t.save assert !t.save
assert_equal 1, t.errors.count assert_equal 1, t.errors.count
assert_equal "must be a date in the future", t.errors.on(:show_from) assert_equal "must be a date in the future", t.errors.on(:show_from)
end end
def test_defer_an_existing_todo def test_defer_an_existing_todo
@not_completed2 @not_completed2
assert_equal :active, @not_completed2.current_state assert_equal :active, @not_completed2.current_state
@not_completed2.show_from = next_week @not_completed2.show_from = next_week
assert @not_completed2.save, "should have saved successfully" + @not_completed2.errors.to_xml assert @not_completed2.save, "should have saved successfully" + @not_completed2.errors.to_xml
assert_equal :deferred, @not_completed2.current_state assert_equal :deferred, @not_completed2.current_state
end end
def test_create_a_new_deferred_todo def test_create_a_new_deferred_todo
user = users(:other_user) user = users(:other_user)
todo = user.todos.build todo = user.todos.build
todo.show_from = next_week todo.show_from = next_week
todo.context_id = 1 todo.context_id = 1
todo.description = 'foo' todo.description = 'foo'
assert todo.save, "should have saved successfully" + todo.errors.to_xml assert todo.save, "should have saved successfully" + todo.errors.to_xml
assert_equal :deferred, todo.current_state assert_equal :deferred, todo.current_state
end end
def test_create_a_new_deferred_todo_by_passing_attributes def test_create_a_new_deferred_todo_by_passing_attributes
user = users(:other_user) user = users(:other_user)
todo = user.todos.build(:show_from => next_week, :context_id => 1, :description => 'foo') todo = user.todos.build(:show_from => next_week, :context_id => 1, :description => 'foo')
assert todo.save, "should have saved successfully" + todo.errors.to_xml assert todo.save, "should have saved successfully" + todo.errors.to_xml
assert_equal :deferred, todo.current_state assert_equal :deferred, todo.current_state
end end
def test_feed_options def test_feed_options
opts = Todo.feed_options(users(:admin_user)) opts = Todo.feed_options(users(:admin_user))
assert_equal 'Tracks Actions', opts[:title], 'Unexpected value for :title key of feed_options' assert_equal 'Tracks Actions', opts[:title], 'Unexpected value for :title key of feed_options'
assert_equal 'Actions for Admin Schmadmin', opts[:description], 'Unexpected value for :description key of feed_options' assert_equal 'Actions for Admin Schmadmin', opts[:description], 'Unexpected value for :description key of feed_options'
end end
def test_toggle_completion def test_toggle_completion
t = @not_completed1 t = @not_completed1
assert_equal :active, t.current_state assert_equal :active, t.current_state
t.toggle_completion! t.toggle_completion!
assert_equal :completed, t.current_state assert_equal :completed, t.current_state
t.toggle_completion! t.toggle_completion!
assert_equal :active, t.current_state assert_equal :active, t.current_state
end end
def test_activate_also_saves def test_activate_also_saves
t = @not_completed1 t = @not_completed1
t.show_from = 1.week.from_now t.show_from = 1.week.from_now
t.save! t.save!
assert t.deferred? assert t.deferred?
t.reload t.reload
t.activate! t.activate!
assert t.active? assert t.active?
t.reload t.reload
assert t.active? assert t.active?
end end
def test_project_returns_null_object_when_nil def test_project_returns_null_object_when_nil
t = @not_completed1 t = @not_completed1
assert !t.project.is_a?(NullProject) assert !t.project.is_a?(NullProject)
t.project = nil t.project = nil
assert t.project.is_a?(NullProject) assert t.project.is_a?(NullProject)
end end
def test_initial_state_defaults_to_active def test_initial_state_defaults_to_active
t = Todo.new t = Todo.new
t.description = 'foo' t.description = 'foo'
t.context_id = 1 t.context_id = 1
t.save! t.save!
t.reload t.reload
assert_equal :active, t.current_state assert_equal :active, t.current_state
end end
def test_initial_state_is_deferred_when_show_from_in_future def test_initial_state_is_deferred_when_show_from_in_future
t = Todo.new t = Todo.new
t.user = users(:admin_user) t.user = users(:admin_user)
t.description = 'foo' t.description = 'foo'
t.context_id = 1 t.context_id = 1
t.show_from = 1.week.from_now.to_date t.show_from = 1.week.from_now.to_date
t.save! t.save!
t.reload t.reload
assert_equal :deferred, t.current_state assert_equal :deferred, t.current_state
end end
def test_todo_is_not_starred def test_todo_is_not_starred
assert !@not_completed1.starred? assert !@not_completed1.starred?
end end
def test_todo_2_is_not_starred def test_todo_2_is_not_starred
assert !Todo.find(2).starred? assert !Todo.find(2).starred?
end end
def test_todo_is_starred_after_starred_tag_is_added def test_todo_is_starred_after_starred_tag_is_added
@not_completed1.add_tag('starred') @not_completed1._add_tags('starred')
assert @not_completed1.starred? assert @not_completed1.starred?
end end
def test_todo_is_starred_after_toggle_starred def test_todo_is_starred_after_toggle_starred
@not_completed1.toggle_star! @not_completed1.toggle_star!
assert @not_completed1.starred? assert @not_completed1.starred?
end end
def test_todo_is_not_starred_after_toggle_starred_twice def test_todo_is_not_starred_after_toggle_starred_twice
@not_completed1.toggle_star! @not_completed1.toggle_star!
@not_completed1.toggle_star! @not_completed1.toggle_star!
assert !@not_completed1.starred? assert !@not_completed1.starred?
end end
end end