timepiece 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6e4dd209b6c6ba8153b3f6c5de00df89d39c0db
-  data.tar.gz: b3ce7e90ca38bb1e88c0576c2729dbed47389a8b
+  metadata.gz: 074f293bf77574c895a32e9eb6e2ff4f10f5d7b1
+  data.tar.gz: 030b9447686b023fde32e90512a479456b856b20
 SHA512:
-  metadata.gz: b8a779d2c3f8d2ed0b10ddb543cfc19641fec536684db8519b421437c753fe4812757fd062b6e5835fa116ba8d78178523ece0f2daa3c79ccd18935cf33e8f9d
-  data.tar.gz: 607a425ad5cc2c1f0676364ee71c9836639030749085683b574c0687f489c6ee1f7d3eb7d48ae3918232dba36b3c275babb0ced3953666a58747ff671f954de0
+  metadata.gz: 6ff01dcc468866c7b44808ae1221bf8cc0c020752986ceae3216a577220cfef285d4da908d6404cc472885722e370ca0a5601b5a3755cb2b96ba7b7326928ff9
+  data.tar.gz: c0b2e7ff32a3e03085288e0ecd891b95e424e8005aea819bc2b26de33dcf4ea9de06a3420f70885eba1d0b061849316643b9cd3db5b995fbb90e82887347b99d

data/app/assets/javascripts/timepiece.js

@@ -19,7 +19,7 @@ function get_time(){
 }
 
 function show_time(){
-	timer = setInterval(function(){
+	clock = setInterval(function(){
 		for(i = 0; i < hours.length; i++){
 			if (seconds[i] < 59){
 				seconds[i] += 1
@@ -83,6 +83,55 @@ function show_time(){
 	}, 1000)
 }
 
+get_timer_days = []
+get_timer_hours = []
+get_timer_minutes = []
+get_timer_seconds = []
+
+function set_timer(){
+  $(".timepiece-timer").each(function(){
+    get_timer_days.push(parseInt($(this).attr('data-days'),10))
+    get_timer_hours.push(parseInt($(this).attr('data-hours'),10))
+    get_timer_minutes.push(parseInt($(this).attr('data-minutes'),10))
+    get_timer_seconds.push(parseInt($(this).attr('data-seconds'),10))
+    timer_days = get_timer_days
+    timer_hours = get_timer_hours
+    timer_minutes = get_timer_minutes
+    timer_seconds = get_timer_seconds
+  });
+}
+
+function show_timer(){
+  timer = setInterval(function(){
+    for(i = 0; i < timer_hours.length; i++){
+      if (timer_seconds[i] < 59){
+        timer_seconds[i] += 1
+      } else {
+        timer_seconds[i] = 0
+        if (timer_minutes[i] < 59){
+          timer_minutes[i] += 1
+        } else {
+          timer_minutes[i] = 0
+          if (timer_hours[i] < 23){
+            timer_hours[i] += 1
+          } else {
+            timer_hours[i] = 0
+            timer_days[i] += 1
+          }
+        }
+      }
+    }
+    $(".timepiece-timer").each(function(i, e){
+      $(e).html(function(){
+        $('.timepiece-days', $(e)).html(( timer_days[i] < 10 ? "0" : "" ) + timer_days[i]);
+        $('.timepiece-hours', $(e)).html(( timer_hours[i] < 10 ? "0" : "" ) + timer_hours[i]);
+        $('.timepiece-minutes', $(e)).html(( timer_minutes[i] < 10 ? "0" : "" ) + timer_minutes[i]);
+        $('.timepiece-seconds', $(e)).html(( timer_seconds[i] < 10 ? "0" : "" ) + timer_seconds[i]);
+      })
+    })
+  }, 1000)
+}
+
 function reset_time(){
 	get_hours = []
 	get_minutes = []
@@ -92,9 +141,12 @@ function reset_time(){
 
 $(document).ready(function(){
 	get_time()
+  set_timer()
 	show_time()
+  show_timer()
 })
 $(document).on('page:load', function(){
+	clearInterval(clock);
 	clearInterval(timer);
 	// Quickfix for Turbolinks. We should revisit this.
 })

data/app/helpers/timepiece_helper.rb

@@ -38,4 +38,29 @@ module TimepieceHelper
     end
   	content_tag(:span, time.html_safe, class: 'timepiece', 'data-timezone' => location, 'data-tptype' => type, 'data-lead' => lead, 'data-abbr_separator' => abbr_sep)
   end
+
+  def timer(time_since = Time.now)
+    seconds_diff = (Time.now - time_since).to_i
+
+    days = seconds_diff / 86400
+    seconds_diff -= days * 86400
+
+    hours = seconds_diff / 3600
+    seconds_diff -= hours * 3600
+
+    minutes = seconds_diff / 60
+    seconds_diff -= minutes * 60
+
+    seconds = seconds_diff
+
+    time = "<span class='timepiece-days'>#{days.to_s.rjust(2, '0')}</span>"\
+           "<span class='timepiece-descriptor tp-descriptor-days'> days </span>"\
+           "<span class='timepiece-hours'>#{hours.to_s.rjust(2, '0')}</span>"\
+           "<span class='timepiece-separator tp-separator-1'>:</span>"\
+           "<span class='timepiece-minutes'>#{minutes.to_s.rjust(2, '0')}</span>"\
+           "<span class='timepiece-separator tp-separator-2'>:</span>"\
+           "<span class='timepiece-seconds'>#{seconds.to_s.rjust(2, '0')}</span>"
+
+    content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds)
+  end
 end

data/lib/timepiece/version.rb

@@ -1,3 +1,3 @@
 module Timepiece
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: timepiece
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Thom Bruce
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-12 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jquery-rails