Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
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
Léo-Paul Géneau
gitlab-ce
Commits
0ef85857
Commit
0ef85857
authored
Mar 23, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Added tests
parent
e8949a1e
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
265 additions
and
78 deletions
+265
-78
app/assets/javascripts/blob/notebook/index.js
app/assets/javascripts/blob/notebook/index.js
+80
-0
app/assets/javascripts/blob/notebook_viewer.js
app/assets/javascripts/blob/notebook_viewer.js
+2
-74
spec/javascripts/blob/notebook/index_spec.js
spec/javascripts/blob/notebook/index_spec.js
+159
-0
spec/javascripts/fixtures/notebook_viewer.html.haml
spec/javascripts/fixtures/notebook_viewer.html.haml
+1
-0
spec/models/blob_spec.rb
spec/models/blob_spec.rb
+19
-0
vendor/assets/javascripts/notebooklab.js
vendor/assets/javascripts/notebooklab.js
+4
-4
No files found.
app/assets/javascripts/blob/notebook/index.js
0 → 100644
View file @
0ef85857
/* eslint-disable no-new */
import
Vue
from
'
vue
'
;
import
VueResource
from
'
vue-resource
'
;
import
NotebookLab
from
'
vendor/notebooklab
'
;
Vue
.
use
(
VueResource
);
Vue
.
use
(
NotebookLab
);
export
default
()
=>
{
const
el
=
document
.
getElementById
(
'
js-notebook-viewer
'
);
new
Vue
({
el
,
data
()
{
return
{
error
:
false
,
loadError
:
false
,
loading
:
true
,
json
:
{},
};
},
template
:
`
<div class="container-fluid md prepend-top-default append-bottom-default">
<div
class="text-center loading"
v-if="loading && !error">
<i
class="fa fa-spinner fa-spin"
aria-hidden="true"
aria-label="iPython notebook loading">
</i>
</div>
<notebook-lab
v-if="!loading && !error"
:notebook="json" />
<p
class="text-center"
v-if="error">
<span v-if="loadError">
An error occured whilst loading the file. Please try again later.
</span>
<span v-else>
An error occured whilst parsing the file.
</span>
</p>
</div>
`
,
methods
:
{
loadFile
()
{
this
.
$http
.
get
(
el
.
dataset
.
endpoint
)
.
then
((
res
)
=>
{
this
.
json
=
res
.
json
();
this
.
loading
=
false
;
})
.
catch
((
e
)
=>
{
if
(
e
.
status
)
{
this
.
loadError
=
true
;
}
this
.
error
=
true
;
});
},
},
mounted
()
{
$
(
'
<link>
'
,
{
rel
:
'
stylesheet
'
,
type
:
'
text/css
'
,
href
:
gon
.
katex_css_url
,
}).
appendTo
(
'
head
'
);
if
(
gon
.
katex_js_url
)
{
$
.
getScript
(
gon
.
katex_js_url
,
()
=>
{
this
.
loadFile
();
});
}
else
{
this
.
loadFile
();
}
},
});
};
app/assets/javascripts/blob/notebook_viewer.js
View file @
0ef85857
import
Vue
from
'
vue
'
;
import
renderNotebook
from
'
./notebook
'
;
import
VueResource
from
'
vue-resource
'
;
import
NotebookLab
from
'
vendor/notebooklab
'
;
Vue
.
use
(
VueResource
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
renderNotebook
);
Vue
.
use
(
NotebookLab
);
document
.
addEventListener
(
'
DOMContentLoaded
'
,
()
=>
{
const
el
=
document
.
getElementById
(
'
js-notebook-viewer
'
);
new
Vue
({
el
,
data
()
{
return
{
error
:
false
,
loadError
:
false
,
loading
:
true
,
json
:
{},
};
},
template
:
`
<div class="container-fluid md prepend-top-default append-bottom-default">
<div
class="text-center loading"
v-if="loading && !error">
<i
class="fa fa-spinner fa-spin"
aria-hidden="true"
aria-label="iPython notebook loading">
</i>
</div>
<notebook-lab
v-if="!loading && !error"
:notebook="json" />
<p
class="text-center"
v-if="error">
<span v-if="loadError">
An error occured whilst loading the file. Please try again later.
</span>
<span v-else>
An error occured whilst parsing the file.
</span>
</p>
</div>
`
,
methods
:
{
loadFile
()
{
this
.
$http
.
get
(
el
.
dataset
.
endpoint
)
.
then
((
res
)
=>
{
this
.
json
=
res
.
json
();
this
.
loading
=
false
;
})
.
catch
((
e
)
=>
{
if
(
e
.
status
)
{
this
.
loadError
=
true
;
}
this
.
error
=
true
;
});
},
},
mounted
()
{
$
(
'
<link>
'
,
{
rel
:
'
stylesheet
'
,
type
:
'
text/css
'
,
href
:
gon
.
katex_css_url
,
}).
appendTo
(
'
head
'
);
$
.
getScript
(
gon
.
katex_js_url
,
()
=>
{
this
.
loadFile
();
});
},
});
});
spec/javascripts/blob/notebook/index_spec.js
0 → 100644
View file @
0ef85857
import
Vue
from
'
vue
'
;
import
renderNotebook
from
'
~/blob/notebook
'
;
describe
(
'
iPython notebook renderer
'
,
()
=>
{
preloadFixtures
(
'
static/notebook_viewer.html.raw
'
);
beforeEach
(()
=>
{
loadFixtures
(
'
static/notebook_viewer.html.raw
'
);
});
it
(
'
shows loading icon
'
,
()
=>
{
renderNotebook
();
expect
(
document
.
querySelector
(
'
.loading
'
),
).
not
.
toBeNull
();
});
describe
(
'
successful response
'
,
()
=>
{
const
response
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
JSON
.
stringify
({
cells
:
[{
cell_type
:
'
markdown
'
,
source
:
[
'
# test
'
],
},
{
cell_type
:
'
code
'
,
execution_count
:
1
,
source
:
[
'
def test(str)
'
,
'
return str
'
,
],
outputs
:
[],
}],
}),
{
status
:
200
,
}));
};
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
response
);
renderNotebook
();
setTimeout
(()
=>
{
done
();
});
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
response
,
);
});
it
(
'
does not show loading icon
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.loading
'
),
).
toBeNull
();
});
it
(
'
renders the notebook
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.md
'
),
).
not
.
toBeNull
();
});
it
(
'
renders the markdown cell
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
h1
'
),
).
not
.
toBeNull
();
expect
(
document
.
querySelector
(
'
h1
'
).
textContent
.
trim
(),
).
toBe
(
'
test
'
);
});
it
(
'
highlights code
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.hljs
'
),
).
not
.
toBeNull
();
expect
(
document
.
querySelector
(
'
.python
'
),
).
not
.
toBeNull
();
});
});
describe
(
'
error in JSON response
'
,
()
=>
{
const
response
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
'
{ "cells": [{"cell_type": "markdown"} }
'
,
{
status
:
200
,
}));
};
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
response
);
renderNotebook
();
setTimeout
(()
=>
{
done
();
});
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
response
,
);
});
it
(
'
does not show loading icon
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.loading
'
),
).
toBeNull
();
});
it
(
'
shows error message
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
).
toBe
(
'
An error occured whilst parsing the file.
'
);
});
});
describe
(
'
error getting file
'
,
()
=>
{
const
response
=
(
request
,
next
)
=>
{
next
(
request
.
respondWith
(
''
,
{
status
:
500
,
}));
};
beforeEach
((
done
)
=>
{
Vue
.
http
.
interceptors
.
push
(
response
);
renderNotebook
();
setTimeout
(()
=>
{
done
();
});
});
afterEach
(()
=>
{
Vue
.
http
.
interceptors
=
_
.
without
(
Vue
.
http
.
interceptors
,
response
,
);
});
it
(
'
does not show loading icon
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.loading
'
),
).
toBeNull
();
});
it
(
'
shows error message
'
,
()
=>
{
expect
(
document
.
querySelector
(
'
.md
'
).
textContent
.
trim
(),
).
toBe
(
'
An error occured whilst loading the file. Please try again later.
'
);
});
});
});
spec/javascripts/fixtures/notebook_viewer.html.haml
0 → 100644
View file @
0ef85857
.file-content
#js-notebook-viewer
{
data:
{
endpoint:
'/test'
}
}
spec/models/blob_spec.rb
View file @
0ef85857
...
@@ -53,6 +53,20 @@ describe Blob do
...
@@ -53,6 +53,20 @@ describe Blob do
end
end
end
end
describe
'#ipython_notebook?'
do
it
'is falsey when language is not Jupyter Notebook'
do
git_blob
=
double
(
text?:
true
,
language:
double
(
name:
'JSON'
))
expect
(
described_class
.
decorate
(
git_blob
)).
not_to
be_ipython_notebook
end
it
'is truthy when language is Jupyter Notebook'
do
git_blob
=
double
(
text?:
true
,
language:
double
(
name:
'Jupyter Notebook'
))
expect
(
described_class
.
decorate
(
git_blob
)).
to
be_ipython_notebook
end
end
describe
'#video?'
do
describe
'#video?'
do
it
'is falsey with image extension'
do
it
'is falsey with image extension'
do
git_blob
=
Gitlab
::
Git
::
Blob
.
new
(
name:
'image.png'
)
git_blob
=
Gitlab
::
Git
::
Blob
.
new
(
name:
'image.png'
)
...
@@ -116,6 +130,11 @@ describe Blob do
...
@@ -116,6 +130,11 @@ describe Blob do
blob
=
stubbed_blob
blob
=
stubbed_blob
expect
(
blob
.
to_partial_path
(
project
)).
to
eq
'download'
expect
(
blob
.
to_partial_path
(
project
)).
to
eq
'download'
end
end
it
'handles iPython notebooks'
do
blob
=
stubbed_blob
(
text?:
true
,
ipython_notebook?:
true
)
expect
(
blob
.
to_partial_path
(
project
)).
to
eq
'notebook'
end
end
end
describe
'#size_within_svg_limits?'
do
describe
'#size_within_svg_limits?'
do
...
...
vendor/assets/javascripts/notebooklab.js
View file @
0ef85857
...
@@ -414,13 +414,13 @@ exports.default = {
...
@@ -414,13 +414,13 @@ exports.default = {
},
},
computed
:
{
computed
:
{
markdown
:
function
markdown
()
{
markdown
:
function
markdown
()
{
var
regex
=
new
RegExp
(
/^
\$\$(
.*
)\$\$
$/
,
'
g
'
);
var
regex
=
new
RegExp
(
'
^
\
$
\
$(.*)
\
$
\
$$
'
,
'
g
'
);
var
source
=
this
.
cell
.
source
.
map
(
function
(
line
)
{
var
source
=
this
.
cell
.
source
.
map
(
function
(
line
)
{
var
matches
=
regex
.
exec
(
line
.
trim
());
var
matches
=
regex
.
exec
(
line
.
trim
());
// Only render use the Katex library if it is actually loaded
// Only render use the Katex library if it is actually loaded
if
(
matches
&&
matches
.
length
>
0
&&
katex
)
{
if
(
matches
&&
matches
.
length
>
0
&&
typeof
katex
!==
'
undefined
'
)
{
return
katex
.
renderToString
(
matches
[
1
]);
return
katex
.
renderToString
(
matches
[
1
]);
}
else
{
}
else
{
return
line
;
return
line
;
...
@@ -3047,7 +3047,7 @@ function escape(html, encode) {
...
@@ -3047,7 +3047,7 @@ function escape(html, encode) {
}
}
function
unescape
(
html
)
{
function
unescape
(
html
)
{
// explicitly match decimal, hex, and named HTML entities
// explicitly match decimal, hex, and named HTML entities
return
html
.
replace
(
/&
(
#
(?:\d
+
)
|
(?:
#x
[
0-9A-Fa-f
]
+
)
|
(?:\w
+
))
;
?
/g
,
function
(
_
,
n
)
{
return
html
.
replace
(
/&
(
#
(?:\d
+
)
|
(?:
#x
[
0-9A-Fa-f
]
+
)
|
(?:\w
+
))
;
?
/g
,
function
(
_
,
n
)
{
n
=
n
.
toLowerCase
();
n
=
n
.
toLowerCase
();
if
(
n
===
'
colon
'
)
return
'
:
'
;
if
(
n
===
'
colon
'
)
return
'
:
'
;
...
@@ -3636,4 +3636,4 @@ module.exports = {
...
@@ -3636,4 +3636,4 @@ module.exports = {
/***/
})
/***/
})
/******/
]);
/******/
]);
});
});
\ No newline at end of file
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