whoops 0.1.10 → 0.2

data/app/assets/stylesheets/type.scss

@@ -0,0 +1,187 @@
+/* Typography.scss
+ * Headings, body text, lists, code, and more for a versatile and durable typography system
+ * ---------------------------------------------------------------------------------------- */
+
+
+// BODY TEXT
+// ---------
+
+p {
+  @include shorthand-font(normal,$basefont,$baseline);
+  margin-bottom: $baseline / 2;
+  small {
+    font-size: $basefont - 2;
+    color: $grayLight;
+  }
+}
+
+
+// HEADINGS
+// --------
+
+h1, h2, h3, h4, h5, h6 {
+  font-weight: bold;
+  color: $grayDark;
+  small {
+    color: $grayLight;
+  }
+}
+h1 {
+  margin-bottom: $baseline;
+  font-size: 30px;
+  line-height: $baseline * 2;
+  small {
+    font-size: 18px;
+  }
+}
+h2 {
+  font-size: 24px;
+  line-height: $baseline * 2;
+  small {
+    font-size: 14px;
+  }
+}
+h3, h4, h5, h6 {
+  line-height: $baseline * 2;
+}
+h3 {
+  font-size: 18px;
+  small {
+    font-size: 14px;
+  }
+}
+h4 {
+  font-size: 16px;
+  small {
+    font-size: 12px;
+  }
+}
+h5 {
+  font-size: 14px;
+}
+h6 {
+  font-size: 13px;
+  color: $grayLight;
+  text-transform: uppercase;
+}
+
+
+// COLORS
+// ------
+
+// Unordered and Ordered lists
+ul, ol {
+  margin: 0 0 $baseline 25px;
+}
+ul ul,
+ul ol,
+ol ol,
+ol ul {
+  margin-bottom: 0;
+}
+ul {
+  list-style: disc;
+}
+ol {
+  list-style: decimal;
+}
+li {
+  line-height: $baseline;
+  color: $gray;
+}
+ul.unstyled {
+  list-style: none;
+  margin-left: 0;
+}
+
+// Description Lists
+dl {
+  margin-bottom: $baseline;
+  dt, dd {
+    line-height: $baseline;
+  }
+  dt {
+    font-weight: bold;
+  }
+  dd {
+    margin-left: $baseline / 2;
+  }
+}
+
+// MISC
+// ----
+
+// Horizontal rules
+hr {
+  margin: 20px 0 19px;
+  border: 0;
+  border-bottom: 1px solid #eee;
+}
+
+// Emphasis
+strong {
+  font-style: inherit;
+  font-weight: bold;
+}
+em {
+  font-style: italic;
+  font-weight: inherit;
+  line-height: inherit;
+}
+.muted {
+  color: $grayLight;
+}
+
+// Blockquotes
+blockquote {
+  margin-bottom: $baseline;
+  border-left: 5px solid #eee;
+  padding-left: 15px;
+  p {
+    @include shorthand-font(300,14px,$baseline);
+    margin-bottom: 0;
+  }
+  small {
+    display: block;
+    @include shorthand-font(300,12px,$baseline);
+    color: $grayLight;
+    &:before {
+      content: '\2014 \00A0';
+    }
+  }
+}
+
+// Addresses
+address {
+  display: block;
+  line-height: $baseline;
+  margin-bottom: $baseline;
+}
+
+// Inline and block code styles
+code, pre {
+  padding: 0 3px 2px;
+  font-family: Monaco, Andale Mono, Courier New, monospace;
+  font-size: 12px;
+  @include border-radius(3px);
+}
+code {
+  background-color: lighten($orange, 40%);
+  color: rgba(0,0,0,.75);
+  padding: 1px 3px;
+}
+pre {
+  background-color: #f5f5f5;
+  display: block;
+  padding: ($baseline - 1) / 2;
+  margin: 0 0 $baseline;
+  line-height: $baseline;
+  font-size: 12px;
+  border: 1px solid #ccc;
+  border: 1px solid rgba(0,0,0,.15);
+  @include border-radius(3px);
+  white-space: pre;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+
+}

data/app/assets/stylesheets/variables.scss

@@ -0,0 +1,60 @@
+/* variables.scss
+ * Variables and mixins to pre-ignite any new web development project
+ * ------------------------------------------------------------------ */
+
+
+// Links
+$linkColor:         #0069d6;
+$linkColorHover:    darken($linkColor, 15);
+
+// Grays
+$black:             #000;
+$grayDark:          lighten($black, 25%);
+$gray:              lighten($black, 50%);
+$grayLight:         lighten($black, 75%);
+$grayLighter:       lighten($black, 90%);
+$white:             #fff;
+
+// Accent Colors
+$blue:              #049CDB;
+$blueDark:          #0064CD;
+$green:             #46a546;
+$red:               #9d261d;
+$yellow:            #ffc40d;
+$orange:            #f89406;
+$pink:              #c3325f;
+$purple:            #7a43b6;
+
+// Baseline grid
+$basefont:          13px;
+$baseline:          18px;
+
+// Griditude
+// Modify the grid styles in mixins.scss
+$gridColumns:       16;
+$gridColumnWidth:   40px;
+$gridGutterWidth:   20px;
+$extraSpace:        ($gridGutterWidth * 2); // For our grid calculations
+$siteWidth:         ($gridColumns * $gridColumnWidth) + ($gridGutterWidth * ($gridColumns - 1));
+
+// Color Scheme
+// Use this to roll your own color schemes if you like (unused by Bootstrap by default)
+$baseColor:         $blue;                        // Set a base color
+$complement:        complement($baseColor);       // Determine a complementary color
+$split1:            adjust-hue($baseColor, 158);  // Split complements
+$split2:            adjust-hue($baseColor, -158);
+$triad1:            adjust-hue($baseColor, 135);  // Triads colors
+$triad2:            adjust-hue($baseColor, -135);
+$tetra1:            adjust-hue($baseColor, 90);   // Tetra colors
+$tetra2:            adjust-hue($baseColor, -90);
+$analog1:           adjust-hue($baseColor, 22);   // Analogs colors
+$analog2:           adjust-hue($baseColor, -22);
+
+
+
+// More variables coming soon:
+// - @basefont to @baseFontSize
+// - @baseline to @baseLineHeight
+// - @baseFontFamily
+// - @primaryButtonColor
+// - anything else? File an issue on GitHub

data/app/assets/stylesheets/whoops-application.css

@@ -0,0 +1,9 @@
+/*
+ * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *= require_self
+ *= require 'bootstrap'
+
+
+*/

data/app/assets/stylesheets/whoops.css.scss

@@ -0,0 +1,142 @@
+body {
+  padding-top:60px;
+  color:#333;
+}
+
+li {
+  color: #333;
+}
+
+.listfill {
+  background:#555;
+}
+
+.alert-message.block-message {
+  border:none;
+}
+
+
+.topbar {
+  color:#999;
+  a {
+    color:white;
+  }
+}
+
+/* sidebar */
+.container-fluid .sidebar {
+  margin-left:-20px;  
+  margin-top:-20px;
+  padding-left:20px;
+  padding-right:20px;
+  width:200px;
+  background:#f8f7ef;
+    
+  input[type=text] {
+    width:190px;
+  }
+    
+
+}
+
+/* for kaminari pagination */
+.sidebar .pagination {
+  margin:0;
+
+  a, .current {
+    line-height: ($baseline * 2) - 2;
+    padding:0;
+    border:none;
+    display:block;
+    float:left;
+    margin-right:2px;  
+  }
+
+  .next, .first, .prev, .last { display:none; }
+}
+
+.content .pagination {
+  height: $baseline * 2 - 2;
+  margin: $baseline 0;
+
+  float: left;
+  margin: 0;
+  border: 1px solid #ddd;
+  border: 1px solid rgba(0,0,0,.15);
+  @include border-radius(3px);
+  @include box-shadow(0 1px 2px rgba(0,0,0,.05));
+
+  .page {
+    display: inline;
+  }
+  a, .current {
+    float: left;
+    padding: 0 14px;
+    line-height: ($baseline * 2) - 2;
+    border-right: 1px solid;
+    border-right-color: #ddd;
+    border-right-color: rgba(0,0,0,.15);
+    *border-right-color: #ddd; /* IE6-7 */
+    text-decoration: none;
+  }
+  a:hover,
+  .current {
+    background-color: lighten($blue, 45%);
+  }
+  .disabled a,
+  .disabled a:hover {
+    background-color: transparent;
+    color: $grayLight;
+  }
+  .next a {
+    border: 0;
+  }
+}
+
+/* main page table links */
+.event-group-list {
+  margin-top: 1em;
+
+  td {
+    padding:0;
+  }  
+
+  a {
+    display:block;
+    padding:10px 10px 9px;
+    
+    &:hover {
+      text-decoration:none;
+    }
+  }
+
+  tbody tr:hover {
+    background-color: lighten($blue, 45%);
+  }
+}
+
+.filter_selects label {
+  cursor: pointer;
+}
+
+/* events for event group */
+.key {
+  font-weight:bold;
+  text-align:right;
+}
+
+ul.detail {
+  margin:0;
+    
+  li {
+    list-style:none;
+    ul {
+      margin-left:20px;
+    }
+  }
+  
+  .key {
+    font-weight:normal;
+    color:$blue;
+  }
+}

data/app/controllers/event_groups_controller.rb

@@ -10,10 +10,7 @@ class EventGroupsController < ApplicationController
       Whoops::EventGroup.where(:_id.in => Whoops::Event.where(:keywords => /#{params[:query]}/i).collect{|e| e.event_group_id}.uniq)
     end
     
-    @event_groups = finder.desc(:last_recorded_at).paginate(
-      :page => params[:page],
-      :per_page => 20
-    )
+    @event_groups = finder.desc(:last_recorded_at).page(params[:page]).per(10)
     
     respond_to do |format|
       format.html
@@ -26,7 +23,7 @@ class EventGroupsController < ApplicationController
   end
   
   def update_event_group_filter
-    self.event_group_filter = params[:whoops_filter] if params[:whoops_filter]
+    self.event_group_filter = params[:whoops_filter] if params[:updating_filters]
   end
   
   def event_group_filter
@@ -34,7 +31,7 @@ class EventGroupsController < ApplicationController
   end
   
   def event_group_filter=(filter)
-    session[:event_group_filter] = Whoops::Filter.new(filter)
+    session[:event_group_filter] = Whoops::Filter.new_from_params(filter)
   end
   
-end
+end

data/app/controllers/events_controller.rb

@@ -10,10 +10,7 @@ class EventsController < ApplicationController
       events_base = events_base.where(conditions)
     end
     
-    @events = events_base.desc(:event_time).paginate(
-      :page => params[:page],
-      :per_page => 20
-    )
+    @events = events_base.desc(:event_time).page(params[:page]).per(20)
   end
   
   def show

data/app/helpers/event_groups_helper.rb

@@ -11,12 +11,12 @@ module EventGroupsHelper
 
     @filter_options = Hash.new{|h, k| h[k] = []}
     
-    @filter_options["service"] = Whoops::EventGroup.services.collect{|s| [s, s]}
+    @filter_options["service"] = Whoops::EventGroup.services.to_a
     
     all_event_groups.each do |event_group|
       mundane_fields = (Whoops::Filter.field_names & Whoops::EventGroup.field_names) - ["service", "message"]
       mundane_fields.each do |field_name|
-        @filter_options[field_name] << [event_group.send(field_name), event_group.send(field_name)]
+        @filter_options[field_name] << event_group.send(field_name)
       end
     end
     
@@ -24,9 +24,13 @@ module EventGroupsHelper
     @filter_options.keys.each do |field_name|
       @filter_options[field_name].compact!
       @filter_options[field_name].sort!{|a, b| a.first <=> b.first}.uniq! if @filter_options[field_name]
-      @filter_options[field_name].unshift(["", "--" + field_name.humanize.downcase + " filter--"])
     end
 
     @filter_options
   end
+
+  def filter_checked?(field_name, option)
+    filtered_field = session[:event_group_filter].send(field_name)
+    filtered_field && filtered_field.include?(option)
+  end
 end