timepiece 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca9f94a35c0ae355e6f8ad7f12ca5c6a88d90fd
-  data.tar.gz: dad6b9ec23757434e6867f20d32a44d45d110403
+  metadata.gz: cffcf03a2b5b2bc7a97ae5d4efce3eba8dce7064
+  data.tar.gz: b56e96e36cebba51284288a3cda1a5324b7f054a
 SHA512:
-  metadata.gz: 8aa986e4724d935119c8382ac45c93ae5324c517cd21ad0ab97e0177c214faa78ee1f316df3a69ce83cab03f247b7a10fd46b3d74cbb82dab804d2acc268037c
-  data.tar.gz: 3678591c6d6af7f2c24050282041f1ccdda34c53788c347e6049461c726006c8f8a8612861ea5dffbaf7291c90f293bb194822a842ad2d00027e40277b6f2e54
+  metadata.gz: 1c5d907b73e131e18bc293dd54369367e06a40d458ea6010045068f5050720cd89db7d6184ed2995c56b4941a3e76dd87f739fbc3c24574f406c3a45677eff94
+  data.tar.gz: ff1df9a38af7bd9a094aa97ef07acd9204471e387d9c5c209eb41e50ea200555972caf3401795115ded59dbe0dad2b22c506039a9c7c96ab08243f9ef60eca27

data/README.rdoc

@@ -1,10 +1,10 @@
 {<img src="https://badge.fury.io/rb/timepiece.svg" alt="Gem Version" />}[http://badge.fury.io/rb/timepiece]
 
-## Timepiece
+= Timepiece
 
 Timepiece is a Rails plugin providing a simple digital clock, accurate to your server's time and maintained by jQuery.
 
-## Installation
+== Installation
 
 1. Add Timepiece to your application's Gemfile
 
@@ -14,7 +14,7 @@ Timepiece is a Rails plugin providing a simple digital clock, accurate to your s
 
     //= require timepiece
 
-## Usage
+== Usage
 
 * Add a functional clock to your views
 
@@ -24,6 +24,30 @@ Timepiece is a Rails plugin providing a simple digital clock, accurate to your s
 
     <%= timepiece('London') %>
 
-* By default, Timepiece shows a 24 hour digital clock. You can show a 12 hour clock by specifying it explicitly.
+* Show a 12 hour clock by specifying it explicitly
 
     <%= timepiece('London', '12') %>
+
+By default the 12 hour clock displays time without any leading character, in the format '1:23pm'. You can add either a zero, as present on the 24 hour clock, or a leading space character the size of a numerical digit - useful for keeping your clocks aligned.
+
+* To add a leading zero to hour values less than ten
+
+    <%= timepiece('London', '12', '0') %>
+
+  or
+
+    <%= timepiece('London', '12', 'zero') %>
+
+* To add a space character
+
+    <%= timepiece('London', '12', '_') %>
+
+  or
+
+    <%= timepiece('London', '12', 'space') %>
+
+You can apply your own styles to any part of the Timepiece clock. For instance, you can capitalize the AM/PM abbreviation by targeting the span with class 'timepiece-abbr'. By default, the abbreviations are displayed without punctuation. To add punctuation, you can specify it in the options.
+
+* Add punctuation to am/pm abbreviation
+
+    <%= timepiece('London', '12', '0', '.') %>

data/app/assets/javascripts/timepiece.js

@@ -53,7 +53,16 @@ function show_time(){
 						$(e).data('hours', hours[i])
 						abbr = 'am'
 					}
-					$('.timepiece-hours', $(e)).html(( $(e).data('hours') < 10 ? "0" : "" ) + $(e).data('hours'));
+					if($(e).attr("data-abbr_separator") == '.'){
+						abbr = abbr.replace(/([apm])/g, '$1.')
+					}
+					if($(e).attr("data-lead") == '0' || $(e).attr("data-lead") == 'zero' ){
+						$('.timepiece-hours', $(e)).html(( $(e).data('hours') < 10 ? "0" : "" ) + $(e).data('hours'));
+					}else if($(e).attr("data-lead") == '_' || $(e).attr("data-lead") == 'space' ){
+						$('.timepiece-hours', $(e)).html(( $(e).data('hours') < 10 ? "&#8199;" : "" ) + $(e).data('hours'));
+					}else{
+						$('.timepiece-hours', $(e)).html($(e).data('hours'));
+					}
 					$('.timepiece-minutes', $(e)).html(( minutes[i] < 10 ? "0" : "" ) + minutes[i]);
 					$('.timepiece-seconds', $(e)).html(( seconds[i] < 10 ? "0" : "" ) + seconds[i]);
 					$('.timepiece-abbr', $(e)).html(abbr);

data/app/helpers/timepiece_helper.rb

@@ -1,23 +1,33 @@
 module TimepieceHelper
-  def timepiece(location = 'UTC', type = '24')
+  def timepiece(location = 'UTC', type = '24', lead = 'none', abbr_sep = 'none')
   	Time.zone = location
   	hours = Time.now.in_time_zone.strftime('%H')
   	minutes = Time.now.in_time_zone.strftime('%M')
   	seconds = Time.now.in_time_zone.strftime('%S')
-  	if type == '12' && hours.to_i > 12
-  	  hours = hours.to_i - 12
+  	if type == '12'
+      hours = hours.to_i
+      if hours > 12
+        hours = hours - 12
+  	    var = 'pm'
+      elsif hours == 0
+  	    hours = 12
+  	    var = 'am'
+  	  elsif hours == 12
+  	    var = 'pm'
+  	  elsif hours < 12
+  	    var = 'am'
+  	  end
       if hours < 10
-        hours = '0' + hours.to_s
+        if lead == '0' || lead == 'zero'
+          hours = '0' + hours.to_s
+        elsif lead == '_' || lead == 'space'
+          hours = '&#8199;' + hours.to_s
+        end
       end
-  	  var = 'pm'
-  	elsif type == '12' && hours.to_i == 0
-  	  hours = 12
-  	  var = 'am'
-  	elsif type == '12' && hours.to_i == 12
-  	  var = 'pm'
-  	elsif type == '12' && hours.to_i < 12
-  	  var = 'am'
-  	end
+      if abbr_sep == '.'
+        var = var.gsub(/([apm])/, '\1.')
+      end
+    end
   	time = "<span class='timepiece-hours'>#{hours}</span>"\
            "<span class='timepiece-separator tp-separator-1'>:</span>"\
            "<span class='timepiece-minutes'>#{minutes}</span>"\
@@ -26,6 +36,6 @@ module TimepieceHelper
     if type == '12'
       time = time + "<span class='timepiece-abbr timepiece-abbr-#{var}'>#{var}</span>"
     end
-  	content_tag(:span, time.html_safe, class: 'timepiece', 'data-timezone' => location, 'data-tptype' => type)
+  	content_tag(:span, time.html_safe, class: 'timepiece', 'data-timezone' => location, 'data-tptype' => type, 'data-lead' => lead, 'data-abbr_separator' => abbr_sep)
   end
 end

data/lib/timepiece/version.rb

@@ -1,3 +1,3 @@
 module Timepiece
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timepiece
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Thom Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-03 00:00:00.000000000 Z
+date: 2014-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails