whoops 0.1.10 → 0.2

data/app/models/whoops/event.rb

@@ -2,13 +2,15 @@ class Whoops::Event
   include Mongoid::Document
   include FieldNames
   
-  belongs_to :event_group, :class_name => "Whoops::EventGroup"
+  belongs_to :event_group, :class_name => "Whoops::EventGroup", :index=>true
   
   field :details
   field :keywords, :type => String
   field :message, :type => String
   field :event_time, :type => DateTime
-    
+
+  index([[:event_group_id,Mongo::ASCENDING],[:event_time, Mongo::DESCENDING]])
+
   validates_presence_of :message  
   
   before_save :set_keywords, :sanitize_details
@@ -17,7 +19,6 @@ class Whoops::Event
     params = params.with_indifferent_access
     
     event_group_params                    = params.slice(*Whoops::EventGroup.field_names)
-    event_group_params[:identifier]       = params[:event_group_identifier]
     event_group_params[:last_recorded_at] = params[:event_time]
     event_group_params
     event_group = Whoops::EventGroup.handle_new_event(event_group_params)
@@ -87,4 +88,4 @@ class Whoops::Event
       end.flatten!
     end
   end
-end
+end

data/app/models/whoops/event_group.rb

@@ -8,7 +8,7 @@ class Whoops::EventGroup
     :environment,
     :event_type,
     :message,
-    :identifier,
+    :event_group_identifier,
     :logging_strategy_name
   ].each do |string_field|
     field string_field, :type => String
@@ -33,14 +33,14 @@ class Whoops::EventGroup
         event_group.send_notifications
         event_group.save
       end
-      
+
       event_group
     end
   end
   
   has_many :events, :class_name => "Whoops::Event"
   
-  validates_presence_of :identifier, :event_type, :service, :message
+  validates_presence_of :event_group_identifier, :event_type, :service, :message
   
   before_save :handle_archival
   
@@ -79,4 +79,4 @@ class Whoops::EventGroup
     Whoops::NotificationMailer.event_notification(self, matcher.matches).deliver unless matcher.matches.empty?
     self.notify_on_next_occurrence = false
   end
-end
+end

data/app/models/whoops/filter.rb

@@ -3,13 +3,26 @@ class Whoops::Filter
   include FieldNames
   
   [:service, :environment, :event_type, :message, :details].each do |document_field|
-    field document_field
+    field document_field, :type => Array
   end
     
   def to_query_document
-    doc = attributes.except(:_id).delete_if{|k, v| v.blank?}
+    doc = attributes.except(:_id, "_id").delete_if{|k, v| v.blank?}
     # match all services under namespace. ie, if "app" given, match "app.web", "app.backend" etc
-    doc[:service] = /#{doc[:service]}(\..*)?/ if doc[:service]
-    doc
+    doc["service"] = doc["service"].collect{ |d| /^#{d}/ } if doc["service"]
+    doc.inject({}) do |hash, current|
+      hash[current.first.to_sym.in] = current.last unless current.last.empty?
+      hash
+    end
   end
+
+  class << self
+    def new_from_params(params)
+      if params
+        new(params.inject({}){|hash, current| hash[current.first] = current.last.keys; hash})
+      else
+        new
+      end
+    end
+  end   
 end

data/app/views/event_groups/_list.html.haml

@@ -1,5 +1,7 @@
-= will_paginate(@event_groups)
-%table.event-group-list
+= paginate(@event_groups)
+
+.clearfix
+%table.event-group-list.bordered-table.zebra-striped
   %thead
     %tr
       %th.header Service
@@ -8,12 +10,14 @@
       %th.header Env
       %th.header Last Occurrence
       %th.header
-  - @event_groups.each do |event_group|
-    %tr
-      %td= link_to event_group.service, whoops_event_group_events_path(event_group)
-      %td= link_to event_group.message.truncate(50), whoops_event_group_events_path(event_group)
-      %td= link_to event_group.event_type, whoops_event_group_events_path(event_group)
-      %td= link_to event_group.environment, whoops_event_group_events_path(event_group)
-      %td= link_to event_group.last_recorded_at.to_s(:whoops_default), whoops_event_group_events_path(event_group)
-      %td= link_to event_group.events.count, whoops_event_group_events_path(event_group)
-= will_paginate(@event_groups)
+  %tbody
+    - @event_groups.each do |event_group|
+      %tr
+        %td= link_to event_group.service, whoops_event_group_events_path(event_group)
+        %td= link_to event_group.message.truncate(50), whoops_event_group_events_path(event_group)
+        %td= link_to event_group.event_type, whoops_event_group_events_path(event_group)
+        %td= link_to event_group.environment, whoops_event_group_events_path(event_group)
+        %td= link_to event_group.last_recorded_at.to_s(:whoops_default), whoops_event_group_events_path(event_group)
+        %td= link_to event_group.events.count, whoops_event_group_events_path(event_group)
+
+= paginate(@event_groups)

data/app/views/event_groups/index.html.haml

@@ -1,18 +1,23 @@
 - content_for :sidebar do
   .space
     %h3 Filters
-    - form_for event_group_filter, :url => whoops_event_groups_path, :html => {:method => "get"} do |f|
-      %ul.filter_selects
-        - filter_options.each do |field_name, options|
-          %li= f.select field_name, options_from_collection_for_select(options, :first, :last, event_group_filter.send(field_name))
-        %li
-          %button#reset reset
+    = form_for event_group_filter, :url => whoops_event_groups_path, :html => {:method => "get"} do |f|
+      = hidden_field_tag 'updating_filters', true
+      - filter_options.each do |field_name, options|
+        %h4= field_name
+        %ul.filter_selects.inputs-list
+          - options.each do |option|
+            %li
+              %label
+                %input{:type => 'checkbox', :name => "whoops_filter[#{field_name}][#{option}]", :checked => filter_checked?(field_name, option)}
+                = option
   .space
     %h3 Keyword Search
-    - form_tag whoops_event_groups_path, :method => "get" do |f|
-      %ul.search
+    = form_tag whoops_event_groups_path, :method => "get" do |f|
+      %ul.search.unstyled
         %li= text_field_tag :query
-        %li= submit_tag "Submit"
+        %li= submit_tag "Submit", :class => "btn primary"
+
 %article.module.width_full
   %header
     %h3 Events

data/app/views/events/_detail.html.haml

@@ -1,5 +1,5 @@
 %ul.detail
   - detail.to_a.sort{|a,b| a[0] <=> b[0]}.each do |sub_detail|
     %li
-      %span.label= sub_detail.first + ":"
+      %span.key= sub_detail.first + ":"
       = format_detail(sub_detail.last)

data/app/views/events/_details.html.haml

@@ -1,8 +1,12 @@
-%table.details
+%table.details.bordered-table
+  %thead
+    %tr
+      %th.key Key
+      %th Value
   %tr
-    %td.label Message
+    %td.key Message
     %td.value= event.message
   - event.details.to_a.sort{|a,b| a[0] <=> b[0]}.each do |detail|
     %tr
-      %td.label= detail.first
+      %td.key= detail.first
       %td.value= format_detail(detail.last)

data/app/views/events/index.html.haml

@@ -4,7 +4,7 @@
 - content_for :sidebar do
   .space
     %h3 Instances
-    = will_paginate @event, :previous_label => "", :next_label => ""
+    = paginate @events, :previous_label => "", :next_label => ""
     %ul#instances
       - @events.each_with_index do |event, index|
         %li{:class => ("selected" if index == 0)}= link_to event.event_time.to_s(:whoops_default), event
@@ -13,23 +13,29 @@
       Search
       = image_tag "/images/_ui/icn_info.png"
     %form
-      %ul
-        %li.info
-          For more on searching, see "Search Event Details" in the 
-          = link_to "README", "https://github.com/flyingmachine/whoops/blob/master/README.asciidoc"
-        %li= text_area_tag :query, params[:query]
-        %li
-          %button search
-          %button reset
+      %p
+        For more on searching, see "Search Event Details" in the 
+        = link_to "documentation", "http://www.whoopsapp.com/#_search_event_details"
 
-%article.module.width_full
+      %p= text_area_tag :query, params[:query]
+      
+      %p
+        %button.btn.primary search
+        %button.btn.secondary#reset reset
+
+%article
   %header
     %h3= @event_group.message
-  %table
-    - [:environment, :event_type, :last_recorded_at].each do |field|
+  %table.span8.bordered-table
+    %thead
       %tr
-        %td.label= field.to_s.humanize
-        %td= @event_group.send(field)
+        %th.key Field
+        %th Value
+    %tbody
+      - [:environment, :event_type, :last_recorded_at].each do |field|
+        %tr
+          %td.key= field.to_s.humanize
+          %td.value= @event_group.send(field)
 
 %article.module.width_full
   %header

data/app/views/layouts/whoops.html.haml

@@ -2,38 +2,21 @@
 %html
   %head
     %title Whoops
-    = stylesheet_link_tag 'screen.css', :media => 'screen, projection'
+    = stylesheet_link_tag 'whoops-application', :media => 'screen, projection'
     /[if IE]
       = stylesheet_link_tag 'ie.css', :media => 'screen, projection'
-
-    = javascript_include_tag 'jquery-1.5.2.min', 'jquery.equalHeight', 'jquery.tablesorter.min', 'whoops.js'
+      
+    = javascript_include_tag 'jquery-1.5.2.min', 'whoops'
     = yield :extra_javascripts
     = csrf_meta_tag
-  %body
-    %header#header
-      %hgroup
-        %h1.site_title
-          = link_to "Whoops", whoops_event_groups_path
-        %h2.section_title 
-
-    / end of header bar
-    %section#secondary_bar
-      .user
-      .breadcrumbs_container
-        %article.breadcrumbs
-          = link_to "Event List", whoops_event_groups_path, :class => ("current" if controller_name == 'event_groups')
-          = yield :breadcrumbs
-    / end of secondary bar
-    %aside#sidebar.column
-      = yield :sidebar
-      %footer
-        %hr/
-        %p
-          %strong Whoops!
 
-    / end of sidebar
-    %section#main.column
-      = yield
-      / end of styles article
-      .spacer
-  
+  %body{:id => @body_id}
+    .topbar
+      .listfill
+        .container-fluid
+          = link_to "Whoops", whoops_event_groups_path, :class => "brand"
+    .container-fluid
+      .sidebar
+        = yield :sidebar
+      .content
+        = yield

data/lib/whoops.rb

@@ -1,5 +1,5 @@
 require "mongoid"
 require "whoops/engine"
-require "will_paginate"
+require "kaminari"
 require "haml"
-require "sass"
+require "sass"

data/lib/whoops/engine.rb

@@ -1,4 +1,7 @@
 module Whoops
   class Engine < Rails::Engine
+    initializer "static assets" do |app|
+      app.middleware.use ::ActionDispatch::Static, File.expand_path("../../../app/assets", __FILE__)
+    end
   end
-end
+end

metadata

@@ -2,12 +2,11 @@
 name: whoops
 version: !ruby/object:Gem::Version 
   hash: 15
-  prerelease: false
+  prerelease: 
   segments: 
   - 0
-  - 1
-  - 10
-  version: 0.1.10
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Daniel Higginbotham
@@ -15,29 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-29 00:00:00 -05:00
-default_executable: 
+date: 2012-02-03 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rails
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,11 +29,11 @@ dependencies:
         - 3
         version: "3"
   type: :runtime
-  version_requirements: *id002
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: sass
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -61,11 +43,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -75,11 +57,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -89,11 +71,11 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: bson_ext
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -103,43 +85,41 @@ dependencies:
         - 0
         version: "0"
   type: :runtime
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: mongoid
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 13
+        hash: 29
         segments: 
         - 2
-        - 0
+        - 4
         - 1
-        version: 2.0.1
+        version: 2.4.1
   type: :runtime
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: will_paginate
+  name: kaminari
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
-        hash: -1876988247
+        hash: 3
         segments: 
-        - 3
         - 0
-        - pre2
-        version: 3.0.pre2
+        version: "0"
   type: :runtime
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -149,11 +129,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: fabrication
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -163,11 +143,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: faker
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -177,11 +157,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id011
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: capybara
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -193,7 +173,7 @@ dependencies:
         - 0
         version: 0.4.0
   type: :development
-  version_requirements: *id012
+  version_requirements: *id011
 description: A Rails engine which receives logs and provides an interface for them
 email: 
 executables: []
@@ -203,6 +183,26 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- app/assets/javascripts/hideshow.js
+- app/assets/javascripts/jquery-1.5.2.min.js
+- app/assets/javascripts/jquery.equalHeight.js
+- app/assets/javascripts/jquery.form.js
+- app/assets/javascripts/jquery.tablesorter.min.js
+- app/assets/javascripts/ui.js
+- app/assets/javascripts/whoops.js
+- app/assets/stylesheets/autocomplete.scss
+- app/assets/stylesheets/bootstrap.scss
+- app/assets/stylesheets/forms.scss
+- app/assets/stylesheets/main.css.scss
+- app/assets/stylesheets/mixins.scss
+- app/assets/stylesheets/patterns.scss
+- app/assets/stylesheets/reset.scss
+- app/assets/stylesheets/scaffolding.scss
+- app/assets/stylesheets/tables.scss
+- app/assets/stylesheets/type.scss
+- app/assets/stylesheets/variables.scss
+- app/assets/stylesheets/whoops-application.css
+- app/assets/stylesheets/whoops.css.scss
 - app/controllers/event_groups_controller.rb
 - app/controllers/events_controller.rb
 - app/helpers/event_groups_helper.rb
@@ -221,57 +221,6 @@ files:
 - app/views/events/_details.html.haml
 - app/views/events/index.html.haml
 - app/views/layouts/whoops.html.haml
-- lib/generators/whoops/assets_generator.rb
-- lib/generators/whoops/templates/assets/images/_ui/breadcrumb_divider.png
-- lib/generators/whoops/templates/assets/images/_ui/btn_submit.png
-- lib/generators/whoops/templates/assets/images/_ui/btn_submit_2.png
-- lib/generators/whoops/templates/assets/images/_ui/btn_view_site.png
-- lib/generators/whoops/templates/assets/images/_ui/header_bg.png
-- lib/generators/whoops/templates/assets/images/_ui/header_shadow.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_add_user.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_alert_error.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_alert_info.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_alert_success.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_alert_warning.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_audio.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_categories.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_edit.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_edit_article.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_folder.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_info.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_jump_back.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_logout.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_new_article.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_photo.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_profile.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_search.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_security.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_settings.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_tags.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_trash.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_user.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_video.png
-- lib/generators/whoops/templates/assets/images/_ui/icn_view_users.png
-- lib/generators/whoops/templates/assets/images/_ui/module_footer_bg.png
-- lib/generators/whoops/templates/assets/images/_ui/post_message.png
-- lib/generators/whoops/templates/assets/images/_ui/secondary_bar.png
-- lib/generators/whoops/templates/assets/images/_ui/secondary_bar_shadow.png
-- lib/generators/whoops/templates/assets/images/_ui/sidebar.png
-- lib/generators/whoops/templates/assets/images/_ui/sidebar_divider.png
-- lib/generators/whoops/templates/assets/images/_ui/sidebar_shadow.png
-- lib/generators/whoops/templates/assets/images/_ui/table_sorter_header.png
-- lib/generators/whoops/templates/assets/javascripts/hideshow.js
-- lib/generators/whoops/templates/assets/javascripts/jquery-1.5.2.min.js
-- lib/generators/whoops/templates/assets/javascripts/jquery.equalHeight.js
-- lib/generators/whoops/templates/assets/javascripts/jquery.form.js
-- lib/generators/whoops/templates/assets/javascripts/jquery.tablesorter.min.js
-- lib/generators/whoops/templates/assets/javascripts/ui.js
-- lib/generators/whoops/templates/assets/javascripts/whoops.js
-- lib/generators/whoops/templates/assets/stylesheets/ie.css
-- lib/generators/whoops/templates/assets/stylesheets/sass/_base.scss
-- lib/generators/whoops/templates/assets/stylesheets/sass/ie.scss
-- lib/generators/whoops/templates/assets/stylesheets/sass/screen.scss
-- lib/generators/whoops/templates/assets/stylesheets/screen.css
 - lib/whoops/engine.rb
 - lib/whoops.rb
 - config/initializers/date_formats.rb
@@ -280,7 +229,6 @@ files:
 - Rakefile
 - Gemfile
 - README.asciidoc
-has_rdoc: true
 homepage: http://www.whoopsapp.com
 licenses: []
 
@@ -310,9 +258,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Rails engine which receives logs and provides an interface for them
 test_files: []
 
+has_rdoc: