active_analytics 0.2.0 → 0.3.0

data/app/views/active_analytics/assets/ariato.js

@@ -0,0 +1,322 @@
+Ariato = {}
+
+Ariato.launchWhenDomIsReady = function(root) {
+  if (document.readyState != "loading") {
+    Ariato.launch()
+    Ariato.launch(document, "aria-roledescription")
+    Ariato.launch(document, "data-ariato")
+  }
+  else
+    document.addEventListener("DOMContentLoaded", function() { Ariato.launchWhenDomIsReady(root) } )
+}
+
+Ariato.launch = function(root, attribute, parent) {
+  attribute || (attribute = "role")
+  var elements = (root || document).querySelectorAll("[" + attribute + "]")
+  for (var i = 0; i < elements.length; i++)
+    Ariato.start(elements[i], attribute, parent)
+}
+
+Ariato.mount = function() {
+}
+
+Ariato.start = function(element, attribute, parent) {
+  var names = element.getAttribute(attribute).split(" ")
+  for (var i = 0; i < names.length; i++) {
+    var name = names[i].charAt(0).toUpperCase() + names[i].slice(1) // Capitalize
+    var func = Ariato.stringToFunction("Ariato." + name) || Ariato.stringToFunction(name)
+    if (func instanceof Function)
+      Ariato.instanciate(func, element, parent)
+  }
+}
+
+Ariato.instanciate = function(func, element, parent) {
+  try {
+    controller = Object.create(func.prototype)
+    controller.parent = parent
+    controller.node = element
+    Ariato.initialize(controller, element)
+    func.call(controller, element)
+  } catch (ex) {
+    console.error(ex)
+  }
+}
+
+Ariato.stringToFunction = function(fullName) {
+  var func = window, names = fullName.split(".")
+  for (var i = 0; i < names.length; i++)
+    if (!(func = func[names[i]]))
+      return null
+  return func
+}
+
+Ariato.initialize = function(controller, container) {
+  Ariato.listenEvents(container, controller)
+  Ariato.assignRoles(container, controller)
+}
+
+Ariato.listenEvents = function(root, controller) {
+  var elements = root.querySelectorAll("[data-event]")
+  for (var i = 0; i < elements.length; i++) {
+    elements[i].getAttribute("data-event").split(" ").forEach(function(eventAndAction) {
+      var array = eventAndAction.split("->")
+      Ariato.listenEvent(controller, elements[i], array[0], array[1])
+    })
+  }
+}
+
+Ariato.listenEvent = function(controller, element, event, action) {
+  if (controller[action] instanceof Function)
+    element.addEventListener(event, controller[action].bind(controller))
+}
+
+Ariato.findRoles = function(container) {
+  var roles = {}, elements = container.querySelectorAll("[data-role]")
+  for (var i = 0; i < elements.length; i++) {
+    var name = elements[i].getAttribute("data-role")
+    roles[name] ? roles[name].push(elements[i]) : roles[name] = [elements[i]]
+  }
+  return roles
+}
+
+Ariato.assignRoles = function(container, controller) {
+  controller.roles = Ariato.findRoles(container)
+  for (var name in controller.roles)
+    if (controller.roles[name].length == 1)
+      controller[name] = controller.roles[name][0]
+}
+
+Ariato.Dialog = function(node) {
+  node.setAttribute("hidden", true)
+  node.addEventListener("open", this.open.bind(this))
+  node.addEventListener("close", this.close.bind(this))
+  node.addEventListener("keydown", this.keydown.bind(this))
+}
+
+Ariato.Dialog.open = function(elementOrId) {
+  var dialog = elementOrId instanceof Element ? elementOrId : document.getElementById(elementOrId)
+  dialog && dialog.dispatchEvent(new CustomEvent("open"))
+}
+
+Ariato.Dialog.close = function(button) {
+  var dialog = Ariato.Dialog.current()
+  if (dialog && dialog.node.contains(button))
+    dialog.close()
+}
+
+Ariato.Dialog.closeCurrent = function() {
+  var dialog = Ariato.Dialog.current()
+  dialog && dialog.close()
+}
+
+Ariato.Dialog.replace = function(elementOrId) {
+  Ariato.Dialog.closeCurrent()
+  Ariato.Dialog.open(elementOrId)
+}
+
+Ariato.Dialog.close = function(button) {
+  var dialog = Ariato.Dialog.current()
+  if (dialog && dialog.node.contains(button))
+    dialog.close()
+}
+
+Ariato.Dialog.list = []
+
+Ariato.Dialog.current = function() {
+  return this.list[this.list.length - 1]
+}
+
+Ariato.Dialog.prototype.open = function(event) {
+  Ariato.Dialog.list.push(this)
+  document.addEventListener("focus", this.bindedLimitFocusScope = this.limitFocusScope.bind(this), true)
+  this.initiator = document.activeElement
+  this.node.removeAttribute("hidden")
+
+  this.lockScrolling()
+  this.createBackdrop()
+  this.createFocusStoppers()
+  this.focusFirstDescendant(this.node)
+}
+
+Ariato.Dialog.prototype.close = function(event) {
+  document.removeEventListener("focus", this.bindedLimitFocusScope, true)
+  this.node.setAttribute("hidden", true)
+  this.removeFocusStoppers()
+  this.removeBackdrop()
+  this.unlockScrolling()
+  this.initiator.focus()
+  Ariato.Dialog.list.pop()
+}
+
+Ariato.Dialog.prototype.keydown = function(event) {
+  if (event.key == "Escape")
+    this.close()
+}
+
+Ariato.Dialog.prototype.focusFirstDescendant = function(parent) {
+  var focusable = ["A", "BUTTON", "INPUT", "SELECT", "TEXTAREA"]
+
+  for (var i = 0; i < parent.children.length; i++) {
+    var child = parent.children[i]
+    if (focusable.indexOf(child.nodeName) != -1 && !child.disabled && child.type != "hidden") {
+      child.focus()
+      return child
+    }
+    else {
+      var focus = this.focusFirstDescendant(child)
+      if (focus) return focus
+    }
+  }
+}
+
+Ariato.Dialog.prototype.limitFocusScope = function(event) {
+  if (this == Ariato.Dialog.current())
+    if (!this.node.contains(event.target))
+      this.focusFirstDescendant(this.node)
+}
+
+Ariato.Dialog.prototype.lockScrolling = function() {
+  document.body.style.position = "fixed";
+  document.body.style.top = "-" + window.scrollY + "px";
+}
+
+Ariato.Dialog.prototype.unlockScrolling = function() {
+  var scrollY = document.body.style.top
+  document.body.style.position = ""
+  document.body.style.top = ""
+  window.scrollTo(0, parseInt(scrollY || "0") * -1)
+}
+
+Ariato.Dialog.prototype.createFocusStoppers = function() {
+  this.node.parentNode.insertBefore(this.focusStopper1 = document.createElement("div"), this.node)
+  this.focusStopper1.tabIndex = 0
+
+  this.node.parentNode.insertBefore(this.focusStopper2 = document.createElement("div"), this.node.nextSibling)
+  this.focusStopper2.tabIndex = 0
+}
+
+Ariato.Dialog.prototype.removeFocusStoppers = function() {
+  this.focusStopper1 && this.focusStopper1.parentNode.removeChild(this.focusStopper1)
+  this.focusStopper2 && this.focusStopper2.parentNode.removeChild(this.focusStopper2)
+}
+
+Ariato.Dialog.prototype.createBackdrop = function() {
+  this.backdrop = document.createElement("div")
+  this.backdrop.classList.add("dialog-backdrop")
+  this.node.parentNode.insertBefore(this.backdrop, this.node)
+  this.backdrop.appendChild(this.node)
+}
+
+Ariato.Dialog.prototype.removeBackdrop = function() {
+  this.backdrop.parentNode.insertBefore(this.node, this.backdrop)
+  this.backdrop.parentNode.removeChild(this.backdrop)
+  this.backdrop = null
+}
+
+Ariato.Alertdialog = Ariato.Dialog
+
+Ariato.MenuButton = function(node) {
+  this.node = this.button = node
+  this.menu = document.getElementById(this.button.getAttribute("aria-controls"))
+
+  this.menu.addEventListener("keydown", this.keydown.bind(this))
+  this.button.addEventListener("keydown", this.keydown.bind(this))
+  
+  this.button.addEventListener("click", this.clicked.bind(this))
+  window.addEventListener("click", this.windowClicked.bind(this), true)
+}
+
+Ariato.MenuButton.prototype.clicked = function(event) {
+  this.node.getAttribute("aria-expanded") == "true" ? this.close() :  this.open()
+}
+
+Ariato.MenuButton.prototype.windowClicked = function() {
+  if (!this.node.contains(event.target) && this.node.getAttribute("aria-expanded") == "true")
+    this.close()
+}
+
+Ariato.MenuButton.prototype.open = function() {
+  this.button.setAttribute("aria-expanded", "true")
+  this.menu.style.display = "block"
+}
+
+Ariato.MenuButton.prototype.close = function() {
+  this.button.setAttribute("aria-expanded", "false")
+  this.menu.style.display = null
+}
+
+Ariato.MenuButton.prototype.keydown = function(event) {
+  switch(event.key) {
+    case "Escape":
+      this.close()
+      break
+    case "ArrowDown":
+      event.preventDefault()
+      this.focusNextItem()
+      break
+    case "ArrowUp":
+      event.preventDefault()
+      this.focusPreviousItem()
+      break
+    case "Tab":
+      this.close()
+    case "Home":
+    case "PageUp":
+      event.preventDefault()
+      this.items()[0].focus()
+      break
+    case "End":
+    case "PageDown":
+      event.preventDefault()
+      var items = this.items()
+      items[items.length-1].focus()
+      break
+  }
+}
+
+Ariato.MenuButton.prototype.items = function() {
+  return this.menu.querySelectorAll("[role=menuitem]")
+}
+
+Ariato.MenuButton.prototype.currentItem = function() {
+  return this.menu.querySelector("[role=menuitem]:focus")
+}
+
+Ariato.MenuButton.prototype.nextItem = function() {
+  var items = this.items()
+  var current = this.currentItem()
+  if (!current) return items[0]
+  for (var i = 0; i < items.length; i++) {
+    if (items[i] == current)
+      return items[i+1]
+  }
+}
+
+Ariato.MenuButton.prototype.previousItem = function() {
+  var items = this.items()
+  var current = this.currentItem()
+  if (!current) return items[0]
+  for (var i = 0; i < items.length; i++) {
+    if (items[i] == current)
+      return items[i-1]
+  }
+}
+
+Ariato.MenuButton.prototype.focusNextItem = function() {
+  var item = this.nextItem()
+  item && item.focus()
+}
+
+Ariato.MenuButton.prototype.focusPreviousItem = function() {
+  var item = this.previousItem()
+  item && item.focus()
+}
+
+Ariato.Menu = function(node) {
+  var button = this.labelledBy()
+  button && new Ariato.MenuButton(button)
+}
+
+Ariato.Menu.prototype.labelledBy = function() {
+  return document.getElementById(this.node.getAttribute("aria-labelledby"))
+}

data/app/views/active_analytics/pages/_table.html.erb

@@ -1,4 +1,3 @@
-
 <% if pages.empty? %>
   <div class="is-empty">
     <span>no data</span>
@@ -8,26 +7,16 @@
     <% for page in pages %>
       <tr>
         <td>
-          <% if page.host == params[:site] %>
-            <% if page.path.present? %>
-              <%= link_to page.path, page_path(site: page.host, page: page_to_params(page.path), from: params[:from], to: params[:to]) %>
-            <% else %>
-              <%= site_icon page.host %>
-              <%= link_to page.host, site_path(site: page.host, from: params[:from], to: params[:to]) %>
-              <small>(page not provided <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy#strict-origin-when-cross-origin">?</a>)</small>
-            <% end %>
-          <% elsif page.host.present? && page.path.present? %>
-            <%= link_to(referrer_path(site: params[:site], referrer: page.host, from: params[:from], to: params[:to])) { site_icon page.host } %>
-            <%= link_to page.url, referrer_path(site: params[:site], referrer: page.host, from: params[:from], to: params[:to]) %>
-          <% elsif page.host.present? %>
-            <%= site_icon page.host %>
-            <%= page.host %>
+          <% if page.path.present? %>
+            <%= link_to page.path, page_path(site: page.host, page: page_to_params(page.path), from: params[:from], to: params[:to]) %>
           <% else %>
-            (None or direct)
+            <%= site_icon page.host %>
+            <%= link_to page.host, site_path(site: page.host, from: params[:from], to: params[:to]) %>
+            <small>(page not provided <a href="https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Referrer-Policy#strict-origin-when-cross-origin">?</a>)</small>
           <% end %>
         </td>
         <td class="number"><%= format_view_count page.total %></td>
       </tr>
     <% end %>
   </table>
-<% end %>
+<% end %>

data/app/views/active_analytics/pages/index.html.erb

@@ -1,5 +1,5 @@
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 

data/app/views/active_analytics/pages/show.html.erb

@@ -1,21 +1,20 @@
 <section>
-  <h2><%= page_from_params %></h2>
+  <h2>
+    <%= page_from_params %>
+    <%= link_to "", File.join("https://", params[:site], page_from_params), target: "_blank" %>
+  </h2>
 </section>
 
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
 <ul class="grid-auto">
   <li class="card">
-   <!-- <section>
-      <h3>Top sources</h3>
-      <%= render "/active_analytics/referrers/table", referrers: @referrers %>
-    </section> -->
     <section>
       <h3>Previous page</h3>
-      <%= render "table", pages: @previous_pages %>
+      <%= render "/active_analytics/referrers/table", referrers: @previous_pages %>
     </section>
   </li>
 
@@ -23,4 +22,4 @@
     <h3>Next page</h3>
     <%= render "table", pages: @next_pages %>
   </li>
-</ul>
+</ul>

data/app/views/active_analytics/referrers/_table.html.erb

@@ -7,11 +7,18 @@
     <% for referrer in referrers %>
       <tr>
         <td>
-          <% if referrer.host %>
+          <% if referrer.try(:path) %>
+            <%= site_icon referrer.host %>
+            <% if referrer.host == params[:site] %>
+              <%= link_to referrer.path, page_path(site: referrer.host, page: page_to_params(referrer.path), from: params[:from], to: params[:to]) %>
+            <% else %>
+              <%= link_to referrer.url, referrer_path(site: params[:site], referrer: referrer.url.chomp("/"), from: params[:from], to: params[:to]) %>
+            <% end %>
+          <% elsif referrer.host %>
             <%= site_icon referrer.host %>
             <%= link_to referrer.host, referrer_path(site: params[:site], referrer: referrer.host, from: params[:from], to: params[:to]) %>
           <% else %>
-            <%= referrer.host %>
+            (None or direct)
           <% end %>
           </td>
         <td class="number"><%= format_view_count referrer.total %></td>

data/app/views/active_analytics/referrers/index.html.erb

@@ -1,9 +1,9 @@
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
 <section class="card">
   <h3>Top sources</h3>
   <%= render "table", referrers: @referrers %>
-</section>
+</section>

data/app/views/active_analytics/referrers/show.html.erb

@@ -1,15 +1,18 @@
 <section>
-  <h2>Source: <%= params[:referrer] %></h2>
+  <h2>
+    Source: <%= params[:referrer] %>
+    <%= link_to "", File.join("https://", params[:referrer]), target: "_blank" %>
+  </h2>
 </section>
 
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 <ul class="grid-auto">
   <li class="card">
     <h3>Source page</h3>
-    <%= render "/active_analytics/pages/table", pages: @previous_pages %>
+    <%= render "/active_analytics/referrers/table", referrers: @previous_pages %>
   </li>
 
   <li class="card">

data/app/views/active_analytics/sites/_histogram.html.erb

@@ -3,11 +3,18 @@
     <tbody>
       <% for bar in histogram.bars %>
         <tr>
-          <th scope="row"><%= bar.label.day %></td>
-            <td style="--size: <%= bar.height %>; --color: rgba(var(--color-grey-100), 1);">
+          <th scope="row">
+            <% if bar.height > 0 %>
+              <%= link_to bar.label.day, url_for(params.merge(from: bar.label.to_date, to: bar.label.to_date).to_unsafe_hash) %>
+            <% else %>
+              <%= bar.label.day %>
+            <% end %>
+          </th>
+          <td style="--size: <%= bar.height %>; --color: rgba(var(--color-grey-100), 1);">
             <span class="data"><%= bar.value.to_i %></span>
             <span class="tooltip"><small class="tooltip-date"><%= l bar.label, format: :long%></small><br/><%= format_view_count bar.value %> views</span>
           </td>
+          </a>
         </tr>
       <% end %>
     </tbody>

data/app/views/active_analytics/sites/_histogram_header.html.erb

@@ -0,0 +1,10 @@
+<h3>
+  <%= format_view_count current_total = histogram.total %> views
+  <% if (previous_total = previous_histogram.total) > 0 %>
+    <% if (diff = current_total - previous_total) > 0 %>
+      &nbsp;<small class="is-success">+<%= number_to_percentage diff * 100.0 / previous_total, precision: 0 %></small>
+    <% elsif (diff = current_total - previous_total) < 0 %>
+      &nbsp;<small class="is-danger"><%= number_to_percentage diff * 100.0 / previous_total, precision: 0 %></small>
+    <% end %>
+  <% end %>
+</h3>

data/app/views/active_analytics/sites/show.html.erb

@@ -1,5 +1,5 @@
 <section class="card">
-  <h3><%= format_view_count @histogram.total %> views</h3>
+  <%= render "/active_analytics/sites/histogram_header", histogram: @histogram, previous_histogram: @previous_histogram %>
   <%= render "/active_analytics/sites/histogram", histogram: @histogram %>
 </section>
 
@@ -13,4 +13,4 @@
     <h3>Top pages <%= link_to "view all", pages_path(from: params[:from], to: params[:to]) %></h3>
     <%= render "/active_analytics/pages/table", pages: @pages %>
   </li>
-</ul>
+</ul>

data/app/views/layouts/active_analytics/_footer.html.erb

@@ -37,12 +37,12 @@
   <header id="custom-range-title">Custom range</header>
   <%= form_tag url_for(params.except(:from, :to).to_unsafe_hash), method: "get", id: "dateRangeForm" do %>
     <div role="group" class="is-block">
-      <label>From <%= text_field_tag :from, params[:from] %></label>
-      <label>To <%= text_field_tag :to, params[:to] %></label>
+      <label>From <%= date_field_tag :from, params[:from] %></label>
+      <label>To <%= date_field_tag :to, params[:to] %></label>
     </div>
   <% end %>
   <footer>
     <%= submit_tag "Change date range", form: "dateRangeForm" %>
     <button type="reset" onclick="Ariato.Dialog.close(this)">Close</button>
   </footer>
-</div>
+</div>

data/app/views/layouts/active_analytics/_header.html.erb

@@ -1,7 +1,5 @@
 <header data-ariato="ActiveAnalytics.Header">
-  <nav aria-label="site"> <!-- implicit role="navigation", aria label "site" is announced = "site navigation" -->
-    
-    <%#= link_to "Analytics", active_analytics_path, role: "button" %>
+  <nav aria-label="site">
     <%= link_to active_analytics_path, class: 'logo' do %>
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 11 11">
         <path class="a" d="M.5,5.5s0,2,1,2,1-2,1-2,0-2,1-2,1,2,1,2,0,2,1,2,1-2,1-2,0-2,1-2,1,2,1,2,0,2,1,2,1-2,1-2"/>

data/app/views/layouts/active_analytics/application.html.erb

@@ -1,13 +1,15 @@
 <!DOCTYPE html>
-<html>
+<html class="active-analytics">
   <head>
     <title>Active analytics</title>
     <meta name=viewport content="width=device-width, initial-scale=1">
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
 
-    <%= stylesheet_link_tag "active_analytics/application", media: "all" %>
-    <%= javascript_include_tag "active_analytics/application" %>
+    <%= tag.link rel: "stylesheet", href: asset_path(:ariato, format: :css) %>
+    <%= tag.link rel: "stylesheet", href: asset_path(:application, format: :css) %>
+    <%= tag.script "", src: asset_path(:ariato, format: :js) %>
+    <%= tag.script "", src: asset_path(:application, format: :js) %>
   </head>
 
   <body>

data/config/routes.rb

@@ -1,9 +1,10 @@
 ActiveAnalytics::Engine.routes.draw do
+  resources :assets, only: [:show]
   get "/:site", to: "sites#show", as: :site, constraints: {site: /[^\/]+/}
 
   # Referrers
   get "/:site/referrers", to: "referrers#index", constraints: {site: /[^\/]+/}, as: :referrers
-  get "/:site/referrers/:referrer", to: "referrers#show", constraints: {site: /[^\/]+/, referrer: /[^\/]+/}, as: :referrer
+  get "/:site/referrers/*referrer", to: "referrers#show", as: :referrer, constraints: {site: /[^\/]+/, referrer: /.+/}
 
   # Pages
   get "/:site/pages", to: "pages#index", constraints: {site: /[^\/]+/}, as: :pages

data/lib/active_analytics/version.rb

@@ -1,3 +1,3 @@
 module ActiveAnalytics
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/lib/active_analytics.rb

@@ -2,6 +2,22 @@ require "active_analytics/version"
 require "active_analytics/engine"
 
 module ActiveAnalytics
+  def self.redis_url=(string)
+    @redis_url = string
+  end
+
+  def self.redis_url
+    @redis_url ||= ENV["ACTIVE_ANALYTICS_REDIS_URL"] || ENV["REDIS_URL"] || "redis://localhost"
+  end
+
+  def self.redis=(connection)
+    @redis = connection
+  end
+
+  def self.redis
+    @redis ||= Redis.new(url: redis_url)
+  end
+
   def self.record_request(request)
     params = {
       site: request.host,
@@ -9,12 +25,39 @@ module ActiveAnalytics
       date: Date.today,
     }
     if request.referrer.present?
-      referrer_uri = URI(request.referrer)
-      params[:referrer_host] = referrer_uri.host
-      params[:referrer_path] = referrer_uri.path
+      params[:referrer_host], params[:referrer_path] = ViewsPerDay.split_referrer(request.referrer)
     end
     ViewsPerDay.append(params)
   rescue => ex
-    raise if Rails.env.development? || Rails.env.test?
+    if Rails.env.development? || Rails.env.test?
+      raise ex
+    else
+      Rails.logger.error(ex.inspect)
+      Rails.logger.error(ex.backtrace.join("\n"))
+    end
+  end
+
+  SEPARATOR = "|"
+  QUEUE = "ActiveAnalytics::Queue"
+  OLD_QUEUE = "ActiveAnalytics::OldQueue"
+
+  def self.queue_request(request)
+    keys = [request.host, request.path]
+    if request.referrer.present?
+      keys.concat(ViewsPerDay.split_referrer(request.referrer))
+    end
+    redis.hincrby(QUEUE, keys.join(SEPARATOR).downcase, 1)
+  end
+
+  def self.flush_queue
+    return if !redis.exists?(QUEUE)
+    cursor = 0
+    date = Date.today
+    redis.rename(QUEUE, OLD_QUEUE)
+    redis.hscan_each(OLD_QUEUE) do |key, count|
+      site, page, referrer_host, referrer_path = key.split(SEPARATOR)
+      ViewsPerDay.append(date: date, site: site, page: page, referrer_host: referrer_host, referrer_path: referrer_path, total: count.to_i)
+    end
+    redis.del(OLD_QUEUE)
   end
 end