mongo3 0.0.9 → 0.1.0

data/.bnignore

@@ -0,0 +1,3 @@
+*.log
+*.psd
+.git

data/.bnsignore

@@ -0,0 +1,16 @@
+# The list of files that should be ignored by Mr Bones.
+# Lines that start with '#' are comments.
+#
+# A .gitignore file can be used instead by setting it as the ignore
+# file in your Rakefile:
+#
+#   PROJ.ignore_file = '.gitignore'
+#
+# For a project with a C extension, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+announcement.txt
+coverage
+doc
+pkg

data/.gitignore

@@ -0,0 +1 @@
+*.psd

data/HISTORY

@@ -26,4 +26,14 @@
   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 ( Tx Tyler !).
+  o More tests
+  o Improved browser support for saf and chrome - sorry don't do windoze ;-(

data/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
 

data/bin/mongo3

@@ -33,20 +33,21 @@ Main {
       puts "\n"*2  
       puts ">>> Opening console..."
       puts "\n"*2
-      open( "http://localhost:6666/explore" )
+      open( "http://localhost:#{default_port}/explore" )
     end
     
     # Clearing args for franky!
     ARGV.clear
     require 'sinatra'    
     require File.join(File.dirname(__FILE__), %w[.. lib app.rb])
-    Sinatra::Application.run! :port => 6666, :environment => 'production'
+    Sinatra::Application.run! :port => default_port, :environment => 'production'
   end
   
+  # default port
+  def default_port() 6663; end
+  
   # sleepy time...
-  def sleep_time
-    3
-  end
+  def sleep_time() 3; end
   
   # open console...
   def open(path)
@@ -73,4 +74,4 @@ Main {
     end
     opts
   end  
-}
+}

data/config/mongo3.yml

@@ -0,0 +1,33 @@
+development:
+  host: localhost
+  port: 27017
+  
+beta:
+  host:     dev8
+  port:     27018
+  user:     "blee"
+  password: "fred"
+      
+# production:
+#   :host:     dev8
+#   :port:     27018
+#   :user:     "blee"
+#   :password: "fred"
+#   
+# serv1:
+#   :host:     dev8
+#   :port:     27018
+#   :user:     "blee"
+#   :password: "fred"  
+#   
+# serv2:
+#   :host:     dev8
+#   :port:     27018
+#   :user:     "blee"
+#   :password: "fred"    
+#   
+# serv3:
+#   :host:     dev8
+#   :port:     27018
+#   :user:     "blee"
+#   :password: "fred"

data/data/populate

@@ -0,0 +1,37 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'mongo'
+
+connection = Mongo::Connection.new( 'localhost', 27017 )
+
+db_name = "fernand_mdb"
+cltn_names = %w[blee bobo]
+
+
+db = connection.db( db_name )
+
+cltn_names.each do |cltn_name|
+  cltn = db.create_collection( cltn_name )
+  cltn.remove
+
+  20.times do |i|
+    row = { 
+      :name      => "#{cltn_name}_#{i}", 
+      :last_name => "#{db_name}.#{cltn_name}_#{i}", 
+      :array     => 10.times.to_a, 
+      :hash => { 
+        :blee => 5.times.to_a, 
+        :duh  => "Hello", 
+        :hash => { 
+          :duh => 10 
+        }
+      } 
+    }
+  puts "Inserting row #{row.inspect}" 
+    cltn.insert( row )
+  end
+
+  cltn = db[cltn_name]
+  puts ""
+  puts "Inserted `#{cltn.count} records in `#{cltn_name}"
+end

data/lib/controllers/collections.rb

@@ -3,6 +3,7 @@ require 'json'
 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 @@ module Collections
       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

data/lib/controllers/databases.rb

@@ -4,7 +4,18 @@ 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 
+      
     @cltns     = options.connection.paginate_db( path_names, page, 10 )
     @back_url  = "/explore/back"
     

data/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!" )
              
@@ -16,6 +16,9 @@ module Explore
 
   # -----------------------------------------------------------------------------
   get '/explore' do
+    session[:selected_cols] = nil
+    session[:query_params]  = nil
+    
     root   = options.connection.build_tree
     @root  = root.to_adjacencies
     @nodes = root.children
@@ -25,10 +28,6 @@ module Explore
 
     erb :'explore/explore'
   end
-
-  get "/fred/:duh" do
-    "Hello World #{params[:duh]}"
-  end
   
   # -----------------------------------------------------------------------------
   get '/explore/back' do  
@@ -51,7 +50,7 @@ module 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]
 
@@ -79,6 +78,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]

data/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)
@@ -22,9 +54,9 @@ module CollectionHelper
       elsif value.is_a?(Hash)
         buff = []
         value.each_pair { |k,v| buff << "#{k}:#{format_value(v)}"}
-        buff.join( "," )
+        buff.join( ", " )
       elsif value.is_a?(Array)
-        value.join(",")        
+        (value.empty? ? "[]" : value.join(", "))
       else
         value
       end        

data/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 )

data/lib/helpers/main_helper.rb

@@ -61,6 +61,11 @@ module MainHelper
     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 

data/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"

data/lib/mongo3/connection.rb

@@ -1,6 +1,8 @@
 require 'yaml'
 
 # BOZO !! Time to refact no?
+# TODO !! Arg check and errors
+# TODO !! Add logging
 module Mongo3
   class Connection
     
@@ -8,15 +10,7 @@ module Mongo3
       @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 @@ module Mongo3
 
     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 @@ module Mongo3
         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 @@ module Mongo3
         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 @@ module Mongo3
     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 @@ module Mongo3
         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 @@ module Mongo3
       # 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 @@ module Mongo3
       # 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

data/lib/mongo3/user.rb

@@ -8,19 +8,25 @@ module Mongo3
     # add a new user    
     def add( path, user_name, password )
       connect_for( path ) do |con|
-        admin_db  = con.db('admin')
-        user_cltn = admin_db[Mongo::DB::SYSTEM_USER_COLLECTION]        
+        user_cltn = users( con )
 
         row = { :user => user_name }        
         user = user_cltn.find_one( row )
         raise "User #{user_name} already exists!" if user
         
-        row[:pwd] = admin_db.send( :hash_password, user_name, password )
-        user_cltn.save( row )
+        row[:pwd] = user_cltn.db.send( :hash_password, user_name, password )
+        return user_cltn.save( row )
       end     
     end
     
+    def clear!( path )
+      connect_for( path ) do |con|
+        res = users( con ).remove( {} )
+      end            
+    end
+    
     def rename( zone, old_name, new_name )
+      raise "NYI"
     end
     
     def delete( path, id )

data/lib/mongo3/zone.rb

@@ -15,20 +15,31 @@ module Mongo3
       end
       
       # Connects to mongo given an zone
+      # BOZO !! Shit is dupped in connection. Fix it !!
       def connect_for( path, &block )
-        zone = zone_for_path( path )    
+        zone = zone_for_path( path )        
         info = config[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']
+
+        con = nil        
+        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'] )
-        end
-        yield con      
+          if info['user'] and info['password']
+            con.db( 'admin' ).authenticate( info['user'], info['password'] )
+          end
+        rescue => boom
+          raise "MongoDB connection failed for `#{info['host']}:#{info['post']}"
+        end        
+          
+        yield con        
         con.close()
       end
     
       # find zone matching the host and port combination
+      # BOZO !! Dupped in connection. Fix it !!
       def zone_for( host, port )
         config.each_pair do |zone, info|
           return zone if info['host'] == host and info['port'] == port.to_i
@@ -39,7 +50,12 @@ module Mongo3
       # 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

data/lib/mongo3.rb

@@ -1,9 +1,9 @@
 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::LIBPATH
+  PATH    = ::File.dirname(LIBPATH) + ::File::SEPARATOR                      unless defined? Mongo3::PATH
   # :startdoc:
 
   # Returns the version string for the library.
@@ -48,9 +48,6 @@ module Mongo3
 
     Dir.glob(search_me).sort.each {|rb| load rb}
   end
+end
 
-end  # module Mongo3
-
-Mongo3.require_all_libs_relative_to(__FILE__)
-
-# EOF
+Mongo3.require_all_libs_relative_to(__FILE__)