mongo3 0.0.4 → 0.0.5

data/lib/mongo3.rb

@@ -2,7 +2,7 @@
 module Mongo3
 
   # :stopdoc:
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
   PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
   # :startdoc:

data/lib/mongo3/connection.rb

@@ -5,15 +5,62 @@ module Mongo3
       @config_file = config_file
     end
 
-    def drop_db( path_names )
+    # drop a database using context and db name
+    def drop_database( path_names, db_name )
       path_name_tokens = path_names.split( "|" )
       env              = path_name_tokens[1]      
+      connect_for( env ) do |con|
+        con.drop_database( db_name )
+      end      
+    end
+    
+    def drop_db( path_names )
+      path_name_tokens = path_names.split( "|" )
+      env              = path_name_tokens[1]
       connect_for( env ) do |con|
         db_name   = path_name_tokens.pop
         con.drop_database( db_name )
       end
     end
 
+    def indexes_for( path_names )
+      path_name_tokens = path_names.split( "|" )
+      env              = path_name_tokens[1]
+      indexes          = {}
+      connect_for( env ) do |con|
+        cltn_name = path_name_tokens.pop
+        db_name   = path_name_tokens.pop
+        db        = con.db( db_name )
+        cltn      = db[cltn_name]
+        indexes   = cltn.index_information
+      end
+      indexes
+    end
+
+    def drop_index( path_names, index )
+      path_name_tokens = path_names.split( "|" )
+      env              = path_name_tokens[1]      
+      connect_for( env ) do |con|
+        cltn_name = path_name_tokens.pop
+        db_name   = path_name_tokens.pop
+        db        = con.db( db_name )
+        cltn      = db[cltn_name]
+        cltn.drop_index( index )
+      end
+    end
+    
+    def create_index( path_names, index, constraints )
+      path_name_tokens = path_names.split( "|" )
+      env              = path_name_tokens[1]      
+      connect_for( env ) do |con|
+        cltn_name = path_name_tokens.pop
+        db_name   = path_name_tokens.pop
+        db        = con.db( db_name )
+        cltn      = db[cltn_name]
+        cltn.create_index( index, constraints ? constraints['unique'] == 1 : false )
+      end      
+    end
+
     def drop_cltn( path_names )
       path_name_tokens = path_names.split( "|" )
       env              = path_name_tokens[1]      
@@ -75,7 +122,7 @@ module Mongo3
           # info[:links][:drop]   = "/databases/drop/"
           info[:size]        = to_mb( con.database_info[db_name] )
           info[:node]        = db.nodes
-          info[:collections] = db.collection_names.size
+          info[:collections] = collection_names( db ).size
           info[:error]       = db.error
           info[:last_status] = db.last_status
         end
@@ -104,7 +151,7 @@ module Mongo3
       connect_for( env ) do |con|
         db_name = path_name_tokens.pop
         db      = con.db( db_name )
-        cltn    = db.collection_names.sort
+        cltn    = collection_names(db).sort
         
         list = WillPaginate::Collection.create( page, per_page, cltn.size ) do |pager|
           offset = (page-1)*per_page
@@ -131,15 +178,17 @@ module Mongo3
         cltn_name = path_name_tokens.pop
         db_name   = path_name_tokens.pop
         db        = con.db( db_name )
-        cltn      = db[cltn_name]
+        cltn      = db[cltn_name]          
+        count     = cltn.find( query_params.first ).count
         
-        list = WillPaginate::Collection.create( page, per_page, cltn.count ) do |pager|
+        list = WillPaginate::Collection.create( page, per_page, count ) do |pager|
           offset = (page-1)*per_page
-          sort   = query_params.last.empty? ? [ ['_id', Mongo::DESCENDING] ] : query_params.last
-          pager.replace( cltn.find( query_params.first, 
+          sort   = query_params.last.empty? ? [ ['_id', Mongo::DESCENDING] ] : query_params.last        
+          results = cltn.find( query_params.first, 
             :sort  => sort,
             :skip  => offset, 
-            :limit => per_page ).to_a)
+            :limit => per_page ).to_a          
+          pager.replace( results )
         end        
       end
       list
@@ -177,26 +226,27 @@ module Mongo3
       config.each_pair do |env, info|
         node = Node.new( env, env, :dyna => true )
         root << node
-        if node.name == bm_env
-          connect_for( env ) do |con|      
-            count = 0
-            data  = { :dyna => true }
-            con.database_names.each do |db_name|
-              db      = con.db( db_name, :strict => true )
-              cltns   = db.collection_names.size  
-              db_node = Node.new( "#{env}_#{count}", "#{db_name}(#{cltns})", data.clone )
-              node << db_node
-              count += 1
-              if bm_db and db_node.name =~ /^#{bm_db}/
-                cltn_count = 0
-                data = { :dyna => false }
-                db.collection_names.each do |cltn_name|
-                  size = db[cltn_name].count
-                  cltn_node = Node.new( "#{db_name}_#{cltn_count}", "#{cltn_name}(#{size})", data.clone )
-                  db_node << cltn_node
-                  cltn_count += 1
-                end              
-              end
+        
+        next unless node.name == bm_env
+
+        connect_for( env ) do |con|      
+          count = 0
+          data  = { :dyna => true }
+          database_names( con ).each do |db_name|
+            db      = con.db( db_name, :strict => true )
+            cltns   = collection_names( db )  
+            db_node = Node.new( "#{env}_#{count}", "#{db_name}(#{cltns.size})", data.clone )
+            node << db_node
+            count += 1
+            if bm_db and db_node.name =~ /^#{bm_db}/
+              cltn_count = 0
+              data = { :dyna => false }
+              cltns.each do |cltn_name|
+                size = db[cltn_name].count
+                cltn_node = Node.new( "#{db_name}_#{cltn_count}", "#{cltn_name}(#{size})", data.clone )
+                db_node << cltn_node
+                cltn_count += 1
+              end              
             end
           end
         end
@@ -209,13 +259,13 @@ module Mongo3
       path_name_tokens = path_names.split( "|" )
       env              = path_name_tokens[1]      
             
-      if db_request?( path_name_tokens )
+      if db_request?( path_name_tokens )        
         sub_tree = build_db_tree( parent_id, env )
       else
         db_name  = path_name_tokens.last        
         sub_tree = build_cltn_tree( parent_id, env, db_name )
       end
-      sub_tree.to_adjacencies
+      sub_tree
     end
         
     # Connects to host and spews out all available dbs
@@ -230,9 +280,9 @@ module Mongo3
       
         count = 0
         data  = { :dyna => true }
-        con.database_names.each do |db_name|
+        database_names( con ).each do |db_name|
           db    = con.db( db_name, :strict => true )
-          cltns = db.collection_names.size  
+          cltns = collection_names( db ).size  
           node  = Node.new( "#{env}_#{count}", "#{db_name}(#{cltns})", data.clone )
           sub_root << node
           count += 1
@@ -254,7 +304,7 @@ module Mongo3
       
         count = 0
         data = { :dyna => false }
-        db.collection_names.each do |cltn_name|
+        collection_names( db ).each do |cltn_name|
           size = db[cltn_name].count
           node = Node.new( "#{db_name}_#{count}", "#{cltn_name}(#{size})", data.clone )
           sub_root << node
@@ -267,12 +317,23 @@ module Mongo3
     # =========================================================================
     private
       
+      def collection_names( db )
+        excludes = %w[system.indexes]
+        db.collection_names - excludes 
+      end
+      
+      # Filters out system dbs
+      def database_names( con )
+        excludes = %w[admin local slave]
+        con.database_names - excludes
+      end
+      
       # Connects to mongo given an environment
       # BOZO !! Auth... 
       def connect_for( env, &block )
         info = landscape[env]
         puts ">>> Connecting for #{env} -- #{info['host']}-#{info['port']}"
-        con = Mongo::Connection.new( info['host'], info['port'] )
+        con = Mongo::Connection.new( info['host'], info['port'], { :slave_ok => true } )
         
         if info['user'] and info['password']
           con.db( 'admin' ).authenticate( info['user'], info['password'] )

data/lib/mongo3/node.rb

@@ -1,14 +1,15 @@
 require 'json'
+require 'mongo/util/ordered_hash'
 
 module Mongo3
   class Node
     attr_accessor :oid, :name, :children, :data, :parent
     
-    def initialize( oid, name, data={} )
+    def initialize( oid, name, data=nil )
       @oid      = oid
       @name     = name
       @children = []
-      @data     = data || {}
+      @data     = data || OrderedHash.new
       @parent   = nil
     end
     
@@ -23,14 +24,18 @@ module Mongo3
       update_paths( new_one )
     end
 
-    def update_paths( node )
-      node.data[:path_names] = node.path( :name )
-      node.data[:path_ids]   = node.path( :oid )
-      node.children.each do |child|
-        child.update_paths( child )
+    def find( node_id )
+      _find( self, node_id )
+    end
+
+    def _find( node, node_id )      
+      return node if node.oid == node_id
+      unless node.children.empty?
+        node.children.each { |c| found = _find( c, node_id ); return found if found }
       end
-    end  
-      
+      nil
+    end
+          
     # convert a tree node to a set of adjacencies
     def to_adjacencies
       root_level = { :id => self.oid, :name => self.name, :data => self.data, :adjacencies => [] } 
@@ -42,27 +47,14 @@ module Mongo3
       cltn
     end
     
-    def path( accessor=:oid )
-      path = []
-      traverse( path, self, accessor )
-      path.reverse.join( "|" )
-    end
-    
-    def traverse( path, node, accessor )
-      path << node.send( accessor ).gsub( /\(\d+\)/, "" )
-      if node.parent
-        traverse( path, node.parent, accessor )
-      end
-    end
-    
     # converts to json
     def to_json(*a)
-      {
-        'id'         => oid,
-        'name'       => self.name,
-        'children'   => self.children,
-        'data'       => self.data
-      }.to_json(*a)
+      hash = OrderedHash.new
+      hash[:id]       = oid
+      hash[:name]     = self.name
+      hash[:children] = self.children
+      hash[:data]     = self.data 
+      hash.to_json(*a)
     end
 
     # Debug...
@@ -79,6 +71,29 @@ module Mongo3
         puts '  '*level + "%-#{20-level}s (%d) [%s] -- %s" % [adj[:id], adj[:adjacencies].size, adj[:name], (adj[:data] ? adj[:data].inspect : 'N/A' )]
       end
     end
+
+    # =========================================================================
+    private
+    
+      def update_paths( node )
+        node.data[:path_names] = node.send( :path, :name )
+        node.data[:path_ids]   = node.send( :path, :oid )
+        node.children.each do |child|
+          child.send( :update_paths, child )
+        end
+      end  
+          
+      def path( accessor=:oid )
+        path = []
+        traverse( path, self, accessor )
+        path.reverse.join( "|" )
+      end
     
+      def traverse( path, node, accessor )
+        path << node.send( accessor ).to_s.gsub( /\(\d+\)/, "" )
+        if node.parent
+          traverse( path, node.parent, accessor )
+        end
+      end 
   end
 end

data/lib/public/stylesheets/mongo3.css

@@ -19,16 +19,24 @@ body {
   margin:           0;
 }
 
+img {
+  border:         none;
+  vertical-align: text-top;
+}
+
+/* Flash */
 div.flash {
   display:                        none;
+  width:                          95%;
   padding:                        10px;
-  font-size:                      .8em;
+  margin:                         20px 0 0px 300px;
+  font-size:                      .5em;
   color:                          #fff;
   border:                         1px #92b948 solid;
-  -moz-border-radius-bottomleft:  0px;
-  -moz-border-radius-topleft:     20px;
-  -moz-border-radius-bottomright: 20px;
-  -moz-border-radius-topright:    0px;  
+  -moz-border-radius-bottomleft:  20px;
+  -moz-border-radius-topleft:     0px;
+  -moz-border-radius-bottomright: 0px;
+  -moz-border-radius-topright:    20px;  
 }
 div.flash_error {
   color:  #f00;  
@@ -45,10 +53,6 @@ div.flash_info {
   overflow:      none;
 }
 
-span#log {
-  color: #ff9d2a;
-}
-
 div#logo {
   float:         left;
   width:         45%;
@@ -117,28 +121,6 @@ p.title span{
 /* ---------------------------------------------------------------------------- */
 /* Common */
 
-div.item {
-  border-top: 1px #1c1c1c solid;
-  padding:    10px 0px 0px 0px;
-  height:     100px;
-  clear:      both;
-  width:      100%;
-}
-
-div.item .tag {
-  float:left;
-}
-
-div.item .lock {
-  float: right;
-  width: 5%;
-  color: #434343;
-}
-
-div.selected {
-  background: transparent url(/images/li_select.png) repeat-x;
-  cursor: pointer;
-}
 ul.host_info {
   font-size: 0.5em;
   color:     #c1c1c1;
@@ -146,7 +128,7 @@ ul.host_info {
 }
 span {
   color:     #c1c1c1;
-  font-size: 0.5em;
+  font-size: 1.0em;
 }
 p.heading {
   width: 80%;
@@ -168,11 +150,6 @@ div#details {
   font-size:                      0.5em;
   color:                          #fff;
   background:                     #1c1c1c;
-  border:                         1px #92b948 solid;
-  -moz-border-radius-bottomleft:  7px;
-  -moz-border-radius-topleft:     7px;
-  -moz-border-radius-bottomright: 7px;
-  -moz-border-radius-topright:    7px;  
 }
 
 .overlay {
@@ -183,10 +160,6 @@ div#details {
   color:                          #fff;
   width:                          650px;
   min-height:                     400px;
-  -moz-border-radius-bottomleft:  7px;
-  -moz-border-radius-topleft:     7px;
-  -moz-border-radius-bottomright: 7px;
-  -moz-border-radius-topright:    7px;  
   -moz-box-shadow:                0 0 90px 5px #000;
   -webkit-box-shadow:             0 0 90px #000;
 } 
@@ -206,50 +179,55 @@ div#details {
 div.scrollable { 
   position:  relative; 
   overflow:  hidden; 
-  height:    440px; 
+  height:    445px; 
+  width:     255px;
 } 
- 
-div.scrollable div.items { 
-  width:800px;
-  position:absolute;  
-  height:20000em; 
+div.scrollable div.items {
+  width:    255px;
+  position: absolute;  
+  height:   20000em; 
 }
 
 #actions {
-	width:800px;
-	margin:30px 0 10px 0;	
+  font-size: 0.5em;
+  width:     255px;
+  height:    15px;
+	margin:    7px 0 1px 0;	
 }
-
 #actions a {
 	font-size:       0.6em;
 	text-decoration: none;
 	cursor:          pointer;
 	color:           #c1c1c1;
 }
-
 #actions a:hover {
 	text-decoration: underline;
 	color:           #92b948;
 }
-
 .disabled {
 	visibility:hidden;		
 }
-
 .nextPage {
 	float:right;
 }	
 
+/* Commons */
+div.borders {
+  -moz-border-radius-bottomleft:      7px;
+  -moz-border-radius-topleft:         7px;
+  -moz-border-radius-bottomright:     7px;
+  -moz-border-radius-topright:        7px;  
+  -webkit-border-top-left-radius:     7px;
+  -webkit-border-top-right-radius:    7px;
+  -webkit-border-bottom-right-radius: 7px;
+  -webkit-border-bottom-left-radius:  7px;
+  border:                             1px #92b948 solid;  
+}
 
 /* Explorer css */
 div#landscape {
   width:                          615px;
   height:                         550px;
-  -moz-border-radius-bottomleft:  7px;
-  -moz-border-radius-topleft:     7px;
-  -moz-border-radius-bottomright: 7px;
-  -moz-border-radius-topright:    7px;  
-  border:                         1px #92b948 solid;
   float:                          left;
 }
 
@@ -258,11 +236,6 @@ div#right {
   padding:                        10px;
   width:                          254px;
   height:                         530px;
-  -moz-border-radius-bottomleft:  7px;
-  -moz-border-radius-topleft:     7px;
-  -moz-border-radius-bottomright: 7px;
-  -moz-border-radius-topright:    7px;  
-  border:                         1px #92b948 solid;
 }
 
 
@@ -333,13 +306,16 @@ fieldset.check {
   width:  20%;
 }
 
+p.ctx {
+  font-size:  0.7em;
+  text-align: right;
+}
+p.ctx span {
+  color: #92b948;
+} 
+
 div.table {
-  padding:                        10px;
-  -moz-border-radius-bottomleft:  7px;
-  -moz-border-radius-topleft:     7px;
-  -moz-border-radius-bottomright: 7px;
-  -moz-border-radius-topright:    7px;  
-  border:                         1px #92b948 solid;    
+/*  padding: 10px;*/
 }
 
 table.cltn {
@@ -371,18 +347,37 @@ div.cltn div#links {
   text-align: center;
 }
 
+/* Indexes... */
+div#indexes {
+  margin: 10px 0px;
+}
+fieldset.sep {
+  margin-top: 10px;
+  padding:    0 0 0 20px;
+  border-top: 1px #434343 solid;
+}
+fieldset.sep legend {
+  color:     #fff;
+  padding:   0 5px;
+  font-size: 1.2em;
+}
+img.del_index {
+  display:none;
+}
+
 input.search {
-  background:                     #fff url(/images/search.png) no-repeat 2px 6px;  
-  width:                          80%;
+  background:                     transparent url(/images/search.png) no-repeat 2px 6px;  
+  width:                          96%;
   border:                         2px #434343 solid;
-  -moz-border-radius-bottomleft:  5px;
-  -moz-border-radius-bottomright: 5px;
-  -moz-border-radius-topleft:     5px;
-  -moz-border-radius-topright:    5px;   
+  -moz-border-radius-bottomleft:  0px;
+  -moz-border-radius-bottomright: 10px;
+  -moz-border-radius-topleft:     10px;
+  -moz-border-radius-topright:    0px;
   height:                         25px;
   font-size:                      1.2em;
-  color:                          #434343;
+  color:                          #92b948;
   padding:                        5px 0px 0px 20px;
+  margin:                         5px 5px;
 }
 
 button {
@@ -451,6 +446,7 @@ img.wait {
 }
 
 .modal {
+  font-size:             0.6em;
 	background-color:      #212021;
 	display:               none;
 	width:                 350px;
@@ -463,3 +459,18 @@ img.wait {
 	-moz-box-shadow:       0 0 20px #92b948;
 	-webkit-box-shadow:    0 0 20px #92b948;
 }
+
+/* Node details */
+div#wrap {
+  font-size: 0.7em;
+}
+
+/* Node info */
+span#log {
+  color:     #92b948;
+  font-size: 0.5em;
+}
+
+div#info {
+  min-height: 520px;
+}