tmin 0.2.4 → 0.2.5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tmin (0.2.1)
+    tmin (0.2.4)
       dm-aggregates (~> 1.2.0)
       dm-core (~> 1.2.0)
       dm-migrations (~> 1.2.0)
@@ -15,6 +15,7 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.7)
+    backports (3.6.0)
     data_objects (0.10.8)
       addressable (~> 2.1)
     database_cleaner (0.6.7)
@@ -53,8 +54,9 @@ GEM
     rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.5.0)
-    sinatra (1.2.8)
-      rack (~> 1.1)
+    sinatra (1.2.9)
+      backports
+      rack (~> 1.1, < 1.5)
       tilt (>= 1.2.2, < 2.0)
     tilt (1.4.1)
 

data/lib/tmin/server.rb

@@ -297,27 +297,31 @@ end
       @url = Firefly::Url.first(:code => params[:code])
 
 
-
+     #The string saved by tminus app.
       string = @url.url
 
+      #Time builds an array from the tminus string that stores the time, countdown name, and all other information about the countdown
       @time = []
       @time = array_builder(string)
 
+
+      #The color is indicated within the 6 spot of the array
       @color = @time[6].to_i
 
+
+      #font_color sends the color number and in return gets what color the font is.
       @font_color = font_builder(@color)
 
+      #Indicates if the alert is set within the string
       @alert = alert_on(@time[2].to_i)
 
+
+      #Date gets passed to the javascript in the redirect.haml that indicates the countdown date. Insert adds 20 to complete the year.
       @date = @time[4].to_s.insert(6, '20')
 
       #Array containing the number relating to the image number of default backgorunds.
       @num = (1..39).to_a
 
-      # @expired = date_expired(@date)
-
-      # @parsed_time = Date.parse(@time[4]).strftime("%FT%T")
-
 
       if @url.nil?
         status 404
@@ -439,13 +443,6 @@ end
    end
 
 
-   def date_expired(time)
-
-    # expired =  DateTime.parse(time) < DateTime.now
-     return expired
-
-  end
-
   end
 end
 

data/lib/tmin/version.rb

@@ -1,4 +1,4 @@
 # encoding: UTF-8
 module Tminus
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

data/views/redirect.haml

@@ -11,15 +11,6 @@
   #countdown
   </div>
 
-  %h2.text-center
-
-    <div class="#{@font_color}">
-    -#- if @expired == true
-    -#  Since
-    -#- else
-    -#  Until
-    Until
-    </div>
   %h2.text-center
     <div class="#{@font_color}">
     = URI.unescape(@time[8])
@@ -62,7 +53,7 @@
                               var neg_days = Math.abs(days)
                               var neg_hours = Math.abs(hours)
                               var neg_minutes = Math.abs(minutes)
-                              var net_seconds = Math.abs(seconds)
+                              var neg_seconds = Math.abs(seconds)
 
                                if (iOS == true) {
                                document.getElementById('device').innerHTML = ' <a href="#{@url.url}">Open in Tminus</a> ';
@@ -71,7 +62,8 @@
                               document.getElementById('countdown').innerHTML = neg_days + ' Days <br> ';
                               document.getElementById('countdown').innerHTML += neg_hours + ' Hours <br>';
                               document.getElementById('countdown').innerHTML += neg_minutes + ' Minutes <br>';
-                              document.getElementById('countdown').innerHTML += neg_seconds + ' Seconds';
+                              document.getElementById('countdown').innerHTML += neg_seconds + ' Seconds <br>';
+                              document.getElementById('countdown').innerHTML +=  '  <h2><div class="#{@font_color}">since </div></h2>';
 
 
 
@@ -85,7 +77,8 @@
                           document.getElementById('countdown').innerHTML = days + ' Days <br> ';
                           document.getElementById('countdown').innerHTML += hours + ' Hours <br>';
                           document.getElementById('countdown').innerHTML += minutes + ' Minutes <br>';
-                          document.getElementById('countdown').innerHTML += seconds + ' Seconds';
+                          document.getElementById('countdown').innerHTML += seconds + ' Seconds <br>';
+                          document.getElementById('countdown').innerHTML +=  '<h2><div class="#{@font_color}"> until </div></h2>';
 
                           if (iOS == true) {
                            document.getElementById('device').innerHTML = ' <a href="#{@url.url}">Open in Tminus</a> ';

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tmin
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - drobs