peek-moped 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 369c744aee19789cf792762afa4fac026e5ba2dc
-  data.tar.gz: 36ca6957eaba5af6e0fa375830b03236ef5b5f9e
+  metadata.gz: 16afba790704ccf8ea686a6bda3730ab0f46cc28
+  data.tar.gz: 3d23cd27ebfc284231d4d3c6484b4826fb2e2fba
 SHA512:
-  metadata.gz: 2146688d83c31c693cd1e84cc2814f090109c83bf3c8c0c1519b19d983fd3784ad5ba3baedcf29741b6fd8c61f6ea0976aebf4f384aa390f21a7d436b2caceed
-  data.tar.gz: b7a40c9aad76f2b646dce34f1030f9989a97158fd08a90dfd865baa56c78676543bb5a0c2e8e129b6275cfee453523b18cf5723de2b328ab5337f3856b95c123
+  metadata.gz: 9f184e562257ca7782c9beca93d32cbe49f7dfacee9b81e57f0483ca89e5b86a3025fa4bfb567ecfe2d9afad6a53594566aa5bb04024841f7c48d799379f8892
+  data.tar.gz: 66018e2664b1e0e9fa5a5bad36789d42778c36fa2a13c34d0d4d6dfbba14d634a5936a89f4343c8642fac25b7071d4cdcde80f16cbbf9077f791b8d2dca9a556

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# 1.0.2
+
+- Write ObjectId in mongodb query format (previously was in binary)
+- Replace $cmd on proper command name which sending to Mongo
+- Colorize and write system DB in collection names
+
 # 1.0.1
 
 - Clearify collection names

data/README.md

@@ -2,6 +2,8 @@
 
 Take a peek into the Mongoid and Moped commands made within your Rails application.
 
+![Preview](/screenshot.png)
+
 Things this peek view provides:
 
 - Total number of Mongo commands called during the request

data/app/views/peek/views/_moped.html.erb

@@ -21,7 +21,7 @@
     font-weight: bold;
   }
   .peek-moped-query-details, .peek-moped-query-stack {
-      display: none;
+    display: none;
   }
   .peek-moped-query-opened {
     background-color: #FFFFE0;
@@ -40,6 +40,10 @@
     position:absolute;
     background-color: #ffffff;
   }
+  .peek-moped-system-db {
+    font-style: italic;
+    color: darkred;
+  }
 </style>
 <div id="moped_queries_log">
     <table cellpadding="3" id="peek-moped-table">
@@ -55,9 +59,11 @@
               <% code_desc = view.op_code_info cmd.op_code %>
               <span class="peek-moped-code" title="<%= code_desc[1] %>"><%= code_desc[0] %></span>
               <a href="#" onclick="$(this).closest('div').toggleClass('peek-moped-query-opened'); return false;">
-                <%= view.cmd_collection_name cmd %>
+                <%= raw view.cmd_collection_name cmd %>
               </a>
-              <div class="peek-moped-query-details"><%= cmd.to_yaml %></div>
+              <div class="peek-moped-query-details"><%=
+                cmd.to_yaml.gsub(/\!ruby\/object\:Moped\:\:BSON\:\:ObjectId\s*raw_data:.*\n\s*([^\n]*)/) {|capture| "ObjectId(\"#{$1.unpack("m")[0].unpack("H*")[0].force_encoding(Moped::BSON::UTF8_ENCODING)}\")"}
+              %></div>
               <div class="peek-moped-query-stack"><b>APP STACK:</b><%= "\n#{row[3].join("\n")}" %></div>
             </div>
           <% end %>

data/lib/peek/views/moped.rb

@@ -55,17 +55,35 @@ module Peek
       end
 
       def cmd_collection_name cmd
+        if %w(admin config local).include? cmd.database
+          name = "<span class=\"peek-moped-system-db\">#{cmd.database}</span>."
+        else
+          name = ''
+        end
+
         if cmd.collection == '$cmd'
           if cmd.selector.has_key? :getlasterror
-            'getLastError()'
+            name << 'getLastError()'
           elsif cmd.selector.has_key? :count
-            "#{cmd.selector[:count]}.count()"
+            name << "#{cmd.selector[:count]}.count()"
+          elsif cmd.selector.has_key? :aggregate
+            name << "#{cmd.selector[:aggregate]}.aggregate(#{cmd.selector[:pipeline].map{|p| p.keys}.flatten.join(', ')})"
+          elsif cmd.selector.has_key? :mapreduce
+            name << "#{cmd.selector[:mapreduce]}.mapReduce(#{cmd.selector[:out].to_s})"
+          elsif cmd.selector.has_key? :findAndModify
+            name << "#{cmd.selector[:findAndModify]}.findAndModify()"
+          elsif cmd.selector.has_key? :geoNear
+            name << "#{cmd.selector[:geoNear]}.geoNear()"
+          elsif cmd.selector.has_key? :ismaster
+            name << "isMaster()"
           else
-            '$cmd'
+            name << '$cmd'
           end
         else
-          cmd.collection
+          name << cmd.collection
         end
+
+        name
       end
 
       def formatted_duration

data/lib/peek-moped/version.rb

@@ -1,5 +1,5 @@
 module Peek
   module Moped
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: peek-moped
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Pavel Chertorogov
@@ -72,6 +72,7 @@ files:
 - lib/peek-moped/version.rb
 - lib/peek/views/moped.rb
 - peek-moped.gemspec
+- screenshot.png
 homepage: https://github.com/nodkz/peek-moped
 licenses: []
 metadata: {}