Skip to content
This repository has been archived by the owner on Jun 22, 2020. It is now read-only.

Commit

Permalink
be a little quicker wiht feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeremy B. Merrill committed May 27, 2016
1 parent e413e39 commit a11a4e0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ platform :jruby do
# but with my own custom version of Tika, http://github.com/jeremybmerrill/tika
# because Warbler can't handle gems sourced from git, I had to make a whole new gem.
gem 'rika-stevedore', "1.6.2", :require => "rika"
gem 'stevedore-uploader', :path => "../stevedore-uploader"
gem 'stevedore-uploader', "~> 1.0.3"

gem "sinatra"
gem "warbler", "2.0.0.rc2"
Expand Down
26 changes: 11 additions & 15 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
PATH
remote: ../stevedore-uploader
specs:
stevedore-uploader (1.0.2-java)
aws-sdk (~> 2)
elasticsearch (~> 1.0)
jruby-openssl (~> 0.9)
mail (~> 2.6)
manticore
nokogiri (~> 1.6)
pst (~> 0.0.2)
rika-stevedore (>= 1.6.1)
rubyzip (~> 1.1)

GEM
remote: https://rubygems.org/
specs:
Expand Down Expand Up @@ -91,6 +77,16 @@ GEM
rack (~> 1.5)
rack-protection (~> 1.4)
tilt (>= 1.3, < 3)
stevedore-uploader (1.0.3-java)
aws-sdk (~> 2)
elasticsearch (~> 1.0)
jruby-openssl (~> 0.9)
mail (~> 2.6)
manticore
nokogiri (~> 1.6)
pst (~> 0.0.2)
rika-stevedore (>= 1.6.1)
rubyzip (~> 1.1)
thread_safe (0.3.5-java)
tilt (2.0.4)
twitter (5.16.0)
Expand Down Expand Up @@ -127,7 +123,7 @@ DEPENDENCIES
manticore
rika-stevedore (= 1.6.2)
sinatra
stevedore-uploader!
stevedore-uploader (~> 1.0.3)
twitter
warbler (= 2.0.0.rc2)

Expand Down
4 changes: 4 additions & 0 deletions uploader/gui_for_uploader.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@
es_index = params["index-name"]
invalid << ["index-name", params["index-name"]] if es_index.nil? || es_index.empty?

settings.logs.puts "Creating a search engine..."

settings.logs.flush


# if the files are already on S3, extract the bucket name from params["files"]
# if they're not, extract the bucket name from params["frontend-location"]
Expand Down
2 changes: 2 additions & 0 deletions uploader/views/uploader.erb
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@
var logs = new EventSource('/upload/stream');

$(document).on('click', '#submit', function(e){
$('#logs').html("<p>Creating a search engine...</p>");

var was_disabled = $('#index-name input').is('[disabled]');
$('#index-name input').removeAttr('disabled');
$.post('/upload/do', $('form').serialize(), function(json_resp){
Expand Down

0 comments on commit a11a4e0

Please sign in to comment.