whoops 0.2.2 → 0.2.3

data/app/controllers/event_groups_controller.rb

@@ -4,13 +4,10 @@ class EventGroupsController < ApplicationController
   helper_method :event_group_filter
   
   def index
-    finder = if params[:query].blank?
-      Whoops::EventGroup.where(event_group_filter.to_query_document)
-    else
-      Whoops::EventGroup.where(:_id.in => Whoops::Event.where(:keywords => /#{params[:query]}/i).collect{|e| e.event_group_id}.uniq)
-    end
+    query_document = event_group_filter.to_query_document
+    query_document.merge!(:_id.in => Whoops::Event.where(:keywords => /#{params[:query]}/i).distinct(:event_group_id)) unless params[:query].blank?
     
-    @event_groups = finder.desc(:last_recorded_at).page(params[:page]).per(30)
+    @event_groups = Whoops::EventGroup.where(query_document).desc(:last_recorded_at).page(params[:page]).per(30)
     
     respond_to do |format|
       format.html

data/app/models/whoops/event.rb

@@ -73,6 +73,7 @@ class Whoops::Event
   end
     
   private
+
   
   def add_details_to_keywords(keywords_array)
     flattened = details.to_a.flatten

data/app/models/whoops/mongoid_search_parser.rb

@@ -39,4 +39,4 @@ class Whoops::MongoidSearchParser
     value.gsub!(/!r(\/.*?\/)/, %Q{!ruby/regexp "\\1"})
     return YAML.load(value)
   end
-end
+end

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

@@ -11,7 +11,6 @@
   .space
     %h3.info-revealer
       Search
-      = image_tag "/images/_ui/icn_info.png"
     %form
       %p
         For more on searching, see "Search Event Details" in the 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whoops
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Daniel Higginbotham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-14 00:00:00 Z
+date: 2012-05-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -239,10 +239,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A Rails engine which receives logs and provides an interface for them
 test_files: []
 
-has_rdoc: