browse-everything 1.0.0.rc2 → 1.1.1

data/lib/browse_everything/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module BrowseEverything
-  VERSION = '1.0.0.rc2'
+  VERSION = '1.1.1'
 end

data/lib/generators/browse_everything/templates/browse_everything_providers.yml.example

@@ -5,6 +5,7 @@
 # dropbox:
 #   client_id: YOUR_DROPBOX_APP_KEY
 #   client_secret: YOUR_DROPBOX_APP_SECRET
+#   download_directory: tmp/
 # box:
 #   client_id: YOUR_BOX_CLIENT_ID
 #   client_secret: YOUR_BOX_CLIENT_SECRET

data/spec/features/test_compiling_stylesheets_spec.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-describe 'Compiling the stylesheets', type: :feature do
+describe 'Compiling the stylesheets', type: :feature, js: true do
   it 'does not raise errors' do
     visit '/'
     expect(page).not_to have_content 'Sass::SyntaxError'

data/spec/lib/browse_everything/browser_spec.rb

@@ -4,7 +4,7 @@ include BrowserConfigHelper
 
 describe BrowseEverything::Browser do
   let(:file_config) do
-    "file_system:\n  home: '/file/config/home'\ndropbox:\n  client_id: 'DropboxId'\n  client_secret: 'DropboxClientSecret'"
+    "file_system:\n  home: '/file/config/home'\ndropbox:\n  client_id: 'DropboxId'\n  client_secret: 'DropboxClientSecret'\n  download_directory: 'tmp/'"
   end
 
   let(:global_config) do
@@ -14,7 +14,8 @@ describe BrowseEverything::Browser do
       },
       dropbox: {
         client_id: 'DropboxId',
-        client_secret: 'DropboxClientSecret'
+        client_secret: 'DropboxClientSecret',
+        download_directory: 'tmp/'
       }
     }
   end
@@ -26,7 +27,8 @@ describe BrowseEverything::Browser do
       },
       dropbox: {
         client_id: 'DropboxId',
-        client_secret: 'DropboxClientSecret'
+        client_secret: 'DropboxClientSecret',
+        download_directory: 'tmp/'
       },
       url_options: url_options
     }

data/spec/lib/browse_everything/driver/dropbox_spec.rb

@@ -8,7 +8,8 @@ describe BrowseEverything::Driver::Dropbox do
   let(:provider_yml) do
     {
       client_id: 'client-id',
-      client_secret: 'client-secret'
+      client_secret: 'client-secret',
+      download_directory: 'spec/fixtures/'
     }
   end
   let(:oauth_response_body) do
@@ -63,6 +64,10 @@ describe BrowseEverything::Driver::Dropbox do
 
     before { driver.connect({ code: 'code' }, {}, connector_response_url_options) }
 
+    it 'accesses the download directory' do
+      expect(driver.config).to include('download_directory' => 'spec/fixtures/')
+    end
+
     describe '#auth_link' do
       subject { driver.auth_link(connector_response_url_options) }
 
@@ -133,6 +138,20 @@ describe BrowseEverything::Driver::Dropbox do
           expect(downloaded_file.read).not_to be_empty
         end
       end
+
+      context 'when the configuration does not specify a download directory' do
+        let(:provider_yml) do
+          {
+            client_id: 'client-id',
+            client_secret: 'client-secret'
+          }
+        end
+        let(:downloaded_file_path) { link_args.first }
+
+        it 'uses the "tmp" directory as the default path' do
+          expect(downloaded_file_path).to include '/tmp/Getting Started.pdf'
+        end
+      end
     end
   end
 end

data/spec/lib/browse_everything/driver_spec.rb

@@ -15,9 +15,49 @@ describe BrowseEverything::Driver do
     end
   end
 
-  describe '#sorter' do
-    it 'defaults to nil' do
-      expect(described_class.sorter).to be nil
+  after do
+    Object.send(:remove_const, :MyDriver)
+  end
+
+  describe '#default_sorter' do
+    let(:file1) do
+      instance_double(BrowseEverything::FileEntry)
+    end
+    let(:file2) do
+      instance_double(BrowseEverything::FileEntry)
+    end
+    let(:file3) do
+      instance_double(BrowseEverything::FileEntry)
+    end
+    let(:files) do
+      [
+        file1,
+        file2,
+        file3
+      ]
+    end
+
+    before do
+      class MyNewDriver < BrowseEverything::Driver::Base; end
+
+      allow(file1).to receive(:container?).and_return(false)
+      allow(file1).to receive(:name).and_return('test file1')
+      allow(file2).to receive(:container?).and_return(false)
+      allow(file2).to receive(:name).and_return('test file2')
+      allow(file3).to receive(:container?).and_return(true)
+      allow(file3).to receive(:name).and_return('test container1')
+    end
+    after do
+      Object.send(:remove_const, :MyNewDriver)
+    end
+
+    it 'defaults to proc which sorts by containers' do
+      expect(MyNewDriver.default_sorter).to be_a(Proc)
+
+      results = MyNewDriver.default_sorter.call(files)
+      expect(results.first.name).to eq file3.name
+      expect(results[1].name).to eq file1.name
+      expect(results.last.name).to eq file2.name
     end
   end
 

data/spec/spec_helper.rb

@@ -4,7 +4,7 @@ ENV['RAILS_ENV'] ||= 'test'
 require 'bundler/setup'
 
 def coverage_needed?
-  ENV['COVERAGE'] || ENV['TRAVIS']
+  ENV['COVERAGE'] || ENV['CI']
 end
 
 if coverage_needed?
@@ -36,6 +36,7 @@ require 'capybara/rspec'
 require 'rspec'
 require 'rspec/rails'
 require 'rspec/its'
+require 'webdrivers'
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
@@ -45,6 +46,12 @@ require 'webmock/rspec'
 WebMock.disable_net_connect!(allow_localhost: true)
 
 RSpec.configure do |config|
+  config.before(:each, type: :feature) { WebMock.disable! }
+  config.after(:each, type: :feature) do
+    WebMock.enable!
+    WebMock.disable_net_connect!(allow_localhost: true)
+  end
+
   config.expect_with :rspec do |c|
     c.syntax = %i[should expect]
   end
@@ -80,7 +87,7 @@ module BrowserConfigHelper
                                  app_key: 'S3AppKey',
                                  app_secret: 'S3AppSecret',
                                  bucket: 's3.bucket',
-                                 region: 's3.region'
+                                 region: 'us-east-1'
                                })
   end
 

data/spec/support/capybara.rb

@@ -4,11 +4,6 @@ require 'selenium-webdriver'
 
 # Temporary pin until chromedriver-helper patched to deal with change in chromedriver versioning
 # See https://github.com/flavorjones/chromedriver-helper/pull/63
-# @note In January 2018, TravisCI disabled Chrome sandboxing in its Linux
-#       container build environments to mitigate Meltdown/Spectre
-#       vulnerabilities, at which point Hyrax could no longer use the
-#       Capybara-provided :selenium_chrome_headless driver (which does not
-#       include the `--no-sandbox` argument).
 Capybara.register_driver :selenium_chrome_headless_sandboxless do |app|
   browser_options = ::Selenium::WebDriver::Chrome::Options.new
   browser_options.args << '--headless'

data/spec/test_app_templates/Gemfile.extra

@@ -1,6 +1,15 @@
 gem 'jquery-rails'
 gem 'puma-rails'
 
+if ENV['RAILS_VERSION']
+  case ENV['RAILS_VERSION']
+  when /6\./
+    gem 'webpacker', '~> 4.0'
+  when /5\./
+    gem 'webpacker', '~> 4.0'
+  end
+end
+
 if ENV['TEST_BOOTSTRAP'] == "3"
   gem "bootstrap-sass"
 else

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -19,20 +19,71 @@ class TestAppGenerator < Rails::Generators::Base
     insert_into_file 'app/assets/stylesheets/application.css.scss', after: '*/' do
       if ENV['TEST_BOOTSTRAP'] == "3"
         # bootstrap 3 from bootstrap-sass gem
-        %(\n\n@import "bootstrap-sprockets";\n@import "bootstrap";\n@import "browse_everything_bootstrap3";)
+        %(\n\n@import "bootstrap-sprockets";\n@import "bootstrap";\n@import "browse_everything/browse_everything_bootstrap3";)
       else
         # bootstrap4 from bootstrap gem
-        %(\n\n@import "bootstrap";\n@import "browse_everything_bootstrap4";)
+        %(\n\n@import "bootstrap";\n@import "browse_everything/browse_everything_bootstrap4";)
       end
     end
   end
 
   def inject_javascript
-    insert_into_file 'app/assets/javascripts/application.js', after: '//= require_tree .' do
-      %(
+    if /^6\./.match?(Rails.version)
+      # Both jQuery and Twitter Bootstrap 3.x need to be added for legacy JavaScript
+      system('yarn add jquery@3.3.1')
+      system('yarn add bootstrap@3.4.1')
+      system('yarn install')
+
+      # Adding the JavaScript module dependencies
+      insert_into_file 'app/javascript/packs/application.js', after: 'require("channels")' do
+        %(
+          require("jquery")
+          require("bootstrap")
+        )
+      end
+
+      # Here the JavaScript needs to be injected for Webpacker
+      insert_into_file 'config/webpack/environment.js', after: "const { environment } = require('@rails/webpacker')" do
+        %(
+          const webpack = require('webpack')
+
+          environment.plugins.prepend('Provide',
+            new webpack.ProvidePlugin({
+              $: 'jquery/src/jquery',
+              jQuery: 'jquery/src/jquery'
+            })
+          )
+        )
+      end
+
+      # Copy the TreeTable JavaScript
+      copy_file('../../app/assets/javascripts/treetable.webpack.js', 'app/javascript/packs/treetable.js')
+
+      # Copy the browse_everything JavaScript
+      copy_file('../../app/assets/javascripts/browse_everything/behavior.js', 'app/javascript/packs/browse-everything.js')
+
+      # Adding the JavaScript module dependencies
+      insert_into_file 'app/javascript/packs/browse-everything.js', before: "'use strict';" do
+        %(
+          require("bootstrap")
+          require("./treetable")
+        )
+      end
+
+      # Load the new packs into the view
+      insert_into_file 'app/views/layouts/application.html.erb', before: '</head>' do
+        %(
+          <%= javascript_pack_tag 'treetable', 'data-turbolinks-track': 'reload' %>
+          <%= javascript_pack_tag 'browse-everything', 'data-turbolinks-track': 'reload' %>
+        )
+      end
+    else
+      insert_into_file 'app/assets/javascripts/application.js', after: '//= require_tree .' do
+        %(
         //= require jquery
         //= require browse_everything
-      )
+        )
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browse-everything
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.1.1
 platform: ruby
 authors:
 - Carolyn Cole
@@ -10,10 +10,10 @@ authors:
 - Thomas Scherz
 - Xiaoming Wang
 - Jeremy Friesen
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-28 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -75,30 +75,42 @@ dependencies:
   name: google_drive
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: googleauth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.6
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +118,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,6 +128,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby-box
   requirement: !ruby/object:Gem::Requirement
@@ -142,19 +160,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.8'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '3.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: '3.7'
 - !ruby/object:Gem::Dependency
   name: typhoeus
   requirement: !ruby/object:Gem::Requirement
@@ -173,28 +191,28 @@ dependencies:
   name: bixby
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
@@ -211,20 +229,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: chromedriver-helper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -365,6 +369,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec_junit_formatter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -421,6 +439,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webdrivers
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -447,12 +479,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".engine_cart.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
 - Gemfile
@@ -463,9 +495,11 @@ files:
 - SUPPORT.md
 - app/assets/javascripts/browse_everything.js
 - app/assets/javascripts/browse_everything/behavior.js
-- app/assets/stylesheets/_browse_everything_bootstrap3.scss
-- app/assets/stylesheets/_browse_everything_bootstrap4.scss
+- app/assets/javascripts/treetable.webpack.js
+- app/assets/stylesheets/browse_everything.scss
 - app/assets/stylesheets/browse_everything/_browse_everything.scss
+- app/assets/stylesheets/browse_everything/_browse_everything_bootstrap3.scss
+- app/assets/stylesheets/browse_everything/_browse_everything_bootstrap4.scss
 - app/assets/stylesheets/jquery.treetable.theme.browse.css
 - app/controllers/browse_everything_controller.rb
 - app/helpers/browse_everything_helper.rb
@@ -549,7 +583,7 @@ homepage: https://github.com/projecthydra/browse-everything
 licenses:
 - Apache 2
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -560,13 +594,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services
 test_files: