blacklight-oembed 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c0c853761558362f5e6e1292cfbdb4f644e93e79757a0066690a55047352fea
-  data.tar.gz: 39773774a0dff4245a920a1884927be49a4baad5bcd8d6d0e18b2f68f194f14a
+  metadata.gz: 3a59252144cd15c58c9f735a54a7ea3287a50eef165e5d4d7c88dbaf457ee3d9
+  data.tar.gz: 4b30f07484b0bf6ed52c65cedfa40319c04d09227b3120f504dbb0823d9ecfb4
 SHA512:
-  metadata.gz: 1e0f64919c741b49fb79c9b76aebb3f05689af7d8daddb73db8628708d5d8f8575c12c0f14e899e756b488d9b5e8863e764e3c7b71e5e61a31ce514a4402238c
-  data.tar.gz: 5a420f515997fa5160ab1d881d2e5c35e5f97906b2dcba62e230ffa79fe9c72c5a07dd00e33af8e5c4c3c7962d165ef71425fd3532bdca4e19293dd683157c18
+  metadata.gz: e60a631c7b0d31897e8703f8e82f12b559ec90b94bdabad788759b11aca3c9c97d810c6db4f7798bfaf3f9b7d7e5f8b5c73a0e58e368a758e78b930d2dab685c
+  data.tar.gz: ca535289339f7665b3441bbb2f0ca30987bfc310578eb7515c81e5a3c9bd214085d393819053a5e2164795f34dbd3da3b1df4616e99239c1e2ff0af6f7d4fe84

data/.env

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

data/.github/workflows/ruby.yml

@@ -12,27 +12,33 @@ jobs:
     name: test (ruby ${{ matrix.ruby }} / rails ${{ matrix.rails_version }} / blacklight ${{ matrix.blacklight_version }} ${{ matrix.additional_name }})
     strategy:
       matrix:
-        ruby: ["3.3"]
-        rails_version: ["7.1.5.1", "7.2.2.1", "8.0.1"]
+        ruby: ["3.4"]
+        rails_version: ["7.2.3.1", "8.0.5", "8.1.3"]
         blacklight_version: ["~> 8.0"]
+        view_component_version: ["~> 3.0"]
         additional_engine_cart_rails_options: ["--css bootstrap"]
         additional_name: [""]
         legacy_config: [""]
         include:
-          - ruby: "3.3"
-            rails_version: "7.2.2.1"
+          - ruby: "3.4"
+            rails_version: "7.2.3.1"
             blacklight_version: "~> 7.0"
             additional_name: ""
-          - ruby: "3.3"
-            rails_version: "7.2.2.1"
+          - ruby: "3.4"
+            rails_version: "7.2.3.1"
             blacklight_version: "~> 8.0"
             additional_name: "with legacy partial config"
             legacy_config: "true"
+          - ruby: "3.4"
+            rails_version: "8.1.3"
+            blacklight_version: "~> 9.0"
+            additional_name: "Blacklight 9"
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
       BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
       CI_TEST_LEGACY_CONFIGURATION: ${{ matrix.legacy_config }}
       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 }}"
+      VIEW_COMPONENT_VERSION: ${{ matrix.view_component_version }}
     steps:
       - uses: actions/checkout@v2
       - name: Set up Ruby ${{ matrix.ruby }}

data/Gemfile

@@ -1,18 +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
+# Declare dependencies in blacklight-gallery.gemspec.
+gemspec path: File.expand_path(__dir__)
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 2.2.1
-# engine_cart stanza: 0.10.0
+# 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
@@ -31,19 +28,7 @@ else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
-
-  case ENV['RAILS_VERSION']
-  when /^5.[12]/
-    gem 'sass-rails', '~> 5.0'
-  when /^4.2/
-    gem 'responders', '~> 2.0'
-    gem 'sass-rails', '>= 5.0'
-    gem 'coffee-rails', '~> 4.1.0'
-  when /^4.[01]/
-    gem 'sass-rails', '< 5.0'
-  end
 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/Rakefile

@@ -1,51 +1,76 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 APP_ROOT = File.dirname(__FILE__)
 
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 require 'solr_wrapper'
+require 'open3'
 
-task :default => :ci
+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
 
-desc "Run specs"
-RSpec::Core::RakeTask.new do |t|
+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
+
+task default: :ci
 
+desc 'Run specs'
+RSpec::Core::RakeTask.new do |t|
 end
 
-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
-
-  ENV['environment'] = "test"
-  SolrWrapper.wrap(port: '8983') do |solr|
-    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), 'solr', 'conf')) do
-      Rake::Task['fixtures'].invoke
-      Rake::Task['spec'].invoke
-    end
+desc 'Execute Continuous Integration build'
+task :ci do
+  ENV['environment'] = 'test'
+  with_solr do
+    Rake::Task['fixtures'].invoke
+    Rake::Task['spec'].invoke
   end
 end
 
 task :server do
-  if File.exists? 'spec/internal'
+  if File.exist? 'spec/internal'
     within_test_app do
-      system "bundle update"
+      system 'bundle update'
     end
   else
     Rake::Task['engine_cart:generate'].invoke
   end
 
-  SolrWrapper.wrap(port: '8983')  do
+  with_solr do
     within_test_app do
-      system "rake blacklight:index:seed"
-      system "bundle exec rails s"
+      system 'rake blacklight:index:seed'
+      system 'bundle exec rails s'
     end
   end
 end

data/app/components/blacklight/oembed/document_oembed_component.rb

@@ -1,16 +1,17 @@
 module Blacklight
   module Oembed
     class DocumentOembedComponent < Blacklight::Component
-      attr_reader :document, :presenter, :classes
+      attr_reader :presenter, :classes
 
-      def initialize(document:, presenter:, classes: ['oembed-widget'], **kwargs)
-        super
+      def initialize(presenter:, classes: ['oembed-widget'], **kwargs)
+        super()
 
-        @document = document
         @presenter = presenter
         @classes = classes
       end
 
+      delegate :document, to: :presenter
+
       def embed
         return if embed_url.blank?
 

data/app/views/catalog/_oembed_default.html.erb

@@ -1 +1 @@
-<%= render Blacklight::Oembed::DocumentOembedComponent.new(document: document, presenter: document_presenter(document)) %>
+<%= render Blacklight::Oembed::DocumentOembedComponent.new(presenter: document_presenter(document)) %>

data/blacklight-oembed.gemspec

@@ -1,34 +1,34 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'blacklight/oembed/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "blacklight-oembed"
+  spec.name          = 'blacklight-oembed'
   spec.version       = Blacklight::Oembed::VERSION
-  spec.authors       = ["Chris Beer"]
-  spec.email         = ["cabeer@stanford.edu"]
-  spec.summary       = %q{Oembed display for Blacklight}
-  spec.homepage      = "https://github.com/sul-dlss/blacklight-oembed"
-  spec.license       = "Apache 2.0"
+  spec.authors       = ['Chris Beer']
+  spec.email         = ['cabeer@stanford.edu']
+  spec.summary       = 'Oembed display for Blacklight'
+  spec.homepage      = 'https://github.com/sul-dlss/blacklight-oembed'
+  spec.license       = 'Apache 2.0'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "rails"
-  spec.add_dependency 'blacklight', '>= 7.25', '< 9'
-  spec.add_dependency "ruby-oembed"
+  spec.add_dependency 'blacklight', '>= 7.25', '< 10'
+  spec.add_dependency 'rails'
+  spec.add_dependency 'ruby-oembed'
+  spec.add_dependency 'view_component', '>= 3.0'
 
-  spec.add_development_dependency "bundler", ">= 1.5"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", "~> 6"
-  spec.add_development_dependency "rspec-its"
-  spec.add_development_dependency "rspec-activemodel-mocks"
-  spec.add_development_dependency "rspec-collection_matchers"
-  spec.add_development_dependency "solr_wrapper"
-  spec.add_development_dependency "engine_cart", "~> 2.0"
-  spec.add_development_dependency "capybara"
-  spec.add_development_dependency "poltergeist", ">= 1.5.0"
+  spec.add_development_dependency 'bundler', '>= 1.5'
+  spec.add_development_dependency 'capybara'
+  spec.add_development_dependency 'engine_cart', '~> 2.0'
+  spec.add_development_dependency 'poltergeist', '>= 1.5.0'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec-activemodel-mocks'
+  spec.add_development_dependency 'rspec-collection_matchers'
+  spec.add_development_dependency 'rspec-its'
+  spec.add_development_dependency 'rspec-rails', '~> 6'
+  spec.add_development_dependency 'solr_wrapper'
 end

data/compose.yaml

@@ -0,0 +1,18 @@
+services:
+  solr:
+    environment:
+      - SOLR_PORT # Set via environment variable or use default defined in .env file
+      - SOLR_VERSION # Set via environment variable or use default defined in .env file
+      - SOLR_MODULES=analysis-extras
+    image: "solr:${SOLR_VERSION}"
+    volumes:
+      - $PWD/solr/conf:/opt/solr/conf
+    ports:
+      - "${SOLR_PORT}:8983"
+    entrypoint:
+      - docker-entrypoint.sh
+      - solr-precreate
+      - blacklight-core
+      - /opt/solr/conf
+      - "-Xms256m"
+      - "-Xmx512m"

data/lib/blacklight/oembed/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Oembed
-    VERSION = '1.4.2'
+    VERSION = '1.5.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,7 @@
-ENV["RAILS_ENV"] ||= 'test'
+ENV['RAILS_ENV'] ||= 'test'
 
 require 'engine_cart'
 EngineCart.load_application!
-
 require 'rspec/collection_matchers'
 require 'rspec/its'
 require 'rspec/rails'
@@ -16,4 +15,4 @@ require 'blacklight/oembed'
 
 RSpec.configure do |c|
   c.infer_spec_type_from_file_location!
-end
+end

data/spec/test_app_templates/Gemfile.extra

@@ -3,3 +3,7 @@ if ENV['BLACKLIGHT_VERSION'] == 'github'
 elsif ENV['BLACKLIGHT_VERSION'] && !ENV['BLACKLIGHT_VERSION'].empty?
   gem 'blacklight', ENV['BLACKLIGHT_VERSION']
 end
+
+unless ENV['VIEW_COMPONENT_VERSION'].to_s == ""
+  gem 'view_component', ENV.fetch('VIEW_COMPONENT_VERSION')
+end

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

@@ -1,14 +1,14 @@
 require 'rails/generators'
 
 class TestAppGenerator < Rails::Generators::Base
-  source_root File.expand_path("../../../../test_app_templates", __FILE__)
+  source_root File.expand_path('../../../test_app_templates', __dir__)
 
   def remove_index
-    remove_file "public/index.html"
+    remove_file 'public/index.html'
   end
 
   def run_blacklight_generator
-    say_status("warning", "GENERATING BL", :yellow)
+    say_status('warning', 'GENERATING BL', :yellow)
 
     if ENV['BLACKLIGHT_VERSION'] == 'github'
       gem 'blacklight', github: 'projectblacklight/blacklight'
@@ -16,8 +16,8 @@ class TestAppGenerator < Rails::Generators::Base
       gem 'blacklight', ENV['BLACKLIGHT_VERSION']
     end
 
-    Bundler.with_clean_env do
-      run "bundle update"
+    Bundler.with_unbundled_env do
+      run 'bundle update'
     end
 
     generate 'blacklight:install'
@@ -26,5 +26,4 @@ class TestAppGenerator < Rails::Generators::Base
   def run_oembed_install
     generate 'blacklight_oembed:install'
   end
-
 end

metadata

@@ -1,49 +1,48 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-oembed
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.5.0
 platform: ruby
 authors:
 - Chris Beer
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.25'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '7.25'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '10'
 - !ruby/object:Gem::Dependency
-  name: blacklight
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.25'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '7.25'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '9'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +57,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: view_component
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -73,7 +86,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -87,35 +100,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: engine_cart
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
-  name: rspec-activemodel-mocks
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -129,7 +142,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
+  name: rspec-activemodel-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -143,7 +156,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: solr_wrapper
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -157,54 +170,54 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: engine_cart
+  name: rspec-its
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: capybara
+  name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: poltergeist
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
-description:
+        version: '0'
 email:
 - cabeer@stanford.edu
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".env"
 - ".github/workflows/ruby.yml"
 - ".gitignore"
 - ".solr_wrapper.yml"
@@ -225,6 +238,7 @@ files:
 - app/javascript/blacklight-oembed/oembed.js
 - app/views/catalog/_oembed_default.html.erb
 - blacklight-oembed.gemspec
+- compose.yaml
 - config/importmap.rb
 - config/jetty.yml
 - config/locales/blacklight-oembed.ar.yml
@@ -266,7 +280,6 @@ homepage: https://github.com/sul-dlss/blacklight-oembed
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -281,8 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key:
+rubygems_version: 4.0.7
 specification_version: 4
 summary: Oembed display for Blacklight
 test_files: