browse-everything 1.1.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b80226009720a599afbe1c801e626b294a6d904ac29cfae3728b01bdb647424e
-  data.tar.gz: 9b461e46201ee1c1b2c5a7a3bf10b525da5cf943c7930ac7fb2adae5933f2a1f
+  metadata.gz: b7cb857160ebc811eafac9247c7cec49eeac9b46edc453a2bb50eba106e58caf
+  data.tar.gz: 85551cebc8b3f2ae374b224e3fba8fd4f72126d58d12bab307977407119c5f75
 SHA512:
-  metadata.gz: 5fe833958e65c9cab265e07253277fca93b3f34ca49fec14c60933c673d0affeb04a9546bc47a6da80a3bb4fe660e9f408a022b2092d907ff4595a00bc2fcc53
-  data.tar.gz: 4950e8b37b3c5d2832733de91350bd9d9dcd41c35cafeab2cec61d1500fbe537bbf441eea2bbc3d20156cdfdc0a8b261e0712387173e7f8f40cfe5f45cd3e359
+  metadata.gz: b75481a9a77c377a58a97b40eca87fe8f5fc1465db82bc1043ce0380674666a4ff80e0459554ba3f042c9bf210add815d176bbbce41255d9fafb9642f123ce34
+  data.tar.gz: a1118f1b26cf47d276fb47194dedc13f3006ffa632613f7df1022445b37e12f2451c307e38bd07c3c22d4151cd7f71e580448caf7461a4ff02f499486e605a0b

data/.circleci/config.yml

@@ -1,7 +1,8 @@
 ---
 version: 2.1
 orbs:
-  samvera: samvera/circleci-orb@0
+  samvera: samvera/circleci-orb@1.0
+  browser-tools: circleci/browser-tools@1.1
 
 jobs:
   build:
@@ -12,86 +13,122 @@ jobs:
         type: string
       bundler_version:
         type: string
-        default: 2.1.4
+        default: 2.4.3
     executor:
       name: 'samvera/ruby'
       ruby_version: << parameters.ruby_version >>
     environment:
       RAILS_VERSION: << parameters.rails_version >>
     steps:
-      - samvera/cached_checkout
+      - browser-tools/install-chrome
 
-      - samvera/bundle_for_gem:
-          bundler_version: << parameters.bundler_version >>
-          ruby_version: << parameters.ruby_version >>
-          project: 'browse-everything'
-
-      - samvera/engine_cart_generate:
-          cache_key: v1-internal-test-app-{{ checksum "browse-everything.gemspec" }}-{{ checksum "Gemfile" }}-{{ checksum "spec/test_app_templates/lib/generators/test_app_generator.rb" }}-{{ checksum "lib/generators/browse_everything/install_generator.rb" }}-{{ checksum "lib/generators/browse_everything/config_generator.rb" }}--<< parameters.rails_version >>-<< parameters.ruby_version >>
+      - samvera/cached_checkout
 
       - run:
-         name: Update sprockets to fix version incompatibilities between internal test app and initial bundle install
-         command: bundle update sprockets
+          name: Check for a branch named 'master'
+          command: |
+            git fetch --all --quiet --prune --prune-tags
+            if [[ -n "$(git branch --all --list master */master)" ]]; then
+              echo "A branch named 'master' was found. Please remove it."
+              echo "$(git branch --all --list master */master)"
+            fi
+            [[ -z "$(git branch --all --list master */master)" ]]
 
-      - samvera/bundle_for_gem:
-          ruby_version: << parameters.ruby_version >>
+      - samvera/bundle:
           bundler_version: << parameters.bundler_version >>
-          project: 'browse-everything'
+          ruby_version: << parameters.ruby_version >>
 
       - samvera/rubocop
 
-      - run:
-          name: Install Karma for JavaScript and functional tests
-          command: sudo npm install -g karma karma-jasmine karma-chrome-launcher
-
       - samvera/parallel_rspec
 
 workflows:
   ci:
     jobs:
       - build:
-          name: "ruby2-7_rails6-0"
-          ruby_version: 2.7.1
-          rails_version: 6.0.3.1
+          name: "ruby3-2_rails7-1"
+          ruby_version: 3.2.1
+          rails_version: 7.1.1
       - build:
-          name: "ruby2-6_rails6-0"
-          ruby_version: 2.6.6
-          rails_version: 6.0.3.1
+          name: "ruby3-2_rails7-0"
+          ruby_version: 3.2.0
+          rails_version: 7.0.4
       - build:
-          name: "ruby2-5_rails6-0"
-          ruby_version: 2.5.8
-          rails_version: 6.0.3.1
+          name: "ruby3-1_rails7-0"
+          ruby_version: 3.1.2
+          rails_version: 7.0.4
 
       - build:
-          name: "ruby2-7_rails5-2"
-          ruby_version: 2.7.1
-          rails_version: 5.2.4.3
+          name: "ruby3-1_rails6-1"
+          ruby_version: 3.1.2
+          rails_version: 6.1.6
+      - build:
+          name: "ruby3-0_rails6-1"
+          ruby_version: 3.0.3
+          rails_version: 6.1.6
+
       - build:
-          name: "ruby2-6_rails5-2"
-          ruby_version: 2.6.6
-          rails_version: 5.2.4.3
+          name: "ruby3-0_rails6-0"
+          ruby_version: 3.0.3
+          rails_version: 6.0.4.7
       - build:
-          name: "ruby2-5_rails5-2"
-          ruby_version: 2.5.8
-          rails_version: 5.2.4.3
+          name: "ruby2-7_rails6-0"
+          ruby_version: 2.7.7
+          rails_version: 6.0.4.7
+
       - build:
-          name: "ruby2-4_rails5-2"
-          ruby_version: 2.4.10
-          rails_version: 5.2.4.3
+          name: "ruby2-7_rails5-2"
+          ruby_version: 2.7.7
+          rails_version: 5.2.7
 
       - build:
           name: "ruby2-7_rails5-1"
-          ruby_version: 2.7.1
+          ruby_version: 2.7.7
           rails_version: 5.1.7
+
+  nightly:
+    triggers:
+      - schedule:
+          cron: "0 0 * * *"
+          filters:
+            branches:
+              only:
+                - main
+    jobs:
       - build:
-          name: "ruby2-6_rails5-1"
-          ruby_version: 2.6.6
-          rails_version: 5.1.7
+          name: "ruby3-2_rails7-0"
+          ruby_version: 3.2.0
+          rails_version: 7.0.4
       - build:
-          name: "ruby2-5_rails5-1"
-          ruby_version: 2.5.8
-          rails_version: 5.1.7
+          name: "ruby3-1_rails7-0"
+          ruby_version: 3.1.2
+          rails_version: 7.0.4
+
+      - build:
+          name: "ruby3-1_rails6-1"
+          ruby_version: 3.1.2
+          rails_version: 6.1.6
+      - build:
+          name: "ruby3-0_rails6-1"
+          ruby_version: 3.0.3
+          rails_version: 6.1.6
+
+      - build:
+          name: "ruby3-0_rails6-0"
+          ruby_version: 3.0.3
+          rails_version: 6.0.4.7
       - build:
-          name: "ruby2-4_rails5-1"
-          ruby_version: 2.4.10
+          name: "ruby2-7_rails6-0"
+          ruby_version: 2.7.7
+          rails_version: 6.0.4.7
+
+      - build:
+          name: "ruby2-7_rails5-2"
+          ruby_version: 2.7.7
+          rails_version: 5.2.7
+
+      - build:
+          name: "ruby2-7_rails5-1"
+          ruby_version: 2.7.7
           rails_version: 5.1.7
+

data/.gitignore

@@ -16,5 +16,7 @@ spec/reports
 spec/fixtures/Getting Started.pdf
 test/tmp
 test/version_tmp
-tmp
-.internal_test_app
+spec/dummy_test_app/tmp
+spec/dummy_test_app/db
+spec/dummy_test_app/log
+!spec/dummy_test_app/tmp/.gitkeep

data/.rubocop.yml

@@ -7,6 +7,14 @@ AllCops:
   DisplayCopNames: true
   Exclude:
     - 'vendor/**/*'
+    - 'spec/dummy_test_app/**/*'
+    - 'bin/rails'
+
+Style/GuardClause:
+  Enabled: false
+
+StyleI/IfUnlessModifier:
+  Enabled: false
 
 Bundler/DuplicatedGem:
   Exclude:
@@ -79,3 +87,7 @@ Style/NumericLiterals:
 Style/RedundantBegin:
   Exclude:
     - 'lib/browse_everything/browser.rb'
+
+Style/IfUnlessModifier:
+  Exclude:
+    - 'Gemfile'

data/.rubocop_todo.yml

@@ -31,11 +31,6 @@ Metrics/MethodLength:
 Metrics/ParameterLists:
   Max: 7
 
-# Offense count: 1
-RSpec/DescribeClass:
-  Exclude:
-    - 'spec/javascripts/jasmine_spec.rb'
-
 # Offense count: 2
 RSpec/MultipleExpectations:
   Max: 2

data/.tool-versions

@@ -0,0 +1,2 @@
+ruby 2.7.5
+nodejs lts-fermium

data/CONTRIBUTING.md

@@ -22,6 +22,28 @@ https://wiki.duraspace.org/display/samvera/Samvera+Community+Intellectual+Proper
 
 You should also add yourself to the `CONTRIBUTORS.md` file in the root of the project.
 
+## Language
+
+The language we use matters.  Today, tomorrow, and for years to come
+people will read the code we write.  They will judge us for our
+design, logic, and the words we use to describe the system.
+
+Our words should be accessible.  Favor descriptive words that give
+meaning while avoiding reinforcing systemic inequities.  For example,
+in the Samvera community, we should favor using allowed\_list instead
+of whitelist, denied\_list instead of blacklist, or source/copy
+instead of master/slave.
+
+We're going to get it wrong, but this is a call to keep working to
+make it right.  View our code and the words we choose as a chance to
+have a conversation. A chance to grow an understanding of the systems
+we develop as well as the systems in which we live.
+
+See [“Blacklists” and “whitelists”: a salutary warning concerning the
+prevalence of racist language in discussions of predatory
+publishing](https://www.ncbi.nlm.nih.gov/pmc/articles/PMC6148600/) for
+further details.
+
 ## Contribution Tasks
 
 * Reporting Issues

data/Gemfile

@@ -9,38 +9,46 @@ group :development, :test do
   gem 'pry-byebug' unless ENV['CI']
 end
 
-# BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.10.0
-# engine_cart stanza: 0.10.0
-# the below comes from engine_cart, a gem used to test this Rails engine gem in the context of a Rails app.
-file = File.expand_path('Gemfile', ENV['ENGINE_CART_DESTINATION'] || ENV['RAILS_ROOT'] || File.expand_path('.internal_test_app', File.dirname(__FILE__)))
-if File.exist?(file)
-  begin
-    eval_gemfile file
-  rescue Bundler::GemfileError => e
-    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
-    Bundler.ui.warn e.message
-  end
-else
-  Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
-
-  if ENV['RAILS_VERSION']
-    if ENV['RAILS_VERSION'] == 'edge'
-      gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
-    else
-      gem 'rails', ENV['RAILS_VERSION']
-    end
+# == Extra dependencies for dummy test app ==
+#
+# Extra dependencies for dummy test app are in .gemspec as a development dependency
+# where possible. But when  dependencies vary for different versions
+# of Rails, rails-version-specific dependencies are here, behind conditionals, for now.
+#
+# TODO switch to use appraisal gem instead, encapsulating these different additional
+# dependencies per Rails version, as well as method of choosing operative rails version.
+#
+# We allow testing under multiple versions of Rails by setting ENV RAILS_VERSION,
+# used in CI, can be used locally too.
+
+# Set a default RAILS_VERSION so we make sure to get extra dependencies for it...
+
+ENV['RAILS_VERSION'] ||= "7.1.1"
+
+if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION'] == 'edge'
+    gem 'rails', github: 'rails/rails'
+  else
+    gem 'rails', ENV['RAILS_VERSION']
   end
 
   case ENV['RAILS_VERSION']
-  when /^6\./
-    gem 'puma', '~> 4.1'
-  when /^5\./
-    gem 'capybara', '~> 2.18.0'
-    gem 'puma', '~> 3.11'
+  when /^7\.1\./
+    # sprockets is optional for rails 7, but we currently require it, and test with it.
+    gem "sprockets-rails"
+  when /^7\.0\./
+    # sprockets is optional for rails 7, but we currently require it, and test with it.
+    gem "sprockets-rails"
+  when /^6\.1\./
+    # opt into mail 2.8.0.rc1 so we get extra dependencies required for rails 6.1
+    # Once mail 2.8.0 final is released this will not be required.
+    # https://github.com/mikel/mail/pull/1472
+    gem "mail", ">= 2.8.0.rc1"
+  when /^6\.0\./
+    gem 'sass-rails', '>= 6'
+  when /^5\.[12]\./
+    gem 'sass-rails', '~> 5.0'
+    gem 'sprockets', '~> 3.7'
+    gem 'thor', '~> 0.20'
   end
 end
-# END ENGINE_CART BLOCK
-
-eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__)) unless File.exist?(file)

data/README.md

@@ -3,13 +3,12 @@
 Code:
 [![Gem Version](https://badge.fury.io/rb/browse-everything.png)](http://badge.fury.io/rb/browse-everything)
 [![CircleCI](https://circleci.com/gh/samvera/browse-everything.svg?style=svg)](https://circleci.com/gh/samvera/browse-everything)
-[![Coverage Status](https://coveralls.io/repos/samvera/browse-everything/badge.svg?branch=master&service=github)](https://coveralls.io/github/samvera/browse-everything?branch=master)
 
 Docs:
 [![Contribution Guidelines](http://img.shields.io/badge/CONTRIBUTING-Guidelines-blue.svg)](./CONTRIBUTING.md)
 [![Apache 2.0 License](http://img.shields.io/badge/APACHE2-license-blue.svg)](./LICENSE.txt)
 
-Jump in: [![Slack Status](http://slack.samvera.org/badge.svg)](http://slack.samvera.org/)
+Community Support: [![Samvera Community Slack](https://img.shields.io/badge/samvera-slack-blueviolet)](http://slack.samvera.org/)
 
 # What is BrowseEverything?
 
@@ -25,29 +24,63 @@ download the files.
 
 **This gem does not depend on hydra-head**
 
+## Technical Debt/Legacy warning
+
+This is code with a long history that has a number of known problems;
+we are trying to keep it alive for existing projects using it. But caution is
+advised in introducing it, in it's present form, to new projects.
+
+A significant overhaul of this gem may be desirable (with backwards-breaking
+changes), to better accomplish gem goals. But there has not been the
+interest/resources in the community to accomplish that at present.
+
+Some known current issues (Jun 2022):
+
+* The S3 adapter is known working; but it's not clear if other adapters using
+OAuth2 (main use case for this gem) are in fact working reliably. And there
+is some concern that the current browse-everything integration API may not be
+compatible with proper OAuth/OAuth2 flows to support OAuth integrations --
+originally the main use case of this gem.
+
+* The CSS and Javascript were both written for use with the sprockets Rails
+asset pipeline.  Recent versions of Rails may require custom configuration
+to use sprockets (especially for JS), which is not currently covered in
+instructions here. Using other means of including CSS and JS may require
+confusing customization also not fully covered here.
+
+* Javascript depends on JQuery, bootstrap (3 or 4; 5 untested), as well as a
+vendored copy of a jquery.treetable plugin.
+
+* CSS is provided for compatibilty with bootstrap 3 or bootstrap 4, but not
+bootstrap 5 (or no bootstrap at all)
+
 ## Product Owner & Maintenance
 
-BrowseEverything is a Core Component of the Samvera community. The documentation for
-what this means can be found
-[here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
+`browse-everything` was a Core Component of the Samvera Community. Given a decline in available labor required for maintenance, this project no longer has a dedicated Product Owner. The documentation for what this means can be found [here](http://samvera.github.io/core_components.html#requirements-for-a-core-component).
 
 ### Product Owner
 
-[mbklein](https://github.com/mbklein)
+**Vacant**
+
+_Until a Product Owner has been identified, we ask that you please direct all requests for support, bug reports, and general questions to the [`#dev` Channel on the Samvera Slack](https://samvera.slack.com/app_redirect?channel=dev)._
 
 # Getting Started
 
 ## Supported Ruby Releases
-Currently, the following releases of Ruby are supported:
-- 2.6.3
-- 2.5.5
-- 2.4.6
+Currently, the following releases of Ruby are tested:
+- 3.1
+- 3.0
+- 2.7
+- 2.6
 
 ## Supported Rails Releases
 The supported Rail releases follow those specified by [the security policy of the Rails Community](https://rubyonrails.org/security/).  As is the case with the supported Ruby releases, it is recommended that one upgrades from any Rails release no longer receiving security updates.
-- 6.0.3
-- 5.2.3
-- 5.1.7
+- 7.1
+- 7.0
+- 6.1
+- 6.0
+- 5.2
+- 5.1
 
 ## Installation
 
@@ -99,29 +132,6 @@ If your app has installed a previous version of browse-everything, you may have
 
 However, we also recommend merging the contents of this file into your main `application.scss` file, as documented in the current install instructions. With the separate generated file with bootstrap imports, you may likely be including bootstrap CSS in your generated CSS bundle twice, if you also have that import in your main application.scss already.
 
-## Testing
-This is a Rails Engine which is tested using the [engine_cart](https://github.com/cbeer/engine_cart) Gem and rspec.
-
-One rspec test invokes [karma](https://karma-runner.github.io/latest/index.html) to run Javascript tests. For this test to succeed, you need to install karma on your system, first by making sure `npm` is installed, and then run `npm install -g karma karma-jasmine karma-chrome-launcher`.
-
-Test suites may be executed with the following invocation:
-
-```bash
-bundle exec rake
-```
-
-Tests by default will be run with bootstrap-4 integration. To test bootstrap-3 integration: `TEST_BOOTSTRAP=3 bundle exec rake`.
-
-### Testing Problems
-Should you attempt to execute the test suite and encounter the following error:
-```bash
-Your Ruby version is 2.x.x, but your Gemfile specified 2.y.z
-```
-...then you must clean the internal test app generated by `engine_cart` with the following:
-```bash
-bundle exec rake engine_cart:clean
-```
-
 ## Usage
 
 ### Adding Providers
@@ -252,6 +262,31 @@ See `spec/support/app/views/file_handler/index.html` for an example use case. Yo
 create a fully-functioning demo app in `spec/internal` (though you will have to create
 `spec/internal/config/browse_everything.providers.yml` file with your own configuration info.)
 
+## Development Testing
+
+This is a Rails Engine which is tested using an in-repo "dummy" app, in the style of skeletons
+generated by `rails plugin new --full`.
+
+### Rails utilities
+
+This gives you Rails-provided tools you can run in project home dir, like: `./bin/rails console`, `./bin/rails server` (to start the dummy app in dev mode), `bundle exec rake db:drop db:create db:migrate` (db management in dummy app).
+
+### Test suite
+
+Full CI/test suite may be executed with the following invocation:
+
+```bash
+bundle exec rake
+```
+
+Or individually, `bundle exec rubocop`, `bundle exec rspec`.
+
+### Testing with different versions of dependencies
+
+You can test with different versions of rails by setting ENV variable `RAILS_VERSION` to a specific version like `"6.1.2"` or `"7.0.0"`, perhaps by `export RAILS_ENV=7.0.0` to set it in your shell session.
+
+After changing `RAILS_VERSION` you may have to run `rm Gemfile.lock` and `bundle install` again. If you get a `Bundler could not find compatible versions...` error, for instance.
+
 # Help
 
 The Samvera community is here to help. Please see our [support guide](./SUPPORT.md).

data/Rakefile

@@ -1,10 +1,18 @@
 # frozen_string_literal: true
 
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+
+APP_RAKEFILE = File.expand_path("spec/dummy_test_app/Rakefile", __dir__)
+load 'rails/tasks/engine.rake'
+
 require 'bundler/gem_tasks'
 
 Dir.glob('tasks/*.rake').each { |r| import r }
 
 require 'rspec/core/rake_task'
-require 'engine_cart/rake_task'
 
 task default: [:ci]

data/app/assets/javascripts/browse_everything/behavior.js

@@ -2,6 +2,7 @@
 
 $(function () {
   var dialog = $('div#browse-everything');
+  var selected_files = new Map(); // { url: input element object }
 
   var initialize = function initialize(obj, options) {
     if ($('div#browse-everything').length === 0) {
@@ -46,25 +47,21 @@ $(function () {
       return t.replace(/\+/g, ' ').split('=', 2);
     });
     var elements = $(fields).map(function () {
-      return $("<input type='hidden'/>").attr('name', decodeURIComponent(this[0])).val(decodeURIComponent(this[1]))[0].outerHTML;
+      return $("<input type='hidden'/>").attr('name', decodeURIComponent(this[0])).val(decodeURIComponent(this[1]))[0];
     });
-    return $(elements.toArray().join("\n"));
+    return $(elements.toArray());
   };
 
   var indicateSelected = function indicateSelected() {
-    return $('input.ev-url').each(function () {
-      return $('*[data-ev-location=\'' + $(this).val() + '\']').addClass('ev-selected');
+    return selected_files.forEach(function (value, key) {
+      var row = $('*[data-ev-location=\'' + key + '\']');
+      row.find('.ev-select-file').prop('checked', true);
+      return row.addClass('ev-selected');
     });
   };
 
   var fileIsSelected = function fileIsSelected(row) {
-    var result = false;
-    $('input.ev-url').each(function () {
-      if (this.value === $(row).data('ev-location')) {
-        return result = true;
-      }
-    });
-    return result;
+    return selected_files.has(row.data('ev-location'));
   };
 
   var toggleFileSelect = function toggleFileSelect(row) {
@@ -77,27 +74,26 @@ $(function () {
     return updateFileCount();
   };
 
+  var hidden_input_prototype = $("<input type='hidden' class='ev-url' name='selected_files[]'/>");
   var selectFile = function selectFile(row) {
-    var target_form = $('form.ev-submit-form');
     var file_location = row.data('ev-location');
-    var hidden_input = $("<input type='hidden' class='ev-url' name='selected_files[]'/>").val(file_location);
-    target_form.append(hidden_input);
+    var hidden_input = hidden_input_prototype.clone().val(file_location);
+    selected_files.set(file_location, hidden_input);
     if (!$(row).find('.ev-select-file').prop('checked')) {
       return $(row).find('.ev-select-file').prop('checked', true);
     }
   };
 
   var unselectFile = function unselectFile(row) {
-    var target_form = $('form.ev-submit-form');
     var file_location = row.data('ev-location');
-    $('form.ev-submit-form input[value=\'' + file_location + '\']').remove();
+    selected_files.delete(file_location);
     if ($(row).find('.ev-select-file').prop('checked')) {
       return $(row).find('.ev-select-file').prop('checked', false);
     }
   };
 
   var updateFileCount = function updateFileCount() {
-    var count = $('input.ev-url').length;
+    var count = selected_files.size;
     var files = count === 1 ? "file" : "files";
     return $('.ev-status').html(count + ' ' + files + ' selected');
   };
@@ -125,7 +121,7 @@ $(function () {
   };
 
   var selectChildRows = function selectChildRows(row, action) {
-    return $('table#file-list tr').each(function () {
+    var returned_rows = $('table#file-list tr').each(function () {
       if ($(this).data('tt-parent-id')) {
         var re = RegExp($(row).data('tt-id'), 'i');
         if ($(this).data('tt-parent-id').match(re)) {
@@ -149,11 +145,12 @@ $(function () {
               $(this).removeClass('ev-selected');
               unselectFile($(this));
             }
-            return updateFileCount();
           }
         }
       }
     });
+    updateFileCount();
+    return returned_rows;
   };
 
   var tableSetup = function tableSetup(table) {
@@ -320,6 +317,7 @@ $(function () {
   $(document).on('click', 'button.ev-cancel', function (event) {
     event.preventDefault();
     dialog.data('ev-state').callbacks.cancel.fire();
+    selected_files.clear();
     return $('.ev-browser').modal('hide');
   });
 
@@ -327,6 +325,7 @@ $(function () {
     event.preventDefault();
     $(this).button('loading');
     startWait();
+    $('form.ev-submit-form').append(Array.from(selected_files.values()));
     var main_form = $(this).closest('form');
     var resolver_url = main_form.data('resolver');
     var ctx = dialog.data('ev-state');
@@ -338,12 +337,13 @@ $(function () {
     }).done(function (data) {
       if (ctx.opts.target != null) {
         var fields = toHiddenFields({ selected_files: data });
-        $(ctx.opts.target).append($(fields));
+        $(ctx.opts.target).append(fields);
       }
       return ctx.callbacks.done.fire(data);
     }).fail(function (xhr, status, error) {
       return ctx.callbacks.fail.fire(status, error, xhr.responseText);
     }).always(function () {
+      selected_files.clear();
       $('body').css('cursor', 'default');
       $('.ev-browser').modal('hide');
       return $('#browse-btn').focus();
@@ -447,10 +447,16 @@ var auto_toggle = function auto_toggle() {
 if (typeof Turbolinks !== 'undefined' && Turbolinks !== null && Turbolinks.supported) {
   // Use turbolinks:load for Turbolinks 5, otherwise use the old way
   if (Turbolinks.BrowserAdapter) {
-    $(document).on('turbolinks:load', auto_toggle);
+    $(document).on('turbolinks:load', function() {
+      // make sure turbolinks:load AND jquery onReady have BOTH happened,
+      // they could come in any order.
+      $(auto_toggle);
+    });
   } else {
-    $(document).on('page:change', auto_toggle);
+    $(document).on('page:change', function() {
+      $(auto_toggle);
+    });
   }
 } else {
-  $(document).ready(auto_toggle);
+  $(auto_toggle);
 }