sidetiq 0.1.3 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
data/.travis.yml CHANGED
@@ -3,7 +3,4 @@ rvm:
3
3
  - 1.9.3
4
4
  - 2.0.0
5
5
  before_script:
6
- - bundle exec rake compile
7
- matrix:
8
- allow_failures:
9
- - rvm: 2.0.0
6
+ - bundle exec rake compile
@@ -8,7 +8,7 @@ module Sidetiq
8
8
  MINOR = 1
9
9
 
10
10
  # Public: Sidetiq patch level.
11
- PATCH = 3
11
+ PATCH = 4
12
12
 
13
13
  # Public: String representation of the current Sidetiq version.
14
14
  STRING = [MAJOR, MINOR, PATCH].compact.join('.')
data/lib/sidetiq/web.rb CHANGED
@@ -2,20 +2,14 @@ require 'sidekiq/web'
2
2
 
3
3
  module Sidetiq
4
4
  module Web
5
- def self.registered(app)
6
- app.helpers do
7
- def find_template(view, *args, &block)
8
- path = File.expand_path(File.join('..', 'views'), __FILE__)
9
- super(path, *args, &block)
10
- super
11
- end
12
- end
5
+ VIEWS = File.expand_path('views', File.dirname(__FILE__))
13
6
 
7
+ def self.registered(app)
14
8
  app.get "/sidetiq" do
15
9
  clock = Sidetiq::Clock.instance
16
10
  @schedules = clock.schedules
17
11
  @time = clock.gettime
18
- slim :sidetiq
12
+ slim File.read(File.join(VIEWS, 'sidetiq.slim'))
19
13
  end
20
14
 
21
15
  app.get "/sidetiq/:name" do
@@ -30,7 +24,7 @@ module Sidetiq
30
24
  worker.name == name
31
25
  end.flatten
32
26
 
33
- slim :sidetiq_details
27
+ slim File.read(File.join(VIEWS, 'sidetiq_details.slim'))
34
28
  end
35
29
  end
36
30
  end
data/test/test_web.rb CHANGED
@@ -23,8 +23,8 @@ class TestWeb < Sidetiq::TestCase
23
23
  def test_home_tab
24
24
  get '/'
25
25
  assert_equal 200, last_response.status
26
- assert_match last_response.body, /Sidekiq/
27
- assert_match last_response.body, /Sidetiq/
26
+ assert_match /Sidekiq/, last_response.body
27
+ assert_match /Sidetiq/, last_response.body
28
28
  end
29
29
 
30
30
  def test_sidetiq_page
@@ -32,8 +32,8 @@ class TestWeb < Sidetiq::TestCase
32
32
  assert_equal 200, last_response.status
33
33
 
34
34
  clock.schedules.each do |worker, schedule|
35
- assert_match last_response.body, /#{worker.name}/
36
- assert_match last_response.body, /#{worker.get_sidekiq_options['queue']}/
35
+ assert_match /#{worker.name}/, last_response.body
36
+ assert_match /#{worker.get_sidekiq_options['queue']}/, last_response.body
37
37
  end
38
38
  end
39
39
 
@@ -43,15 +43,15 @@ class TestWeb < Sidetiq::TestCase
43
43
  schedule = clock.schedules[Worker]
44
44
 
45
45
  schedule.recurrence_rules.each do |rule|
46
- assert_match last_response.body, /#{rule.to_s}/
46
+ assert_match /#{rule.to_s}/, last_response.body
47
47
  end
48
48
 
49
49
  schedule.exception_rules.each do |rule|
50
- assert_match last_response.body, /#{rule.to_s}/
50
+ assert_match /#{rule.to_s}/, last_response.body
51
51
  end
52
52
 
53
53
  schedule.next_occurrences(10).each do |time|
54
- assert_match last_response.body, /#{time.getutc.to_s}/
54
+ assert_match /#{time.getutc.to_s}/, last_response.body
55
55
  end
56
56
  end
57
57
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: sidetiq
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 0.1.3
5
+ version: 0.1.4
6
6
  platform: ruby
7
7
  authors:
8
8
  - Tobias Svensson