timepiece_helper.rb in timepiece-0.1.3

- old
+ new
@@ -1,31 +1,41 @@
 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>"\
            "<span class='timepiece-separator tp-separator-2'>:</span>"\
            "<span class='timepiece-seconds'>#{seconds}</span>"
     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
\ No newline at end of file