whoops 0.0.3 → 0.0.4

data/app/controllers/events_controller.rb

@@ -3,10 +3,19 @@ class EventsController < ApplicationController
   
   def index
     @event_group = Whoops::EventGroup.find(params[:whoops_event_group_id])
-    @events = @event_group.events.desc(:event_time).paginate(
+    
+    events_base = @event_group.events
+    unless params[:query].blank?
+      conditions = Whoops::SearchParser.new(params[:query]).mongoid_conditions
+      events_base = events_base.where(conditions)
+    end
+    
+    @events = events_base.desc(:event_time).paginate(
       :page => params[:page],
       :per_page => 20
     )
+    
+    puts 'test'
   end
   
   def show

data/app/models/whoops/event.rb

@@ -18,15 +18,15 @@ class Whoops::Event
     event_group_params[:last_recorded_at] = params[:event_time]
     
     event_group = Whoops::EventGroup.first(:conditions => event_group_params.slice(*Whoops::EventGroup.identifying_fields))
-    if event_group
-      event_group.attributes = event_group_params
-      event_group.save
-    else
-      event_group = Whoops::EventGroup.create(event_group_params)
-    end
+    event_group ||= Whoops::EventGroup.create(event_group_params)
         
     event_params = params.slice(*Whoops::Event.field_names)
     event_group.events.create(event_params)
   end 
   
+  def self.search(query)
+    conditions = Whoops::SearchParser.new(query).mongoid_conditions
+    where(conditions)
+  end
+  
 end

data/app/models/whoops/search_parser.rb

@@ -0,0 +1,40 @@
+class Whoops::SearchParser
+  attr_accessor :query
+  def initialize(query)
+    self.query = query
+  end
+  
+  def mongoid_conditions
+    self.query.split("\n").inject({}) do |conditions, line|
+      line.strip!
+      next(conditions) if line.empty?
+      
+      parsed = parse_line(line)
+      key = parsed[:method] ? parsed[:key].send(parsed[:method]) : parsed[:key]
+      
+      conditions[key] = parsed[:value]
+      conditions
+    end
+  end
+  
+  def parse_line(line)
+    key, method, value = line.match(/([^\s]*?)(#[^\s]*)? ([^#]*)/)[1..3]
+    
+    key = key.sub(/:$/, '').to_sym
+    method = method.gsub(/(^#|:$)/, '').to_sym if method
+    value = parse_value(value)
+    {
+      :key => key,
+      :method => method,
+      :value => value
+    }
+  end
+  
+  # Allows user to enter hashes or array
+  def parse_value(value)
+    value = value.strip
+    # value = "!ruby/regexp \"#{value}\"" if value =~ /^\/.*\/$/
+    value.gsub!(/\/.*?\//, %Q{!ruby/regexp "\\0"})
+    return YAML.load(value)
+  end
+end

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

@@ -7,7 +7,6 @@
           %li= f.select field_name, options_from_collection_for_select(options, :first, :last, event_group_filter.send(field_name))
         %li
           %button#reset reset
-
 %article.module.width_full
   %header
     %h3 Events

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

@@ -2,11 +2,20 @@
   = breadcrumbs(["Event Details", whoops_event_group_path(@event_group)])
   
 - content_for :sidebar do
-  %h3 Instances
-  = will_paginate @event, :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
+  .space
+    %h3 Instances
+    = will_paginate @event, :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
+  .space
+    %h3 Search
+    %form
+      %ul
+        %li= text_area_tag :query, params[:query]
+        %li
+          %button search
+          %button reset
 
 %article.module.width_full
   %header
@@ -21,5 +30,8 @@
   %header
     %h3 Details
   #event-details
-    = render :partial => "events/details", :object => @events.first, :as => :event
+    - if @events.empty?
+      %p Your search returned no results.
+    - else 
+      = render :partial => "events/details", :object => @events.first, :as => :event
 

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

@@ -6,7 +6,7 @@
     /[if IE]
       = stylesheet_link_tag 'ie.css', :media => 'screen, projection'
 
-    = javascript_include_tag 'jquery-1.5.2.min', 'jquery.equalHeight', 'jquery.tablesorter.min', 'application.js'
+    = javascript_include_tag 'jquery-1.5.2.min', 'jquery.equalHeight', 'jquery.tablesorter.min', 'whoops.js'
     = yield :extra_javascripts
     = csrf_meta_tag
   %body
@@ -21,7 +21,7 @@
       .user
       .breadcrumbs_container
         %article.breadcrumbs
-          = link_to "All Events", whoops_event_groups_path, :class => ("current" if controller_name == 'event_groups')
+          = link_to "Event List", whoops_event_groups_path, :class => ("current" if controller_name == 'event_groups')
           = yield :breadcrumbs
     / end of secondary bar
     %aside#sidebar.column

data/lib/generators/whoops/templates/assets/javascripts/{application.js → whoops.js}

@@ -4,7 +4,7 @@ Whoops = {
       $("#new_whoops_filter").submit()
     })
     $("#reset").click(function(){
-      window.location = "/?whoops_filter[service]"
+      window.location = "/event_groups?whoops_filter[service]"
       return false
     })
   },

data/lib/generators/whoops/templates/assets/stylesheets/sass/screen.scss

@@ -169,23 +169,25 @@ height: 24px;
 line-height: 23px;
 }
 
-.breadcrumbs a.current, .breadcrumbs a.current:hover {
-color: #9E9E9E;
-font-weight: bold;
-text-shadow: 0 1px 0 #fff;
-text-decoration: none;
-}
-
 .breadcrumbs a:link, .breadcrumbs a:visited {
-color: #44474F;
-text-decoration: none;
-text-shadow: 0 1px 0 #fff;
-font-weight: bold;}
+  color: #44474F;
+  text-decoration: none;
+  text-shadow: 0 1px 0 #fff;
+  font-weight: bold;
+}
 
 .breadcrumbs a:hover {
-color: #222222;
+  color: #222222;
 }
 
+.breadcrumbs a.current, .breadcrumbs a:link.current, .breadcrumbs a.current:hover {
+  color: #9E9E9E;
+  font-weight: bold;
+  text-shadow: 0 1px 0 #fff;
+  text-decoration: none;
+}
+
+
 .breadcrumb_divider {
 display: inline-block;
 width: 12px;
@@ -311,9 +313,16 @@ text-decoration: none;
     }
   }
   
-  form li {
-    list-style:none;
-    padding:0;
+  form {
+    li {
+      list-style:none;
+      padding:0 15px 0 0;
+    }
+    
+    textarea {
+      height:100px;
+      width:100%;
+    }
   }
 }
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whoops
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Daniel Higginbotham
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-15 00:00:00 -04:00
+date: 2011-07-03 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -254,6 +254,7 @@ files:
 - app/models/whoops/event.rb
 - app/models/whoops/event_group.rb
 - app/models/whoops/filter.rb
+- app/models/whoops/search_parser.rb
 - app/views/event_groups/_list.html.haml
 - app/views/event_groups/index.html.haml
 - app/views/events/_detail.html.haml
@@ -298,13 +299,13 @@ files:
 - 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/application.js
 - 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