@@ -31,7 +31,7 @@ INSTALL: gem update --system gem update rails - Install a few required gems: tzinfo, tztime, rspec + Install a few required gems: tzinfo, tztime, rspec -- tzinfo and tztime may not be needed with rails 2.1 Create config/database.yml; if you don't know how to do this, then you probably won't learn anything from this app. Import the database with rake db:migrate README @@ -5,8 +5,6 @@ class ApplicationController < ActionController::Base include AuthenticatedSystem include ExceptionNotifiable - before_filter :set_user_time_zone - class AccessDenied < StandardError; end # Pick a unique cookie name to distinguish our session data from others' @@ -15,7 +13,7 @@ class ApplicationController < ActionController::Base # If you want timezones per-user, uncomment this: before_filter :login_required - around_filter :set_user_time_zone + before_filter :set_timezone around_filter :catch_errors protected @@ -25,10 +23,8 @@ class ApplicationController < ActionController::Base private - def set_user_time_zone - Time.zone = logged_in? ? current_user.time_zone : TimeZone.new('Etc/UTC') - yield - Time.reset! + def set_timezone + Time.zone = current_user.time_zone if logged_in? end def catch_errors app/controllers/application.rb @@ -1,8 +1,8 @@ module ApplicationHelper - # Show the local time - def tz(time_at) - TzTime.zone.utc_to_local(time_at.utc) - end + # Show the local time == outdated with rails 2.1 + ##def tz(time_at) + ##TzTime.zone.utc_to_local(time_at.utc) + ##end end app/helpers/application_helper.rb @@ -22,7 +22,7 @@ class User < ActiveRecord::Base include AuthenticatedBase has_many :assets, :as => :attachable - composed_of :tz, :class_name => 'TZInfo::Timezone', :mapping => %w( time_zone time_zone ) ## in rails 2.1 this will be updated. + ## outdated with rails 2.1 composed_of :tz, :class_name => 'TZInfo::Timezone', :mapping => %w( time_zone time_zone ) ## in rails 2.1 this will be updated. validates_uniqueness_of :login, :email, :case_sensitive => false app/models/user.rb @@ -12,4 +12,5 @@ <%= form.password_field :password_confirmation %></p> <p><label for="user_time_zone">Default timezone</label> - <%= form.time_zone_select :time_zone, TimeZone.us_zones %></p> + <%= form.time_zone_select :time_zone, TimeZone.us_zones %> + </p> app/views/users/_form.html.erb @@ -33,6 +33,8 @@ Rails::Initializer.run do |config| :session_key => '_restful_auth_rspec_session', :secret => '62a9f27912d6522beff9f364438209e0' } + # config/environment.rb -- turn on time zone default + config.time_zone = 'Pacific Time (US & Canada)' # Use the database for sessions instead of the cookie-based default, # which shouldn't be used to store highly confidential information config/environment.rb @@ -11,8 +11,6 @@ config.whiny_nils = true # Show full error reports and disable caching config.action_controller.consider_all_requests_local = true config.action_controller.perform_caching = false -config.action_view.cache_template_extensions = false -config.action_view.debug_rjs = true # Don't care if the mailer can't send config.action_mailer.raise_delivery_errors = false config/environments/development.rb @@ -196,7 +196,7 @@ describe "Requesting /users/1/edit using GET" do controller_name :users before(:each) do - @user = mock_model(User, :tz => nil) + ## outdated with rails 2.1 @user = mock_model(User, :tz => nil) User.stub!(:find_by_param).and_return(@user) controller.stub!(:current_user).and_return @user end @@ -259,7 +259,7 @@ describe "Requesting /users/1 using PUT" do controller_name :users before(:each) do - @user = mock_model(User, :to_param => "1", :update_attributes => true, :tz => nil) + ## outdate with rails 2.1 ## @user = mock_model(User, :to_param => "1", :update_attributes => true, :tz => nil) User.stub!(:find_by_param).and_return(@user) controller.stub!(:current_user).and_return(@user) @@ -296,7 +296,7 @@ describe "Requesting /users/1 using DELETE" do controller_name :users before(:each) do - @user = mock_model(User, :destroy => true, :tz => nil) + ## outdate with rails 2.1 ## @user = mock_model(User, :destroy => true, :tz => nil) User.stub!(:find_by_param).and_return(@user) controller.stub!(:current_user).and_return @user end spec/controllers/users_controller_spec.rb @@ -3,7 +3,7 @@ ENV["RAILS_ENV"] = "test" require File.expand_path(File.dirname(__FILE__) + "/../config/environment") require 'spec/rails' -require 'tzinfo' +## outdate with rails 2.1 ## require 'tzinfo' require 'rspec_extensions' # custom in lib/ @@ -28,7 +28,7 @@ Spec::Runner.configure do |config| def mock_user user = mock_model(User, :id => 1, - :tz => TimeZone.new('USA/PDT'), + ## outdate with rails 2.1 ## :tz => TimeZone.new('USA/PDT'), :login => 'flappy', :email => 'flappy@email.com', :password => '', :password_confirmation => '', spec/spec_helper.rb @@ -133,7 +133,7 @@ namespace :peepcode do desc "Install gems needed by PeepCode" task :special_gems do # TODO hpricot - %w(libxml-ruby gruff sparklines ar_mailer bong production_log_analyzer tzinfo rspec).each do |gemname| + %w(libxml-ruby gruff sparklines ar_mailer bong production_log_analyzer rspec).each do |gemname| sudo "gem install #{gemname} -y" end end vendor/plugins/peepserver/recipes/peepserver.rb vendor/plugins/tzinfo_timezone/README vendor/plugins/tzinfo_timezone/Rakefile vendor/plugins/tzinfo_timezone/init.rb vendor/plugins/tzinfo_timezone/lib/tzinfo_timezone.rb vendor/plugins/tzinfo_timezone/test/tzinfo_timezone_test.rb vendor/plugins/tztime/README vendor/plugins/tztime/lib/tz_time.rb e2d25dc99528485efda41d2a7398bd3c8da5ada1 Carl Tanner captproton@betterbilling.net http://github.com/captproton/caboo.se-sample-app-v3/commit/c71e4811826a8fcf304542b01a8e477e5b051382 c71e4811826a8fcf304542b01a8e477e5b051382 2008-06-06T14:24:52-07:00 2008-06-06T14:24:52-07:00 Removed deprciated code: WARNING: config.action_view.cache_template_extensions option has been deprecated and has no affect. Please remove it from your config files. See http://www.rubyonrails.org/deprecation for details. (called from send at /usr/local/lib/ruby/gems/1.8/gems/rails-2.1.0/lib/initializer.rb:455) d7d01d3c7be7ae53b92e42cbd2e0c56855fb291b Carl Tanner captproton@betterbilling.net