Merge branch 'master' into release/1.1.0

* master:
  update submodule
  update submodule
  - Replace Gson with Jackson - Refactor package
  - Added unit test cases which were covered by previous unit tests - Rename the one java class name to fix typo
  - Set 1.6 for sourceCompatibility and targetCompatibility - removed unnecessary lines
  test case for issue #7 (Arrays)
  complete rewrite
  update submodule
  update submodule
  update submodule
  update submodule

Author: Hideki Itakura

build.gradle

@@ -1,8 +1,10 @@
-
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'eclipse'
 
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
 repositories {
     maven { url 'http://files.couchbase.com/maven2/' }
     mavenCentral()

src/main/java/com/couchbase/lite/javascript/JavaScriptViewCompiler.java

@@ -1,201 +1,26 @@
 package com.couchbase.lite.javascript;
 
-import com.couchbase.lite.Database;
-import com.couchbase.lite.Emitter;
 import com.couchbase.lite.Mapper;
 import com.couchbase.lite.Reducer;
 import com.couchbase.lite.ViewCompiler;
-import com.couchbase.lite.util.Log;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-import org.elasticsearch.script.javascript.support.NativeList;
-import org.elasticsearch.script.javascript.support.NativeMap;
-import org.mozilla.javascript.Context;
-import org.mozilla.javascript.Function;
-import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.WrapFactory;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
 
 public class JavaScriptViewCompiler implements ViewCompiler {
-
-	@Override
-	public Mapper compileMap(String source, String language) {
+    @Override
+    public Mapper compileMap(String source, String language) {
         if (language.equals("javascript")) {
             return new ViewMapBlockRhino(source);
         }
         throw new IllegalArgumentException(language + " is not supported");
-	}
+    }
 
-	@Override
-	public Reducer compileReduce(String source, String language) {
+    @Override
+    public Reducer compileReduce(String source, String language) {
         if (language.equals("javascript")) {
             return new ViewReduceBlockRhino(source);
         }
         throw new IllegalArgumentException(language + " is not supported");
-	}
-
-}
-
-/**
- * Wrap Factory for Rhino Script Engine
- */
-class CustomWrapFactory extends WrapFactory {
-
-    public CustomWrapFactory() {
-        setJavaPrimitiveWrap(false); // RingoJS does that..., claims its annoying...
-    }
-
-	@Override
-    public Scriptable wrapAsJavaObject(Context cx, Scriptable scope, Object javaObject, Class staticType) {
-        if (javaObject instanceof Map) {
-            return new NativeMap(scope, (Map) javaObject);
-        }
-        else if(javaObject instanceof List) {
-            return new NativeList(scope, (List<Object>)javaObject);
-        }
-
-        return super.wrapAsJavaObject(cx, scope, javaObject, staticType);
-    }
-}
-
-// REFACT: Extract superview for both the map and reduce blocks as they do pretty much the same thing
-
-class ViewMapBlockRhino implements Mapper {
-
-    private static WrapFactory wrapFactory = new CustomWrapFactory();
-    private Scriptable globalScope;
-    private String src;
-
-    public ViewMapBlockRhino(String src) {
-        this.src = src;
-        Context ctx = Context.enter();
-        try {
-            ctx.setOptimizationLevel(-1);
-            ctx.setWrapFactory(wrapFactory);
-            globalScope = ctx.initStandardObjects(null, true);
-        } finally {
-            Context.exit();
-        }
     }
-
-	@Override
-    public void map(Map<String, Object> document, Emitter emitter) {
-        Context ctx = Context.enter();
-        try {
-            ctx.setOptimizationLevel(-1);
-            ctx.setWrapFactory(wrapFactory);
-
-            //create a place to hold results
-            String placeHolder = "var map_results = [];";
-            ctx.evaluateString(globalScope, placeHolder, "placeHolder", 1, null);
-
-            //register the emit function
-            String emitFunction = "var emit = function(key, value) { map_results.push([key, value]); };";
-            ctx.evaluateString(globalScope, emitFunction, "emit", 1, null);
-
-            //register the map function
-            String mapSrc = "var map = " + src + ";";
-            try {
-            	ctx.evaluateString(globalScope, mapSrc, "map", 1, null);
-            } catch(org.mozilla.javascript.EvaluatorException e) {
-            	// Error in the JavaScript view - CouchDB swallows  the error and tries the next document
-            	// REFACT: would be nice to check this in the constructor so we don't have to reparse every time
-            	// should also be much faster if we can insert the map function into this objects globals
-                Log.e(Database.TAG, "Javascript syntax error in view:\n" + src, e);
-                return;
-            }
-            
-            // Need to stringify the json tree, as the ContextWrapper is unable
-            // to correctly convert nested json to their js representation.
-            // More specifically, if a dictionary is included that contains an array as a value 
-            // that array will not be wrapped correctly but you'll get the plain 
-            // java.util.ArrayList instead - and then an error.
-            ObjectMapper mapper = new ObjectMapper();
-            String json = null;
-            try {
-            	json = mapper.writeValueAsString(document);
-			} catch (IOException e) {
-				// Can thrown different subclasses of IOException- but we really do not care,
-				// as this document was unserialized from JSON, so Jackson should be able to serialize it. 
-				Log.e(Database.TAG, "Error reserializing json from the db: " + document, e);
-				return;
-			}
-            
-            String mapInvocation = "map(" + json + ");";
-            try {
-            	ctx.evaluateString(globalScope, mapInvocation, "map invocation", 1, null);
-            }
-            catch (org.mozilla.javascript.RhinoException e) {
-            	// Error in the JavaScript view - CouchDB swallows  the error and tries the next document
-                Log.e(Database.TAG, "Error in javascript view:\n" + src + "\n with document:\n" + document, e);
-                return;
-            }
-
-            //now pull values out of the place holder and emit them
-            NativeArray mapResults = (NativeArray)globalScope.get("map_results", globalScope);
-            for(int i=0; i<mapResults.getLength(); i++) {
-                NativeArray mapResultItem = (NativeArray)mapResults.get(i);
-                if(mapResultItem.getLength() == 2) {
-                    Object key = mapResultItem.get(0);
-                    Object value = mapResultItem.get(1);
-                    emitter.emit(key, value);
-                } else {
-                    Log.e(Database.TAG, String.format("Expected 2 element array with key and value.  Got: %s", mapResultItem));
-                }
-
-            }
-        } finally {
-            Context.exit();
-        }
-
-    }
-    
 }
 
-class ViewReduceBlockRhino implements Reducer {
-
-    private static WrapFactory wrapFactory = new CustomWrapFactory();
-    private Scriptable globalScope;
-    private String src;
 
-    public ViewReduceBlockRhino(String src) {
-        this.src = src;
-        Context ctx = Context.enter();
-        try {
-            ctx.setOptimizationLevel(-1);
-            ctx.setWrapFactory(wrapFactory);
-            globalScope = ctx.initStandardObjects(null, true);
-        } finally {
-            Context.exit();
-        }
-    }
-
-	@Override
-    public Object reduce(List<Object> keys, List<Object> values, boolean rereduce) {
-        Context ctx = Context.enter();
-        try {
-            ctx.setOptimizationLevel(-1);
-            ctx.setWrapFactory(wrapFactory);
-
-            //register the reduce function
-            String reduceSrc = "var reduce = " + src + ";";
-            ctx.evaluateString(globalScope, reduceSrc, "reduce", 1, null);
-
-            //find the reduce function and execute it
-            Function reduceFun = (Function)globalScope.get("reduce", globalScope);
-            Object[] functionArgs = { keys, values, rereduce };
-            Object result = reduceFun.call(ctx, globalScope, globalScope, functionArgs);
 
-            return result;
-
-        } finally {
-            Context.exit();
-        }
-
-    }
-    
-}

src/main/java/com/couchbase/lite/javascript/ViewMapBlockRhino.java

@@ -0,0 +1,62 @@
+package com.couchbase.lite.javascript;
+
+import com.couchbase.lite.Emitter;
+import com.couchbase.lite.Mapper;
+import com.couchbase.lite.javascript.scopes.MapGlobalScope;
+import com.couchbase.lite.javascript.wrapper.CustomWrapFactory;
+
+import org.mozilla.javascript.Function;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.WrapFactory;
+
+import java.util.Map;
+
+class ViewMapBlockRhino implements Mapper {
+
+    private static WrapFactory wrapFactory = new CustomWrapFactory();
+    private Scriptable globalScope;
+    private MapGlobalScope mapGlobalScope;
+    private Function mapFunction;
+
+    public ViewMapBlockRhino(String src) {
+
+        org.mozilla.javascript.Context ctx = org.mozilla.javascript.Context.enter();
+
+        try {
+            ctx.setOptimizationLevel(-1);
+            ctx.setWrapFactory(wrapFactory);
+            mapGlobalScope = new MapGlobalScope();
+            globalScope = ctx.initStandardObjects(mapGlobalScope, true);
+            mapFunction = ctx.compileFunction(globalScope, src, "map", 0, null);
+        } finally {
+            org.mozilla.javascript.Context.exit();
+        }
+    }
+
+    @Override
+    public void map(Map<String, Object> document, Emitter emitter) {
+
+        mapGlobalScope.setEmitter(emitter);
+
+        org.mozilla.javascript.Context ctx = org.mozilla.javascript.Context.enter();
+        try {
+            ctx.setOptimizationLevel(-1);
+            ctx.setWrapFactory(wrapFactory);
+
+            Scriptable localScope = ctx.newObject(globalScope);
+            localScope.setPrototype(globalScope);
+            localScope.setParentScope(null);
+
+            Object jsDocument = org.mozilla.javascript.Context.javaToJS(document, localScope);
+
+            try {
+                mapFunction.call(ctx, localScope, null, new Object[]{jsDocument});
+            } catch (org.mozilla.javascript.RhinoException e) {
+                // Error in the JavaScript view - CouchDB swallows  the error and tries the next document
+                return;
+            }
+        } finally {
+            org.mozilla.javascript.Context.exit();
+        }
+    }
+}