@@ -103,13 +103,6 @@ class ApplicationController < ActionController::Base end end - def render_message(message) - respond_to do |wants| - wants.js { render(:update) { |p| p.alert message } } - wants.html { render :text => message, :layout => true } - end - end - def rescue_action_with_page_detection(exception) get_site path, args = request.request_uri.downcase.split('?') @@ -145,30 +138,6 @@ class ApplicationController < ActionController::Base def add_errors_to_flash(record) flash[:warning] = record.errors.full_messages.join('; ') end - - def decimal_in_words(number) - if number % 1 == 0.0 - "exactly #{number}" - elsif number % 1 < 0.5 - "more than #{number.to_i}" - elsif number % 1 >= 0.5 - "less than #{number.to_i + 1}" - end - end - - # stolen from ActionView::Helpers::NumberHelper - def number_to_phone(number, options = {}) - options = options.stringify_keys - area_code = options.delete("area_code") { false } - delimiter = options.delete("delimiter") { "-" } - extension = options.delete("extension") { "" } - begin - str = area_code == true ? number.to_s.gsub(/([0-9]{3})([0-9]{3})([0-9]{4})/,"(\\1) \\2#{delimiter}\\3") : number.to_s.gsub(/([0-9]{3})([0-9]{3})([0-9]{4})/,"\\1#{delimiter}\\2#{delimiter}\\3") - extension.to_s.strip.empty? ? str : "#{str} x #{extension.to_s.strip}" - rescue - number - end - end def only_admins unless @logged_in.admin? app/controllers/application.rb @@ -649,6 +649,8 @@ class Person < ActiveRecord::Base find_by_sql("select distinct service_category from people where service_category is not null and service_category != '' order by service_category").map { |p| p.service_category } end + include ActionView::Helpers::NumberHelper # number_to_phone used by pdf generation below + def generate_directory_pdf pdf = PDF::Writer.new pdf.margins_pt 70, 20, 20, 20 @@ -740,16 +742,3 @@ class Person < ActiveRecord::Base end -# stolen from ActionView::Helpers::NumberHelper -def number_to_phone(number, options = {}) - options = options.stringify_keys - area_code = options.delete("area_code") { false } - delimiter = options.delete("delimiter") { "-" } - extension = options.delete("extension") { "" } - begin - str = area_code == true ? number.to_s.gsub(/([0-9]{3})([0-9]{3})([0-9]{4})/,"(\\1) \\2#{delimiter}\\3") : number.to_s.gsub(/([0-9]{3})([0-9]{3})([0-9]{4})/,"\\1#{delimiter}\\2#{delimiter}\\3") - extension.to_s.strip.empty? ? str : "#{str} x #{extension.to_s.strip}" - rescue - number - end -end app/models/person.rb @@ -101,6 +101,10 @@ class PersonTest < Test::Unit::TestCase assert people(:tim).email_changed? end + should "generate a custom directory pdf" do + assert_match /PDF\-1\.3/, people(:tim).generate_directory_pdf.to_s[0..100] + end + private def partial_fixture(table, name, valid_attributes) test/unit/person_test.rb 31d0bfa15066640b4ba1000ff2c444b8b6a32dee Tim Morgan tim@timmorgan.org http://github.com/seven1m/onebody/commit/774e4c1209c23c99a044f020e90f18929e69f787 774e4c1209c23c99a044f020e90f18929e69f787 2008-08-05T08:51:42-07:00 2008-08-05T06:14:00-07:00 Removed unused methods from Application controller. 416a77a575d4566bc4f2ddee6d7b20acc07538d0 Tim Morgan tim@timmorgan.org