blacklight-gallery 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: afc388305ae4f5c94d0db93b84263384c06fd63ceceb1fdb1ba1a6de3dd63df0
-  data.tar.gz: 07edb913bd3e3ef52416f195f2e931401da662ccdd290f183d0c56173fc1fc43
+  metadata.gz: e46d19afef2a73a0d960fc1ad28a8ae3d6e3a226dc574471be1c741511ae9d02
+  data.tar.gz: 06eacaef480be2254d90bb5eee685983428c650992ac7d05a2271f43f6bf05a0
 SHA512:
-  metadata.gz: 6d83d6abd455fe7816d959d6e77156090e9476440d6763e3d0ce0bd97eda0e0ed4e4b4fff90b61818dd2871bd835fddc1df0f1faf4792e70468fbffc3c2ac319
-  data.tar.gz: 88daf8b07b7433adb30ee28b36d25fabe2407003f768d48e9a6f2322e0bf826a14b0459884442e160e1d6bf50cc0bb4a8810f6be10bc5e4bf22209d81753e16c
+  metadata.gz: d83f792de40711259077f22f486ca0d13abb06c2ca7ae6bdfdd7bf304087adc5dfbf1b317b471abd283eaa60222d26de2bb8ccd2c7d7765adeb0354a3513d942
+  data.tar.gz: '095c95d7bf7009a46d89561554ffde63cc2a65f47d08b2ba5118206ab028913cb9078ebcc6485a18592b2e4d9dec4d23b44e402083d35a16e5ef7af42c908195'

data/.env

@@ -0,0 +1,2 @@
+SOLR_VERSION=9.6.1
+SOLR_PORT=8983

data/.github/workflows/ruby.yml

@@ -13,43 +13,27 @@ jobs:
     name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} / blacklight ${{ matrix.blacklight_version }} ${{ matrix.additional_name }})
     strategy:
       matrix:
-        ruby: ["3.2", "3.3", "3.4"]
-        rails_version: ["8.0.1"]
-        blacklight_version: ["~> 9.0.0beta1"]
+        ruby: ["3.3", "3.4", "4.0"]
+        rails_version: ["8.1.3"]
+        blacklight_version: ["~> 9.0"]
         experimental: [false]
         additional_engine_cart_rails_options: [""] # default: propshaft, bootstrap, importmaps
         additional_name: [""]
         include:
           - ruby: "3.4"
-            rails_version: "7.2.2.1"
-            blacklight_version: "~> 9.0.0beta1"
+            rails_version: "7.2.3.1"
             experimental: false
-            additional_engine_cart_rails_options: ""
-            additional_name: ""
-          - ruby: "3.2"
-            rails_version: "7.1.5.1"
-            blacklight_version: "~> 9.0.0beta1"
-            experimental: false
-            additional_engine_cart_rails_options: ""
-            additional_name: ""
-          - ruby: "3.4"
-            rails_version: "7.2.2.1"
-            blacklight_version: "github"
-            experimental: true
-            additional_engine_cart_rails_options: ""
-            additional_name: "/ Blacklight main"
+            additional_name: "Rails 7.2"
           - ruby: "3.4"
-            rails_version: "8.0.1"
-            blacklight_version: "github"
-            experimental: true
-            additional_engine_cart_rails_options: ""
-            additional_name: "/ Blacklight main"
+            rails_version: "8.0.5"
+            experimental: false
+            additional_name: "Rails 8.0"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
-      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
+      ENGINE_CART_RAILS_OPTIONS: "--skip-git --skip-listen --skip-spring --skip-keeps --skip-action-cable --skip-coffee --skip-kamal --skip-solid --skip-thruster --skip-docker --skip-test ${{ matrix.additional_engine_cart_rails_options }}"
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Set up Ruby ${{ matrix.ruby }}
         uses: ruby/setup-ruby@v1
         with:

data/Gemfile

@@ -1,20 +1,15 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in blacklight-gallery.gemspec
-gemspec
-
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?('/')
-  "https://github.com/#{repo_name}.git"
-end
-
-gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
+gemspec path: File.expand_path(__dir__)
 
 # BEGIN ENGINE_CART BLOCK
 # engine_cart: 2.5.0
 # engine_cart stanza: 2.5.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__)))
+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
@@ -36,6 +31,4 @@ else
 end
 # END ENGINE_CART BLOCK
 
-unless File.exist?(file)
-  eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__))
-end
+eval_gemfile File.expand_path('spec/test_app_templates/Gemfile.extra', File.dirname(__FILE__)) unless File.exist?(file)

data/README.md

@@ -11,7 +11,7 @@ Add this line to your Blacklight application's Gemfile:
 
 And then execute:
 
-    $ bundle
+    $ bundle install
 
 Or install it yourself as:
 
@@ -29,11 +29,9 @@ $ rails g blacklight_gallery:install
 
 ### Installation for Node-based JS bundlers
 
-For node-based bundlers add `blacklight-gallery masonry-layout@v4` as a dependency and add this to your entrypoint:
+For node-based bundlers add this to your entrypoint:
 ```js
-import 'blacklight-gallery/vendor/assets/javascripts/imagesloaded.pkgd.js'
-import 'blacklight-gallery/app/javascript/blacklight-gallery/slideshow'
-import 'blacklight-gallery/app/javascript/blacklight-gallery/masonry'
+import 'blacklight-gallery'
 ```
 
 ## Manual Installation

data/Rakefile

@@ -1,13 +1,42 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 APP_ROOT = File.dirname(__FILE__)
 
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
+require 'open3'
+
+def system_with_error_handling(*args)
+  Open3.popen3(*args) do |_stdin, stdout, stderr, thread|
+    puts stdout.read
+    raise "Unable to run #{args.inspect}: #{stderr.read}" unless thread.value.success?
+  end
+end
+
+def with_solr(&block)
+  # We're being invoked by the app entrypoint script and solr is already up via docker compose
+  if ENV['SOLR_ENV'] == 'docker-compose'
+    yield
+  elsif system('docker compose version')
+    # We're not running `docker compose up' but still want to use a docker instance of solr.
+    begin
+      puts 'Starting Solr'
+      system_with_error_handling 'docker compose up -d solr'
+      yield
+    ensure
+      puts 'Stopping Solr'
+      system_with_error_handling 'docker compose stop solr'
+    end
+  else
+    SolrWrapper.wrap do |solr|
+      solr.with_collection(&block)
+    end
+  end
+end
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :ci
+task default: :ci
 
 # Build with our opinionated defaults if none are provided.
 rails_options = ENV.fetch('ENGINE_CART_RAILS_OPTIONS', '')
@@ -15,45 +44,37 @@ rails_options = "#{rails_options} -a propshaft" unless rails_options.match?(/-a\
 rails_options = "#{rails_options} -j importmap" unless rails_options.match?(/-j\s|--javascript/)
 ENV['ENGINE_CART_RAILS_OPTIONS'] = rails_options
 
-desc "Load fixtures"
-task :fixtures => ['engine_cart:generate'] do
+desc 'Load fixtures'
+task fixtures: ['engine_cart:generate'] do
   within_test_app do
-      system "rake blacklight:index:seed RAILS_ENV=test"
-      abort "Error running fixtures" unless $?.success?
+    system 'rake blacklight:index:seed RAILS_ENV=test'
+    abort 'Error running fixtures' unless $?.success?
   end
 end
 
-desc "Execute Continuous Integration build"
-task :ci => ['engine_cart:generate'] do
-  require 'solr_wrapper'
-  SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), 'solr', 'conf')) do
-      within_test_app do
-        # Precompiles the assets
-        `bin/rails spec:prepare`
-      end
-
-      Rake::Task['fixtures'].invoke
-      Rake::Task['spec'].invoke
+desc 'Execute Continuous Integration build'
+task :ci do
+  with_solr do
+    Rake::Task['fixtures'].invoke
+    within_test_app do
+      # Precompiles the assets
+      `bin/rails spec:prepare`
     end
+    Rake::Task['spec'].invoke
   end
 end
 
-desc "Run Solr and Blacklight for interactive development"
+desc 'Run Solr and Blacklight for interactive development'
 task :server do
-  require 'solr_wrapper'
-  SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core',
-                         dir: File.join(__dir__, 'solr', 'conf')) do
-      within_test_app do
-        # Set `FILE` to the local fixture so we get thumbnails
-        ENV['FILE'] = File.join(__dir__, 'spec', 'fixtures', 'sample_solr_documents.yml')
-        system 'rake blacklight:index:seed'
-        ENV.delete('FILE')
-
-        system "yarn build:css"
-        system "bundle exec rails s"
-      end
+  with_solr do
+    within_test_app do
+      # Set `FILE` to the local fixture so we get thumbnails
+      ENV['FILE'] = File.join(__dir__, 'spec', 'fixtures', 'sample_solr_documents.yml')
+      system 'rake blacklight:index:seed'
+      ENV.delete('FILE')
+
+      system 'yarn build:css'
+      system 'bundle exec rails s'
     end
   end
 end

data/app/assets/config/blacklight_gallery/manifest.js

@@ -1,2 +1 @@
 //= link_tree ../../../javascript .js
-//= link_tree ../../../../vendor/assets/javascripts .js