genevalidatorapp 1.5.2 → 1.5.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7043715d7c1f2a8a163dff14f4d767820f023c35
4
- data.tar.gz: c4026227dd0483bc393cabe0a895db4e08f08384
3
+ metadata.gz: 9eb1457cc2173c9ef5d4fee437c35f0c3a35ef10
4
+ data.tar.gz: b78826c8f4a6c26d17af027808858e76d9faf44e
5
5
  SHA512:
6
- metadata.gz: b0b66d513f0e8f77adff6bc412211148f5bebda107396c9ba4313142366d61e89ca66e155828fd007941e8c351809d22929c69e188b2a9410511d3751521efa0
7
- data.tar.gz: b48d501b323122ab5ea5f25adf1d0c7be5e1f0ee586cee2abf8174c402057bc3a528162aa335982ab1d6f0b74b478fb2829521303b6a9e229c025ba43a474f27
6
+ metadata.gz: dbabca96bd30a820f8d99a9e41df220700cbfdf8b9ca50d10e3e351bb8fa6cad98f7b0ecbe501e9f190f45731dd79e9ccee40928c6909de9f64cbc4fbee8aff3
7
+ data.tar.gz: 9e825c7677ec8279bf7d35ee6c04c7fc5ce6f6ab100f47bae9d8e541669aad130a1f38f8aff6ae0ea2ebe532b0561db3a2d750a4e05d23640b46916c836168db
@@ -108,8 +108,10 @@ module GeneValidatorApp
108
108
  # Copy the public folder (in the app root) to the gv_app_dir location - this
109
109
  # gv_app_dir is then used by the app to serve all dependencies...
110
110
  def init_public_dir
111
- root_web_files_dir = File.join(GeneValidatorApp.root, 'public/web_files')
112
- FileUtils.cp_r(root_web_files_dir, @public_dir)
111
+ root_web_files = File.join(GeneValidatorApp.root, 'public/web_files')
112
+ root_gv = File.join(GeneValidatorApp.root, 'public/GeneValidator')
113
+ FileUtils.cp_r(root_web_files, @public_dir)
114
+ FileUtils.cp_r(root_gv, @public_dir)
113
115
  end
114
116
 
115
117
  def init_binaries
@@ -38,6 +38,7 @@ module GeneValidatorApp
38
38
  @params = params
39
39
  validate_params
40
40
  obtain_db_path
41
+ @json_url = produce_json_url_link(url)
41
42
  @url = produce_result_url_link(url)
42
43
  end
43
44
 
@@ -47,8 +48,8 @@ module GeneValidatorApp
47
48
  write_seq_to_file
48
49
  run_genevalidator
49
50
  copy_json_folder
50
- (@params[:result_link]) ? @url : output_json_file_path
51
- parse_output_json
51
+ { parsed_json: parse_output_json, json_url: @json_url,
52
+ results_url: @url }
52
53
  end
53
54
 
54
55
  private
@@ -212,7 +213,13 @@ module GeneValidatorApp
212
213
  # Reuturns the URL of the results page.
213
214
  def produce_result_url_link(url)
214
215
  url.gsub(/input/, '').gsub(%r{/*$}, '') +
215
- "/GeneValidator/#{@unique_id}/input_file.fa.html/results.html"
216
+ "/GeneValidator/#{@unique_id}/input_file.fa.html/results1.html"
217
+ end
218
+
219
+ # Reuturns the URL of the results page.
220
+ def produce_json_url_link(url)
221
+ url.gsub(/input/, '').gsub(%r{/*$}, '') +
222
+ "/GeneValidator/#{@unique_id}/input_file.fa.json"
216
223
  end
217
224
 
218
225
  def parse_output_json
@@ -51,8 +51,15 @@ module GeneValidatorApp
51
51
  post '/' do
52
52
  cross_origin # Required for the API to work...
53
53
  RunGeneValidator.init(request.url, params)
54
- @json_results = RunGeneValidator.run
55
- slim :results, layout: false
54
+ @gv_results = RunGeneValidator.run
55
+ @json_results = @gv_results[:parsed_json]
56
+ if @params[:results_url]
57
+ @gv_results[:results_url]
58
+ elsif @params[:json_url]
59
+ @gv_results[:json_url]
60
+ else
61
+ slim :results, layout: false
62
+ end
56
63
  end
57
64
 
58
65
  # This error block will only ever be hit if the user gives us a funny
@@ -1,3 +1,3 @@
1
1
  module GeneValidatorApp
2
- VERSION = '1.5.2'
2
+ VERSION = '1.5.3'
3
3
  end
@@ -0,0 +1,12 @@
1
+ <!DOCTYPE html><html><head><title>GeneValidator: identify problems with gene predictions</title><meta content="text/html; charset=utf-8" http-equiv="Content-Type"><link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/bootswatch/3.3.5/flatly/bootstrap.min.css"><link rel="stylesheet" type="text/css" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
2
+ <style type="text/css">html{position:relative;min-height:100%;}body{margin:0 0 100px;background-color:#F5F5F5}footer{bottom:0;width:100%;margin:0 auto;position:absolute;height:100px;overflow:hidden;border-top:2px solid #DBDBDB;padding-top:10px;color:#b4bcc2}
3
+ </style></head>
4
+ <body>
5
+ <div class="container text-center">
6
+ <h1 style="font-size: 78px">GeneValidator</h1>
7
+ <h4 style="margin-bottom:3em">Identify Problems with Protein-Coding Gene Predictions</h4>
8
+ <i class="fa fa-spinner fa-spin" style="font-size: 10em"></i>
9
+ <h2> Calculating...</h2>
10
+ <p class="results_link"> This may take some time. Please leave this page open.</p>
11
+ </div>
12
+ <footer><div class="container center-block"><p class="text-muted text-center">Please cite: "Dragan M<sup>&Dagger;</sup>, Moghul MI<sup>&Dagger;</sup>, Priyam A, Bustos C &amp; Wurm Y <em>(in prep)</em> GeneValidator: identify problematic gene predictions"<br/> Developed at <a href="https://wurmlab.github.io" target="_blank">Wurm Lab</a>, <a href="http://www.sbcs.qmul.ac.uk" target="_blank">QMUL</a> with funding by <a href="http://www.bbsrc.ac.uk/home/home.aspx" target="_blank">BBSRC</a> and <a href="https://www.google-melange.com/gsoc/homepage/google/gsoc2013" target="_blank">Google Summer of Code 2013</a><br/>This page was created by <a href="https://github.com/wurmlab/genevalidator" target="_blank" >GeneValidator</a> v1.6.5</p></div></footer></body></html>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: genevalidatorapp
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.5.2
4
+ version: 1.5.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Monica Dragan
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2015-08-03 00:00:00.000000000 Z
14
+ date: 2015-09-21 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: bundler
@@ -218,7 +218,7 @@ files:
218
218
  - lib/genevalidatorapp/routes.rb
219
219
  - lib/genevalidatorapp/server.rb
220
220
  - lib/genevalidatorapp/version.rb
221
- - public/GeneValidator/.gitkeep
221
+ - public/GeneValidator/loading.html
222
222
  - public/src/css/bootstrap1.min.css
223
223
  - public/src/css/custom.css
224
224
  - public/src/css/custom.min.css
File without changes