Merge branch 'tapir'

acadet · Nov 6, 2014 · 7caadc2 · 7caadc2
2 parents 9c9303d + e4cf843
commit 7caadc2
Show file tree

Hide file tree

Showing 46 changed files with 217 additions and 1,533 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,5 @@ app/ui/js/output.js
 testing/out
 **/*.css
 
+
+*.cfg
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -140,9 +140,9 @@ module.exports = function (grunt) {
     				atBegin : true
     			}
     		},
-    		testing : {
+    		test : {
     			files : ['**/*.ts'],
-    			tasks : ['ts:testing', 'shell:testing', 'clean:build'],
+    			tasks : ['ts:build', 'ts:testing', 'shell:testing', 'clean:build'],
     			options : {
     				interrupt : true,
     				atBegin : true
@@ -178,7 +178,7 @@ module.exports = function (grunt) {
 	});
 
 	grunt.registerTask('build', ['watch:build']);
-	grunt.registerTask('testing', ['watch:testing']);
+	grunt.registerTask('test', ['watch:test']);
 	grunt.registerTask(
 		'release',
 		[

diff --git a/README.md b/README.md
@@ -18,4 +18,6 @@ using it. Please open a ticket in tracker to notify me :) I'll appreciate.
 
 * Based on Node-Webkit framework
 * Uses TypeScript to produce JS code
+	- [Ludivine](https://github.com/acadet/ludivine) as core
+	- [Oscar](https://github.com/acadet/oscar) for testing
 * HTML5/CSS3/SASS for front-end 
diff --git a/app/dependencies.ts b/app/dependencies.ts
@@ -2,24 +2,17 @@
 
 /// <reference path="libs/jquery.d.ts" />
 /// <reference path="libs/jqueryui.d.ts" />
+/// <reference path="libs/ludivine.1.1.0.min.ts" />
 
 // System part
 
 /// <reference path="system/TSObject.ts" />
 /// <reference path="system/NumberHelper.ts" />
-/// <reference path="system/Timer.ts" />
-/// <reference path="system/Action.ts" />
-/// <reference path="system/Func.ts" />
-/// <reference path="system/Exception.ts" />
 /// <reference path="system/DOMElement.ts" />
 /// <reference path="system/DOMTree.ts" />
-/// <reference path="system/strings/StringBuffer.ts" />
 /// <reference path="system/node-webkit/NodeWindow.ts" />
 /// <reference path="system/node-webkit/Presenter.ts" />
 /// <reference path="system/Regex.ts" />
-/// <reference path="system/Log.ts" />
-/// <reference path="system/Pair.ts" />
-/// <reference path="system/Guid.ts" />
 /// <reference path="system/MathHelper.ts" />
 /// <reference path="system/StringHelper.ts" />
 /// <reference path="helpers/FormHelper.ts" />
@@ -28,15 +21,6 @@
 /// <reference path="system/storage/FileAPI.ts" />
 /// <reference path="system/Random.ts" />
 
-// Collections parts
-
-/// <reference path="system/collections/utils/CollectionException.ts" />
-/// <reference path="system/collections/IList.ts" />
-/// <reference path="system/collections/impl/ArrayList.ts" />
-/// <reference path="system/collections/IDictionary.ts" />
-/// <reference path="system/collections/impl/Dictionary.ts" />
-/// <reference path="system/collections/Queue.ts" />
-
 // Storage part
 
 /// <reference path="system/storage/SQLAPI.ts" />
@@ -56,6 +40,7 @@
 
 // Helpers part
 
+/// <reference path="helpers/ActionHelper.ts" />
 /// <reference path="helpers/ExceptionHandler.ts" />
 /// <reference path="helpers/URLHelper.ts" />
 /// <reference path="helpers/URLDetailsProvider.ts" />

diff --git a/app/system/Action.ts → app/helpers/ActionHelper.ts b/app/system/Action.ts → app/helpers/ActionHelper.ts
@@ -1,25 +1,5 @@
 /// <reference path="../dependencies.ts" />
 
-interface Action0 {
-	() : void;
-}
-
-interface Action<T> {
-	(t : T) : void;
-}
-
-interface Action2<T, U> {
-	(t : T, u : U) : void;
-}
-
-interface Action3<T, U, V> {
-	(t : T, u : U, v : V) : void;
-}
-
-interface Action4<T, U, V, W> {
-	(t : T, u : U, v : V, w : W) : void;
-}
-
 class ActionHelper {
 	static getValueOrDefaultNoArgs(action : Action0) : Action0 {
 		var mock : Action0;
@@ -38,4 +18,4 @@ class ActionHelper {
 
 		return (TSObject.exists(action)) ? action : mock;
 	}
-}
+}
diff --git a/app/helpers/VersionHelper.ts b/app/helpers/VersionHelper.ts
@@ -5,7 +5,7 @@ class VersionHelper {
 	//region Fields
 
 	private static _target : string = 'http://yimello.adriencadet.com/version';
-	private static _version : string = '0.3.1';
+	private static _version : string = '0.3.2';
 
 	//endregion Fields
 
@@ -21,7 +21,7 @@ class VersionHelper {
 
 	//region Public Methods
 
-	static isUpToDate(callback : Action<boolean>, errorHandler : Action<string> = null) : void {
+	static isUpToDate(callback : Action<boolean>, errorHandler? : Action<string>) : void {
 		var get : GetRequest;
 
 		if (Environment.isOnline()) {

diff --git a/app/libs/ludivine.1.1.0.min.ts b/app/libs/ludivine.1.1.0.min.ts
diff --git a/app/models/business/impl/TagBookmarkBusiness.ts b/app/models/business/impl/TagBookmarkBusiness.ts
@@ -22,7 +22,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 	private _browseDLNode(
 		node : DOMElement,
 		currentTags : IList<Tag>,
-		collection : IList<Pair<Bookmark, IList<Tag>>>)
+		collection : IList<KeyValuePair<Bookmark, IList<Tag>>>)
 		: void
 	{
 		var i : number;
@@ -38,7 +38,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 					b.setURL(a.getAttribute('href'));
 					b.setTitle(a.getText());
 
-					collection.add(new Pair<Bookmark, IList<Tag>>(b, currentTags));
+					collection.add(new KeyValuePair<Bookmark, IList<Tag>>(b, currentTags));
 				}
 			);
 
@@ -61,7 +61,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 				(e) => {
 					var l : IList<Tag>;
 
-					l = currentTags.clone();
+					l = <IList<Tag>>currentTags.select(x => true);
 					l.add(collectedTags.getAt(i));
 					this._browseDLNode(e, l, collection);
 					i++;
@@ -71,10 +71,10 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 
 	private _addRecursiveBookmark(
 		index : number,
-		coll : IList<Pair<Bookmark, IList<Tag>>>,
+		coll : IList<KeyValuePair<Bookmark, IList<Tag>>>,
 		callback? : Action0,
 		errorHandler? : Action<string>) : void {
-		var p : Pair<Bookmark, IList<Tag>>;
+		var p : KeyValuePair<Bookmark, IList<Tag>>;
 
 		callback = ActionHelper.getValueOrDefaultNoArgs(callback);
 		errorHandler = ActionHelper.getValueOrDefault(errorHandler);
@@ -90,7 +90,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 			._args
 			.getBookmarkBusiness()
 			.isNotAlreadyExisting(
-				p.getFirst().getURL(),
+				p.getKey().getURL(),
 				(success) => {
 					if (!success) {
 						Log.error(new BusinessException('Unable to import bookmark, one has already same URL'));
@@ -102,15 +102,15 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 						._args
 						.getTagBusiness()
 						.merge(
-							p.getSecond(),
+							p.getValue(),
 							(outcome) => {
 								var tags : IList<Tag> = outcome;
 
 								this
 									._args
 									.getBookmarkBusiness()
 									.add(
-										p.getFirst(),
+										p.getKey(),
 										(outcome) => {
 											this.bindTags(
 												outcome,
@@ -512,7 +512,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 		reader.onload =
 			(e) => {
 				var dlRoot : DOMElement;
-				var coll : IList<Pair<Bookmark, IList<Tag>>>;
+				var coll : IList<KeyValuePair<Bookmark, IList<Tag>>>;
 				var tags : IList<Tag>;
 				var defaultTag : Tag;
 
@@ -525,7 +525,7 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 					DOMElement
 						.fromString('<ROOT>' + reader.result + '</ROOT>')
 						.findSingle('> DL');
-				coll = new ArrayList<Pair<Bookmark, IList<Tag>>>();
+				coll = new ArrayList<KeyValuePair<Bookmark, IList<Tag>>>();
 				this._browseDLNode(dlRoot, tags, coll);
 				this._addRecursiveBookmark(
 					0,
@@ -600,8 +600,8 @@ class TagBookmarkBusiness implements ITagBookmarkBusiness {
 						(pair) => {
 							var sbk : ScoredBookmark;
 							var currentScore : number;
-							var bk : Bookmark = pair.getFirst();
-							var tagList : IList<Tag> = pair.getSecond();
+							var bk : Bookmark = pair.getKey();
+							var tagList : IList<Tag> = pair.getValue();
 
 							sbk = new ScoredBookmark();
 							bk.hydrate(sbk);

diff --git a/app/models/business/impl/TagBusiness.ts b/app/models/business/impl/TagBusiness.ts
@@ -324,7 +324,7 @@ class TagBusiness implements IInternalTagBusiness {
 						tag.setLabel(StringHelper.trim(tag.getLabel()));
 
 						// Find a tag with same name
-						o = outcome.findFirst(e => StringHelper.compare(e.getLabel(), tag.getLabel()));
+						o = outcome.find(e => StringHelper.compare(e.getLabel(), tag.getLabel()));
 
 						if (o !== null) {
 							// A tag with same is already existing, nothing to do

diff --git a/app/models/dao/ITagBookmarkDAO.ts b/app/models/dao/ITagBookmarkDAO.ts
@@ -17,5 +17,5 @@ interface ITagBookmarkDAO {
 
 	sortBookmarksByTitleAscForTag(tag : Tag, callback : Action<IList<Bookmark>>) : void;
 
-	sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action<IList<Pair<Bookmark, IList<Tag>>>>) : void;
+	sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action<IList<KeyValuePair<Bookmark, IList<Tag>>>>) : void;
 }
diff --git a/app/models/dao/impl/BookmarkDAO.ts b/app/models/dao/impl/BookmarkDAO.ts
@@ -83,7 +83,7 @@ class BookmarkDAO extends DataAccessObject implements IBookmarkDAO {
 
 	update(bookmark : Bookmark, callback? : Action<Bookmark>) : void {
 		var dict : IDictionary<string, any>;
-		var selector : Pair<string, any>;
+		var selector : KeyValuePair<string, any>;
 
 		callback = ActionHelper.getValueOrDefault(callback);
 
@@ -99,7 +99,7 @@ class BookmarkDAO extends DataAccessObject implements IBookmarkDAO {
 		dict.add('description', bookmark.getDescription());
 		dict.add('views', bookmark.getViews());
 
-		selector = new Pair<string, any>('id', bookmark.getId());
+		selector = new KeyValuePair<string, any>('id', bookmark.getId());
 
 		this.getARO().update(
 			DAOTables.Bookmarks,
@@ -136,7 +136,7 @@ class BookmarkDAO extends DataAccessObject implements IBookmarkDAO {
 						.getARO()
 						.delete(
 							DAOTables.Bookmarks,
-							new Pair<string, any>('id', bookmark.getId()),
+							new KeyValuePair<string, any>('id', bookmark.getId()),
 							(success2) => {
 								callback(success1 && success2);
 							}
@@ -154,7 +154,7 @@ class BookmarkDAO extends DataAccessObject implements IBookmarkDAO {
 			.getARO()
 			.find(
 				DAOTables.Bookmarks,
-				new Pair<string, any>('id', id),
+				new KeyValuePair<string, any>('id', id),
 				callback,
 				Bookmark.fromObject
 			);
@@ -165,7 +165,7 @@ class BookmarkDAO extends DataAccessObject implements IBookmarkDAO {
 			.getARO()
 			.find(
 				DAOTables.Bookmarks,
-				new Pair<string, any>('url', url),
+				new KeyValuePair<string, any>('url', url),
 				callback,
 				Bookmark.fromObject
 			);

diff --git a/app/models/dao/impl/TagBookmarkDAO.ts b/app/models/dao/impl/TagBookmarkDAO.ts
@@ -125,7 +125,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 	}
 
 	removeBookmarkRelations(bookmark : Bookmark, callback? : Action<boolean>) : void {
-		var selector : Pair<string, any>;
+		var selector : KeyValuePair<string, any>;
 
 		callback = ActionHelper.getValueOrDefault(callback);
 
@@ -135,7 +135,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 			return;
 		}
 
-		selector = new Pair<string, any>('bookmark_id', bookmark.getId());
+		selector = new KeyValuePair<string, any>('bookmark_id', bookmark.getId());
 		this
 			.getARO()
 			.delete(
@@ -153,7 +153,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 	}
 
 	removeTagRelations(tag : Tag, callback? : Action<boolean>) : void {
-		var selector : Pair<string, any>;
+		var selector : KeyValuePair<string, any>;
 
 		callback = ActionHelper.getValueOrDefault(callback);
 
@@ -163,7 +163,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 			return;
 		}
 
-		selector = new Pair<string, any>('tag_id', tag.getId());
+		selector = new KeyValuePair<string, any>('tag_id', tag.getId());
 		this
 			.getARO()
 			.delete(
@@ -237,7 +237,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 			);
 	}
 
-	sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action<IList<Pair<Bookmark, IList<Tag>>>>) : void {
+	sortBookmarksByTitleAscWithBoundTagsByLabelAsc(callback : Action<IList<KeyValuePair<Bookmark, IList<Tag>>>>) : void {
 		var request : StringBuffer;
 
 		request = new StringBuffer('SELECT bk.id AS id, bk.url as url, bk.title AS title, bk.description AS description, ');
@@ -257,13 +257,13 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 			.executeSQL(
 				request.toString(),
 				(set) => {
-					var pairList : IList<Pair<Bookmark, IList<Tag>>>;
+					var pairList : IList<KeyValuePair<Bookmark, IList<Tag>>>;
 					var bk : Bookmark = null;
 					var l : IList<Tag>;
 					var outcome : SQLRowSet;
-					var p : Pair<Bookmark, IList<Tag>>;
+					var p : KeyValuePair<Bookmark, IList<Tag>>;
 
-					pairList = new ArrayList<Pair<Bookmark, IList<Tag>>>();
+					pairList = new ArrayList<KeyValuePair<Bookmark, IList<Tag>>>();
 
 					if (!TSObject.exists(set)) {
 						callback(pairList);
@@ -278,7 +278,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 
 						if (bk === null || bk.getId() !== item.id) {
 							if (bk !== null) {
-								p = new Pair<Bookmark, IList<Tag>>(bk, l);
+								p = new KeyValuePair<Bookmark, IList<Tag>>(bk, l);
 								pairList.add(p);
 							}
 
@@ -301,7 +301,7 @@ class TagBookmarkDAO extends DataAccessObject implements ITagBookmarkDAO {
 					}
 
 					if (bk !== null) {
-						p = new Pair<Bookmark, IList<Tag>>(bk, l);
+						p = new KeyValuePair<Bookmark, IList<Tag>>(bk, l);
 						pairList.add(p);
 					}