Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
jio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
jio
Commits
e77cf759
Commit
e77cf759
authored
Dec 21, 2012
by
Tristan Cavelier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
overriden serialized method changed on localstorage.js
parent
ea446b38
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
136 deletions
+22
-136
src/jio.storage/intro.js
src/jio.storage/intro.js
+4
-129
src/jio.storage/localstorage.js
src/jio.storage/localstorage.js
+5
-7
src/jio/storages/storage.js
src/jio/storages/storage.js
+13
-0
No files found.
src/jio.storage/intro.js
View file @
e77cf759
...
@@ -11,107 +11,6 @@
...
@@ -11,107 +11,6 @@
*/
*/
var
utilities
=
{
var
utilities
=
{
/**
* @method isObjectEmpty - Check whether an object is empty
* @param {obj} object - object to test
* @returns {boolean} string- true/false
*/
isObjectEmpty
:
function
(
obj
)
{
var
key
;
if
(
obj
.
length
&&
obj
.
length
>
0
)
{
return
false
;
}
if
(
obj
.
length
&&
obj
.
length
===
0
)
{
return
true
;
}
for
(
key
in
obj
)
{
if
({}.
hasOwnProperty
.
call
(
obj
,
key
))
{
return
false
;
}
}
return
true
;
},
/**
* @method isObjectSize - Check number of elements in object
* @param {obj} object - object to test
* @returns {size} integer - size
*/
isObjectSize
:
function
(
obj
)
{
var
size
=
0
,
key
;
for
(
key
in
obj
)
{
if
(
obj
.
hasOwnProperty
(
key
))
{
size
++
;
}
}
return
size
;
},
/**
* @method isInObject - Check if revision is on tree
* @param {needle} string - revision
* @param {haystack} array - active leaves (versions of a document)
* @returns {boolean} string- true/false
*/
isInObject
:
function
(
needle
,
haystack
)
{
var
length
=
haystack
.
length
;
for
(
var
i
=
0
;
i
<
length
;
i
++
)
{
if
(
haystack
[
i
]
===
needle
)
{
return
true
;
}
}
return
false
;
},
/**
* @method isUUID - Check if docid is UUID
* @param {needle} string - docId
* @returns {boolean} string- true/false
*/
isUUID
:
function
(
documentId
)
{
var
reg
=
/^
[
0-9a-f
]{8}
-
[
0-9a-f
]{4}
-
[
0-9a-f
]{4}
-
[
0-9a-f
]{4}
-
[
0-9a-f
]{12}
$/i
.
test
(
documentId
);
return
reg
;
},
/**
* Creates the error object for all errors
* @method createErrorObject
* @param {string} error_code The error code
* @param {string} message The error message
* @return {object} Error object
*/
createErrorObject
:
function
(
error_code
,
message
)
{
var
error_object
,
assignErrorValues
;
error_object
=
{
"
status
"
:
error_code
,
"
message
"
:
message
,
"
reason
"
:
message
};
assignErrorValues
=
function
(
statusText
)
{
var
tmp
=
''
;
error_object
.
statusText
=
statusText
;
error_object
.
error
=
statusText
.
toLowerCase
().
split
(
'
'
).
join
(
'
_
'
);
};
switch
(
code
)
{
case
409
:
assignErrorValues
(
'
Conflict
'
);
break
;
case
403
:
assignErrorValues
(
'
Forbidden
'
);
break
;
case
404
:
assignErrorValues
(
'
Not found
'
);
break
;
}
return
error_object
;
},
/**
/**
* Generates a hash code of a string
* Generates a hash code of a string
* @method hashCode
* @method hashCode
...
@@ -187,11 +86,10 @@ var utilities = {
...
@@ -187,11 +86,10 @@ var utilities = {
* @method createDocument - Creates a new document
* @method createDocument - Creates a new document
* @info - docid POST = "" for POST, PUT = string
* @info - docid POST = "" for POST, PUT = string
* @param {docid} string - id for the new document
* @param {docid} string - id for the new document
* @param {docpath} string - the path where to store the document
* @stored - 'jio/local/USR/APP/FILE_NAME'
* @stored - 'jio/local/USR/APP/FILE_NAME'
* @returns {doc} object - document object
* @returns {doc} object - document object
*/
*/
createDocument
:
function
(
docId
,
docPath
)
{
createDocument
:
function
(
docId
)
{
var
now
=
Date
.
now
(),
var
now
=
Date
.
now
(),
doc
=
{},
doc
=
{},
hash
=
utilities
.
hashCode
(
''
+
doc
+
'
'
+
now
+
''
);
hash
=
utilities
.
hashCode
(
''
+
doc
+
'
'
+
now
+
''
);
...
@@ -254,30 +152,6 @@ var utilities = {
...
@@ -254,30 +152,6 @@ var utilities = {
return
doc
;
return
doc
;
},
},
// ==================== CREATE/UPDATE DOCUMENT TREE ==================
/**
* @method createDocumentTree- Creates a new document.tree
* @param {doc } object - the document object
* @info: - the tree will include
* @key {type} string - "branch" or "leaf"
* @key {status} string - "available" or "deleted"
* @key {rev} string - revision string of this node
* @key {spawns} object - child branches/leaves
* @stored - 'jio/local/USR/APP/FILE_NAME/tree_revision'
* @info - one active leaf is needed to keep tree alive
* @info - deleted versions/branches = "status deleted"
* @info - no active leaves will delete tree, too
*/
createDocumentTree
:
function
(
doc
)
{
var
tree
=
{
type
:
'
leaf
'
,
status
:
'
available
'
,
rev
:
doc
.
_rev
,
kids
:[]
};
return
tree
;
},
/**
/**
* @method updateDocumentTree- update a document tree
* @method updateDocumentTree- update a document tree
* @param {docTreeNode} object - document tree
* @param {docTreeNode} object - document tree
...
@@ -411,7 +285,8 @@ var utilities = {
...
@@ -411,7 +285,8 @@ var utilities = {
},
},
/**
/**
* Gets the winner revision from a document tree
* Gets the winner revision from a document tree.
* The winner is the deeper revision on the left.
* @method getWinnerRevisionFromDocumentTree
* @method getWinnerRevisionFromDocumentTree
* @param {object} document_tree The document tree
* @param {object} document_tree The document tree
* @return {string} The winner revision
* @return {string} The winner revision
...
@@ -473,7 +348,7 @@ var utilities = {
...
@@ -473,7 +348,7 @@ var utilities = {
* @param {tree} object - active leaves (versions of a document)
* @param {tree} object - active leaves (versions of a document)
* @returns - true/false
* @returns - true/false
*/
*/
isDeadLeaf
:
function
(
prev_rev
,
docTreeNode
){
isDeadLeaf
:
function
(
prev_rev
,
docTreeNode
){
var
type
=
docTreeNode
[
'
type
'
],
var
type
=
docTreeNode
[
'
type
'
],
status
=
docTreeNode
[
'
status
'
],
status
=
docTreeNode
[
'
status
'
],
kids
=
docTreeNode
[
'
kids
'
],
kids
=
docTreeNode
[
'
kids
'
],
...
...
src/jio.storage/localstorage.js
View file @
e77cf759
...
@@ -179,13 +179,11 @@ var newLocalStorage = function (spec, my) {
...
@@ -179,13 +179,11 @@ var newLocalStorage = function (spec, my) {
// ================== storage overrides =====================
// ================== storage overrides =====================
// Overriding serialized()
that
.
serialized
=
function
()
{
var
super_serialized
=
that
.
serialized
;
return
{
that
.
serialized
=
function
()
{
"
applicationname
"
:
priv
.
applicationname
,
var
o
=
super_serialized
();
"
username
"
:
priv
.
username
o
.
applicationname
=
priv
.
applicationname
;
};
o
.
username
=
priv
.
username
;
return
o
;
};
};
// Overrinding validateState()
// Overrinding validateState()
...
...
src/jio/storages/storage.js
View file @
e77cf759
...
@@ -203,6 +203,19 @@ var storage = function(spec, my) {
...
@@ -203,6 +203,19 @@ var storage = function(spec, my) {
return
''
;
return
''
;
};
};
that
.
post
=
function
(
command
)
{
var
docid
,
option
;
docid
=
command
.
getDocId
();
option
=
command
.
cloneOption
();
// check if the tree already exists
that
.
_get
(
docid
+
'
.tree.json
'
,
option
,
// if the tree does not exists yet
// if the tree exists
};
that
.
_post
=
function
()
{
that
.
_post
=
function
()
{
setTimeout
(
function
()
{
setTimeout
(
function
()
{
that
.
error
(
that
.
createErrorObject
(
that
.
error
(
that
.
createErrorObject
(
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment