mongoid-colors 0.2 → 0.3

data/lib/mongoid-colors/colorizer.rb

@@ -33,10 +33,9 @@ module MongoidColors::Colorizer
       end
 
       line << case m[:operation]
-      when 'QUERY'  then 'QUERY '.colorize(:green)
-      when 'INSERT' then 'INSERT '.red
-      when 'UPDATE' then 'UPDATE '.red
-      else m[:operation].to_s
+      when /(QUERY|COUNT)/   then "#{m[:operation]} ".colorize(:green)
+      when /(INSERT|UPDATE|MODIFY)/ then "#{m[:operation]} ".red
+      else "#{m[:operation]} "
       end
 
       line << CodeRay.scan(m[:query], :ruby).term
@@ -51,7 +50,21 @@ module MongoidColors::Colorizer
     when /^MONGODB (.*)\['(.*)'\]\.(.*)$/
       {:database => $1, :collection => $2, :query => $3}
     when /^ *MOPED: (\S+:\S+) (\S+) +database=(\S+)( collection=(\S+))? (.*[^)])( \((.*)ms\))?$/
-      {:host => $1, :operation => $2, :database => $3, :collection => $5, :query => $6, :duration => $8}
+      res = {:host => $1, :operation => $2, :database => $3, :collection => $5, :query => $6, :duration => $8}
+      if res[:operation] == 'COMMAND'
+        command = eval(res[:query])
+        if command[:count]
+          res[:operation]  = 'COUNT'
+          res[:collection] = command.delete(:count)
+          res[:query]      = command.inspect
+        end
+        if command[:findAndModify]
+          res[:operation]  = 'FIND AND MODIFY'
+          res[:collection] = command.delete(:findAndModify)
+          res[:query]      = command.inspect
+        end
+      end
+      res
     when /which could negatively impact client-side performance/
     when /COMMAND.*getlasterror/
       :ignore

data/lib/mongoid-colors/version.rb

@@ -1,3 +1,3 @@
 module MongoidColors
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-colors
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -66,9 +66,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/mongoid-colors.rb
 - lib/mongoid-colors/colorizer.rb
 - lib/mongoid-colors/version.rb
+- lib/mongoid-colors.rb
 - README.md
 homepage: http://github.com/nviennot/rspec-console
 licenses: []
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Colorize your Mongoid traces