timepiece 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29753600532c93645ad077cf5e97280983fdd478
-  data.tar.gz: f4b43874df409cadb0e110cfd513cb2a2d9f0e7d
+  metadata.gz: 55a219b78a6927f763181f5700c4f28bf1ce0f2a
+  data.tar.gz: 30e46491727c80469d98eafb218936c875643eb7
 SHA512:
-  metadata.gz: eedbde663b7c1d3f5d124515855f65eadcc9e76564aafd4e549a71fccd337431c2bf80229343c0b8ce2540714b629d92b71f7e298eaddf5963601e37f6b9cee5
-  data.tar.gz: 301639cb6c0a76ce2ddedb0853edb91e850c5cfe7569fe150b3b2bc84eb2e82669bbe6199c05e8e8bd015287132212712f18b4b8f3860b7c2899dfbcbe6dde92
+  metadata.gz: 8b2776cc30157401fd2d4eb5ba21e2d86aa9563641ac8f5f0cd7c1ea5da4bb78c0f3f70d59353479ab6a3538d5ebbeb85b1cb45675bb0768731a9293b07e6935
+  data.tar.gz: b0a8d915526a887cc1d7fce98e5bc3ab414a685d5b913d0206da5613eef607ac12aba6072a9b94379726f9d7d73c80f074d34943a68ebe42ebad8ec92ab9e753

data/app/assets/javascripts/timepiece.js

@@ -160,18 +160,15 @@
   	}, 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
@@ -190,23 +187,12 @@
             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
-            }
+            timer_hours[i] += 1
           }
         }
       }
       $(".timepiece-timer").each(function(i, e){
         $(e).html(function(){
-          $('.timepiece-days', $(e)).html(timer_days[i]);
-          if (timer_days[i] == 1){
-            $('.tp-descriptor-days', $(e)).html('&nbsp;day ');
-          } else {
-            $('.tp-descriptor-days', $(e)).html('&nbsp;days ');
-          }
           $('.timepiece-hours', $(e)).html(( timer_hours[i] < 10 ? "0" : "" ) + timer_hours[i]);
           if (timer_hours[i] == 1){
             $('.tp-descriptor-hours', $(e)).html('&nbsp;hour ');

data/app/helpers/timepiece_helper.rb

@@ -68,9 +68,6 @@ module TimepieceHelper
   def timer(time_since = Time.now, id: '')
     seconds_diff = (Time.now - time_since).to_i
 
-    days = seconds_diff / 86400
-    seconds_diff -= days * 86400
-
     hours = seconds_diff / 3600
     seconds_diff -= hours * 3600
 
@@ -79,42 +76,42 @@ module TimepieceHelper
 
     seconds = seconds_diff
 
-    time = "<span class='timepiece-days'>#{days.to_s}</span>"\
-           "<span class='timepiece-separator tp-separator-days-hours'>:</span>"\
-           "<span class='timepiece-hours'>#{"%02d" % hours}</span>"\
+    time = "<span class='timepiece-hours'>#{"%02d" % hours}</span>"\
            "<span class='timepiece-separator tp-separator-hours-minutes'>:</span>"\
            "<span class='timepiece-minutes'>#{"%02d" % minutes}</span>"\
            "<span class='timepiece-separator tp-separator-minutes-seconds'>:</span>"\
            "<span class='timepiece-seconds'>#{"%02d" % seconds}</span>"
            # "<span class='timepiece-seconds'>#{seconds.to_s.rjust(2, '0')}</span>" # Note: rjust; it might be useful.
 
-    content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds, 'id' => (id unless id.blank?))
+    content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds, 'id' => (id unless id.blank?))
   end
-  def timer_in_words(time_since = Time.now, id: '')
-    seconds_diff = (Time.now - time_since).to_i
+  if false
+    def timer_in_words(time_since = Time.now, id: '')
+      seconds_diff = (Time.now - time_since).to_i
 
-    days = seconds_diff / 86400
-    seconds_diff -= days * 86400
+      days = seconds_diff / 86400
+      seconds_diff -= days * 86400
 
-    hours = seconds_diff / 3600
-    seconds_diff -= hours * 3600
+      hours = seconds_diff / 3600
+      seconds_diff -= hours * 3600
 
-    minutes = seconds_diff / 60
-    seconds_diff -= minutes * 60
+      minutes = seconds_diff / 60
+      seconds_diff -= minutes * 60
 
-    seconds = seconds_diff
+      seconds = seconds_diff
 
-    time = "<span class='timepiece-days'>#{days.to_s}</span>"\
-           "<span class='timepiece-descriptor tp-descriptor-days'> days </span>"\
-           "<span class='timepiece-hours'>#{hours.to_s}</span>"\
-           "<span class='timepiece-descriptor tp-descriptor-hours'> hours </span>"\
-           "<span class='timepiece-minutes'>#{minutes.to_s}</span>"\
-           "<span class='timepiece-descriptor tp-descriptor-minutes'> minutes </span>"\
-           "<span class='timepiece-seconds'>#{seconds.to_s}</span>"\
-           "<span class='timepiece-descriptor tp-descriptor-seconds'> seconds </span>"
-           # "<span class='timepiece-seconds'>#{seconds.to_s.rjust(2, '0')}</span>" # Note: rjust; it might be useful.
+      time = "<span class='timepiece-days'>#{days.to_s}</span>"\
+             "<span class='timepiece-descriptor tp-descriptor-days'> days </span>"\
+             "<span class='timepiece-hours'>#{hours.to_s}</span>"\
+             "<span class='timepiece-descriptor tp-descriptor-hours'> hours </span>"\
+             "<span class='timepiece-minutes'>#{minutes.to_s}</span>"\
+             "<span class='timepiece-descriptor tp-descriptor-minutes'> minutes </span>"\
+             "<span class='timepiece-seconds'>#{seconds.to_s}</span>"\
+             "<span class='timepiece-descriptor tp-descriptor-seconds'> seconds </span>"
+             # "<span class='timepiece-seconds'>#{seconds.to_s.rjust(2, '0')}</span>" # Note: rjust; it might be useful.
 
-    content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds, 'id' => (id unless id.blank?))
+      content_tag(:span, time.html_safe, class: 'timepiece-timer', 'data-days' => days, 'data-hours' => hours, 'data-minutes' => minutes, 'data-seconds' => seconds, 'id' => (id unless id.blank?))
+    end
   end
 
   def countdown(time_until = Time.new(2016), id: '')

data/lib/timepiece/version.rb

@@ -1,3 +1,3 @@
 module Timepiece
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

metadata

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