countdowner 0.2.2 → 0.2.3

data/lib/assets/javascripts/jquery.countdowner.js

@@ -1,25 +1,27 @@
 (function() {
 
   $(function() {
-    var $countdowner, removeAfterEnd,
+    var $countdowner, updateCountdowner,
       _this = this;
     $countdowner = $('#countdowner');
     if ($countdowner.length) {
-      removeAfterEnd = function() {
-        if ($countdowner.data('end_at') < new Date().toISOString()) {
+      updateCountdowner = function() {
+        var now;
+        console.log('updateCountdowner');
+        now = new Date().toISOString();
+        if ($countdowner.data('start_at') <= now) {
+          $countdowner.show();
+        }
+        if ($countdowner.data('end_at') < now) {
           $countdowner.remove();
-          if (_this.checkEnd != null) {
-            clearInterval(_this.checkEnd);
+          if (_this.updateCountdownerTimer != null) {
+            return clearInterval(_this.updateCountdownerTimer);
           }
-          return true;
         }
       };
-      if (!removeAfterEnd()) {
-        $.timeago.settings.allowFuture = true;
-        $countdowner.find('time').timeago();
-        $countdowner.show();
-        return this.checkEnd = setInterval(removeAfterEnd, 60000);
-      }
+      $.timeago.settings.allowFuture = true;
+      $countdowner.find('time').timeago();
+      return this.updateCountdownerTimer = setInterval(updateCountdowner, 2000);
     }
   });
 

data/lib/assets/javascripts/src/jquery.countdowner.js.coffee

@@ -1,13 +1,13 @@
 $ ->
   $countdowner = $('#countdowner')
   if $countdowner.length
-    removeAfterEnd = =>
-      if $countdowner.data('end_at') < new Date().toISOString()
+    updateCountdowner = =>
+      now = new Date().toISOString()
+      if $countdowner.data('start_at') <= now
+        $countdowner.show()
+      if $countdowner.data('end_at') < now
         $countdowner.remove()
-        clearInterval(@checkEnd) if @checkEnd?
-        true
-    unless removeAfterEnd()
-      $.timeago.settings.allowFuture = true
-      $countdowner.find('time').timeago()
-      $countdowner.show()
-      @checkEnd = setInterval(removeAfterEnd, 60000)
+        clearInterval(@updateCountdownerTimer) if @updateCountdownerTimer?
+    $.timeago.settings.allowFuture = true
+    $countdowner.find('time').timeago()
+    @updateCountdownerTimer = setInterval(updateCountdowner, 30000)

data/lib/countdowner/action_view.rb

@@ -1,9 +1,12 @@
 module Countdowner
   module ActionView
     def countdowner(options = {})
-      message = Countdowner::Message.current or return
-      options[:id] = 'countdowner'
-      options[:'data-end_at'] = Countdowner::Datetime.new(message.end_at).iso
+      message = Countdowner::Message.current.first or return
+      options.merge!(
+        :id => 'countdowner',
+        :'data-end_at' => Countdowner::Datetime.new(message.end_at).iso,
+        :'data-start_at' => Countdowner::Datetime.new(message.start_at).iso
+      )
       options[:style] = 'display:none' if options.delete(:hidden_initially)
       content_tag(:div, options) do
         time = Countdowner::Datetime.new(message.target)

data/lib/countdowner/message.rb

@@ -6,8 +6,7 @@ module Countdowner
     validate :ensure_valid_periods
 
     def self.current
-      find(:first, :order => "target",
-           :conditions => ["target > :now and end_at > :now and start_at < :now", {:now => Time.now.utc}])
+      find(:all, :order => "target", :conditions => ["target > :now and end_at > :now", {:now => Time.now.utc}])
     end
 
     private

data/lib/countdowner/version.rb

@@ -1,3 +1,3 @@
 module Countdowner
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: countdowner
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -156,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2446644807931660482
+      hash: 3910419754330681090
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -165,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2446644807931660482
+      hash: 3910419754330681090
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24