mongo3 0.0.6 → 0.0.7

data/HISTORY

@@ -18,4 +18,12 @@
 0.0.5 - Lots of changes... Yeah!
   o cleaned up ui
   o added edit on main context window
-  o added index crud for collection
+  o added index crud for collection
+  
+0.0.6 - Bug fixes and minor cleanups
+
+0.0.7 - Big changes !
+  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

data/README.rdoc

@@ -32,7 +32,7 @@
 * Provide support for db authentication [done]
 * Ability to drilldown in collections and query for content [done]
 * CRUD on dbs, collections, indexes [done]
-* Administer users
+* Administer users [done]
 * Collection rename
 * Manage logs
 * Support for shards and replication
@@ -45,6 +45,8 @@
 * agnostic-will_paginate
 * memcache-client
 * sinatra
+* mongo_rack
+* main
 
 == INSTALL:
   
@@ -73,9 +75,25 @@
 === Launch It!
 
     Launch it. Fires up sinatra and opens up the console
-    NOTE: Assumes memcache server is running on local host with default port!
+    NOTE!!: The gem now leverages mongo_rack ( a mongoDB based session store ).
+    By default, this assumes a mongoDB instance is running on localhost and on default port!
     
     > mongo3
+    
+    Alternatively you can use a different mongo instance to store mongo3 session information
+    or use memcache by specifying the --pool options as follows:
+    
+    To use the mongo session store on localhost at port 27030 with db name 'mongo3' and collection named 'sessions' 
+    
+    > mongo3 --pool "mongo://localhost:27030/mongo3/sessions" 
+    
+    To use memcache session store on localhost at port 11233 with namespace 'mongo3'
+    
+    > mongo3 --pool "memcache://localhost:11233/mongo3"
+    
+    The pool options assumes the following format:
+    
+    --pool {mongo|memcache}://{host}:{port}/{db_name|namespace}/{cltn_name}
   
 == LICENSE:
 

data/Rakefile

@@ -34,4 +34,6 @@ depend_on "mongo"                 , ">= 0.18.1"
 depend_on "mongo_ext"             , ">= 0.18.1"
 depend_on "agnostic-will_paginate", ">= 3.0.0"
 depend_on "memcache-client"       , ">= 1.5.0"
+depend_on "mongo_rack"            , ">= 0.0.1"
+depend_on "main"                  , ">= 4.2.0"
 

data/aa.rb

@@ -0,0 +1,17 @@
+require 'rubygems'
+require 'mongo'
+
+con = Mongo::Connection.new( 'localhost', 27019 )
+puts con.database_names.inspect
+
+admin = con.db('admin')
+
+users = admin[Mongo::DB::SYSTEM_USER_COLLECTION]
+
+puts users.count
+
+row = { :user => "fred", :pwd => admin.send( :hash_password, "fred", "duh" ) }
+
+users.save( row )
+
+puts users.find({}).inspect

data/bin/mongo3

@@ -1,29 +1,76 @@
 #!/usr/bin/env ruby
 require 'rubygems'
-require 'sinatra'
-require File.expand_path( File.join(File.dirname(__FILE__), %w[.. lib mongo3]))
-require File.join(File.dirname(__FILE__), %w[.. lib main.rb])
+require 'main'
 
-def open(path)
-  case RUBY_PLATFORM
-    when /darwin/
-      system 'open', path
-    when /mswin(?!ce)|mingw|cygwin|bccwin/
-      system 'start', path
-    else
-      system 'firefox', path
-  end
-end
+URI_MATCH = /(mongo|memcache):\/\/(.+?)\:(\d+)\/(\w+)\/{0,1}(\w*)/
 
-Thread.new do 
-  puts "\n"*2
-  puts ">>> Waiting for Franky to warm up..."
-  puts "\n"*2  
-  sleep( 3 )
-  puts "\n"*2  
-  puts "\n\n >>> Opening console..."
-  puts "\n"*2
-  open( "http://localhost:6666/explore" )
-end
-
-Sinatra::Application.run! :port => 6666, :environment => 'production'
+Main {  
+  option( 'pool=[pool]', 'p' ) {
+    validate    { |pool| pool =~ URI_MATCH }
+    description "specify server uri. Must be of the form {[mongo|memcache]}://{host}:{port}/{[database_name|namespace]}[/{collection_name}]"
+  }
+  environment( 'RACK_ENV' ) {
+    default 'production'
+  }
+  
+  @@options = {}
+  
+  # Enter main loop  
+  def run
+    require File.expand_path( File.join(File.dirname(__FILE__), %w[.. lib mongo3]))    
+    
+    @@options = parse_args( params[:pool].value )
+    ENV['RACK_ENV'] = params['RACK_ENV'].value
+    
+    Thread.new do 
+      puts "-"*100
+      puts "Initializing mongo3 -- Version #{Mongo3::VERSION}"
+      puts "-"*100      
+      puts "\n"*2
+      puts ">>> Waiting for Franky to warm up..."
+      puts "\n"*2  
+      sleep( sleep_time )
+      puts "\n"*2  
+      puts ">>> Opening console..."
+      puts "\n"*2
+      open( "http://localhost:6666/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'
+  end
+  
+  # sleepy time...
+  def sleep_time
+    3
+  end
+  
+  # open console...
+  def open(path)
+    case RUBY_PLATFORM
+      when /darwin/
+        system 'open', path
+      when /mswin(?!ce)|mingw|cygwin|bccwin/
+        system 'start', path
+      else
+        system 'firefox', path
+    end
+  end
+  
+  # parse uri into sub components
+  def parse_args( server_uri )
+    return unless server_uri
+    tokens = server_uri.match( URI_MATCH ).captures
+    opts = { :protocol => tokens.first, :host => tokens[1], :port => tokens[2] }
+    if opts[:protocol] == "mongo"
+      opts[:db_name]   = tokens[3]
+      opts[:cltn_name] = tokens[4]
+    else
+      opts[:namespace] = tokens[3]
+    end
+    opts
+  end  
+}

data/lib/{main.rb → app.rb}

@@ -5,18 +5,37 @@ require File.join( File.dirname(__FILE__), 'mongo3.rb' )
 require 'mongo'
 gem 'agnostic-will_paginate'
 require 'will_paginate'
+require 'mongo_rack'
 
 set :public, File.join( File.dirname(__FILE__), %w[public] )
 set :views , File.join( File.dirname(__FILE__), %w[views] )
 
 # -----------------------------------------------------------------------------
-# Configuration
+# Configurations
+
+configure :production do
+  set :logging, false  
+end
+
 configure do
   Mongo3.load_all_libs_relative_to(__FILE__, 'helpers' )
   Mongo3.load_all_libs_relative_to(__FILE__, 'controllers' )
-  
-  use Rack::Session::Memcache, :namespace => 'mongo3'
-  
+ 
+  # Pick up command line args if any?  
+  if defined? @@options and @@options
+    if @@options[:protocol] == 'mongo'
+      use Rack::Session::Mongo, 
+        :server => "%s:%d/%s/%s" % [@@options[:host], @@options[:port], @@options[:db_name], @@options[:cltn_name]]
+    else
+      use Rack::Session::Memcache, 
+        :memcache_server => "%s:%d" % [@@options[:host], @@options[:port]],
+        :namespace       => @@options[:namespace]
+    end
+  else
+    # Default is a mongo session store
+    use Rack::Session::Mongo
+  end
+  set :config_file, File.join( ENV['HOME'], %w[.mongo3 landscape.yml] )
   set :connection, Mongo3::Connection.new( File.join( ENV['HOME'], %w[.mongo3 landscape.yml] ) )
 end
 

data/lib/controllers/collections.rb

@@ -2,7 +2,6 @@ require 'json'
 
 module Collections
   
-# [ ['last_name', -1], ['name', 1] ]  
   # ---------------------------------------------------------------------------
   post "/collections/create_index/" do
     json   = params[:index].gsub( /'/, "\"" )
@@ -56,7 +55,6 @@ module Collections
   end
   
   # ---------------------------------------------------------------------------
-  # BOZO !! Validation....
   post "/collections/search/" do
     json = params[:search].gsub( /'/, "\"" )
     if json.empty?
@@ -78,6 +76,7 @@ module Collections
     erb :'collections/update.js', :layout => false
   end
 
+  # ---------------------------------------------------------------------------
   post '/collections/delete/' do
     path_names = session[:path_names]
     options.connection.delete_row( path_names, params[:id] )
@@ -88,6 +87,7 @@ module Collections
     erb :'collections/update.js', :layout => false    
   end
 
+  # ---------------------------------------------------------------------------
   get '/collections/clear/' do
     path_names = session[:path_names]
     options.connection.clear_cltn( path_names )    
@@ -95,6 +95,7 @@ module Collections
     erb :'collections/all_done.js', :layout => false    
   end
 
+  # ---------------------------------------------------------------------------
   get '/collections/drop/' do
     path_names = session[:path_names]
     options.connection.drop_cltn( path_names )    
@@ -104,7 +105,7 @@ module Collections
   
   # ===========================================================================
   helpers do    
-    def load_cltn( page=1 )
+    def load_cltn( page=1 )    
       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

data/lib/controllers/explore.rb

@@ -23,7 +23,6 @@ module Explore
     reset_crumbs!
     reset_paths!
 
-# Mongo3::Node.dump_adj( @root )    
     erb :'explore/explore'
   end
 
@@ -72,7 +71,7 @@ module Explore
     @sub_tree = root.to_adjacencies
     @node_id  = @sub_tree.first[:id]
     @nodes    = root.children
-# Mongo3::Node.dump_adj( @sub_tree )    
+    
     erb :'explore/more_data_js', :layout => false
   end
 

data/lib/controllers/users.rb

@@ -0,0 +1,44 @@
+module Users
+  # --------------------------------------------------------------------------- 
+  # Paginate users
+  get "/users/:page" do    
+    @back_url  = "/explore/back"
+    @page      = params[:page].to_i || 1
+
+    user_mgmt = Mongo3::User.new( options.config_file )    
+    @users    = user_mgmt.list( session[:path_names], @page, 10 )
+        
+    erb :'users/list'
+  end
+  
+  # ---------------------------------------------------------------------------  
+  post "/users/delete/" do
+    id        = params[:id]
+    user_mgmt = Mongo3::User.new( options.config_file ) 
+
+    user_mgmt.delete( session[:path_names], id )    
+    flash_it!( :info, "User was dropped successfully!" )            
+    @users = user_mgmt.list( session[:path_names], 1, 10 )
+  
+    erb :'users/results.js', :layout => false
+  end
+
+  # ---------------------------------------------------------------------------  
+  post "/users/add/" do
+    user_name = params[:user]
+    passwd    = params[:passwd]
+    user_mgmt = Mongo3::User.new( options.config_file ) 
+
+    begin
+      user_mgmt.add( session[:path_names], user_name, passwd )
+      flash_it!( :info, "User #{user_name} was added successfully!" )      
+    rescue => boom
+      flash_it!( :error, boom )
+    ensure
+      @users = user_mgmt.list( session[:path_names], 1, 10 )
+    end
+  
+    erb :'users/results.js', :layout => false
+  end
+  
+end

data/lib/mongo3/connection.rb

@@ -1,3 +1,4 @@
+# BOZO !! Time to refact no?
 module Mongo3
   class Connection
     
@@ -96,38 +97,41 @@ module Mongo3
         cltn.remove( {:_id => Mongo::ObjectID.from_string(id) } )
       end
     end
-     
+         
     def show( path_names )
       path_name_tokens = path_names.split( "|" )
       info             = OrderedHash.new
-      zone              = path_name_tokens[1]
-      
+      zone             = path_name_tokens[1]
+
+      info[:links] = OrderedHash.new      
       info[:title] = path_name_tokens.last
-      if path_name_tokens.size == 2
+            
+      # If detect slave only show reg info
+      slave = slave_zone?( path_name_tokens )
+      if path_name_tokens.size == 2 or slave
         connect_for( zone ) do |con|
-          info[:name]        = zone
-          info[:host]        = con.host
-          info[:port]        = con.port
-          info[:databases]   = OrderedHash.new
+          info[:links][:users]  = "/users/1" unless slave
+          info[:name]           = zone
+          info[:host]           = con.host
+          info[:users]          = con.db('admin')[Mongo::DB::SYSTEM_USER_COLLECTION].count rescue 0
+          info[:port]           = con.port
+          info[:databases]      = OrderedHash.new
           con.database_info.sort { |a,b| b[1] <=> a[1] }.each { |e| info[:databases][e[0]] = to_mb( e[1] ) }
-          info[:server] = con.server_info
+          info[:server]         = con.server_info
         end
       # BOZO !! Need to figure out links strategy!
       elsif path_name_tokens.size == 3
         db_name = path_name_tokens.pop
-        info[:links] = OrderedHash.new
         connect_for( zone ) do |con|          
           db = con.db( db_name )
           info[:links][:manage] = "/databases/1"
-          # info[:links][:drop]   = "/databases/drop/"
-          info[:size]        = to_mb( con.database_info[db_name] )
-          info[:node]        = db.nodes
-          info[:collections] = collection_names( db ).size
-          info[:error]       = db.error
-          info[:last_status] = db.last_status
+          info[:size]           = to_mb( con.database_info[db_name] )
+          info[:node]           = db.nodes
+          info[:collections]    = collection_names( db ).size
+          info[:error]          = db.error
+          info[:last_status]    = db.last_status
         end
-      elsif path_name_tokens.size == 4
-        info[:links] = OrderedHash.new        
+      elsif path_name_tokens.size == 4        
         cltn_name = path_name_tokens.pop
         db_name   = path_name_tokens.pop
         connect_for( zone ) do |con|
@@ -136,7 +140,6 @@ module Mongo3
           indexes = db.index_information( cltn_name )
                     
           info[:links][:manage] = "/collections/1"
-          # info[:links][:drop]   = "/collections/drop/"          
           info[:size]           = cltn.count
           info[:indexes]        = format_indexes( indexes ) if indexes and !indexes.empty?
         end
@@ -253,19 +256,44 @@ module Mongo3
     # Build zone tree
     def build_partial_tree( path_names )
       path_name_tokens = path_names.split( "|" )      
-      bm_zone           = path_name_tokens[1]
+      bm_zone          = path_name_tokens[1]
       bm_cltn          = path_name_tokens.pop if path_name_tokens.size == 4
       bm_db            = path_name_tokens.pop if path_name_tokens.size == 3
       
       root = Node.make_node( "home" )
       
       # iterate thru zones
+      adjacencies = {}      
       config.each_pair do |zone, info|
         node = Node.new( zone, zone, :dyna => true )
         root << node
         
+        adjs = adjacencies[zone]
+        if adjs
+          node.mark_master!
+          adjs.each { |n| node << n }
+        end
+        masters = slave?( zone )
+        
+        unless masters.empty?
+          node.mark_slave!     
+          masters.each do |master|
+            host, port  = master.split( ":" )
+            master_zone = zone_for( host, port )
+            next unless master_zone
+            master_node = root.find( "home|#{master_zone}")
+            if master_node
+              master_node.mark_master!
+              master_node << node
+            else
+              adjacencies[master_zone] = [] unless adjacencies[master_zone]
+              adjacencies[master_zone] << node
+            end
+          end
+        end
+                
         next unless node.name == bm_zone
-
+                
         connect_for( zone ) do |con|      
           count = 0
           data  = { :dyna => true }
@@ -366,7 +394,6 @@ module Mongo3
       end
       
       # Connects to mongo given an zone
-      # BOZO !! Auth... 
       def connect_for( zone, &block )
         info = landscape[zone]
         # puts ">>> Connecting for #{zone} -- #{info['host']}-#{info['port']}"
@@ -404,6 +431,7 @@ module Mongo3
    
       # Convert size to mb
       def to_mb( val )
+        return 0 unless val
         return val if val < 1_000_000
         "#{format_number(val/1_000_000)}Mb"
       end
@@ -420,11 +448,17 @@ module Mongo3
         end
         nil
       end
+
+      # Check if this is a slave or a db path   
+      def slave_zone?( tokens )
+        return false unless tokens.size == 3
+        return false unless config.keys.include?( tokens.last )
+        true
+      end
       
       # Initialize the mongo installation landscape
       def config
         unless @config
-puts ">>>> Loading config from file"          
           @config = YAML.load_file( @config_file )
         end
         @config

data/lib/mongo3/user.rb

@@ -0,0 +1,53 @@
+require 'mongo'
+require File.join( File.dirname(__FILE__), %w[zone.rb] )
+
+module Mongo3
+  # Administer users on a connection  
+  class User < Mongo3::Zone
+    
+    # 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]        
+
+        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 )
+      end     
+    end
+    
+    def rename( zone, old_name, new_name )
+    end
+    
+    def delete( path, id )
+      connect_for( path ) do |con|
+        res = users( con ).remove( :_id => Mongo::ObjectID.from_string( id ) )
+      end      
+    end
+        
+    def list( path, page, per_page=10 )
+      connect_for( path ) do |con|
+        user_cltn = users( con )
+        list = WillPaginate::Collection.create( page, per_page, user_cltn.size ) do |pager|
+          offset = (page-1)*per_page
+          results = user_cltn.find( {}, 
+            :sort  => [['user', Mongo::ASCENDING]],
+            :skip  => offset,
+            :limit => per_page ).to_a          
+          return pager.replace( results )
+        end
+      end
+    end
+    
+    private    
+      
+      def users( con )
+        admin = con.db('admin')
+        admin[Mongo::DB::SYSTEM_USER_COLLECTION]        
+      end
+  end
+end

data/lib/mongo3/zone.rb

@@ -0,0 +1,48 @@
+module Mongo3
+  class Zone
+
+    attr_reader :config
+        
+    def initialize( config_file )
+      @config_file = config_file
+    end
+    
+    # =========================================================================
+    protected
+    
+      def zone_for_path( path )
+        path.split( "|" )[1]
+      end
+      
+      # Connects to mongo given an zone
+      def connect_for( path, &block )
+        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 } )
+        
+        if info['user'] and info['password']
+          con.db( 'admin' ).authenticate( info['user'], info['password'] )
+        end
+        yield con      
+        con.close()
+      end
+    
+      # find zone matching the host and port combination
+      def zone_for( host, port )
+        config.each_pair do |zone, info|
+          return zone if info['host'] == host and info['port'] == port.to_i
+        end
+        nil
+      end
+      
+      # Initialize the mongo installation landscape
+      def config
+        unless @config
+          @config = YAML.load_file( @config_file )
+        end
+        @config
+      end
+    
+  end
+end

data/lib/mongo3.rb

@@ -1,10 +1,9 @@
-
 module Mongo3
-
+  
   # :stopdoc:
-  VERSION = '0.0.6'
-  LIBPATH = ::File.expand_path(::File.dirname(__FILE__)) + ::File::SEPARATOR
-  PATH = ::File.dirname(LIBPATH) + ::File::SEPARATOR
+  VERSION = '0.0.7' 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
   # :startdoc:
 
   # Returns the version string for the library.

data/lib/public/stylesheets/mongo3.css

@@ -1,3 +1,4 @@
+/* BOZO !! Refact! */
 * {
   outline-color: invert;
   outline-style: none;
@@ -19,6 +20,13 @@ body {
   margin:           0;
 }
 
+span#version {
+  color:          #4d7bff;
+  font-size:      .4em;
+  vertical-align: bottom;
+  margin:         88px 0px 0px -57px;
+}
+
 img {
   border:         none;
   vertical-align: text-top;
@@ -73,7 +81,7 @@ ul {
 
 a {
   text-decoration: none;
-  color:           #434343;
+  color:           #c1c1c1;
 }
 a:hover {
   color: #92b948;
@@ -333,7 +341,8 @@ table.cltn tr {
   color: #fff;
 }
 table.cltn tr.highlight {
-  color: #92b948;
+  color:  #92b948;
+  cursor: pointer;
 }
 
 div.cltn div#summary {
@@ -474,3 +483,65 @@ span#log {
 div#info {
   min-height: 520px;
 }
+
+/* Node information */
+div.item img {
+  z-index:      100;
+  display:      none;
+  float:        left;
+  margin-right: 10px;
+}
+
+div#legend {
+  border-bottom: 1px #434343 solid;
+  font-size:     0.5em;
+  color:         #92b948;
+  overflow:      hidden;
+}
+div#legend_link {
+  text-align:  right;
+  width:       15%;
+  float:       right;
+  font-size:   .7em;
+  padding-top: 7px;
+}
+
+div.items {
+  margin-top:10px;
+}
+
+div.item {
+  border-top: 1px #bcffca solid;
+  height:     30px;
+  width:      100%;
+  font-size:  .4em;
+  cursor:     pointer;
+  z-index:    1;
+}
+div.selected {
+  background-image: url(/images/selected_bg.png);
+  color: #92b948;
+}
+
+/* Users */
+input.field_border {
+  -moz-border-radius-bottomleft:  0px;
+  -moz-border-radius-bottomright: 10px;
+  -moz-border-radius-topleft:     10px;
+  -moz-border-radius-topright:    0px;  
+}
+
+input.user {
+  background:                     transparent;  
+  width:                          200px;
+  border:                         2px #434343 solid;
+  height:                         25px;
+  font-size:                      1.2em;
+  color:                          #92b948;
+  padding:                        5px 0px 0px 5px;
+  margin:                         5px 5px;
+}
+
+button.user:hover {
+  background-color: #ad1ecb;
+}

data/lib/views/explore/_node_info.erb

@@ -1,47 +1,7 @@
-<style>
-  div.item img {
-    z-index:100;
-    display:none;
-    float:left;
-    margin-right:10px;
-  }
-  
-  div#legend {
-    border-bottom: 1px #434343 solid;
-    font-size:     0.5em;
-    color:         #92b948;
-    overflow:      hidden;
-  }
-  div#legend_link {
-    text-align:  right;
-    width:       30%;
-    float:       right;
-    font-size:   .7em;
-    padding-top: 7px;
-  }
-
-  div.items {
-    margin-top:10px;
-  }
-  
-  div.item {
-    border-top: 1px #bcffca solid;
-    height:     30px;
-    width:      100%;
-    font-size:  .4em;
-    cursor:     pointer;
-    z-index:    1;
-  }
-  div.selected {
-    background-image: url(/images/selected_bg.png);
-    color: #92b948;
-  }
-</style>
-
 <% legend = path_type( session[:path_names] ) %>
 <div id="legend">
-  <div style="width:60%;float:left">
-    @ <%= truncate( legend_title( session[:path_names] ), 30 ) %>
+  <div style="width:85%;float:left">
+    @ <%= truncate( legend_title( session[:path_names] ), 20 ) %>
   </div>
   <% unless zone_path?( session[:path_names] ) %>
     <div id="legend_link">
@@ -59,7 +19,8 @@
 
 <div class="scrollable vertical">
   <div class="items">
-    <% count=0;@nodes.sort{|a,b| a.name <=> b.name}.each do |node| %>
+    <% count=0;@nodes.sort{|a,b| a.name <=> b.name}.each do |node| %>      
+      <% next if node.data[:slave] and !zone_path?( session[:path_names] ) %> 
       <div id="<%=count%>" class="item">
         <% unless zone_path?( session[:path_names] ) %>
           <img id="<%=count%>" rel="div#confirm_drop" class="drop" href="/explore/database/<%=node.oid%>/<%=node.name%>/drop" title="drop <%=legend%>..." src="/images/delete.png"/>
@@ -84,7 +45,7 @@
   $( function() {
     $("div.scrollable").scrollable({ 
         vertical:true,  
-        size:    14,
+        size:    13,
     }).mousewheel();
     
     $("div.item").hover( 

data/lib/views/layout.erb

@@ -14,8 +14,9 @@
       <div id="logo">
         <a href="/explore" style="float:left">
           <img src='/images/mongo3.png' style="border:none"/>
+          <span id="version"><%=Mongo3.version%></span>
         </a>
-        <div class="flash">Hello World</div>        
+        <div class="flash">Hello World</div>
       </div>      
       <div id="main">
         <%= yield %>

data/lib/views/users/_new.erb

@@ -0,0 +1,41 @@
+<script src="/javascripts/jquery.example.js" type="text/javascript"></script>
+    
+<form id="add_user" onsubmit="add_user();return false;" action="/users/add/" method="post" style="text-align:center">
+  <fieldset>
+    <input id="user" type="text" name="user" class="user field_border" value=""/>
+    <input id="passwd" type="password" name="passwd" class="user field_border" value=""/>
+    <button type="submit" id="submit_button" class="button user" style="height:30px;font-size:1em">create</button>
+    <img id="add_load" src="/images/loading.gif" style="width:25px;height:25px;vertical-align:sub;display:none"></img>
+  </fieldset>  
+</form>
+
+<script>
+ $( function() {
+   clear_fields( $('form#add_user') );
+   $('input.user').hover( 
+     function() { $(this).css( "border-color", "#92b948") }, 
+     function() { $(this).css( "border-color", "#434343") })
+ });
+
+ function clear_fields( form )
+ {
+   form.find( ".no_input" ).val( '' );
+   $('input#user').example("user name", { className: 'no_input' } );
+   $('input#passwd').example("secret", { className: 'no_input' } );      
+ }
+ 
+ function add_user()
+ {
+   $.ajax({
+     data:       $.param( $("form#add_user").serializeArray() ),
+     dataType:   'script',
+     type:       'post',
+     url:        '/users/add/',
+     beforeSend: function() { $('img#add_load').show(); },
+     complete:   function() { 
+       clear_fields( $(this) );       
+       $('img#add_load').hide(); 
+     }     
+   }); 
+ }
+</script>

data/lib/views/users/_results.erb

@@ -0,0 +1,78 @@
+<%= partial :'users/new'%>
+
+<div id="summary">
+  <%= page_entries_info @users, :entry_name => 'user' %>
+</div>
+
+<% unless @users.empty? %>
+  <div class="borders" style="padding:10px">
+    <table id="cltn" class="cltn" border="0" cellpadding="10" cellspacing="20">
+      <thead>
+        <th width="2%">&nbsp;</th>
+        <th>Id</th>
+        <th>Name</th>
+      </thead>
+      <tbody>
+        <% count = 0; @users.each do |user| %>
+          <tr id="<%=count%>" valign="top">
+            <td id="<%=count%>">
+              <img rel="div#confirm_drop" class="drop" id="<%=user['_id']%>" rel="<%=count%>" src="/images/delete.png" title="drop this user" style="display:none"/>
+              <img class="wait" id="wait_<%=count%>" src="/images/loading.gif"></img>
+            </td>
+            <td><%= user['_id'] %></td>
+            <td><%= user['user'] %></td>
+          </tr>
+        <% count+=1;end %>
+      </tbody>
+    </table>
+  </div>
+  <div id="links">
+    <%= will_paginate @users, :params => { :url => "/users" } %>
+  </div>
+<% else %>
+  <div class="no_items">Oh snap! No users found...</span>
+<% end %>
+
+<div class="modal" id="confirm_drop" style="font-size:1em">
+   <p>Dropping user. Are you sure?</p>
+   <p style="margin:10px">
+     <button class="close yes">Yes</button>
+     <button class="close">No</button>
+   </p>
+</div>
+
+<script>
+  $( function() {
+    $("table#cltn tr" ).hover( 
+      function() { 
+        $(this).addClass( 'highlight' );
+        $("td#" + $(this).attr('id') + " img.drop" ).show();
+      }, 
+      function() { 
+        $(this).removeClass( 'highlight' );      
+        $("td#" + $(this).attr('id') + " img.drop" ).hide();
+    });
+    
+    $('img.drop' ).overlay( {
+      expose: {
+         color:     '#212021',
+         loadSpeed: 200,
+         opacity:   0.9 
+      },
+      onBeforeLoad: function() {
+        $("button.yes").attr( 'id', this.getTrigger().attr('id') );
+      },
+      closeOnClick: false
+    });
+        
+    $( 'button.yes' ).click( function() {
+      var self = $(this);
+      $.ajax({
+        data:     {id:self.attr('id')},
+        dataType: 'script',
+        type:     'post',
+        url:      '/users/delete/'
+      }); 
+    });    
+  });
+</script>

data/lib/views/users/list.erb

@@ -0,0 +1,12 @@
+<%= zone_locator %>
+
+<div class="cltn">
+  <a class="back" href="<%=@back_url%>">&laquo;&nbsp;back</a>
+  <div class="title">users</div>  
+</div>
+
+<div class="cltn" style="padding:10px;">
+  <div id="results">
+    <%= partial :'users/results'%>
+  </div>
+</div>  

data/lib/views/users/results.js.erb

@@ -0,0 +1,2 @@
+<%= erb :'shared/flash.js', :layout => false %>
+$('div#results').html( "<%=escape_javascript(partial(:'users/results'))%>" );

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo3
 version: !ruby/object:Gem::Version 
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-30 00:00:00 -07:00
+date: 2010-01-03 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,6 +52,26 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 1.5.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: mongo_rack
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.0.1
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: main
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 4.2.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bones
   type: :development
@@ -98,6 +118,10 @@ extra_rdoc_files:
 - lib/views/layout.erb
 - lib/views/shared/_flash.erb
 - lib/views/shared/flash.js.erb
+- lib/views/users/_new.erb
+- lib/views/users/_results.erb
+- lib/views/users/list.erb
+- lib/views/users/results.js.erb
 files: 
 - .bnignore
 - .bnsignore
@@ -105,12 +129,15 @@ files:
 - HISTORY
 - README.rdoc
 - Rakefile
+- aa.rb
 - bin/mongo3
 - config/mongo3.yml
 - data/populate
+- lib/app.rb
 - lib/controllers/collections.rb
 - lib/controllers/databases.rb
 - lib/controllers/explore.rb
+- lib/controllers/users.rb
 - lib/helpers/collection_helper.rb
 - lib/helpers/crumb_helper.rb
 - lib/helpers/database_helper.rb
@@ -118,10 +145,11 @@ files:
 - lib/helpers/flash_helper.rb
 - lib/helpers/main_helper.rb
 - lib/helpers/paths_helper.rb
-- lib/main.rb
 - lib/mongo3.rb
 - lib/mongo3/connection.rb
 - lib/mongo3/node.rb
+- lib/mongo3/user.rb
+- lib/mongo3/zone.rb
 - lib/public/.DS_Store
 - lib/public/images/button.png
 - lib/public/images/button_act.png
@@ -216,6 +244,10 @@ files:
 - lib/views/layout.erb
 - lib/views/shared/_flash.erb
 - lib/views/shared/flash.js.erb
+- lib/views/users/_new.erb
+- lib/views/users/_results.erb
+- lib/views/users/list.erb
+- lib/views/users/results.js.erb
 - spec/landscape.yml
 - spec/mongo3/connection_spec.rb
 - spec/mongo3/node_spec.rb