V1.0.1 - added support for embedded docs. improved nav

Author: derailed

Diff for: HISTORY

@@ -26,4 +26,13 @@
   o Added user administration - should be able to crub users on zone now
   o Added mongo based session store using mongo_rack. (Per Kyle's suggestion! ). This is now the default session store.
     You can alternatively still use memcache ( see README for instructions )
-  o Bug fixes and some cleanup
+  o Bug fixes and some cleanup
+  
+0.0.8 - Bug fixes and clean up
+
+0.0.9 - Bug fixes and clean up
+
+0.1.0 - Big improvements! 
+  o Added better support for docs and embedded docs.
+  o Change navigation to make it easier to drilldown.
+  o More tests

Diff for: README.rdoc

@@ -34,8 +34,10 @@
 * CRUD on dbs, collections, indexes [done]
 * Administer users [done]
 * Collection rename
+* Database creation
 * Manage logs
 * Support for shards and replication
+* Add support for drilling down array and embedded documents [done]
 
 == DEPENDENCIES
 

Diff for: bin/mongo3

@@ -44,7 +44,7 @@ Main {
   end
 
   # default port
-  def default_port() 6666; end
+  def default_port() 6663; end
 
   # sleepy time...
   def sleep_time() 3; end
@@ -74,4 +74,4 @@ Main {
     end
     opts
   end  
-}
+}

Diff for: lib/app.rb

@@ -14,7 +14,7 @@
 # Configurations
 
 configure :production do
-  set :logging, false  
+  set :logging, true  
 end
 
 configure do

Diff for: lib/controllers/collections.rb

@@ -3,6 +3,7 @@
 module Collections
 
   # ---------------------------------------------------------------------------
+  # BOZO - Move to indexes ctrl
   post "/collections/create_index/" do
     json   = params[:index].gsub( /'/, "\"" )
     tokens = json.split( "|" )
@@ -34,7 +35,7 @@ module Collections
   # --------------------------------------------------------------------------- 
   # Paginate on a collection
   get "/collections/:page" do    
-    @back_url  = "/explore/back"
+    @back_url  = "/databases/1"
     @page      = params[:page].to_i || 1
 
     @indexes = options.connection.indexes_for( session[:path_names] )
@@ -46,9 +47,6 @@ module Collections
 
   # ---------------------------------------------------------------------------
   post "/collections/refresh/:page/" do
-    selected_cols = params[:cols].keys.sort    
-    session[:selected_cols] = selected_cols
-
     load_cltn( params[:page].to_i )
 
     erb :'collections/update.js', :layout => false
@@ -119,12 +117,6 @@ def load_cltn( page=1 )
       path_names     = session[:path_names]
 
       @cltn          = options.connection.paginate_cltn( path_names, query_params, @page, 15 )
-      @cols          = []
-      @selected_cols = []      
-      unless @cltn.empty?
-        @cols          = @cltn.first.keys.sort
-        @selected_cols = session[:selected_cols] || @cols[0...5]
-      end
     end
   end
 end

Diff for: lib/controllers/databases.rb

@@ -4,7 +4,19 @@ module Databases
   get "/databases/:page" do
     page       = params[:page].to_i || 1
     path_names = session[:path_names]
-          
+    tokens     = path_names.split( "|" )
+    
+    # Could be we have a cltn path. if so adjust for it
+    if tokens.size > 3
+      tokens.pop
+      session[:path_names] = tokens.join( "|") 
+      path_names           = session[:path_names]      
+      path_ids             = session[:path_ids].split( "|" )
+      path_ids.pop
+      session[:path_ids]   = path_ids.join( "|" )
+    end 
+      
+puts "DB PATH #{path_names.inspect}"
     @cltns     = options.connection.paginate_db( path_names, page, 10 )
     @back_url  = "/explore/back"
 

Diff for: lib/controllers/explore.rb

@@ -7,7 +7,7 @@ module Explore
     @node_id   = params[:db_id]
     db_name    = params[:db_name].gsub( /\(\d+\)/, '' )
 
-    options.connection.drop_database( session[:path_names], db_name )
+    options.connection.drop_db( "#{session[:path_names]}|#{db_name}" )
 
     flash_it!( :info, "Database `#{db_name} was dropped successfully!" )
 
@@ -43,14 +43,16 @@ module Explore
 
     crumbs_from_path( path_ids, path_names )
 
+puts "PATHS #{path_names} -- #{@node_id}"    
     @root  = options.connection.build_partial_tree( path_names )
+Mongo3::Node.dump( @root )    
     @nodes = @root.find( @node_id ).children
 
     erb :'explore/explore'
   end
 
   # -----------------------------------------------------------------------------
-  get '/explore/show/:path_ids/:path_names' do
+  get '/explore/info/:path_ids/:path_names' do
     path_ids   = params[:path_ids]
     path_names = params[:path_names]
 
@@ -78,6 +80,21 @@ module Explore
     erb :'explore/more_data_js', :layout => false
   end
 
+  # ---------------------------------------------------------------------------
+  get "/explore/show/:path_ids/:path_names" do
+    path_ids   = params[:path_ids]
+    path_names = params[:path_names]
+    
+    # crumbs_from_path( path_ids, path_names )
+    update_paths!( path_ids, path_names )
+
+    if cltn_path?( path_ids )
+      erb :'explore/load_collection.js', :layout => false
+    else
+      erb :'explore/load_database.js', :layout => false
+    end
+  end
+
   # -----------------------------------------------------------------------------
   get '/explore/update_crumb/:path_ids/:path_names' do
     path_ids   = params[:path_ids]

Diff for: lib/helpers/collection_helper.rb

@@ -15,6 +15,38 @@ module CollectionHelper
   helpers do
     include WillPaginate::ViewHelpers::Base   
 
+    def format_nodes( item, col )
+      buff = []
+      _format_nodes( buff, item, col )
+      buff.join( "\n" )
+    end
+    
+    def _format_nodes( buff, item, col=nil )
+      if item.is_a?( Array )
+        buff << "<li><ins style=\"background-position:-48px -16px\"></ins><span>#{col} <span class=\"meta\" style=\"color:#c1c1c1\">(#{item.size})</span></span>"
+        return buff if item.empty?
+        buff << "<ul>"
+        count = 0
+        item.each do |element|
+          _format_nodes( buff, element ) 
+          count += 1
+        end
+        buff << "</ul>"        
+        buff << "</li>"
+      elsif item.is_a?( Hash )
+        buff << "<li><ins style=\"background-position:-48px -16px\"></ins><span>#{col} (#{item.size})</span>"
+        return buff if item.empty?
+        buff << "<ul>"
+        item.each_pair do |key,val|
+          _format_nodes( buff, val, key ) 
+        end
+        buff << "</ul>"
+        buff << "</li>"
+      else
+        buff << "<li><ins></ins><span title=\"#{item.to_s}\">#{truncate(item.to_s,90)} <span class=\"meta\" style=\"color:#c1c1c1\">#{col ? "[#{col} - #{item.class}]" : "[#{item.class}]"}</span></span></li>"
+      end      
+    end
+    
     # Attempts to format an attribute to some human readable format
     def format_value( value )
       if value.is_a?( Fixnum)

Diff for: lib/helpers/explore_helper.rb

@@ -1,11 +1,6 @@
 module ExploreHelper 
 
   helpers do    
-
-    # looking at zone path?    
-    def zone_path?( path )
-      path.split( "|" ).size == 1
-    end
 
     # compute legend title
     def legend_title( path )

Diff for: lib/helpers/main_helper.rb

@@ -61,6 +61,11 @@ def display_info( info )
     end
 
     def partial( page, options={} )
+      if object = options.delete(:object)        
+        template = page.to_s.split("/").last
+        options.merge!( :locals => { template.to_sym => object } )
+      end
+      
       if page.to_s.index( /\// )
         page = page.to_s.gsub( /\//, '/_' ) 
       else 

Diff for: lib/helpers/paths_helper.rb

@@ -1,6 +1,21 @@
 module PathHelper
   helpers do
 
+    # looking at zone path?    
+    def zone_path?( path )
+      path.split( "|" ).size == 1
+    end
+
+    # looking at db path?    
+    def db_path?( path )
+      path.split( "|" ).size == 3
+    end
+
+    # looking at cltn path?
+    def cltn_path?( path )
+      path.split( "|" ).size == 4
+    end
+    
     def reset_paths!
       session[:path_ids]   = "home"
       session[:path_names] = "home"

Diff for: lib/mongo3.rb

@@ -1,7 +1,7 @@
 module Mongo3
 
   # :stopdoc:
-  VERSION = '0.0.9'                                                          unless defined? Mongo3::VERSION
+  VERSION = '0.1.0'                                                          unless defined? Mongo3::VERSION
   LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR unless defined? Mongo3::LIBPATH
   PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR                      unless defined? Mongo3::PATH
   # :startdoc:

Diff for: lib/mongo3/connection.rb

@@ -1,22 +1,16 @@
 require 'yaml'
 
 # BOZO !! Time to refact no?
+# TODO !! Arg check and errors
+# TODO !! Add logging
 module Mongo3
   class Connection
 
     def initialize( config_file )
       @config_file = config_file
     end
 
-    # drop a database using context and db name
-    def drop_database( path_names, db_name )
-      path_name_tokens = path_names.split( "|" )
-      zone              = path_name_tokens[1]      
-      connect_for( zone ) do |con|
-        con.drop_database( db_name )
-      end      
-    end
-    
+    # drop a db using a db path    
     def drop_db( path_names )
       path_name_tokens = path_names.split( "|" )
       zone              = path_name_tokens[1]
@@ -42,12 +36,12 @@ def indexes_for( path_names )
 
     def drop_index( path_names, index )
       path_name_tokens = path_names.split( "|" )
-      zone              = path_name_tokens[1]      
+      zone              = path_name_tokens[1]
       connect_for( zone ) do |con|
         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]        
         cltn.drop_index( index )
       end
     end
@@ -84,7 +78,7 @@ def clear_cltn( path_names )
         db_name   = path_name_tokens.pop
         db        = con.db( db_name )
         cltn      = db[cltn_name]
-        cltn.remove
+        cltn.remove( {} )
       end
     end
 
@@ -96,7 +90,7 @@ def delete_row( path_names, id )
         db_name   = path_name_tokens.pop
         db        = con.db( db_name )
         cltn      = db[cltn_name]
-        cltn.remove( {:_id => Mongo::ObjectID.from_string(id) } )
+        res = cltn.remove( {:_id => Mongo::ObjectID.from_string(id) } )
       end
     end
 
@@ -150,7 +144,7 @@ def show( path_names )
     end
 
     def paginate_db( path_names, page=1, per_page=10 )
-      path_name_tokens = path_names.split( "|" )
+      path_name_tokens = path_names.split( "|" )      
       zone              = path_name_tokens[1]
       list             = nil
       connect_for( zone ) do |con|
@@ -189,7 +183,15 @@ def paginate_cltn( path_names, query_params=[{},[]], page=1, per_page=10 )
         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
-          results = cltn.find( query_params.first, 
+          query  = query_params.first
+          
+          # Scan for regexes...
+          query.each_pair do |k,v|
+            if v.is_a?( String ) and v.index( /^\// )
+              query[k] = Regexp.new( v.gsub( "/", '' ) )
+            end
+          end
+          results = cltn.find( query, 
             :sort  => sort,
             :skip  => offset, 
             :limit => per_page ).to_a          
@@ -398,14 +400,23 @@ def database_names( con )
       # Connects to mongo given an zone
       def connect_for( zone, &block )
         info = landscape[zone]
-        # puts ">>> Connecting for #{zone} -- #{info['host']}-#{info['port']}"
-        con = Mongo::Connection.new( info['host'], info['port'], { :slave_ok => true } )
+        raise "Unable to find zone info in config file for zone `#{zone}" unless info
+        raise "Check your config. Unable to find `host information" unless info['host']
+        raise "Check your config. Unable to find `port information" unless info['port']
+        
+        begin
+          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'] )
+          if info['user'] and info['password']
+            con.db( 'admin' ).authenticate( info['user'], info['password'] )
+          end
+          yield con        
+          con.close()
+        rescue => boom
+          # puts boom
+          # puts boom.backtrace.each {|l| puts l }          
+          raise "MongoDB connection failed for `#{info['host'].inspect}:#{info['port'].inspect}"
         end
-        yield con        
-        con.close()
       end
 
       # db request occurs within dist 2
@@ -461,10 +472,14 @@ def slave_zone?( tokens )
       # Initialize the mongo installation landscape
       def config
         unless @config
-          @config = YAML.load_file( @config_file )
+          begin
+            @config = YAML.load_file( @config_file )
+          rescue => boom
+            @config = nil
+            raise "Unable to grok yaml landscape file. #{boom}"
+          end
         end
         @config
-      end
-            
+      end            
   end
 end