Merge pull request #45 from moai/develop

Version 0.5.0

Makefile

@@ -8,7 +8,7 @@ AR= ar rcu
 RANLIB= ranlib
 RM= rm -f
 OUTLIB= mongo.so
-OBJS = main.o mongo_bsontypes.o mongo_dbclient.o mongo_replicaset.o mongo_connection.o mongo_cursor.o mongo_gridfile.o mongo_gridfs.o mongo_gridfschunk.o mongo_query.o utils.o mongo_cxx_extension.o mongo_gridfilebuilder.o
+OBJS = main.o mongo_bsontypes.o mongo_dbclient.o mongo_replicaset.o mongo_connection.o mongo_cursor.o mongo_gridfile.o mongo_gridfs.o mongo_gridfschunk.o mongo_query.o utils.o mongo_gridfilebuilder.o
 
 # macports
 ifneq ("$(wildcard /opt/local/include/mongo/client/dbclient.h)","")
@@ -98,9 +98,7 @@ mongo_bsontypes.o: mongo_bsontypes.cpp common.h
 	$(CC) -c -o $@ $< $(CFLAGS)
 utils.o: utils.cpp common.h utils.h
 	$(CC) -c -o $@ $< $(CFLAGS)
-mongo_cxx_extension.o: mongo_cxx_extension.cpp mongo_cxx_extension.h
-	$(CC) -c -o $@ $< $(CFLAGS)
-mongo_gridfilebuilder.o: mongo_gridfilebuilder.cpp mongo_cxx_extension.h common.h utils.h
+mongo_gridfilebuilder.o: mongo_gridfilebuilder.cpp common.h utils.h
 	$(CC) -c -o $@ $< $(CFLAGS)
 
 .PHONY: all check checkdarwin clean DetectOS Linux Darwin echo

README.md

@@ -1,5 +1,15 @@
 # A Lua driver for mongodb
 
+## Versions compatibility
+
+| luamongo | mongo-c++-driver |
+| -------- | ---------------- |
+| v0.4.5   |   legacy-0.9.0   |
+| v0.5.0   |   legacy-1.1.0   |
+
+Version 1.0.0 is expected when the modern c++ driver is marked as stable. See
+at the end of this file what changes are introduced from v0.4.5 to v0.5.0.
+
 ## Compilation
 
 The makefile automatically detects which platform and Lua version are you
@@ -128,3 +138,21 @@ external_deps_dirs = {
   },
 }
 ```
+
+## Changes from v0.4.5 to v0.5.0
+
+- `GridFileBuilder` has been introduced into legacy C++ driver, luamongo don't
+  implements it any more. The constructor has been changed and now it only
+  receives an instance of GridFS class.
+
+- `db:ensure_index()` function has been replaced by `db:create_index()`. The
+  parameters of the new function are `create_index(ns,keys,options)` where
+  `keys` and `options` can be Lua tables or JSON strings (both dictionaries
+  which allow 'unique' and 'name' fields).
+
+- `db:get_indexes()` is now `db:enumerate_indexes()`.
+
+- `db:reset_index_cache()` has been removed.
+
+- `gridfs:find_file()` requires a query. It has been added
+  `gridfs:find_file_by_name(filename)` equivalent to old implementation.

common.h

@@ -1,6 +1,6 @@
 #define LUAMONGO_NAME           "mongo"
 #define LUAMONGO_NAME_STRING    "_NAME"
-#define LUAMONGO_VERSION        "0.4"
+#define LUAMONGO_VERSION        "0.5"
 #define LUAMONGO_VERSION_STRING "_VERSION"
 
 #define LUAMONGO_ROOT            "mongo"

main.cpp

@@ -23,6 +23,7 @@
 
 #include <iostream>
 #include <client/dbclient.h>
+#include <client/init.h>
 #include <sys/time.h>
 #include "utils.h"
 #include "common.h"
@@ -55,6 +56,17 @@ int mongo_time(lua_State *L) {
     return 1;
 }
 
+struct Initializer {
+    mongo::client::GlobalInstance *instance;
+    Initializer() : instance(0) { }
+    ~Initializer() { delete instance; }
+    void init() {
+	instance = new mongo::client::GlobalInstance();
+	instance->assertInitialized();
+    }
+};
+Initializer initializer;
+
 /*
  *
  * library entry point
@@ -69,7 +81,9 @@ LM_EXPORT int luaopen_mongo(lua_State *L) {
         {"time", mongo_time},
         {NULL, NULL}
     };
-
+
+    initializer.init();
+
     // bsontypes is the root table
     mongo_bsontypes_register(L);