mongo3 0.0.7 → 0.0.8

data/lib/app.rb

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'sinatra'
 require 'forwardable'
-require File.join( File.dirname(__FILE__), 'mongo3.rb' )
+require File.expand_path( File.join( File.dirname(__FILE__), 'mongo3.rb' ) )
 require 'mongo'
 gem 'agnostic-will_paginate'
 require 'will_paginate'

data/lib/controllers/collections.rb

@@ -59,7 +59,9 @@ module Collections
     json = params[:search].gsub( /'/, "\"" )
     if json.empty?
       @query = {}
-      @sort  = {}
+      @sort  = []
+      session[:query_params] = [@query,@sort]
+      load_cltn
     else
       tokens = json.split( "|" )
       begin
@@ -106,7 +108,7 @@ module Collections
   # ===========================================================================
   helpers do    
     def load_cltn( page=1 )    
-      query_params = session[:query_params] || [{},[]]
+      query_params = session[:query_params] || [Hash.new,[]]
       if ( !query_params.first or query_params.first.empty?) and ( !query_params.last or query_params.last.empty? )
         @query = nil
       else  

data/lib/controllers/explore.rb

@@ -26,6 +26,10 @@ module Explore
     erb :'explore/explore'
   end
 
+  get "/fred/:duh" do
+    "Hello World #{params[:duh]}"
+  end
+  
   # -----------------------------------------------------------------------------
   get '/explore/back' do  
     session[:selected_cols] = nil
@@ -58,7 +62,7 @@ module Explore
   end
   
   # -----------------------------------------------------------------------------
-  get '/explore/more_data/:path_ids/:path_names/*' do
+  get '/explore/more_data/:path_ids/:path_names/' do
     path_ids   = params[:path_ids]
     parent_id  = path_ids.split("|").last
     path_names = params[:path_names]

data/lib/helpers/collection_helper.rb

@@ -27,9 +27,12 @@ module CollectionHelper
   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"
+      when Mongo::ASCENDING
+        "asc"
+      when Mongo::DESCENDING  
+        "desc"
+      else                    
+        "n/a"
     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_name_tokens[0..count].join( "|" )}/#{path_id_tokens[0..count].join( "|") }"]
+        @crumbs << [crumb, "/explore/center/#{CGI.escape(path_name_tokens[0..count].join( "|" ))}/#{CGI.escape(path_id_tokens[0..count].join( "|")) }"]
         count += 1
       end
       session[:crumbs] = @crumbs
     end
     
     def pop_crumb!( path_ids, path_names )
-      path  = "/explore/center/#{path_ids}/#{path_names}"
+      path  = "/explore/center/#{CGI.escape(path_ids)}/#{CGI.escape(path_names)}"
       level = 0
       range = nil
       @crumbs.each do |pair|
@@ -38,7 +38,7 @@ module CrumbHelper
       titles = @crumbs.map{ |p| p.first }
       unless titles.include?( title )
         @crumbs.pop if @crumbs.size == 3
-        @crumbs << [title, url]
+        @crumbs << [title, CGI.escape(url)]
         session[:crumbs] = @crumbs
       end
     end

data/lib/helpers/database_helper.rb

@@ -8,9 +8,12 @@ module DatabaseHelper
    
     def context_for( paths )
       case paths.size
-        when 2 : "zone"
-        when 3 : "database"
-        else     "collection"
+        when 2 
+          "zone"
+        when 3 
+          "database"
+        else     
+          "collection"
       end      
     end    
   end  

data/lib/helpers/explore_helper.rb

@@ -15,9 +15,12 @@ module ExploreHelper
     def path_type( path )
       tokens = path.split( "|" )
       case tokens.length 
-        when 1 : "zone"
-        when 2 : "database"
-        else     "collection"
+        when 1 
+          "zone"
+        when 2 
+          "database"
+        else     
+          "collection"
       end            
     end
     

data/lib/helpers/paths_helper.rb

@@ -28,9 +28,12 @@ module PathHelper
     def title_for( path_names )
       tokens = path_names.split( "|" )
       buff = case tokens.size
-        when 2 : "zone"
-        when 3 : "database"
-        else     "collection"
+        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>"

data/lib/mongo3/connection.rb

@@ -1,3 +1,5 @@
+require 'yaml'
+
 # BOZO !! Time to refact no?
 module Mongo3
   class Connection
@@ -186,7 +188,7 @@ 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        
+          sort   = query_params.last.empty? ? [ ['_id', Mongo::DESCENDING] ] : query_params.last
           results = cltn.find( query_params.first, 
             :sort  => sort,
             :skip  => offset, 
@@ -224,7 +226,7 @@ module Mongo3
           host, port = master.split( ":" )
           master_zone = zone_for( host, port )
           next unless master_zone
-          master_node = root.find( "home|#{master_zone}")
+          master_node = root.find( master_zone )
           if master_node
             master_node.mark_master!
             master_node << node
@@ -281,7 +283,7 @@ module Mongo3
             host, port  = master.split( ":" )
             master_zone = zone_for( host, port )
             next unless master_zone
-            master_node = root.find( "home|#{master_zone}")
+            master_node = root.find( master_zone )
             if master_node
               master_node.mark_master!
               master_node << node

data/lib/mongo3.rb

@@ -1,7 +1,7 @@
 module Mongo3
   
   # :stopdoc:
-  VERSION = '0.0.7' unless defined? Mongo3::VERSION
+  VERSION = '0.0.8' 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:

data/lib/views/explore/_node_info.erb

@@ -25,7 +25,7 @@
         <% 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"/>
         <% end %> 
-        <p rel="div#details" href="/explore/show/<%=node.data[:path_ids]%>/<%=node.data[:path_names]%>" class="info">
+        <p rel="div#details" href="/explore/show/<%=CGI.escape(node.data[:path_ids])%>/<%=CGI.escape(node.data[:path_names])%>" class="info">
           <%=truncate(node.name, 30)%>
         </p>
       </div>

data/lib/views/explore/explore.erb

@@ -106,7 +106,7 @@
           {
             Log.write( "fetching new data..." );
             var url = "/explore/more_data/";
-            url     += node.data.path_ids + "/" + node.data.path_names + "/";
+            url     += escape(node.data.path_ids) + "/" + escape(node.data.path_names) + "/";
             $.ajax( {
               dataType: 'script',
               type:     'GET',
@@ -137,7 +137,8 @@
     onBeforePlotLine: function(adj) {
       var nodeTo   = adj.nodeTo;
       var nodeFrom = adj.nodeFrom;
-      if( nodeFrom.data.slave && nodeTo.data.master )
+#console.log( "Node from " + nodeFrom.name + " " + nodeFrom.data.master + " -- " + nodeTo.data.)
+      if( (nodeFrom.data.slave && nodeTo.data.master) || (nodeFrom.data.master && nodeTo.data.slave) )
       {
         adj.data.$lineWidth = 3;
         adj.data.$color     = "#f00";

data/spec/landscape.yml

@@ -1,3 +1,3 @@
 test:
   host: localhost
-  port: 27017
+  port: 12345

data/spec/mongo3/connection_spec.rb

@@ -1,12 +1,12 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. spec_helper] ) )
 require 'ostruct'
 require 'mongo'
 
 describe Mongo3::Connection do
   
   before( :all ) do
-    @con    = Mongo::Connection.new( 'localhost', 27017 )
-    @db   = @con.db( 'mongo3_test_db', :strict => true )    
+    @con    = Mongo::Connection.new( 'localhost', 12345 )
+    @db     = @con.db( 'mongo3_test_db', :strict => true )
     @mongo3 = Mongo3::Connection.new( File.join(File.dirname(__FILE__), %w[.. landscape.yml]) )    
   end
   
@@ -35,6 +35,7 @@ describe Mongo3::Connection do
   it "should clear out a cltn correctly" do
     @mongo3.clear_cltn( "home|test|mongo3_test_db|test1_cltn" )
     @db['test1_cltn'].count.should == 0
+    @db['test2_cltn'].count.should == 10
   end
   
   it "should delete a row correctly" do
@@ -60,7 +61,7 @@ describe Mongo3::Connection do
         
     test.should_not be_nil
     test['host'].should == 'localhost'
-    test['port'].should == 27017
+    test['port'].should == 12345
   end
   
   it "should build a tree correctly" do
@@ -80,16 +81,16 @@ describe Mongo3::Connection do
   describe "#show" do
     it "should pull env info correctly" do
       info = @mongo3.show( "home|test" )
-      info.size.should             == 6
+      info.size.should             == 8
       info[:title].should          == "test"
       info[:databases].size.should > 1
     end
     
     it "should pull db info correctly" do
       info = @mongo3.show( "home|test|mongo3_test_db" )
-      info.size.should               == 7
-      info[:collections].size.should == 4
-      info[:title].should            == "mongo3_test_db"      
+      info.size.should          == 7
+      info[:collections].should == 2
+      info[:title].should       == "mongo3_test_db"      
     end
     
     it "should pull cltn info correctly" do
@@ -119,7 +120,7 @@ describe Mongo3::Connection do
     
     it "should build a partial tree correctly" do
       root = @mongo3.build_partial_tree( "home|test|mongo3_test_db" )
-      root.find( "test_2" ).children.should have(0).items
+      root.find( "test_0" ).children.should have(2).items
     end
   end
 

data/spec/mongo3/node_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), %w[.. spec_helper])
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. spec_helper] ) )
 require 'ostruct'
 
 describe Mongo3::Node do

data/spec/spec_helper.rb

@@ -5,7 +5,7 @@ require 'mongo'
 gem 'agnostic-will_paginate'
 require 'will_paginate/collection'
 
-require File.join(File.dirname(__FILE__), %w[.. lib mongo3])
+require File.expand_path( File.join( File.dirname(__FILE__), %w[.. lib mongo3] ) )
 
 Spec::Runner.configure do |config|
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo3
 version: !ruby/object:Gem::Version 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-03 00:00:00 -07:00
+date: 2010-01-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -72,16 +72,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 4.2.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: bones
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.5.1
-    version: 
 description: "  Mongo3 allows you to manage your mongoDB clusters using a web based admin console.\n  The console provides for getting an overview of your mongo landscape and drilldown to\n  see various information about your databases. You will be able to manage your clusters\n  by performing common database admin tasks directly from the web console.\n  \n  The initial release of Mongo3 will be a read only shallow mode. Further development\n  still needs to take place to build up the functionality from the existing code base."
 email: fernand.galiana@gmail.com
 executables: 
@@ -123,16 +113,10 @@ extra_rdoc_files:
 - lib/views/users/list.erb
 - lib/views/users/results.js.erb
 files: 
-- .bnignore
-- .bnsignore
-- .gitignore
 - HISTORY
 - README.rdoc
 - Rakefile
-- aa.rb
 - bin/mongo3
-- config/mongo3.yml
-- data/populate
 - lib/app.rb
 - lib/controllers/collections.rb
 - lib/controllers/databases.rb
@@ -150,53 +134,35 @@ files:
 - 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
-- lib/public/images/button_act.psd
 - lib/public/images/c292199_a.jpg
 - lib/public/images/clear.png
-- lib/public/images/clear.psd
 - lib/public/images/close.png
-- lib/public/images/close.psd
 - lib/public/images/cluster.png
-- lib/public/images/cluster.psd
 - lib/public/images/db.jpg
 - lib/public/images/db.png
-- lib/public/images/db.psd
 - lib/public/images/delete.png
 - lib/public/images/delete_big.png
-- lib/public/images/delete_big.psd
 - lib/public/images/edit.png
-- lib/public/images/edit.psd
 - lib/public/images/header.png
-- lib/public/images/header.psd
 - lib/public/images/li_select.png
-- lib/public/images/li_select.psd
 - lib/public/images/loading.gif
 - lib/public/images/lock.png
-- lib/public/images/lock.psd
 - lib/public/images/mongo.png
-- lib/public/images/mongo.psd
 - lib/public/images/mongo3.png
-- lib/public/images/mongo3.psd
 - lib/public/images/mongo3_db.png
-- lib/public/images/mongo3_db.psd
-- lib/public/images/mongo_10.psd
 - lib/public/images/mongo_db.jpg
 - lib/public/images/mongo_db.png
-- lib/public/images/mongo_db.psd
 - lib/public/images/mongo_db_1.jpg
 - lib/public/images/mongo_db_2
 - lib/public/images/mongo_db_4
 - lib/public/images/monkey.jpg
 - lib/public/images/monkey.png
-- lib/public/images/monkey.psd
 - lib/public/images/monkey_1.jpg
 - lib/public/images/monkey_10.jpg
 - lib/public/images/search.png
 - lib/public/images/selected_bg.png
-- lib/public/images/selected_bg.psd
 - lib/public/images/tooltip/black.png
 - lib/public/images/tooltip/black_arrow.png
 - lib/public/images/tooltip/black_arrow_big.png
@@ -205,7 +171,6 @@ files:
 - lib/public/images/tooltip/white_arrow.png
 - lib/public/images/tooltip/white_arrow_big.png
 - lib/public/images/tooltip/white_big.png
-- lib/public/javascripts/.DS_Store
 - lib/public/javascripts/application.js
 - lib/public/javascripts/jit.js
 - lib/public/javascripts/jit.min.js

data/.bnignore

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

data/.bnsignore

@@ -1,16 +0,0 @@
-# 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

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

data/aa.rb

@@ -1,17 +0,0 @@
-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/config/mongo3.yml

@@ -1,33 +0,0 @@
-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

@@ -1,28 +0,0 @@
-#!/usr/bin/env ruby
-require 'rubygems'
-require 'mongo'
-
-connection = Mongo::Connection.new( 'localhost', 27019 )
-# db = connection.db( 'admin' )
-# db.authenticate( 'admin', 'admin')
-
-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}" }
-  puts "Inserting row #{row.inspect}"  
-    cltn.insert( row )
-  end
-
-  cltn = db[cltn_name]
-  puts ""
-  puts "Inserted `#{cltn.count} records in `#{cltn_name}"
-end