mongo3 0.0.5 → 0.0.6

data/lib/views/explore/explore.erb

@@ -91,41 +91,59 @@
         domElement.innerHTML = truncate( unescape(node.name), 15 );
         
         addEvent(domElement, 'click', function () {
-        var children_count = 0;
-        for( var i in node.adjacencies )
-           children_count += 1;
+          var children_count = 0;
+          for( var i in node.adjacencies )
+             children_count += 1;
 
-        if ( node.data && children_count == 1 && node.data.dyna )
-        {
-          Log.write( "fetching new data..." );
-          var url = "/explore/more_data/";
-          url     += node.data.path_ids + "/" + node.data.path_names + "/";
-          $.ajax( {
-            dataType: 'script',
-            type:     'GET',
-            url:      url
-          });
-        }
-        else
-        {
-           if( node.data.path_ids.split( '|' ).length < 4 ) {
-             Log.write( "centering..." );               
-             ht.onClick( node.id, {
-               Move:      { enable: true, offsetX: 30, offsetY: 5 },
-               onComplete: function() { 
-                 $.ajax( {
-                    dataType: 'script', 
-                    type:     'GET', 
-                    url:      "/explore/update_crumb/" + node.data.path_ids + "/" + node.data.path_names });
-                } });
-            }
-            else {
-              Log.write( "no more data" );
-            }
-         }
+          // Bail if slave node 
+          if ( node.data && node.data.slave )
+          {
+            Log.write( "Slave node detected. No action" );
+            return;
+          }
+            
+          if ( node.data && node.data.dyna && (children_count == 1 || node.data.master)  )
+          {
+            Log.write( "fetching new data..." );
+            var url = "/explore/more_data/";
+            url     += node.data.path_ids + "/" + node.data.path_names + "/";
+            $.ajax( {
+              dataType: 'script',
+              type:     'GET',
+              url:      url,
+              success:  function() { node.data.dyna = false; }
+            });
+          }
+          else
+          {
+             if( node.data.path_ids.split( '|' ).length < 4 ) {
+               Log.write( "centering..." );               
+               ht.onClick( node.id, {
+                 Move:      { enable: true, offsetX: 30, offsetY: 5 },
+                 onComplete: function() { 
+                   $.ajax( {
+                      dataType: 'script', 
+                      type:     'GET', 
+                      url:      "/explore/update_crumb/" + node.data.path_ids + "/" + node.data.path_names });
+                  } });
+              }
+              else {
+                Log.write( "no more data" );
+              }
+           }
       });
     },
               
+    onBeforePlotLine: function(adj) {
+      var nodeTo   = adj.nodeTo;
+      var nodeFrom = adj.nodeFrom;
+      if( nodeFrom.data.slave && nodeTo.data.master )
+      {
+        adj.data.$lineWidth = 3;
+        adj.data.$color     = "#f00";
+      }
+    },
+    
     onPlaceLabel: function(domElement, node){
       var item = $(domElement);
 
@@ -145,6 +163,9 @@
     onBeforePlotNode: function( node ) {
       level = node.data.path_ids.split("|").length;
   
+      if( node.data.slave || node.data.master )
+        return;
+      
       if( level == 1 ) 
       {        
         node.data.$dim   = 10;

data/lib/views/layout.erb

@@ -5,12 +5,8 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />    
     <link rel="icon" href="/favicon.ico" type="image/x-icon"/>
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>    
-    <link rel="stylesheet" href="/stylesheets/mongo3.css" type="text/css" media="screen" />
-    <script src="/javascripts/jquery_min.js" type="text/javascript"></script>
-    <script src="/javascripts/jquery_ui_min.js" type="text/javascript"></script>
-    <script src="/javascripts/jquery.tools.min.js" type="text/javascript"></script>
-    <script src="/javascripts/application.js" type="text/javascript"></script>
-    <script src="/javascripts/jit.min.js" type="text/javascript"></script>
+    <%= stylesheets %w[mongo3] %>
+    <%= javascripts %w[jquery_min jquery_ui_min jquery.tools.min application jit.min] %>
   </head>
 
   <body id="body">

data/spec/mongo3/connection_spec.rb

@@ -38,9 +38,10 @@ describe Mongo3::Connection do
   end
   
   it "should delete a row correctly" do
+    before = @cltn1.count
     obj = @cltn1.find_one()
     @mongo3.delete_row( "home|test|mongo3_test_db|test1_cltn", obj['_id'].to_s )
-    @db['test1_cltn'].count.should == 9    
+    @db['test1_cltn'].count.should == before-1    
   end
   
   it "should drop a cltn correctly" do
@@ -110,23 +111,23 @@ describe Mongo3::Connection do
     
     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.size.should == 3
       adjs.first[:name].should == 'mongo3_test_db'
       adjs.first[:id].should   == 200
-      adjs.first[:adjacencies].should have(3).items
+      adjs.first[:adjacencies].should have(2).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
+      root.find( "test_2" ).children.should have(0).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
+      rows.size.should == 2
+      rows.total_entries.should == 2
     end    
   end  
   
@@ -143,4 +144,37 @@ describe Mongo3::Connection do
       rows.total_entries.should == 4
     end    
   end  
+  
+  describe "indexes" do
+    it "should list indexes correctly" do
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      indexes.should_not be_nil
+      indexes.keys.should have(1).item
+      indexes.keys.first.should == '_id_'
+    end
+    
+    it "should add an index correctly" do
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      before = indexes.size
+      @mongo3.create_index( "home|test|mongo3_test_db|test1_cltn", [[:name, Mongo::ASCENDING]], {:unique => 1} )
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      indexes.size.should == before + 1
+    end
+
+    it "should add a compound index correctly" do
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      before = indexes.size
+      @mongo3.create_index( "home|test|mongo3_test_db|test1_cltn", [[:name, Mongo::ASCENDING], [:_id, Mongo::DESCENDING]], {:unique => 1} )
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      indexes.size.should == before + 1
+    end
+    
+    it "should drop an index correctly" do
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      before = indexes.size
+      @mongo3.drop_index( "home|test|mongo3_test_db|test1_cltn", "name_1"  )
+      indexes = @mongo3.indexes_for( "home|test|mongo3_test_db|test1_cltn" )
+      indexes.size.should == before - 1      
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mongo3
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Fernand Galiana
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-29 00:00:00 -07:00
+date: 2009-12-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -42,6 +42,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 3.0.0
     version: 
+- !ruby/object:Gem::Dependency 
+  name: memcache-client
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.5.0
+    version: 
 - !ruby/object:Gem::Dependency 
   name: bones
   type: :development
@@ -168,50 +178,8 @@ files:
 - lib/public/images/tooltip/white_arrow_big.png
 - lib/public/images/tooltip/white_big.png
 - lib/public/javascripts/.DS_Store
-- lib/public/javascripts/Jit-1.1.3.zip
-- lib/public/javascripts/Jit/Examples/Hypertree/example1.html
-- lib/public/javascripts/Jit/Examples/Hypertree/example1.js
-- lib/public/javascripts/Jit/Examples/Hypertree/example2.html
-- lib/public/javascripts/Jit/Examples/Hypertree/example2.js
-- lib/public/javascripts/Jit/Examples/Hypertree/example3.html
-- lib/public/javascripts/Jit/Examples/Hypertree/example3.js
-- lib/public/javascripts/Jit/Examples/Other/example1.html
-- lib/public/javascripts/Jit/Examples/Other/example1.js
-- lib/public/javascripts/Jit/Examples/Other/example2.html
-- lib/public/javascripts/Jit/Examples/Other/example2.js
-- lib/public/javascripts/Jit/Examples/Other/example3.html
-- lib/public/javascripts/Jit/Examples/Other/example3.js
-- lib/public/javascripts/Jit/Examples/RGraph/example1.html
-- lib/public/javascripts/Jit/Examples/RGraph/example1.js
-- lib/public/javascripts/Jit/Examples/RGraph/example2.html
-- lib/public/javascripts/Jit/Examples/RGraph/example2.js
-- lib/public/javascripts/Jit/Examples/RGraph/example3.html
-- lib/public/javascripts/Jit/Examples/RGraph/example3.js
-- lib/public/javascripts/Jit/Examples/Spacetree/example1.html
-- lib/public/javascripts/Jit/Examples/Spacetree/example1.js
-- lib/public/javascripts/Jit/Examples/Spacetree/example2.html
-- lib/public/javascripts/Jit/Examples/Spacetree/example2.js
-- lib/public/javascripts/Jit/Examples/Spacetree/example3.html
-- lib/public/javascripts/Jit/Examples/Spacetree/example3.js
-- lib/public/javascripts/Jit/Examples/Treemap/example1.html
-- lib/public/javascripts/Jit/Examples/Treemap/example1.js
-- lib/public/javascripts/Jit/Examples/Treemap/example2.html
-- lib/public/javascripts/Jit/Examples/Treemap/example2.js
-- lib/public/javascripts/Jit/Examples/Treemap/example3.html
-- lib/public/javascripts/Jit/Examples/Treemap/example3.js
-- lib/public/javascripts/Jit/Examples/css/Hypertree.css
-- lib/public/javascripts/Jit/Examples/css/Other.css
-- lib/public/javascripts/Jit/Examples/css/RGraph.css
-- lib/public/javascripts/Jit/Examples/css/Spacetree.css
-- lib/public/javascripts/Jit/Examples/css/Treemap.css
-- lib/public/javascripts/Jit/Examples/css/base.css
-- lib/public/javascripts/Jit/Examples/css/col1.png
-- lib/public/javascripts/Jit/Examples/css/col2.png
-- lib/public/javascripts/Jit/Examples/css/gradient.png
-- lib/public/javascripts/Jit/Extras/excanvas.js
-- lib/public/javascripts/Jit/jit-yc.js
-- lib/public/javascripts/Jit/jit.js
 - lib/public/javascripts/application.js
+- lib/public/javascripts/jit.js
 - lib/public/javascripts/jit.min.js
 - lib/public/javascripts/jquery.example.js
 - lib/public/javascripts/jquery.tools.min.js

data/lib/public/javascripts/Jit/Examples/Hypertree/example1.html

@@ -1,57 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<title>Hypertree - Tree Animation</title>
-
-<!-- CSS Files -->
-<link type="text/css" href="../css/base.css" rel="stylesheet" />
-<link type="text/css" href="../css/Hypertree.css" rel="stylesheet" />
-
-<!--[if IE]><script language="javascript" type="text/javascript" src="../../Extras/excanvas.js"></script><![endif]-->
-
-<!-- JIT Library File -->
-<script language="javascript" type="text/javascript" src="../../jit.js"></script>
-
-<!-- Example File -->
-<script language="javascript" type="text/javascript" src="example1.js"></script>
-</head>
-
-<body onload="init();">
-<div id="container">
-
-<div id="left-container">
-
-
-
-        <div class="text">
-        <h4>
-Tree Animation    
-        </h4> 
-
-            A static JSON Tree structure is used as input for this animation.<br /><br />
-            Clicking on a node should move the tree and center that node.<br /><br />
-            The centered node's children are displayed in a relations list in the right column.
-            
-        </div>
-
-        <div id="id-list"></div>
-
-
-<div style="text-align:center;"><a href="example1.js">See the Example Code</a></div>            
-</div>
-
-<div id="center-container">
-    <div id="infovis"></div>    
-</div>
-
-<div id="right-container">
-
-<div id="inner-details"></div>
-
-</div>
-
-<div id="log"></div>
-</div>
-</body>
-</html>