Generalized CodeWScope for use with JRuby

banker · banker · commit feb9b4b6fe7a · 2010-07-21T09:46:36.000-04:00
diff --git a/src/main/org/bson/BSONCallback.java b/src/main/org/bson/BSONCallback.java
@@ -8,12 +8,16 @@ public interface BSONCallback {
     
     void objectStart();
     void objectStart(String name);
+    void objectStart(boolean array);
     Object objectDone();
 
+    void reset();
+    Object get();
+    BSONCallback createBSONCallback();
+
     void arrayStart();
     void arrayStart(String name);
     Object arrayDone();
-
     
     void gotNull( String name );
     void gotUndefined( String name );
diff --git a/src/main/org/bson/BSONDecoder.java b/src/main/org/bson/BSONDecoder.java
@@ -154,6 +154,7 @@ boolean decodeElement()
         case CODE_W_SCOPE:
             _in.readInt();
             _callback.gotCodeWScope( name , _in.readUTF8String() , _readBasicObject() );
+
             break;
 
         case ARRAY:
@@ -239,10 +240,11 @@ BSONObject _readBasicObject()
         _in.readInt();
         
         BSONCallback save = _callback;
+        BSONCallback _basic = _callback.createBSONCallback();
         _callback = _basic;
         _basic.reset();
         _basic.objectStart(false);
-        
+
         while( decodeElement() );
         _callback = save;
         return (BSONObject)(_basic.get());
@@ -343,6 +345,4 @@ String readUTF8String()
     private byte[] _random = new byte[1024];
 
     private PoolOutputBuffer _stringBuffer = new PoolOutputBuffer();
-
-    private final BasicBSONCallback _basic = new BasicBSONCallback();
 }
diff --git a/src/main/org/bson/BasicBSONCallback.java b/src/main/org/bson/BasicBSONCallback.java
@@ -12,9 +12,9 @@ public class BasicBSONCallback implements BSONCallback {
     public BasicBSONCallback(){
         reset();
     }
-    
-    public BSONObject create(){
-        return new BasicBSONObject();
+
+    public BSONCallback createBSONCallback(){
+        return new BasicBSONCallback();
     }
 
     public BSONObject create( boolean array , List<String> path ){
diff --git a/src/test/org/bson/BSONTest.java b/src/test/org/bson/BSONTest.java
@@ -28,6 +28,7 @@
 
 import org.testng.annotations.Test;
 
+import org.bson.types.CodeWScope;
 import org.bson.io.*;
 
 public class BSONTest extends TestCase {
@@ -70,7 +71,6 @@ void _test( BSONObject o , int size , String hash )
     public void testBasic1()
         throws IOException {
         BSONObject o = new BasicBSONObject();
-
         _test( new BasicBSONObject( "x" , true ) , 9 , "6fe24623e4efc5cf07f027f9c66b5456" );    
 
         _test( new BasicBSONObject( "x" , null ) , 8 , "12d43430ff6729af501faf0638e68888" );
@@ -109,6 +109,15 @@ public void testOB1(){
 
     }
 
+    @Test
+    public void testCode()
+      throws IOException{
+        BSONObject scope = new BasicBSONObject( "x", 1 );
+        CodeWScope c = new CodeWScope( "function() { x += 1; }" , scope );
+        BSONObject code_object = new BasicBSONObject( "map" , c);
+        _test( code_object , 53 , "52918d2367533165bfc617df50335cbb" );
+    }
+
     @Test
     public void testOBBig1(){
         BasicOutputBuffer a = new BasicOutputBuffer();

Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,9 @@ public class BasicBSONCallback implements BSONCallback {`
`12`	`12`	`public BasicBSONCallback(){`
`13`	`13`	`reset();`
`14`	`14`	`}`
`15`		`-`
`16`		`- public BSONObject create(){`
`17`		`- return new BasicBSONObject();`
	`15`	`+`
	`16`	`+ public BSONCallback createBSONCallback(){`
	`17`	`+ return new BasicBSONCallback();`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public BSONObject create( boolean array , List<String> path ){`