RubyGems - howler - Versions diffs - 1.0.0 → 1.1.0 - Mend

howler 1.0.0 → 1.1.0

Files changed (21) hide show

data/Gemfile.lock +1 -1
data/howler.gemspec +1 -1
data/lib/howler/config.ru +2 -0
data/lib/howler/exceptions/notify.rb +4 -0
data/lib/howler/queue.rb +1 -1
data/lib/howler/support/config.rb +1 -1
data/lib/howler/support/version.rb +1 -1
data/lib/howler/web.rb +10 -0
data/lib/howler/web/views/html.erb +4 -4
data/lib/howler/web/views/index.erb +1 -1
data/lib/howler/web/views/navigation.erb +5 -5
data/lib/howler/web/views/notification_messages.erb +2 -2
data/lib/howler/web/views/notifications.erb +1 -1
data/lib/howler/web/views/queue.erb +1 -1
data/lib/howler/web/views/queue_table.erb +1 -1
data/lib/howler/web/views/queues.erb +1 -1
data/spec/models/exceptions/notify_spec.rb +8 -0
data/spec/models/support/config_spec.rb +1 -1
data/spec/requests/web_spec.rb +4 -2
data/spec/spec_helper.rb +2 -2
metadata +5 -5

data/Gemfile.lock CHANGED

@@ -6,6 +6,7 @@ PATH
       connection_pool
       multi_json
       redis
+      sinatra
 GEM
   remote: http://rubygems.org/
@@ -64,5 +65,4 @@ DEPENDENCIES
   howler!
   rake
   rspec
-  sinatra
   timecop

data/howler.gemspec CHANGED

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency              'celluloid'
   gem.add_dependency              'connection_pool'
   gem.add_dependency              'multi_json'
+  gem.add_dependency              'sinatra'
   gem.add_development_dependency  'rake'
-  gem.add_development_dependency  'sinatra'
   gem.add_development_dependency  'rspec'
   gem.add_development_dependency  'capybara'
   gem.add_development_dependency  'timecop'

data/lib/howler/config.ru CHANGED

@@ -1,4 +1,6 @@
 require File.expand_path('../web', __FILE__)
 require 'multi_json'
+Howler::Config[:path_prefix] = '/'
 run Howler::Web

data/lib/howler/exceptions/notify.rb CHANGED

@@ -11,5 +11,9 @@ module Howler
         'ruby_version' => `ruby -v`.chomp
       }
     end
+    def to_s(*)
+      "Exception from #{@env['hostname']}\n\n#{backtrace.join("\n")}"
+    end
   end
 end

data/lib/howler/queue.rb CHANGED

@@ -116,7 +116,7 @@ module Howler
     def notify(message, e)
       message[:status] = 'notified'
-      message[:exception] = e
+      message[:cause] = e
       Howler.redis.with {|redis| redis.lpush("notifications", MultiJson.encode(message)) }
     end

data/lib/howler/support/config.rb CHANGED

@@ -1,6 +1,6 @@
 module Howler
   class Config
-    WHITELIST = %w(concurrency shutdown_timeout)
+    WHITELIST = %w(concurrency shutdown_timeout path_prefix).freeze
     def self.[](key)
       Howler.redis.with {|redis| redis.hget("howler:config", key.to_s) }

data/lib/howler/support/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Howler
-  VERSION = %W(1 0 0) .join(".")
+  VERSION = %W(1 1 0) .join(".")
 end

data/lib/howler/web.rb CHANGED

@@ -3,6 +3,8 @@ require_relative ''
 require 'sinatra/base'
 require 'erb'
+Howler::Config[:path_prefix] = '/howler/'
 module Howler
   class Web < Sinatra::Base
     dir = File.dirname(File.expand_path(__FILE__))
@@ -39,6 +41,14 @@ module Howler
     end
     helpers do
+      def path(item)
+        Howler::Config[:path_prefix] + item
+      end
+      def h(thing)
+        escape_html(thing).gsub("\n", "<br>")
+      end
       def process_args(args)
         args.to_s.gsub(/^\[|\]$/, '')
       end

data/lib/howler/web/views/html.erb CHANGED

@@ -2,9 +2,9 @@
 <html lang="en">
 <head>
   <meta charset="utf-8">
-  <title>Howler</title>
+  <title>Howler Dashboard</title>
   <meta name="description" content="Monitoring Panel for Howler.">
-  <link href="/application.css" rel="stylesheet">
-  <link href="/queues.css" rel="stylesheet">
-  <link href="/bootstrap.min.css" rel="stylesheet">
+  <link href="<%= path 'application.css' %>" rel="stylesheet">
+  <link href="<%= path 'queues.css' %>" rel="stylesheet">
+  <link href="<%= path 'bootstrap.min.css' %>" rel="stylesheet">
 </head>

data/lib/howler/web/views/index.erb CHANGED

@@ -5,7 +5,7 @@
   <%= erb(:navigation) %>
   <footer>
-    <p>&copy; <%= Time.now.year %></p>
+    <p></p>
   </footer>
 </body>
 </html>

data/lib/howler/web/views/navigation.erb CHANGED

@@ -8,15 +8,15 @@
       </a>
       <div class="nav-collapse">
         <ul class="nav">
-          <li class="item"><a href="/">Howler</a></li>
+          <li class="item"><a href="<%= path '' %>/howler">Howler</a></li>
           <li class="divider-vertical"></li>
-          <li class="item"><a href="/queues">Queues</a></li>
+          <li class="item"><a href="<%= path 'queues' %>">Queues</a></li>
           <li class="divider-vertical"></li>
-          <li class="item"><a href="/notifications">Notifications</a></li>
+          <li class="item"><a href="<%= path 'notifications' %>">Notifications</a></li>
           <li class="divider-vertical"></li>
-          <li class="item"><a href="/statistics">Statistics</a></li>
+          <li class="item"><a href="<%= path 'statistics' %>">Statistics</a></li>
           <li class="divider-vertical"></li>
-          <li class="item"><a href="/settings">Settings</a></li>
+          <li class="item"><a href="<%= path 'settings' %>">Settings</a></li>
           <li class="divider-vertical"></li>
         </ul>
       </div>

data/lib/howler/web/views/notification_messages.erb CHANGED

@@ -5,7 +5,7 @@
       <thead>
       <tr>
         <th>Message</th>
-        <th>Notification</th>
+        <th>Notification (Cause)</th>
         <th>Occurred</th>
       </tr>
       </thead>
@@ -14,8 +14,8 @@
       <% @notifications.each do |notification| %>
         <tr>
           <td><%= notification['class'] %>.<%= notification['method'] %>(<%= process_args(notification['args']) %>)</td>
+          <td class="cause"><%= h notification['cause'] %></td>
           <td><%= Howler::Util.at(notification['created_at']) %></td>
-          <td><%= notification['status'] %></td>
         </tr>
       <% end %>
       </tbody>

data/lib/howler/web/views/notifications.erb CHANGED

@@ -9,7 +9,7 @@
 </div>
 <footer>
-  <p>&copy; <%= Time.now.year %></p>
+  <p></p>
 </footer>
 </body>
 </html>

data/lib/howler/web/views/queue.erb CHANGED

@@ -30,7 +30,7 @@
 </div>
 <footer>
-  <p>&copy; <%= Time.now.year %></p>
+  <p></p>
 </footer>
 </body>
 </html>

data/lib/howler/web/views/queue_table.erb CHANGED

@@ -18,7 +18,7 @@
           <td><%= queue.created_at %></td>
           <td><%= queue.success %></td>
           <td class="error"><%= queue.error %></td>
-          <td><a href="/queues/<%= queue.id %>">More...</a></td>
+          <td><a href="<%= path "queues/#{queue.id}" %>">More...</a></td>
         </tr>
       <% end %>
       </tbody>

data/lib/howler/web/views/queues.erb CHANGED

@@ -9,7 +9,7 @@
   </div>
   <footer>
-    <p>&copy; <%= Time.now.year %></p>
+    <p></p>
   </footer>
 </body>
 </html>

data/spec/models/exceptions/notify_spec.rb CHANGED

@@ -23,4 +23,12 @@ describe Howler::Message::Notify do
       subject.env['ruby_version'].should == `ruby -v`.chomp
     end
   end
+  describe "#to_s" do
+    let!(:subj) { begin; raise subject; rescue Exception => e; e; end}
+    it "should have the allowed attributes" do
+      subject.to_s.should == "Exception from #{subject.env['hostname']}\n\n#{subject.backtrace.join("\n")}"
+    end
+  end
 end

data/spec/models/support/config_spec.rb CHANGED

@@ -2,7 +2,7 @@ require "spec_helper"
 describe Howler::Config do
   it "should have an attribute white-list" do
-    Howler::Config::WHITELIST.should == %w(concurrency shutdown_timeout)
+    Howler::Config::WHITELIST.should == %w(concurrency shutdown_timeout path_prefix)
   end
   describe ".[]" do

data/spec/requests/web_spec.rb CHANGED

@@ -191,8 +191,9 @@ describe "web" do
   describe "Notifications#index" do
     describe "when there are notifications" do
       before do
+        @ex = generate_exception
         [:length, :collect, :max].each_with_index do |method, i|
-          queue.statistics(Array, method, [i*10]) { raise Howler::Message::Notify.new(generate_exception, :type => method)}
+          queue.statistics(Array, method, [i*10]) { raise Howler::Message::Notify.new(@ex, :type => method)}
         end
         visit "/notifications"
@@ -208,8 +209,9 @@ describe "web" do
           within ".table tbody" do
             page.should have_content(Howler::Util.at(@time))
+            page.should have_content(@ex.to_s)
-            %w(Array.length(0) Array.collect(10) Array.max(20) notified).each do |value|
+            %w(Array.length(0) Array.collect(10) Array.max(20)).each do |value|
               page.should have_content(value)
             end
           end

data/spec/spec_helper.rb CHANGED

@@ -26,7 +26,6 @@ require 'howler/async'
 require 'howler/web'
 Capybara.default_driver = :selenium
 Capybara.app = Howler::Web
 RSpec.configure do |config|
@@ -34,8 +33,9 @@ RSpec.configure do |config|
   config.before(:each) do
     Howler.send(:_redis).flushall
-    Howler::Config.class_eval("@@options={:concurrency => 1}")
     Howler.stub(:next).with(:id).and_return(123)
+    Howler::Config[:concurrency] = 1
+    Howler::Config[:path_prefix] = '/'
   end
   config.after(:suite) do

metadata CHANGED

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: howler
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2012-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
@@ -76,14 +76,14 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sinatra
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: