parabuzzle
/
craneoperator
mirror of https://github.com/parabuzzle/craneoperator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5 from parabuzzle/fix_slash_bug/issue_4 

handle slashes in container name
pull/11/head 2.0.2
Mike Heijmans 2016-05-17 11:29:19 -07:00
parent ef1030878b fd69aea023
commit 1b0e8b40a8
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/404.html
View File

@ -5,20 +5,20 @@
<title>Crane Operator Not Found</title>
<!-- bootstrap css -->
<link rel="stylesheet" href="bootstrap.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="/bootstrap.min.css" crossorigin="anonymous">
<!-- bootstrap theme -->
<link rel="stylesheet" href="bootstrap-theme.css" crossorigin="anonymous">
<link rel="stylesheet" href="/bootstrap-theme.css" crossorigin="anonymous">
<!-- application css -->
<link rel="stylesheet" href="app.css" crossorigin="anonymous">
<link rel="stylesheet" href="/app.css" crossorigin="anonymous">
</head>
<body>
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container">
<div class="navbar-header">
<img class="navbar-brand" src="mini-logo.svg">
<img class="navbar-brand" src="/mini-logo.svg">
<a href="/" class="navbar-brand">Crane Operator</a>
</div>
<div id="navbar" class="collapse navbar-collapse">
@ -34,7 +34,7 @@
</div>
<div>
<br/><br/>
<img class="img-responsive" src="404.png"/>
<img class="img-responsive" src="/404.png"/>
</div>
</div>
</body>

6
public/index.html
View File

@ -5,13 +5,13 @@
<title>Crane Operator</title>
<!-- bootstrap css -->
<link rel="stylesheet" href="bootstrap.min.css" crossorigin="anonymous">
<link rel="stylesheet" href="/bootstrap.min.css" crossorigin="anonymous">
<!-- bootstrap theme -->
<link rel="stylesheet" href="bootstrap-theme.css" crossorigin="anonymous">
<link rel="stylesheet" href="/bootstrap-theme.css" crossorigin="anonymous">
<!-- application css -->
<link rel="stylesheet" href="app.css" crossorigin="anonymous">
<link rel="stylesheet" href="/app.css" crossorigin="anonymous">
</head>
<body>

9
server.rb
View File

@ -97,7 +97,7 @@ class CraneOp < Sinatra::Base
containers.to_json
end
get '/container/:container/tags.json' do |container|
get '/container/*/tags.json' do |container|
content_type :json
tags = container_tags(container)
@ -105,7 +105,12 @@ class CraneOp < Sinatra::Base
tags.to_json
end
get '/container/:container/:tag.json' do |container, tag|
get /container\/(.*\/)(.*.json)/ do |container, tag|
# This is here because we need to handle slashes in container names
container.chop!
tag.gsub!('.json', '')
content_type :json
info = container_info(container, tag)