Merge pull request #90 from martinciu/4075b57526e2632bda8a61fed1dd7678d3859b79

Time zone support

Merge pull request #90 from martinciu/4075b57526e2632bda8a61fed1dd7678d3859b79
Time zone support
Nathan B
2 parents fb03e5a1 4075b575
Showing 5 changed files with 25 additions and 1 deletions Show diff stats
app/controllers/application_controller.rb
app/models/user.rb
app/views/users/_fields.html.haml
config/initializers/mongo.rb
spec/controllers/users_controller_spec.rb
@@ -2,6 +2,7 @@ class ApplicationController &lt; ActionController::Base
   protect_from_forgery
   before_filter :authenticate_user!
+  before_filter :set_time_zone
   # Devise override - After login, if there is only one app,
   # redirect to that app's path instead of the root path (apps#index).
@@ -23,7 +24,10 @@ protected
   def redirect_to_root
     redirect_to(root_path)
   end
-
+  
+  def set_time_zone
+    Time.zone = current_user.time_zone if user_signed_in?
+  end
 end
@@ -11,6 +11,7 @@ class User
   field :name
   field :admin, :type => Boolean, :default => false
   field :per_page, :type => Fixnum, :default => PER_PAGE
+  field :time_zone, :default => "UTC" 
   after_destroy :destroy_watchers
   before_save :ensure_authentication_token
@@ -18,6 +18,10 @@
   = f.select :per_page, [10, 20, 30, 50, 75, 100]
 .required
+  = f.label :time_zone
+  = f.time_zone_select :time_zone, ActiveSupport::TimeZone.us_zones
+
+.required
   = f.label :password
   = f.password_field :password
@@ -6,6 +6,7 @@ if mongo = ENV[&#39;MONGOHQ_URL&#39;] || ENV[&#39;MONGOLAB_URI&#39;]
     config.master = Mongo::Connection.new(settings.host, settings.port).db(database_name)
     config.master.authenticate(settings.user, settings.password) if settings.user
     config.allow_dynamic_fields = false
+    config.use_activesupport_time_zone = true
   end
 end
@@ -16,6 +16,10 @@ describe UsersController do
     before do
       sign_in @user = Factory(:user)
     end
+    
+    it "should set a time zone" do
+      Time.zone.should.to_s == @user.time_zone
+    end
     context "GET /users/:other_id/edit" do
       it "redirects to the home page" do
@@ -34,6 +38,11 @@ describe UsersController do
         get :edit, :id => @user.id
         response.body.should match(/id="user_per_page"/)
       end
+
+      it "should have time_zone option" do
+        get :edit, :id => @user.id
+        response.body.should match(/id="user_time_zone"/)
+      end
     end
     context "PUT /users/:other_id" do
@@ -64,6 +73,11 @@ describe UsersController do
           put :update, :id => @user.to_param, :user => {:per_page => 555}
           @user.reload.per_page.should == 555
         end
+        
+        it "should be able to set time_zone option" do
+          put :update, :id => @user.to_param, :user => {:time_zone => "Warsaw"}
+          @user.reload.time_zone.should == "Warsaw"
+        end
       end
       context "when the update is unsuccessful" do
	@@ -11,6 +11,7 @@ class User		@@ -11,6 +11,7 @@ class User
11	field :name	11	field :name
12	field :admin, :type => Boolean, :default => false	12	field :admin, :type => Boolean, :default => false
13	field :per_page, :type => Fixnum, :default => PER_PAGE	13	field :per_page, :type => Fixnum, :default => PER_PAGE
		14	+ field :time_zone, :default => "UTC"
14		15
15	after_destroy :destroy_watchers	16	after_destroy :destroy_watchers
16	before_save :ensure_authentication_token	17	before_save :ensure_authentication_token
	@@ -6,6 +6,7 @@ if mongo = ENV['MONGOHQ_URL'] \|\| ENV['MONGOLAB_URI']		@@ -6,6 +6,7 @@ if mongo = ENV['MONGOHQ_URL'] \|\| ENV['MONGOLAB_URI']
6	config.master = Mongo::Connection.new(settings.host, settings.port).db(database_name)	6	config.master = Mongo::Connection.new(settings.host, settings.port).db(database_name)
7	config.master.authenticate(settings.user, settings.password) if settings.user	7	config.master.authenticate(settings.user, settings.password) if settings.user
8	config.allow_dynamic_fields = false	8	config.allow_dynamic_fields = false
		9	+ config.use_activesupport_time_zone = true
9	end	10	end
10	end	11	end
11		12