sidekiq-throttled 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: caf7b98eeb976c1114776cb1981a3bd6b7c218f8
-  data.tar.gz: 1945f409e2048660611a1a7ede586bb573899d51
+  metadata.gz: 3802ab6e7e994bd8faa55662720249224b8e6c6b
+  data.tar.gz: b1a33d3471eec53203d4f5e652e750fb88587f19
 SHA512:
-  metadata.gz: 6b6640758e9fea0d59f715d87071da32300dc54e3397b2e9c90f16bbcfb90e9bfd22153e607cdfbbe7cd04359ef0e920f9a59b37c8870bfd467c71b239951e1e
-  data.tar.gz: e6ea732bdbb2818828203823a7620fd681eacae992eff09422bc57f9a659ecb1fa992a08e1191c50df0cad346af980000074855c7f87fd705c4af62f8cdd01a1
+  metadata.gz: b8d0bdd85bfeb292e4a52f4186d34667f4e0866af137fbefd258ee662e227297f7508542c64a658a045c5cac95bd37141d8587e623c2ba99d97d9e9d96940ad2
+  data.tar.gz: 7b705aa1272d5fd0f499d318678b5700ef75e84e8aed3fb41accbd39cb2679fd6ea8d711225ecbea4b5c4499fd1c4d910a4f0510321f4dd60d7aae2eed510f30

data/.travis.yml

@@ -11,6 +11,10 @@ before_install:
   - gem --version
   - gem install bundler --no-rdoc --no-ri
   - bundle --version
+  - mkdir travis-phantomjs
+  - wget https://s3.amazonaws.com/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -O $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2
+  - tar -xvf $PWD/travis-phantomjs/phantomjs-2.0.0-ubuntu-12.04.tar.bz2 -C $PWD/travis-phantomjs
+  - export PATH=$PWD/travis-phantomjs:$PATH
 
 install: bundle install --without development
 

data/CHANGES.md

@@ -1,3 +1,12 @@
+## 0.7.2 (2017-04-02)
+
+* Fix summary bar fixer on sidekiq 4.2+.
+  ([@ixti])
+
+* Fix regexp used to fix summay bar queues link when ui was enhanced.
+  ([@ixti])
+
+
 ## 0.7.1 (2017-03-30)
 
 * Fix summary bar queues link when queue ui was enhanced.

data/Gemfile

@@ -19,6 +19,7 @@ end
 group :test do
   gem "capybara"
   gem "coveralls", :require => false
+  gem "poltergeist"
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/gemfiles/sidekiq_4.0.gemfile

@@ -19,6 +19,7 @@ end
 group :test do
   gem "capybara"
   gem "coveralls", :require => false
+  gem "poltergeist"
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/gemfiles/sidekiq_4.1.gemfile

@@ -19,6 +19,7 @@ end
 group :test do
   gem "capybara"
   gem "coveralls", :require => false
+  gem "poltergeist"
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/gemfiles/sidekiq_4.2.gemfile

@@ -19,6 +19,7 @@ end
 group :test do
   gem "capybara"
   gem "coveralls", :require => false
+  gem "poltergeist"
   gem "rack-test"
   gem "simplecov", ">= 0.9"
   gem "sinatra", "~> 1.4", ">= 1.4.6"

data/lib/sidekiq/throttled/version.rb

@@ -3,6 +3,6 @@
 module Sidekiq
   module Throttled
     # Gem version
-    VERSION = "0.7.1"
+    VERSION = "0.7.2"
   end
 end

data/lib/sidekiq/throttled/web.rb

@@ -40,7 +40,7 @@ module Sidekiq
 
         # @api private
         def registered(app)
-          app.send(:include, SummaryFix)
+          SummaryFix.apply! app
           register_throttled_tab app
           register_enhanced_queues_tab app
         end

data/lib/sidekiq/throttled/web/summary_fix.html

@@ -0,0 +1,7 @@
+<script>
+  $(function ($el) {
+    var $el = $(".summary li.enqueued > a"),
+        url = $el.attr("href").replace(/\/queues$/, "/enhanced-queues");
+    $el.attr("href", url);
+  });
+</script>

data/lib/sidekiq/throttled/web/summary_fix.rb

@@ -4,22 +4,22 @@ module Sidekiq
   module Throttled
     module Web
       module SummaryFix
-        JAVASCRIPT = <<-JAVASCRIPT
-        <script>
-          $(function ($el) {
-            var $el = $(".summary li.enqueued > a"),
-                url = $el.attr("href").replace(/\/queues$/, "/enhanced-queues");
-            $el.attr("href", url);
-          });
-        </script>
-        JAVASCRIPT
+        HTML = File.read("#{__dir__}/summary_fix.html").freeze
 
         class << self
           attr_accessor :enabled
+
+          def apply!(app)
+            if "4.2.0" <= Sidekiq::VERSION
+              Sidekiq::WebAction.send(:prepend, SummaryFix)
+            else
+              app.send(:prepend, SummaryFix)
+            end
+          end
         end
 
         def display_custom_head
-          SummaryFix.enabled ? "#{super}#{JAVASCRIPT}" : super
+          "#{super}#{HTML if SummaryFix.enabled}"
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-throttled
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Alexey V Zapparov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -87,6 +87,7 @@ files:
 - lib/sidekiq/throttled/web.rb
 - lib/sidekiq/throttled/web/queues.html.erb
 - lib/sidekiq/throttled/web/stats.rb
+- lib/sidekiq/throttled/web/summary_fix.html
 - lib/sidekiq/throttled/web/summary_fix.rb
 - lib/sidekiq/throttled/web/throttled.html.erb
 - lib/sidekiq/throttled/worker.rb