Merge branch 'common-src' into master-src: deleteDatabase reliability (…

…#112); open & close callbacks (#109/#110)

.gitignore

@@ -1,2 +1,5 @@
 .DS_Store
 .plugin
+.metadata/*
+*.swp
+*~

SQLitePlugin.coffee.md

@@ -86,10 +86,16 @@ License for common Javascript: MIT or Apache
       return
 
     SQLitePlugin::transaction = (fn, error, success) ->
+      if !@openDBs[@dbname]
+        error('database not open')
+        return
       @addTransaction new SQLitePluginTransaction(this, fn, error, success, true, false)
       return
 
     SQLitePlugin::readTransaction = (fn, error, success) ->
+      if !@openDBs[@dbname]
+        error('database not open')
+        return
       @addTransaction new SQLitePluginTransaction(this, fn, error, success, true, true)
       return
 
@@ -105,10 +111,17 @@ License for common Javascript: MIT or Apache
       return
 
     SQLitePlugin::open = (success, error) ->
+      onSuccess = () => success this
       unless @dbname of @openDBs
         @openDBs[@dbname] = true
-        cordova.exec success, error, "SQLitePlugin", "open", [ @openargs ]
-
+        cordova.exec onSuccess, error, "SQLitePlugin", "open", [ @openargs ]
+      else
+        ###
+        for a re-open run onSuccess async so that the openDatabase return value
+        can be used in the success handler as an alternative to the handler's
+        db argument
+        ###
+        nextTick () -> onSuccess();
       return
 
     SQLitePlugin::close = (success, error) ->
@@ -117,7 +130,7 @@ License for common Javascript: MIT or Apache
       if @dbname of @openDBs
         delete @openDBs[@dbname]
 
-        cordova.exec null, null, "SQLitePlugin", "close", [ { path: @dbname } ]
+        cordova.exec success, error, "SQLitePlugin", "close", [ { path: @dbname } ]
 
       return
 
@@ -381,6 +394,7 @@ License for common Javascript: MIT or Apache
         new SQLitePlugin openargs, okcb, errorcb
 
       deleteDb: (databaseName, success, error) ->
+        delete SQLitePlugin::openDBs[databaseName]
         cordova.exec success, error, "SQLitePlugin", "delete", [{ path: databaseName }]
 
 ### Exported API:

bin/test.sh

@@ -22,7 +22,7 @@ fi
 
 if [[ ! -x $(which cordova) ]]; then
   echo "you need cordova. please install with:"
-  echo "npm install -g coffee-script"
+  echo "npm install -g cordova"
   exit 1
 fi