browse-everything 1.1.0 → 1.1.1

data/lib/browse_everything/version.rb

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

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/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

@@ -87,7 +87,7 @@ module BrowserConfigHelper
                                  app_key: 'S3AppKey',
                                  app_secret: 'S3AppSecret',
                                  bucket: 's3.bucket',
-                                 region: 's3.region'
+                                 region: 'us-east-1'
                                })
   end
 

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

@@ -28,11 +28,62 @@ class TestAppGenerator < Rails::Generators::Base
   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.1.0
+  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: 2020-10-23 00:00:00.000000000 Z
+date: 2020-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -120,7 +120,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: ruby-box
   requirement: !ruby/object:Gem::Requirement
@@ -191,16 +191,16 @@ 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
@@ -495,6 +495,7 @@ files:
 - SUPPORT.md
 - app/assets/javascripts/browse_everything.js
 - app/assets/javascripts/browse_everything/behavior.js
+- 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
@@ -582,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
@@ -597,8 +598,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: AJAX/Rails engine file browser for cloud storage services
 test_files: