dashing-contrib 0.2.7 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c1af8e6a23da563538528e1079c552bfb019aa46
-  data.tar.gz: dab0eb3200986b9c49d3eb07470fbca811780dbc
+  metadata.gz: db4b803d738d37ff783a90c40f86ea1110b32702
+  data.tar.gz: 4b10b26814f2840c48e99afa23a4e7fb0881f8d5
 SHA512:
-  metadata.gz: 6b6f1ca30db0fe811fb1347b1636266e9c90e8c6f72893e74207a0d74a354943d86455a04c047fe404413230916713166f76febb89b4dcfa05d93958cb8398b9
-  data.tar.gz: 7c94b5561494410e42d6b74a9e46a308ab4cd230046ad0a210f167fcb4de14db6801acd1cb0e646acbc900c5948fcd1570982c204211b30666ccf986539f39c4
+  metadata.gz: b454091f40e27caadf7737856155b5329f0075cb3bf03be786f0fc9679eb3f82908f16e699a36ab219ada0c25604339cda2b8d286578f7fba41b4f061b75d627
+  data.tar.gz: 6aa44494946c7a2c139c9a542d51e7cb6c005d2b9eed800dd1e24e85ccf07fbb813822ecf505b73c6975103a010f564b9528c80dceb56519af7b088190cb26b2

data/.travis.yml

@@ -1,8 +1,8 @@
 language: ruby
 rvm:
-  - 2.0.0
   - 2.1.0
   - 2.1.1
   - 2.2.0
+  - 2.4.1
 script:
   - bundle exec rspec

data/README.md

@@ -16,7 +16,7 @@ This project is an extension to Shopify's Dashing. Including this rubygem you wi
 Read each individual widget documentation to use dashing-contrib built-in widgets after the installation steps.
 
 ## Installation
-Requires Ruby >= 1.9.3. Add this line to your Dashing's dashboard Gemfile:
+Requires Ruby >= 2.1.0. Add this line to your Dashing's dashboard Gemfile:
 
     gem 'dashing-contrib', '~> 0.2.2'
 

data/lib/dashing-contrib/assets/widgets/switcher/switcher.coffee

@@ -77,30 +77,187 @@ class WidgetSwitcher
   constructor: (@elements) ->
     @$elements = $(@elements)
 
-  start: (interval=5000) ->
+
+  start: (interval=5000, control) ->
     self = @
+    
     @maxPos = @$elements.length - 1;
     @curPos = Math.min(1, @maxPos)
 
     # Show only first at start
     self.$elements.slice(1).hide()
 
-    # Start loop
-    @handle = setInterval(()->
-      # Hide all at first - then show the current and ensure it uses table-cell display type
-      self.$elements.hide()
-      $(self.$elements[self.curPos]).show().css('display', 'table-cell')
+    # instantiate switcher controls for countdown and manual switching
+    @switcherControls = new WidgetSwitcherControls(interval, control, @)
+    if @switcherControls.present()
+      @switcherControls.start() 
+    else
+      @startLoop(interval)
 
-      # Increase the position or reset back to zero
-      self.curPos += 1
-      if self.curPos > self.maxPos
-        self.curPos = 0
+
+  startLoop: (interval) ->
+    self = @
+    @handle = setInterval(()->
+        self.next()
 
     , parseInt(interval, 10))
 
-  stop: () ->
+
+  next: () ->
+    # Hide all at first - then show the current and ensure it uses table-cell display type
+    @$elements.hide()
+    $(@$elements[@curPos]).show().css('display', 'table-cell')
+
+    # Increase the position or reset back to zero
+    @curPos += 1
+    if @curPos > @maxPos
+      @curPos = 0
+
+
+  prev: () ->
+    @$elements.hide()
+    previous = @curPos - 2
+    previous = @maxPos if previous == -1
+    previous = @maxPos - 1  if previous == -2
+
+    $(@$elements[previous]).show().css('display', 'table-cell')
+
+    @curPos -= 1
+    if @curPos < 0
+      @curPos = @maxPos
+
+  stopLoop: () ->
     clearInterval(@handle)
 
+#  currentName: () ->
+#    @curName
+#
+  nextName: () ->
+    $(@elements[@curPos]).attr("data-switcher-name")
+        
+    #@dashboardNames[@curPos + 1] || @dashboardNames[0]
+#
+#  previousName: () ->
+#    @dashboardNames[@curPos - 1] || @dashboardNames[@dashboardNames.length - 1]
+
+
+class WidgetSwitcherControls
+  arrowContent = "&#65515;"
+  stopTimerContent = "stop timer"
+  startTimerContent = "start timer"
+
+  constructor: (interval=60000,id, widgetSwitcher) ->
+    @currentTime = parseInt(interval, 10)
+    @interval = parseInt(interval, 10)
+    @$elements = $("##{id}")
+    @widgetSwitcher = widgetSwitcher
+    @incrementTime = 1000 # refresh every 1000 milliseconds
+    @arrowContent = @$elements.data('next-widget-content') || WidgetSwitcherControls.arrowContent
+    @stopTimerContent = @$elements.data('stop-widget-timer-content') || WidgetSwitcherControls.stopTimerContent
+    @startTimerContent = @$elements.data('start-widget-timer-content') || WidgetSwitcherControls.startTimerContent
+    @
+
+  present: () ->
+    @$elements.length
+
+  start: () ->
+    @addElements()
+    @$timer = $.timer(@updateTimer, @incrementTime, true)
+    @updateWidgetName()
+
+  addElements: () ->
+    template = @$elements.find('widget-name-template')
+    if template.length
+      @$nextWidgetNameTemplate = template
+      @$nextWidgetNameTemplate.remove()
+    else
+      @$nextWidgetNameTemplate = $("<widget-name-template>Next widget: $nextName in </widget-name-template>")
+    @$nextWidgetNameContainer = $("<span id='dc-wid-switcher-next-name'></span>")
+    @$countdown = $("<span id='dc-wid-switcher-countdown'></span>")
+    @$manualPrev = $("<span id='dc-wid-switcher-prev' class='fa fa-backward'></span>").
+      html(@arrowContent).
+      click () =>
+        @switchWidget(false)
+    @$manualNext = $("<span id='dc-wid-switcher-next' class='fa fa-forward'></span>").
+      html(@arrowContent).
+      click () =>
+        @switchWidget()
+    @$switcherStopper = $("<span id='dc-wid-switcher-pause-reset' class='fa fa-pause'></span>").
+      html(@stopTimerContent).
+      click(@pause)
+    @$elements.
+      append(@$nextWidgetNameContainer).
+      append(@$countdown).
+      append(@$manualPrev).
+      append(@$switcherStopper).
+      append(@$manualNext)
+
+  pad: (number, length) =>
+    str = "#{number}"
+    while str.length < length
+      str = "0#{str}"
+    str
+
+  formatTime: (time) ->
+    time = time / 10;
+    min = parseInt(time / 6000, 10)
+    sec = parseInt(time / 100, 10) - (min * 60)
+
+    formattedMin = if min > 0 then @pad(min, 2) else "00"
+    formattedSec = @pad(sec, 2)
+    "#{formattedMin}:#{formattedSec}"
+
+
+  pause: () =>
+    @$timer.toggle()
+    if @isRunning()
+      @$switcherStopper.removeClass('fa-pause').addClass('fa-play').html(@startTimerContent)
+    else
+      @$switcherStopper.removeClass('fa-play').addClass('fa-pause').html(@stopTimerContent)
+
+  isRunning: () =>
+    @$switcherStopper.hasClass('fa-pause')
+
+  resetCountdown: (next=true) ->
+    @switchWidget(next)
+    # Stop and reset timer
+    @$timer.stop().play(true)
+
+  switchWidget: (next=true) ->
+    # Get time from form
+    newTime = @interval
+    if newTime > 0
+      @currentTime = newTime
+
+    if next
+      @widgetSwitcher.next()
+    else
+      @widgetSwitcher.prev();
+
+    @updateWidgetName()
+    @updateTimeString()
+
+  updateTimer: () =>
+    @updateTimeString()
+    # If timer is complete, trigger alert
+    if @currentTime is 0
+      #@pause()
+      @resetCountdown()
+      return
+
+    # Increment timer position
+    @currentTime -= @incrementTime
+    if @currentTime < 0
+      @currentTime = 0
+
+  updateWidgetName: () ->
+    @$nextWidgetNameContainer.html(
+      @$nextWidgetNameTemplate.html().replace('$nextName', @widgetSwitcher.nextName())
+    )
+
+  updateTimeString: () ->
+    timeString = @formatTime(@currentTime)
+    @$countdown.html(timeString)        
 # Adds a countdown timer to show when next dashboard will appear
 # TODO:
 #   - show the name of the next dashboard
@@ -207,6 +364,7 @@ class DashboardSwitcherControls
 Dashing.DashboardSwitcher = DashboardSwitcher
 Dashing.WidgetSwitcher = WidgetSwitcher
 Dashing.DashboardSwitcherControls = DashboardSwitcherControls
+Dashing.WidgetSwitcherControls = WidgetSwitcherControls
 
 # Dashboard loaded and ready
 Dashing.on 'ready', ->
@@ -217,7 +375,9 @@ Dashing.on 'ready', ->
     $widgets = $listItem.children('div')
     if $widgets.length > 1
       switcher = new WidgetSwitcher $widgets
-      switcher.start($listItem.attr('data-switcher-interval') or 5000)
+      interval = $listItem.attr('data-switcher-interval')
+      control = $listItem.attr('data-switcher-control')
+      switcher.start(interval or 5000, control)
 
   # If multiple dashboards defined (using data-swticher-dashboards="board1 board2")
   $container = $('#container')

data/lib/dashing-contrib/version.rb

@@ -1,3 +1,3 @@
 module DashingContrib
-  VERSION = '0.2.7'
+  VERSION = '0.2.8'
 end

metadata

@@ -1,208 +1,208 @@
 --- !ruby/object:Gem::Specification
 name: dashing-contrib
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
 platform: ruby
 authors:
 - Jing Dong
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2017-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: time_diff
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.3'
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.5'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
   name: dashing
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: nagiosharder
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.4'
-description: " Dashing Contrib aims to make templates plugins easy to maintain and
-  contribute "
+description: ' Dashing Contrib aims to make templates plugins easy to maintain and
+  contribute '
 email:
 - me@jing.io
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -289,17 +289,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: An extension to Dashing that makes easier to maintaining, sharing widgets