wiser_timezone 0.1.0 → 0.1.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NTQyN2U3NWM0NjAyY2VlYTNlYWMxM2Q4N2E1NGI5ZTBiMDg0YzNiMQ==
+    ZWY0ZDI0OTA5NjY2NmFkMGQ1NTVjZDIxODFjZmI4ZjMxMmIyOGI3OA==
   data.tar.gz: !binary |-
-    NmNmYjlhMTQyYWU2MGYyNGFkYTc5NTk0Y2FkZTc3YWUzMzJhODFmMg==
+    MTg1ZGJkOTAzNGZiNTA5MGQxYjY1NDIwZGJlZjlhZWZkNTE0NjczZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Y2IxYTJjZDk0N2VlNWRjZGFkNmU5MGVlNGJiMDdkOWI2NWM2ODJkOWJiMjg1
-    M2Q5ZDI3OGMxZjcwZTVjNDQ3ZTFiNWZlOTZjNDAyNWY1NDliMzE5NDUyNGIx
-    ZDQ2MjJjZWEyOTBkMDRlNjcwZDhjODA2Zjg4YmM0ZmFjZThhZDM=
+    ZGMwYzNkMDhkZTkxYzc1ZWUwOGIzMWNiMDU0MzExYjM2MWZiYmRmNzhlY2I3
+    NWJkZDhmYTlkZjQyNmMwNWIyNDgwNjZhMGUwMjkwMTU2ZjdiODkxZTQwOWVi
+    NDdlODRhMGY0NDEwN2U3YTU2MjgwYmUzNDkxZTQ5OTUzZGUxZjg=
   data.tar.gz: !binary |-
-    ODdjODQ5NDMyMGUxYWY1Yjc4YzkzMzhlYTdjZDM0YThlZmFmMmE1YWNjM2Nk
-    ZjUzNTViNDY4MDM3YzJhM2I3MDE3YjllMTNhMmQ3YjVhYTYxYjcwMWJjMjUx
-    YTA4NzdhNWI1YWJmY2Y0ZWRjYmUzZGUwYTc3NDI2YjU2ZjZjODA=
+    NWRjOGQ1YWNkMDBhOTMyMDRlN2MzNjU3OWM0MDkwODNkZTRlN2VhOWU4YmEy
+    YzFmN2RjNzUzZmIwMzY0NjE5MTIwYTNjYTcxODgxODI3NjQyZjcxNTI5YTUw
+    NjZmMTc4ODc3MmJlN2YwODkyYmQzZDU1YzY1YmQwNzQ0NmY0MmU=

data/README.md

@@ -16,7 +16,7 @@ You can do normal gem installation for `wiser_timezone` from your terminal:
 
 or add this line in your Gemfile:
 
-    gem 'wiser_timezone'
+    gem 'wiser_timezone', '~> 0.1.1'
 
 Be sure to restart your application if it is already running.
 
@@ -85,6 +85,15 @@ Or even format the value:
 	<%= wiser_timezone(@post.created_at).strftime('%Y-%m-%d %H:%M:%S') %>
 	// Return: 2014-03-15 02:37:07
 
+### Expand
+
+You can use the *WiserTimezone* helpers in your controller, just include the library in your `ApplicationController`:
+
+	include WiserTimezone::WiserTimezoneHelper
+	class ApplicationController < ActionController::Base
+		# More Codes
+	end
+
 ### Extra
 
 You can get the current timezone using the `current_timezone` method:
@@ -93,6 +102,12 @@ You can get the current timezone using the `current_timezone` method:
 	<%= current_timezone %>
 	// Return: (GMT+08:00) Beijing
 
+You can get the current timezone offset using the `current_timezone_offset` method:
+
+	My timezone is:
+	<%= current_timezone_offset %>
+	// Return: GMT+8
+
 
 ## Contributing
 

data/app/assets/javascripts/wiser_timezone.js

@@ -1,5 +1,11 @@
 $(document).ready(function(){
   wiser_timezone_reload();
+
+  $(window).resize(function(){
+    if($('#wiser_timezone_container').is(':visible')){
+      $('body').css('margin-top', $('#wiser_timezone_container').height() + 'px')
+    }
+  })
 });
 
 var wiser_timezone_reload = function(){
@@ -7,12 +13,15 @@ var wiser_timezone_reload = function(){
     browser_offset = (-(new Date()).getTimezoneOffset() / 60).toString();
     setting_offset = $('#wiser_timezone_space').data('offset')
 
-
     if(browser_offset != setting_offset){
-      $('body').css('margin-top', '50px')
-      $('#wiser_timezone_container').show()
+      $(window).resize()
       url = $('#wiser_timezone_link').attr('href')
-      $('#wiser_timezone_link').attr('href', url + '?offset=' + encodeURIComponent(browser_offset))
+      if(!$('#wiser_timezone_link').hasClass('wiser_timezone_link')){
+        $('#wiser_timezone_link').addClass('wiser_timezone_link')
+        $('#wiser_timezone_link').attr('href', url + '?offset=' + encodeURIComponent(browser_offset))
+        hours_offset = (new Date()).getTimezoneOffset() / -60
+        $('#wiser_timezone_space').html($('#wiser_timezone_space').html().replace('~TZ~','GMT+' + hours_offset))
+      }
     }else{
       $('#wiser_timezone_container').remove()
     }

data/app/assets/stylesheets/wiser_timezone.css

@@ -10,11 +10,12 @@
 #wiser_timezone_container #wiser_timezone_space {
   /* Layout */
   padding: 10px 15px;
+  line-height: 1.2em;
   /* Font */
   font-family: Arial, 'Liberation Sans', 'DejaVu Sans', sans-serif;
   color: #555;
   /* Border */
-  border-bottom: 1px solid #3e5e71;
+  border-bottom: 1px solid #ddd;
   /* Background */
   background: #f5f9ff;
 }
@@ -27,4 +28,7 @@
   /* Font */
   text-decoration: none;
   color: #3e5e71;
+}
+.no_wrap {
+  white-space: nowrap;
 }

data/app/controllers/wiser_timezone/wiser_timezone_controller.rb

@@ -2,8 +2,12 @@ module WiserTimezone
   class WiserTimezoneController < ApplicationController
     def set_timezone
       if params[:offset].present?
-        if current_user.present? && current_user.try(:timezone).present?
-          current_user.update_attribute(:timezone, params[:offset])
+        if current_user.present?
+          begin
+            current_user.update_attribute(:timezone, params[:offset])
+          rescue
+            raise "You probably need to run the migration. Please review the documentation."
+          end
         else
           cookies[:wiser_timezone_offset] = params[:offset]
         end

data/app/helpers/wiser_timezone/wiser_timezone_helper.rb

@@ -5,6 +5,12 @@ module WiserTimezone
       return ActiveSupport::TimeZone[offset.to_i]
     end
 
+    def current_timezone_offset
+      timezone_str = current_timezone.to_s
+      offset_str = timezone_str[timezone_str.index('(')+1..-1].split(':').first()
+      return "#{offset_str[0..3]}#{offset_str[4..-1].to_i}"
+    end
+
     def wiser_timezone(date)
       begin
         date_time = date.to_datetime
@@ -17,26 +23,28 @@ module WiserTimezone
     def wiser_timezone_initialize
       link = link_to('Click Here', set_timezone_path, :method => 'post', :data => {:offset => "#{offset}"}, :id => 'wiser_timezone_link')
       if offset.present?
-        msg = "Your computer's timezone does not appear to match the current setting #{current_timezone}. #{link} to update the timezone."
+        msg = "Your computer's timezone does not appear to match the current setting #{current_timezone}. <span class='no_wrap'>#{link} to update the timezone to ~TZ~.</span>"
       else
-        msg = "You do not have timezone in your user setting. #{link} to save your time zone."
+        msg = "You do not have timezone in your user settings. <span class='no_wrap'>#{link} to set your timezone to ~TZ~.</span>"
       end
       space = "<div id='wiser_timezone_space' data-offset='#{offset}'>#{msg}</div>"
-      html = "<div id='wiser_timezone_container' style='display:none;'>#{space}</div>"
+      html = "<div id='wiser_timezone_container' style='display:block;'>#{space}</div>"
       return html.html_safe
     end
 
     private
 
     def offset
-      if current_user.present? && current_user.try(:timezone).present?
-        offset = current_user.timezone
+      if current_user.present?
+        if current_user.try(:timezone).present?
+          @timezone_offset ||= current_user.timezone
+        else
+          @timezone_offset = nil
+        end
       elsif cookies[:wiser_timezone_offset].present?
-        offset = cookies[:wiser_timezone_offset]
-      else
-        offset = 0
+        @timezone_offset ||= cookies[:wiser_timezone_offset]
       end
-      return offset.to_i
+      return @timezone_offset
     end
   end
 end

data/lib/wiser_timezone/version.rb

@@ -1,3 +1,3 @@
 module WiserTimezone
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wiser_timezone
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kenneth John Balgos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler