mongo3 0.0.4 → 0.0.5

data/lib/views/explore/center_js.erb

@@ -1,3 +1,4 @@
 $('div#crumbs').html( "<%=escape_javascript(partial(:'explore/crumbs'))%>" );
+$('div#info').html( "<%=escape_javascript(partial(:'explore/node_info'))%>" );
 
 center( '<%=@node_id%>' );

data/lib/views/explore/explore.erb

@@ -2,22 +2,25 @@
   <%= partial :'explore/crumbs' %>
 </div>
 
-<div id="landscape"></div>
+<div id="landscape" class="borders"></div>
 
-<div id="right">
+<div id="right" class="borders">
   <div id="info"></div>
   <span id="log"></span>  
 </div>
 
-<div id="details" class="overlay">
+<div id="details" class="borders overlay">
   <div id="wrap"></div>
 </div>
 
 <script>
+  function remove_node( node_id ) {
+    ht.op.removeNode( node_id, { type: 'fade:seq', duration: 1000, transition: Trans.Quart.easeOut } );
+  }
+  
   function center( node_id ) {
     ht.onClick( node_id, {
-      Move:      { enable: true, offsetX: 30, offsetY: 5 },
-      onComplete: function() { update_info( node_id ); } });
+      Move:      { enable: true, offsetX: 30, offsetY: 5 } });
   }
 
   function morphit( id, json ) {
@@ -26,8 +29,7 @@
       type:       'fade:con', 
       delay:      10, 
       hideLabels: false, 
-      transition: Trans.Quart.easeOut,
-      onComplete: function() { update_info(id); } 
+      transition: Trans.Quart.easeOut
     });
     Log.write( "plotting..." );
   }
@@ -111,7 +113,6 @@
              ht.onClick( node.id, {
                Move:      { enable: true, offsetX: 30, offsetY: 5 },
                onComplete: function() { 
-                 update_info( node.id ); 
                  $.ajax( {
                     dataType: 'script', 
                     type:     'GET', 
@@ -164,83 +165,13 @@
     },
         
     onAfterCompute: function() {
-      Log.write("loaded");
+      Log.write("done");
     } });
     
     ht.loadJSON( eval( <%=@root.to_json%> ) );
     ht.controller.onAfterCompute(); 
     ht.refresh();
-    
-    if( '<%=@center%>'.length )
-      update_info( '<%=@center%>' );
-    else
-      update_info( 'home' );
-  }
 
-  function update_info(node_id)
-  {
-    var node = null;  
-    if( node_id )
-      node = Graph.Util.getNode(ht.graph, node_id);                                        
-    else
-      node = Graph.Util.getClosestNodeToOrigin(ht.graph, "pos");
-  
-    var html    = "";
-    var depth   = node.data.path_ids.split( '|' ).length
-    var legends = ['', 'environments', 'databases', 'collections']
-      
-    var children      = [];
-    var children_hash = {};
-    Graph.Util.eachAdjacency( node, function(adj) {      
-      child = adj.nodeTo;
-      if( parent ) {
-        if( child.name != parent.name ) {
-          children_hash[child.name] = child;
-          children.push( child.name );
-        }
-      }
-      else {
-        children_hash[child.name] = child;
-        children.push( child.name );
-      }
-    });
-    children = children.sort();
-  
-    html += "<span class=\"what\">" + legends[depth] + "(" + children.length + ")</span>";  
-    html += "<p style='padding:5px 10px;text-align:left;color:#c1c1c1'>";
-  
-    var buff = "<ul style='font-size:0.4em'>";  
-    for( var i in children ) {
-      var node = children_hash[children[i]];
-      buff += "<li>";
-      buff += make_link( node );
-      buff += "</li>";
-    }  
-    html += "</ul>" + buff;
-    html += "</p>";
-    $('div#info').html( html );
-  
-    $('a.info[rel]').overlay( 
-      { top:    '15%',
-        expose: '#1c1c1c',
-        onBeforeLoad: function() {
-          var wrap = this.getContent().find( 'div#wrap' );
-          wrap.load( this.getTrigger().attr( 'href' ) );
-        }
-      });   
-  }
-
-  function make_link( node )
-  {
-    return "<a rel=\"div#details\" class=\"info\" href=\"/explore/show/" + node.data.path_ids + "/" + node.data.path_names + "\">" + node.name + "</a>";  
-  }
-
-  function refresh_data( url, path, name )
-  {
-    $.ajax( {
-      dataType: 'script', 
-      type:     'GET', 
-      url:      url + "/" + path + "/" + name
-    });
+    $('div#info').html( "<%=escape_javascript( partial( :'explore/node_info' ) )%>" )    
   }
 </script>

data/lib/views/explore/more_data_js.erb

@@ -1,3 +1,4 @@
 $('div#crumbs').html( "<%=escape_javascript(partial(:'explore/crumbs'))%>" );
+$('div#info').html( "<%=escape_javascript(partial(:'explore/node_info'))%>" );
 
 morphit( '<%=@node_id%>', '<%=escape_javascript( @sub_tree.to_json )%>' );

data/lib/views/explore/update.js.erb

@@ -0,0 +1,5 @@
+<%= erb :'shared/flash.js', :layout => false %>
+
+// $('div#info').html( "<=escape_javascript(partial(:'explore/node_info'))%>" );
+
+remove_node( '<%=@node_id%>' );

data/lib/views/explore/update_crumb_js.erb

@@ -1 +1,2 @@
-$('div#crumbs').html( "<%=escape_javascript(partial(:'explore/crumbs'))%>" );
+$('div#crumbs').html( "<%=escape_javascript(partial(:'explore/crumbs'))%>" );
+$('div#info').html( "<%=escape_javascript(partial(:'explore/node_info'))%>" );

data/lib/views/layout.erb

@@ -16,12 +16,12 @@
   <body id="body">
     <div id="overall">
       <div id="logo">
-        <a href="/explore">
+        <a href="/explore" style="float:left">
           <img src='/images/mongo3.png' style="border:none"/>
         </a>
+        <div class="flash">Hello World</div>        
       </div>      
       <div id="main">
-        <div class="flash"></div>
         <%= yield %>
       </div>
     </div>      

data/lib/views/shared/flash.js.erb

@@ -1,8 +1,10 @@
-$('div.flash').html( "<%=escape_javascript(partial(:'shared/flash'))%>" );
-$('div.flash').show();
-<% if @flash[:error] %>
-  $('div.flash').attr( 'class', 'flash flash_error' );
-<% else %>
+<% if @flash %>
+  $('div.flash').html( "<%=escape_javascript(partial(:'shared/flash'))%>" );
+  $('div.flash').show();
+  <% if @flash[:error] %>
+    $('div.flash').attr( 'class', 'flash flash_error' );
+  <% else %>
     $('div.flash').attr( 'class', 'flash flash_info' );
-<% end %>
-$('div.flash').fadeOut( 3000 );
+  <% end %>
+  $('div.flash').fadeOut( 3000 );
+<% end %>

data/spec/landscape.yml

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

data/spec/mongo3/connection_spec.rb

@@ -0,0 +1,146 @@
+require 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 )    
+    @mongo3 = Mongo3::Connection.new( File.join(File.dirname(__FILE__), %w[.. landscape.yml]) )    
+  end
+  
+  before( :each ) do    
+    unless @db.collection_names.include? 'test1_cltn'
+      @cltn1 = @db.create_collection('test1_cltn') 
+    else
+      @cltn1 = @db['test1_cltn']
+    end
+    unless @db.collection_names.include? 'test2_cltn'
+      @cltn2 = @db.create_collection('test2_cltn') 
+    else
+      @cltn2 = @db['test2_cltn']
+    end
+    
+    @cltn1.remove
+    10.times do |i|
+      @cltn1.insert( {:name => "test_#{i}", :value => i } )
+    end
+    @cltn2.remove
+    10.times do |i|
+      @cltn2.insert( {:name => "test_#{i}", :value => i } )
+    end
+  end
+  
+  it "should clear out a cltn correctly" do
+    @mongo3.clear_cltn( "home|test|mongo3_test_db|test1_cltn" )
+    @db['test1_cltn'].count.should == 0
+  end
+  
+  it "should delete a row correctly" do
+    obj = @cltn1.find_one()
+    @mongo3.delete_row( "home|test|mongo3_test_db|test1_cltn", obj['_id'].to_s )
+    @db['test1_cltn'].count.should == 9    
+  end
+  
+  it "should drop a cltn correctly" do
+    @mongo3.drop_cltn( "home|test|mongo3_test_db|test1_cltn" )
+    lambda { @db['test1_cltn'] }.should raise_error( /Collection test1_cltn/ )
+  end
+  
+  it "should drop a db correctly" do
+    @mongo3.drop_db( "home|test|mongo3_test_db" )
+    @con.database_names.include?( 'mongo3_test_db' ).should == false
+    @db = @con.db( 'mongo3_test_db', :strict => true )    
+  end
+  
+  it "should load a landscape file correctly" do
+    test = @mongo3.landscape['test']
+        
+    test.should_not be_nil
+    test['host'].should == 'localhost'
+    test['port'].should == 27017
+  end
+  
+  it "should build a tree correctly" do
+    root = @mongo3.build_tree
+
+    root.name.should == 'home'
+    root.oid.should  == 'home'
+    root.data[:path_names].should == 'home'
+    
+    children = root.children
+    children.should have(1).item
+    children.first.name.should == 'test'
+    children.first.oid.should  == 'test'
+    children.first.children.should be_empty
+  end
+  
+  describe "#show" do
+    it "should pull env info correctly" do
+      info = @mongo3.show( "home|test" )
+      info.size.should             == 6
+      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"      
+    end
+    
+    it "should pull cltn info correctly" do
+      info = @mongo3.show( "home|test|mongo3_test_db|test1_cltn" )
+      info.size.should    == 4
+      info[:size].should  == 10
+      info[:title].should == "test1_cltn"
+    end
+  end
+  
+  describe "#build_sub_tree" do
+    it "should build a adjacencies from db correctly" do
+      adjs = @mongo3.build_sub_tree( 100, "home|test" ).to_adjacencies
+      adjs.should_not be_empty
+      adjs.size.should > 1
+      adjs.first[:name].should == 'test'
+      adjs.first[:id].should   == 100
+    end
+    
+    it "should build a adjacencies from cltn correctly" do
+      adjs = @mongo3.build_sub_tree( 200, "home|test|mongo3_test_db" ).to_adjacencies
+      adjs.size.should == 4
+      adjs.first[:name].should == 'mongo3_test_db'
+      adjs.first[:id].should   == 200
+      adjs.first[:adjacencies].should have(3).items
+    end    
+    
+    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(3).items
+    end
+  end
+
+  describe "paginate db" do
+    it "should paginate a db correctly" do
+      rows = @mongo3.paginate_db( "home|test|mongo3_test_db" )
+      rows.size.should == 3
+      rows.total_entries.should == 3
+    end    
+  end  
+  
+  describe "paginate cltn" do
+    it "should paginate a cltn correctly" do
+      rows = @mongo3.paginate_cltn( "home|test|mongo3_test_db|test1_cltn" )
+      rows.size.should == 10
+      rows.total_entries.should == 10
+    end
+    
+    it "should paginate db with q correctly" do
+      rows = @mongo3.paginate_cltn( "home|test|mongo3_test_db|test1_cltn", [{:value =>{'$gt' => 5 }}, []] )
+      rows.size.should == 4
+      rows.total_entries.should == 4
+    end    
+  end  
+end

data/spec/mongo3/node_spec.rb

@@ -35,6 +35,14 @@ describe Mongo3::Node do
     end
   end
   
+  it "should make a new node correctly" do
+    node = Mongo3::Node.make_node( "blee" )
+    node.name.should              == "blee"
+    node.oid.should               == "blee"
+    node.data[:path_ids].should   == "blee"
+    node.data[:path_names].should == "blee"
+  end
+  
   it "should create a node correctly" do
     @root.oid.should         == 0
     @root.name.should        == "root"
@@ -66,19 +74,29 @@ describe Mongo3::Node do
   end
   
   it "should set the path correctly" do
-    @cltns.first.data[:path].should == "root|env_0|db_0|cltn_0"
-    @dbs.last.data[:path].should    == "root|env_1|db_3"
-    @envs.first.data[:path].should  == "root|env_0"
-    @root.data[:path].should        be_nil
+    @cltns.first.data[:path_names].should == "root|env_0|db_0|cltn_0"
+    @dbs.last.data[:path_names].should    == "root|env_1|db_3"
+    @envs.first.data[:path_names].should  == "root|env_0"
+    @root.data[:path_names].should        be_nil
   end
   
   it "should dump to json correctly" do
-    @cltns.first.to_json.should == "{\"name\":\"cltn_0\",\"id\":102,\"children\":[],\"data\":{\"path\":\"root|env_0|db_0|cltn_0\"}}"
-    @dbs.first.to_json.should   == "{\"name\":\"db_0\",\"id\":102,\"children\":[{\"name\":\"cltn_0\",\"id\":102,\"children\":[],\"data\":{\"path\":\"root|env_0|db_0|cltn_0\"}},{\"name\":\"cltn_1\",\"id\":103,\"children\":[],\"data\":{\"path\":\"root|env_0|db_0|cltn_1\"}},{\"name\":\"cltn_2\",\"id\":104,\"children\":[],\"data\":{\"path\":\"root|env_0|db_0|cltn_2\"}},{\"name\":\"cltn_3\",\"id\":105,\"children\":[],\"data\":{\"path\":\"root|env_0|db_0|cltn_3\"}}],\"data\":{\"path\":\"root|env_0|db_0\"}}"
+    @cltns.first.to_json.should_not be_empty
+    @dbs.first.to_json.should_not   be_empty
   end
   
   it "should dump adjacencies correctly" do
-    @cltns.first.to_adjacencies.should == [{:adjacencies=>[], :name=>"cltn_0", :data=>{:path=>"root|env_0|db_0|cltn_0"}, :id=>102}]
-    @dbs.first.to_adjacencies.should   == [{:name=>"db_0", :adjacencies=>[102, 103, 104, 105], :data=>{:path=>"root|env_0|db_0"}, :id=>102}, {:name=>"cltn_0", :adjacencies=>[], :data=>{:path=>"root|env_0|db_0|cltn_0"}, :id=>102}, {:name=>"cltn_1", :adjacencies=>[], :data=>{:path=>"root|env_0|db_0|cltn_1"}, :id=>103}, {:name=>"cltn_2", :adjacencies=>[], :data=>{:path=>"root|env_0|db_0|cltn_2"}, :id=>104}, {:name=>"cltn_3", :adjacencies=>[], :data=>{:path=>"root|env_0|db_0|cltn_3"}, :id=>105}] 
+    item = @cltns.first.to_adjacencies
+    item.should have(1).item
+    item.first[:name].should == "cltn_0"
+    item.first[:id].should  == 102
+    
+    item = @dbs.first.to_adjacencies
+    item.should have(5).item
+    item.first[:name].should == 'db_0'
+    item.last[:name].should  == 'cltn_3'    
+    
+    # @dbs.first.to_adjacencies.should   == 
+    # [{:adjacencies=>[102, 103, 104, 105], :name=>"db_0", :id=>102, :data=>{:path_ids=>"0|100|102", :path_names=>"root|env_0|db_0"}}, {:adjacencies=>[], :name=>"cltn_0", :id=>102, :data=>{:path_ids=>"0|100|102|102", :path_names=>"root|env_0|db_0|cltn_0"}}, {:adjacencies=>[], :name=>"cltn_1", :id=>103, :data=>{:path_ids=>"0|100|102|103", :path_names=>"root|env_0|db_0|cltn_1"}}, {:adjacencies=>[], :name=>"cltn_2", :id=>104, :data=>{:path_ids=>"0|100|102|104", :path_names=>"root|env_0|db_0|cltn_2"}}, {:adjacencies=>[], :name=>"cltn_3", :id=>105, :data=>{:path_ids=>"0|100|102|105", :path_names=>"root|env_0|db_0|cltn_3"}}]
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'rubygems'
 require 'rack'
-# require 'rack/test'
+require 'rack/test'
+require 'mongo'
+gem 'agnostic-will_paginate'
+require 'will_paginate/collection'
 
 require File.join(File.dirname(__FILE__), %w[.. lib mongo3])
 

data/tasks/rdoc.rake

@@ -1,5 +1,5 @@
 require 'rake/rdoctask'
-require 'darkfish-rdoc'
+# require 'darkfish-rdoc'
 
 namespace :doc do
 
@@ -28,7 +28,7 @@ namespace :doc do
     rd.options << "-t #{title}"
     rd.options << "-SHN"
     rd.options << "-f"
-    rd.options << "darkfish"    
+    # rd.options << "darkfish"    
     rd.options.concat(rdoc.opts)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo3
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-27 00:00:00 -07:00
+date: 2009-12-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,9 @@ extensions: []
 
 extra_rdoc_files: 
 - lib/views/collections/_fields_form.erb
+- lib/views/collections/_index_form.erb
+- lib/views/collections/_index_rows.erb
+- lib/views/collections/_indexes.erb
 - lib/views/collections/_results.erb
 - lib/views/collections/_rows.erb
 - lib/views/collections/_search_form.erb
@@ -67,6 +70,7 @@ extra_rdoc_files:
 - lib/views/collections/list.erb
 - lib/views/collections/results.js.erb
 - lib/views/collections/update.js.erb
+- lib/views/collections/update_indexes.js.erb
 - lib/views/databases/_results.erb
 - lib/views/databases/list.erb
 - lib/views/databases/results.js.erb
@@ -74,9 +78,11 @@ extra_rdoc_files:
 - lib/views/explore/_dump_array.erb
 - lib/views/explore/_dump_hash.erb
 - lib/views/explore/_info.erb
+- lib/views/explore/_node_info.erb
 - lib/views/explore/center_js.erb
 - lib/views/explore/explore.erb
 - lib/views/explore/more_data_js.erb
+- lib/views/explore/update.js.erb
 - lib/views/explore/update_crumb_js.erb
 - lib/views/landscape.erb
 - lib/views/layout.erb
@@ -97,8 +103,11 @@ files:
 - lib/controllers/explore.rb
 - lib/helpers/collection_helper.rb
 - lib/helpers/crumb_helper.rb
+- lib/helpers/database_helper.rb
+- lib/helpers/explore_helper.rb
 - 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
@@ -120,6 +129,8 @@ files:
 - 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
@@ -146,6 +157,8 @@ files:
 - 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
@@ -207,6 +220,9 @@ files:
 - lib/public/stylesheets/mongo3.css
 - lib/utils.rb
 - lib/views/collections/_fields_form.erb
+- lib/views/collections/_index_form.erb
+- lib/views/collections/_index_rows.erb
+- lib/views/collections/_indexes.erb
 - lib/views/collections/_results.erb
 - lib/views/collections/_rows.erb
 - lib/views/collections/_search_form.erb
@@ -214,6 +230,7 @@ files:
 - lib/views/collections/list.erb
 - lib/views/collections/results.js.erb
 - lib/views/collections/update.js.erb
+- lib/views/collections/update_indexes.js.erb
 - lib/views/databases/_results.erb
 - lib/views/databases/list.erb
 - lib/views/databases/results.js.erb
@@ -221,14 +238,18 @@ files:
 - lib/views/explore/_dump_array.erb
 - lib/views/explore/_dump_hash.erb
 - lib/views/explore/_info.erb
+- lib/views/explore/_node_info.erb
 - lib/views/explore/center_js.erb
 - lib/views/explore/explore.erb
 - lib/views/explore/more_data_js.erb
+- lib/views/explore/update.js.erb
 - lib/views/explore/update_crumb_js.erb
 - lib/views/landscape.erb
 - lib/views/layout.erb
 - lib/views/shared/_flash.erb
 - lib/views/shared/flash.js.erb
+- spec/landscape.yml
+- spec/mongo3/connection_spec.rb
 - spec/mongo3/node_spec.rb
 - spec/spec_helper.rb
 - tasks/bones.rake