sidetiq 0.1.3 → 0.1.4

data/.travis.yml

@@ -3,7 +3,4 @@ rvm:
   - 1.9.3
   - 2.0.0
 before_script:
-  - bundle exec rake compile
-matrix:
-  allow_failures:
-    - rvm: 2.0.0
+  - bundle exec rake compile

data/lib/sidetiq/version.rb

@@ -8,7 +8,7 @@ module Sidetiq
     MINOR = 1
 
     # Public: Sidetiq patch level.
-    PATCH = 3
+    PATCH = 4
 
     # Public: String representation of the current Sidetiq version.
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')

data/lib/sidetiq/web.rb

@@ -2,20 +2,14 @@ require 'sidekiq/web'
 
 module Sidetiq
   module Web
-    def self.registered(app)
-      app.helpers do
-        def find_template(view, *args, &block)
-          path = File.expand_path(File.join('..', 'views'), __FILE__)
-          super(path, *args, &block)
-          super
-        end
-      end
+    VIEWS = File.expand_path('views', File.dirname(__FILE__))
 
+    def self.registered(app)
       app.get "/sidetiq" do
         clock = Sidetiq::Clock.instance
         @schedules = clock.schedules
         @time = clock.gettime
-        slim :sidetiq
+        slim File.read(File.join(VIEWS, 'sidetiq.slim'))
       end
 
       app.get "/sidetiq/:name" do
@@ -30,7 +24,7 @@ module Sidetiq
           worker.name == name
         end.flatten
 
-        slim :sidetiq_details
+        slim File.read(File.join(VIEWS, 'sidetiq_details.slim'))
       end
     end
   end

data/test/test_web.rb

@@ -23,8 +23,8 @@ class TestWeb < Sidetiq::TestCase
   def test_home_tab
     get '/'
     assert_equal 200, last_response.status
-    assert_match last_response.body, /Sidekiq/
-    assert_match last_response.body, /Sidetiq/
+    assert_match /Sidekiq/, last_response.body
+    assert_match /Sidetiq/, last_response.body
   end
 
   def test_sidetiq_page
@@ -32,8 +32,8 @@ class TestWeb < Sidetiq::TestCase
     assert_equal 200, last_response.status
 
     clock.schedules.each do |worker, schedule|
-      assert_match last_response.body, /#{worker.name}/
-      assert_match last_response.body, /#{worker.get_sidekiq_options['queue']}/
+      assert_match /#{worker.name}/, last_response.body
+      assert_match /#{worker.get_sidekiq_options['queue']}/, last_response.body
     end
   end
 
@@ -43,15 +43,15 @@ class TestWeb < Sidetiq::TestCase
     schedule = clock.schedules[Worker]
 
     schedule.recurrence_rules.each do |rule|
-      assert_match last_response.body, /#{rule.to_s}/
+      assert_match /#{rule.to_s}/, last_response.body
     end
 
     schedule.exception_rules.each do |rule|
-      assert_match last_response.body, /#{rule.to_s}/
+      assert_match /#{rule.to_s}/, last_response.body
     end
 
     schedule.next_occurrences(10).each do |time|
-      assert_match last_response.body, /#{time.getutc.to_s}/
+      assert_match /#{time.getutc.to_s}/, last_response.body
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: sidetiq
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Tobias Svensson