mongo3 0.0.2 → 0.0.3

data/HISTORY

@@ -1,2 +1,8 @@
 0.0.1 - Initial Drop
-  not much there yet...
+  not much there yet...
+0.0.2 - 
+  Added mongo auth
+  Added collection/db views
+0.0.3 -
+  Added collection crud
+  Refactored view code

data/data/populate

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+require 'rubygems'
+require 'mongo'
+
+connection = Mongo::Connection.new( 'localhost', 27018 )
+db = connection.db( 'admin' )
+db.authenticate( 'admin', 'admin')
+
+db = connection.db( 'fernand' )
+cltn = db.create_collection( "blee" )
+cltn.remove
+
+10.times do |i|
+  row = { :name => "fred_#{i}", :last_name => "Blee_#{i}" }
+puts "Inserting row #{row.inspect}"  
+  cltn.insert( row )
+end
+
+cltn = db["fred"]
+puts "Inserted `#{cltn.count} records"

data/lib/controllers/collections.rb

@@ -4,55 +4,96 @@ module Collections
   
   # --------------------------------------------------------------------------- 
   # Paginate on a collection
-  get "/cltn/:page" do
+  get "/collections/:page" do
     @back_url  = "/explore/back"
     @page      = params[:page].to_i || 1
     @title     = title_for( session[:path_names] )
     
     load_cltn( params[:page].to_i )
-    erb :cltn_list
+    erb :'collections/list'
   end  
   
   # ---------------------------------------------------------------------------
-  post "/cltn_refresh/:page" do
+  post "/collections/refresh/:page/" do
     selected_cols = params[:cols].keys.sort    
     session[:selected_cols] = selected_cols
 
     load_cltn( params[:page].to_i )
         
-    erb :cltn_update_js, :layout => false
+    erb :'collections/update.js', :layout => false
   end
   
   # ---------------------------------------------------------------------------
   # BOZO !! Validation....
-  post "/cltn_search" do
-    json = params[:search].gsub( /'/, "\"" )    
+  post "/collections/search/" do
+    json = params[:search].gsub( /'/, "\"" )
     if json.empty?
       @query = {}
       @sort  = {}
     else
-      tokens = json.split( "|" )      
-      @query = JSON.parse( tokens.shift )
-      @sort  = tokens.empty? ? [] : JSON.parse( tokens.first )    
+      tokens = json.split( "|" )
+      begin
+        @query = JSON.parse( tokens.shift )
+        @sort  = tokens.empty? ? [] : JSON.parse( tokens.first )
+      rescue => boom        
+        flash_it!( :error, boom )
+        return erb(:'shared/flash.js', :layout => false)
+      end
     end
     session[:query_params] = [@query, @sort]
     
     load_cltn
-    erb :cltn_update_js, :layout => false
+    erb :'collections/update.js', :layout => false
   end
 
+  post '/collections/delete/' do
+    path_names = session[:path_names]
+    options.connection.delete_row( path_names, params[:id] )
+    load_cltn
+    erb :'collections/update.js', :layout => false    
+  end
+
+  get '/collections/clear/' do
+    path_names = session[:path_names]
+    options.connection.clear_cltn( path_names )
+    load_cltn
+    
+    flash_it!( :info, "Collection #{path_names.split('|').last} was cleared successfully!" )
+    erb :'collections/results.js', :layout => false    
+  end
+
+  get '/collections/drop/' do
+    path_names = session[:path_names]
+    options.connection.drop_cltn( path_names )
+    load_cltn
+    
+    flash_it!( :info, "Collection #{path_names.split('|').last} was dropped successfully!" )        
+    erb :'collections/results.js', :layout => false    
+  end
+  
   # ===========================================================================
   helpers do    
     def load_cltn( page=1 )
       query_params   = session[:query_params] || [{},[]]
-      @query         = [query_params.first.to_json, query_params.last.to_json].join(",")
+      
+      if query_params.first.empty? and query_params.last.empty?
+        @query = nil
+      else  
+        @query = [query_params.first.to_json, query_params.last.to_json].join( " | " )
+        @query.gsub!( /\"/, "'" )
+      end
+puts "QUERY #{@query.inspect}"      
       @page          = page
       path_names     = session[:path_names]
       path_ids       = session[:path_ids]
       
       @cltn          = options.connection.paginate_cltn( path_names, query_params, @page, 15 )
-      @cols          = @cltn.first.keys.sort
-      @selected_cols = session[:selected_cols] || @cols[0...5]
+      @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

@@ -1,7 +1,7 @@
 module Databases
   
   # ---------------------------------------------------------------------------  
-  get "/db/:page" do
+  get "/databases/:page" do
     page       = params[:page].to_i || 1
     path_ids   = session[:path_ids]
     path_names = session[:path_names]
@@ -10,7 +10,7 @@ module Databases
     @title     = title_for( path_names )    
     @back_url  = "/explore/back"
     
-    erb :db_list
+    erb :'databases/list'
   end  
   
 end

data/lib/controllers/explore.rb

@@ -4,8 +4,7 @@ module Explore
   get '/explore' do
     reset_crumbs!
     @root = options.connection.build_tree
-Mongo3::Node.dump( @root )
-    erb :explore
+    erb :'explore/explore'
   end
 
   # -----------------------------------------------------------------------------
@@ -21,12 +20,11 @@ Mongo3::Node.dump( @root )
     crumbs_from_path( path_ids, path_names )
     
     @root = options.connection.build_partial_tree( path_ids, path_names )
-# Mongo3::Node.dump( @root )
     
     # need to adjust crumbs in case something got blown...
     @center = path_ids.split( "|" ).last
      
-    erb :explore
+    erb :'explore/explore'
   end
   
   # -----------------------------------------------------------------------------
@@ -39,7 +37,7 @@ Mongo3::Node.dump( @root )
     session[:path_ids]   = path_ids
     session[:path_names] = path_names
     
-    partial :info
+    partial :'explore/info'
   end
   
   # -----------------------------------------------------------------------------
@@ -53,25 +51,22 @@ Mongo3::Node.dump( @root )
     crumbs_from_path( path_ids, path_names )    
     
     @sub_tree = options.connection.build_sub_tree( path_ids, path_names )
-# Mongo3::Node.dump_adj( @sub_tree )
     @node_id  = @sub_tree.first[:id]
     
-    erb :more_data_js, :layout => false
+    erb :'explore/more_data_js', :layout => false
   end
 
   # -----------------------------------------------------------------------------
   get '/explore/update_crumb/:path/:crumbs' do
     crumbs_from_path( params[:path], params[:crumbs] )
-    erb :update_crumb_js, :layout => false
+    erb :'explore/update_crumb_js', :layout => false
   end
   
   # -----------------------------------------------------------------------------  
   get '/explore/center/:node_id' do
-    @node_id = params[:node_id]  
-      
-    pop_crumb!( @node_id )
-    
-    erb :center_js, :layout => false
+    @node_id = params[:node_id]        
+    pop_crumb!( @node_id )    
+    erb :'explore/center_js', :layout => false
   end
       
 end

data/lib/helpers/flash_helper.rb

@@ -0,0 +1,9 @@
+module FlashHelper
+ helpers do
+   
+   def flash_it!( type, msg )
+     @flash = session[:flash] || OrderedHash.new
+     @flash[type] = msg
+   end
+ end
+end

data/lib/helpers/main_helper.rb

@@ -1,18 +1,17 @@
-module MainHelper
-
-  JS_ESCAPE_MAP = 
-  {
-    '\\'    => '\\\\',
-    '</'    => '<\/',
-    "\r\n"  => '\n',
-    "\n"    => '\n',
-    "\r"    => '\n',
-    '"'     => '\\"',
-    "'"     => "\\'" 
-  }
-  
+module MainHelper  
  helpers do   
    
+    def align_for( value )
+      return "right" if value.is_a?(Fixnum)
+      "left"
+    end
+    
+    # Add thousand markers
+    def format_number( value )      
+      return value.to_s.gsub(/(\d)(?=\d{3}+(\.\d*)?$)/, '\1,') if value.instance_of?(Fixnum)
+      value
+    end
+   
     def back_paths!
       path_ids   = session[:path_ids]
       path_names = session[:path_names]
@@ -40,27 +39,40 @@ module MainHelper
       return info if info.is_a?( String )
       if info.is_a?( Hash )
         @info = info
-        partial :dump_hash
+        partial :'explore/dump_hash'
       elsif info.is_a?( Array )
         @info = info
-        partial :dump_array
+        partial :'explore/dump_array'
       else
-        info
+        format_number( info )
       end
     end
     
     def partial( page, options={} )
-      erb "_#{page}".to_sym, options.merge!( :layout => false )
+      if page.to_s.index( /\// )
+        page = page.to_s.gsub( /\//, '/_' ) 
+      else 
+        page = "_" + page.to_s
+      end
+      erb page.to_sym, options.merge!( :layout => false )
     end
    
+    JS_ESCAPE_MAP = 
+    {
+      '\\'    => '\\\\',
+      '</'    => '<\/',
+      "\r\n"  => '\n',
+      "\n"    => '\n',
+      "\r"    => '\n',
+      '"'     => '\\"',
+      "'"     => "\\'" 
+    }   
     def escape_javascript(javascript)
       if javascript
          javascript.gsub(/(\\|<\/|\r\n|[\n\r"'])/) { JS_ESCAPE_MAP[$1] }
       else
          ''
       end
-    end
-    
-  end
-  
+    end    
+  end  
 end

data/lib/mongo3/connection.rb

@@ -4,7 +4,43 @@ module Mongo3
     def initialize( config_file )
       @config_file = config_file
     end
-            
+
+    def drop_cltn( path_names )
+      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
+      end
+    end
+
+    def clear_cltn( path_names )
+      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.remove
+      end
+    end
+           
+    def delete_row( path_names, id )
+      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.remove( {:_id => Mongo::ObjectID.from_string(id) } )
+      end
+    end
+     
     def show( path_names )
       path_name_tokens = path_names.split( "|" )
       info             = OrderedHash.new
@@ -24,7 +60,7 @@ module Mongo3
         db_name = path_name_tokens.pop
         connect_for( env ) do |con|          
           db = con.db( db_name )
-          info[:edit]        = "/db/1"
+          info[:edit]        = "/databases/1"
           info[:size]        = to_mb( con.database_info[db_name] )
           info[:node]        = db.nodes
           info[:collections] = db.collection_names.size
@@ -39,7 +75,7 @@ module Mongo3
           cltn    = db[cltn_name]
           indexes = db.index_information( cltn_name )
           
-          info[:edit]    = "/cltn/1"
+          info[:edit]    = "/collections/1"
           info[:size]    = cltn.count
           info[:indexes] = format_indexes( indexes ) if indexes and !indexes.empty?
         end
@@ -219,7 +255,7 @@ module Mongo3
         
     # =========================================================================
     private
-
+      
       # Connects to mongo given an environment
       # BOZO !! Auth... 
       def connect_for( env, &block )

data/lib/mongo3.rb

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

data/lib/public/javascripts/jquery.confirm.js

@@ -0,0 +1,132 @@
+/**
+ * Confirm plugin 1.2
+ *
+ * Copyright (c) 2007 Nadia Alramli (http://nadiana.com/)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ */
+
+/**
+ * For more docs and examples visit:
+ * http://nadiana.com/jquery-confirm-plugin
+ * For comments, suggestions or bug reporting,
+ * email me at: http://nadiana.com/contact/
+ */
+
+jQuery.fn.confirm = function(options) {
+  options = jQuery.extend({
+    msg: 'Are you sure?',
+    stopAfter: 'never',
+    wrapper: '<span></span>',
+    eventType: 'click',
+    dialogShow: 'show',
+    dialogSpeed: '',
+    timeout: 0
+  }, options);
+  options.stopAfter = options.stopAfter.toLowerCase();
+  if (!options.stopAfter in ['never', 'once', 'ok', 'cancel']) {
+    options.stopAfter = 'never';
+  }
+  options.buttons = jQuery.extend({
+    ok: 'Yes',
+    cancel: 'No',
+    wrapper:'<a href="#"></a>',
+    separator: '/'
+  }, options.buttons);
+
+  // Shortcut to eventType.
+  var type = options.eventType;
+
+  return this.each(function() {
+    var target = this;
+    var $target = jQuery(target);
+    var timer;
+    var saveHandlers = function() {
+      var events = jQuery.data(target, 'events');
+      if (!events) {
+        // There are no handlers to save.
+        return;
+      }
+      target._handlers = new Array();
+      for (var i in events[type]) {
+        target._handlers.push(events[type][i]);
+      }
+    }
+    
+    // Create ok button, and bind in to a click handler.
+    var $ok = jQuery(options.buttons.wrapper)
+      .append(options.buttons.ok)
+      .click(function() {
+      // Check if timeout is set.
+      if (options.timeout != 0) {
+        clearTimeout(timer);
+      }
+      $target.unbind(type, handler);
+      $target.show();
+      $dialog.hide();
+      // Rebind the saved handlers.
+      if (target._handlers != undefined) {
+        jQuery.each(target._handlers, function() {
+          $target.click(this);
+        });
+      }
+      // Trigger click event.
+      $target.click();
+      if (options.stopAfter != 'ok' && options.stopAfter != 'once') {
+        $target.unbind(type);
+        // Rebind the confirmation handler.
+        $target.one(type, handler);
+      }
+      return false;
+    })
+
+    var $cancel = jQuery(options.buttons.wrapper).append(options.buttons.cancel).click(function() {
+      // Check if timeout is set.
+      if (options.timeout != 0) {
+        clearTimeout(timer);
+      }
+      if (options.stopAfter != 'cancel' && options.stopAfter != 'once') {
+        $target.one(type, handler);
+      }
+      $target.show();
+      $dialog.hide();
+      return false;
+    });
+
+    if (options.buttons.cls) {
+      $ok.addClass(options.buttons.cls);
+      $cancel.addClass(options.buttons.cls);
+    }
+
+    var $dialog = jQuery(options.wrapper)
+    .append(options.msg)
+    .append($ok)
+    .append(options.buttons.separator)
+    .append($cancel);
+
+    var handler = function() {
+      jQuery(this).hide();
+
+      // Do this check because of a jQuery bug
+      if (options.dialogShow != 'show') {
+        $dialog.hide();
+      }
+
+      $dialog.insertBefore(this);
+      // Display the dialog.
+      $dialog[options.dialogShow](options.dialogSpeed);
+      if (options.timeout != 0) {
+        // Set timeout
+        clearTimeout(timer);
+        timer = setTimeout(function() {$cancel.click(); $target.one(type, handler);}, options.timeout);
+      }
+      return false;
+    };
+
+    saveHandlers();
+    $target.unbind(type);
+    target._confirm = handler
+    target._confirmEvent = type;
+    $target.one(type, handler);
+  });
+}