mongo3 0.0.4 → 0.0.5

data/HISTORY

@@ -13,4 +13,9 @@
   o Fixed issue on over extending cookies. Ie mongo3 suffered amnesia. Switching to memcache
   o Using memcache for session store - will need a local memcache server on default port!
   o Added confirm dialog on clear and drop
-  o Bug fixes and some refactor
+  o Bug fixes and some refactor
+  
+0.0.5 - Lots of changes... Yeah!
+  o cleaned up ui
+  o added edit on main context window
+  o added index crud for collection

data/README.rdoc

@@ -36,6 +36,8 @@
 
 == DEPENDENCIES
 
+* At this time mongo3 only is supported on ruby 1.8 and sinatra 0.9.4
+
 * mongo + mongo_ext
 * agnostic-will_paginate
 * memcache-client

data/Rakefile

@@ -1,7 +1,6 @@
 # Look in the tasks/setup.rb file for the various options that can be
 # configured in this Rakefile. The .rake files in the tasks directory
 # are where the options are used.
-
 begin
   require 'bones'
   Bones.setup

data/data/populate

@@ -2,9 +2,9 @@
 require 'rubygems'
 require 'mongo'
 
-connection = Mongo::Connection.new( 'localhost', 27018 )
-db = connection.db( 'admin' )
-db.authenticate( 'admin', 'admin')
+connection = Mongo::Connection.new( 'localhost', 27019 )
+# db = connection.db( 'admin' )
+# db.authenticate( 'admin', 'admin')
 
 db_name = "fernand_mdb"
 cltn_name = "blee"
@@ -15,7 +15,7 @@ db = connection.db( db_name )
 cltn = db.create_collection( cltn_name )
 cltn.remove
 
-10.times do |i|
+20.times do |i|
   row = { :name => "fred_#{i}", :last_name => "Blee_#{i}" }
 puts "Inserting row #{row.inspect}"  
   cltn.insert( row )

data/lib/controllers/collections.rb

@@ -2,14 +2,46 @@ require 'json'
 
 module Collections
   
+# [ ['last_name', -1], ['name', 1] ]  
+  # ---------------------------------------------------------------------------
+  post "/collections/create_index/" do
+    json   = params[:index].gsub( /'/, "\"" )
+    tokens = json.split( "|" )
+    
+    begin
+      raise "You need to enter an index description" if tokens.empty?
+      index       = JSON.parse( tokens.shift )
+      constraints = tokens.empty? ? nil : JSON.parse( tokens.first )
+      
+      options.connection.create_index( session[:path_names], index, constraints )
+      flash_it!( :info, "Index was created successfully!" )
+    rescue => boom
+      flash_it!( :error, boom )
+      return erb(:'shared/flash.js', :layout => false)
+    end
+
+    @indexes = options.connection.indexes_for( session[:path_names] )
+        
+    erb :'collections/update_indexes.js', :layout => false    
+  end
+  
+  # ---------------------------------------------------------------------------  
+  post "/collections/drop_index/" do
+    options.connection.drop_index( session[:path_names], params[:id] )
+    flash_it!( :info, "Index was dropped successfully!" )
+    erb :'shared/flash.js', :layout => false
+  end
+
   # --------------------------------------------------------------------------- 
   # Paginate on a collection
   get "/collections/:page" do    
     @back_url  = "/explore/back"
     @page      = params[:page].to_i || 1
-    @title     = title_for( session[:path_names] )
+
+    @indexes = options.connection.indexes_for( session[:path_names] )
+    
+    load_cltn( params[:page].to_i )
     
-    load_cltn( params[:page].to_i )    
     erb :'collections/list'
   end  
   
@@ -35,14 +67,14 @@ module Collections
       begin
         @query = JSON.parse( tokens.shift )
         @sort  = tokens.empty? ? [] : JSON.parse( tokens.first )
-      rescue => boom        
+        session[:query_params] = [@query, @sort]
+        load_cltn        
+      rescue => boom
         flash_it!( :error, boom )
         return erb(:'shared/flash.js', :layout => false)
       end
     end
-    session[:query_params] = [@query, @sort]
     
-    load_cltn
     erb :'collections/update.js', :layout => false
   end
 
@@ -50,6 +82,9 @@ module Collections
     path_names = session[:path_names]
     options.connection.delete_row( path_names, params[:id] )
     load_cltn
+    
+    flash_it!( :info, "Row was deleted successfully!" )
+    
     erb :'collections/update.js', :layout => false    
   end
 
@@ -70,9 +105,8 @@ module Collections
   # ===========================================================================
   helpers do    
     def load_cltn( page=1 )
-      query_params   = session[:query_params] || [{},[]]
-      
-      if query_params.first.empty? and query_params.last.empty?
+      query_params = session[:query_params] || [{},[]]
+      if ( !query_params.first or query_params.first.empty?) and ( !query_params.last or query_params.last.empty? )
         @query = nil
       else  
         @query = [query_params.first.to_json, query_params.last.to_json].join( " | " )

data/lib/controllers/databases.rb

@@ -6,12 +6,22 @@ module Databases
     path_names = session[:path_names]
           
     @cltns     = options.connection.paginate_db( path_names, page, 10 )
-    @title     = title_for( path_names )    
     @back_url  = "/explore/back"
     
     erb :'databases/list'
   end
   
+  # ---------------------------------------------------------------------------
+  get "/databases/collection/:name/" do
+    cltn_name  = params[:name]
+    path_names = session[:path_names]
+    path_ids   = session[:path_ids]
+    
+    update_paths!( path_ids + "|" + cltn_name, path_names + "|" + cltn_name )
+
+    redirect "/collections/1"
+  end
+      
   # ---------------------------------------------------------------------------  
   get "/databases/drop/" do
     path_names = session[:path_names]

data/lib/controllers/explore.rb

@@ -1,9 +1,27 @@
 module Explore
   
+  # -----------------------------------------------------------------------------  
+  get "/explore/database/:db_id/:db_name/drop" do
+    path_ids   = session[:path_ids]
+    path_names = session[:path_names]
+    @node_id   = params[:db_id]
+    db_name    = params[:db_name].gsub( /\(\d+\)/, '' )
+    
+    options.connection.drop_database( session[:path_names], db_name )
+    
+    flash_it!( :info, "Database `#{db_name} was dropped successfully!" )
+             
+    erb :'explore/update.js', :layout => false
+  end
+
   # -----------------------------------------------------------------------------
   get '/explore' do
+    @root  = options.connection.build_tree
+    @nodes = @root.children
+    
     reset_crumbs!
-    @root = options.connection.build_tree
+    reset_paths!
+    
     erb :'explore/explore'
   end
 
@@ -17,13 +35,13 @@ module Explore
     reset_crumbs!
     path_names = session[:path_names]
     path_ids   = session[:path_ids]
-    crumbs_from_path( path_ids, path_names )
+    @node_id   = path_ids.split('|').last    
     
-    @root = options.connection.build_partial_tree( path_names )
+    crumbs_from_path( path_ids, path_names )
     
-    # need to adjust crumbs in case something got blown...
-    @center = path_ids.split('|').last
-     
+    @root  = options.connection.build_partial_tree( path_names )
+    @nodes = @root.find( @node_id ).children
+         
     erb :'explore/explore'
   end
   
@@ -48,22 +66,41 @@ module Explore
     
     crumbs_from_path( path_ids, path_names )    
     
-    @sub_tree = options.connection.build_sub_tree( parent_id, path_names )
+    root = options.connection.build_sub_tree( parent_id, path_names )
+    @sub_tree = root.to_adjacencies
     @node_id  = @sub_tree.first[:id]
+    @nodes    = root.children
     
     erb :'explore/more_data_js', :layout => false
   end
 
   # -----------------------------------------------------------------------------
-  get '/explore/update_crumb/:path/:crumbs' do
-    crumbs_from_path( params[:path], params[:crumbs] )
+  get '/explore/update_crumb/: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 )
+    
+    root   = options.connection.build_partial_tree( path_names )
+    node_id  = path_ids.split( "|" ).last
+    @nodes = root.find( node_id ).children
+    
     erb :'explore/update_crumb_js', :layout => false
   end
   
   # -----------------------------------------------------------------------------  
-  get '/explore/center/:node_id' do
-    @node_id = params[:node_id]        
-    pop_crumb!( @node_id )    
+  get '/explore/center/:path_ids/:path_names' do
+    path_ids   = params[:path_ids]
+    path_names = params[:path_names]
+    @node_id   = path_ids.split( "|" ).last 
+    
+    update_paths!( path_ids, path_names )
+    pop_crumb!( path_names, path_ids )
+    
+    root   = options.connection.build_partial_tree( path_names )
+    @nodes = root.find( @node_id ).children
+    
     erb :'explore/center_js', :layout => false
   end
       

data/lib/helpers/collection_helper.rb

@@ -14,6 +14,24 @@ module CollectionHelper
 
  helpers do
    include WillPaginate::ViewHelpers::Base   
+   
+   # format indexes to key:orientation
+   def format_index( pair )
+     buff = []
+     buff << pair.first
+     buff << orientation( pair.last )
+     buff.join( ":" )
   end
   
+  # converts orientation to human
+  def orientation( value )
+    return "id" if value.is_a?(Mongo::ObjectID)
+    case( value.to_i )
+      when Mongo::ASCENDING  : "asc"
+      when Mongo::DESCENDING : "desc"
+      else                     "n/a"
+    end
+  end
+
+ end
 end

data/lib/helpers/crumb_helper.rb

@@ -8,14 +8,14 @@ module CrumbHelper
       @crumbs = []
       count   = 0
       path_name_tokens.each do |crumb|
-        @crumbs << [crumb, "/explore/center/#{path_id_tokens[count]}"]
+        @crumbs << [crumb, "/explore/center/#{path_name_tokens[0..count].join( "|" )}/#{path_id_tokens[0..count].join( "|") }"]
         count += 1
       end
       session[:crumbs] = @crumbs
     end
     
-    def pop_crumb!( node_id )
-      path  = "/explore/center/#{node_id}"
+    def pop_crumb!( path_ids, path_names )
+      path  = "/explore/center/#{path_ids}/#{path_names}"
       level = 0
       range = nil
       @crumbs.each do |pair|
@@ -30,7 +30,7 @@ module CrumbHelper
     end
   
     def reset_crumbs!
-      @crumbs = [ ["home", '/explore/center/home'] ]
+      @crumbs = [ ["home", '/explore/center/home/home'] ]
       session[:crumbs] = @crumbs
     end
   

data/lib/helpers/database_helper.rb

@@ -0,0 +1,17 @@
+module DatabaseHelper
+  helpers do
+      
+    def db_title
+      paths = session[:path_names].split( "|" )
+      return context_for( paths ), paths.last
+    end
+   
+    def context_for( paths )
+      case paths.size
+        when 2 : "zone"
+        when 3 : "database"
+        else     "collection"
+      end      
+    end    
+  end  
+end

data/lib/helpers/explore_helper.rb

@@ -0,0 +1,30 @@
+module ExploreHelper 
+  
+  helpers do    
+
+    # looking at zone path?    
+    def zone_path?( path )
+      path.split( "|" ).size == 1
+    end
+    
+    # compute legend title
+    def legend_title( path )
+      path.split( "|" ).last      
+    end
+    
+    def path_type( path )
+      tokens = path.split( "|" )
+      case tokens.length 
+        when 1 : "zone"
+        when 2 : "database"
+        else     "collection"
+      end            
+    end
+    
+    # compute legend from given path.
+    def legend_for( path, count )
+     "#{path_type(path)}s(<span id='count'>#{count}</span>)"
+    end    
+  end
+  
+end

data/lib/helpers/flash_helper.rb

@@ -1,6 +1,13 @@
 module FlashHelper
  helpers do
    
+   # clear out flash object
+   def clear_it!
+     @flash = session[:flash] || OrderedHash.new     
+     @flash.clear
+   end
+   
+   # add flash message
    def flash_it!( type, msg )
      @flash = session[:flash] || OrderedHash.new
      @flash[type] = msg

data/lib/helpers/main_helper.rb

@@ -1,12 +1,17 @@
 module MainHelper  
  helpers do   
-   
-    def update_paths!( path_ids, path_names )
-puts "UPDAING PATH #{path_ids} -- #{path_names}"      
-      session[:path_ids]   = path_ids
-      session[:path_names] = path_names
+      
+    def zone_locator
+      locator = session[:path_names].split( "|" )[1]
+      "<p class=\"ctx\"><span>zone</span>#{locator}</p>"
     end
-    
+      
+    def truncate(text, length = 30, truncate_string = "...")
+      return "" if text.nil?
+      l = length - truncate_string.size
+      text.size > length ? (text[0...l] + truncate_string).to_s : text
+    end
+      
     def align_for( value )
       return "right" if value.is_a?(Fixnum)
       "left"
@@ -17,30 +22,7 @@ puts "UPDAING PATH #{path_ids} -- #{path_names}"
       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]
-      new_path_ids = path_ids.split( "|" )
-      new_path_ids.pop
-    
-      path_names = session[:path_names]    
-      new_path_names = path_names.split( "|" )
-      new_path_names.pop
-      
-      update_paths!( new_path_ids.join( "|" ), new_path_names.join( "|" ) )
-    end
-    
-    def title_for( path_names )
-      tokens = path_names.split( "|" )
-      buff = case tokens.length 
-        when 2 : "Environment"
-        when 3 : "Database"
-        else     "Collection"
-      end
-      
-      buff += " <em>#{tokens.last}</em>"
-    end
-    
+           
     def display_info( info )
       return info if info.is_a?( String )
       if info.is_a?( Hash )

data/lib/helpers/paths_helper.rb

@@ -0,0 +1,40 @@
+module PathHelper
+  helpers do
+    
+    def reset_paths!
+      session[:path_ids]   = "home"
+      session[:path_names] = "home"
+    end
+    
+    def update_paths!( path_ids, path_names )
+      session[:path_ids]   = path_ids
+      session[:path_names] = path_names
+    end
+    
+    # Pop paths 1 level
+    def back_paths!
+      path_ids     = session[:path_ids]
+      new_path_ids = path_ids.split( "|" )
+      new_path_ids.pop
+    
+      path_names = session[:path_names]    
+      new_path_names = path_names.split( "|" )
+      new_path_names.pop
+      
+      update_paths!( new_path_ids.join( "|" ), new_path_names.join( "|" ) )
+    end
+    
+    # compute title from path    
+    def title_for( path_names )
+      tokens = path_names.split( "|" )
+      buff = case tokens.size
+        when 2 : "zone"
+        when 3 : "database"
+        else     "collection"
+      end
+      db = tokens.size > 3 ? "<span class=\"ctx\">#{tokens[2]}</span>." : ""
+      "<p class=\"ctx\" style=\"text-align:center;font-size:0.8em\">#{db}#{tokens.last}</p>"
+    end
+    
+  end
+end