blacklight-oembed 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca622e6493231613d2e1e8709cd59bdd5b092102e8add584aa8729cc62dafd92
-  data.tar.gz: 71350e1b92d7bda34dbd15a9da041c6320d1fe722920e29d72517f3e58774fc5
+  metadata.gz: 9dd1000e07ba6fd737d35bc9523688050ac88f02c17d9b11d843f5fd26537413
+  data.tar.gz: 222e686b52915f68c6aa471b658ec23dffcfb186abe6cf266ec65ee4210e1d42
 SHA512:
-  metadata.gz: e275f3324443f7120656aba199c6da9ee87d175ac00248122a3b75938a1152a22cdc371c30e31fc38f1ab548c376d17b795d5dc62c2ee73065937a23fe460d4a
-  data.tar.gz: 6b5d7d3b20aaa33894e1e30830032e25565e78004af528e09f6ee7ba60f0652a255e7d60125840f79354563a79b13d865755ce8980a96f7beedad136669c2c9d
+  metadata.gz: 82ba4038c2ed1082fb19582a874b311924b0b85ab4127cee0667e89134d3636221889e1670a3b104af045992cf9fb1e115aab179ae01f31d3469e08ce637993c
+  data.tar.gz: 37bb62f22038526d2fcba2d88a800527a63b4df6db432cab1e66bea0bb5d53d2624a13acbcad92a82f0ddfa62b23f1746913353c0821febda524de9a737c3f58

data/.github/workflows/ruby.yml

@@ -2,9 +2,9 @@ name: CI
 
 on:
   push:
-    branches: [ main ]
+    branches: [main]
   pull_request:
-    branches: [ main ]
+    branches: [main]
 
 jobs:
   test:
@@ -12,32 +12,34 @@ 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.4', '7.2.1']
-        blacklight_version: ['~> 7.0']
-        additional_name: ['']
-        legacy_config: ['']
+        ruby: ["3.3"]
+        rails_version: ["7.1.5.1", "7.2.2.1", "8.0.1"]
+        blacklight_version: ["~> 8.0"]
+        additional_engine_cart_rails_options: ["--css bootstrap"]
+        additional_name: [""]
+        legacy_config: [""]
         include:
-        - ruby: '3.3'
-          rails_version: '7.2.1'
-          blacklight_version: '~> 8.0'
-          additional_name: ''
-        - ruby: '3.3'
-          rails_version: '7.2.1'
-          blacklight_version: '~> 8.0'
-          additional_name: 'with legacy partial config'
-          legacy_config: 'true'
+          - ruby: "3.3"
+            rails_version: "7.2.2.1"
+            blacklight_version: "~> 7.0"
+            additional_name: ""
+          - ruby: "3.3"
+            rails_version: "7.2.2.1"
+            blacklight_version: "~> 8.0"
+            additional_name: "with legacy partial config"
+            legacy_config: "true"
     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 }}"
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up Ruby ${{ matrix.ruby }}
-      uses: ruby/setup-ruby@v1
-      with:
-        ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies with Rails ${{ matrix.rails_version }}
-      run: bundle install
-    - name: Run tests
-      run: bundle exec rake
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - name: Install dependencies with Rails ${{ matrix.rails_version }}
+        run: bundle install
+      - name: Run tests
+        run: bundle exec rake

data/.gitignore

@@ -16,3 +16,6 @@ test/tmp
 test/version_tmp
 tmp
 .internal_test_app
+
+node_modules
+package-lock.json

data/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link_tree ../../javascript .js

data/app/assets/javascripts/blacklight_oembed/oembed.esm.js

@@ -0,0 +1,34 @@
+function oEmbed(elements) {
+  if (!elements) return;
+
+  // Ensure elements is an array-like collection
+  elements = elements instanceof NodeList ? Array.from(elements) : [elements];
+
+  elements.forEach(function(embedViewer) {
+    const embedURL = embedViewer.dataset.embedUrl; // Get the embed URL from the data attribute
+
+    if (!embedURL) return;
+
+    // Fetch JSON data from the embed URL
+    fetch(embedURL)
+      .then(response => {
+        if (!response.ok) {
+          throw new Error('Network response was not ok');
+        }
+        return response.json();
+      })
+      .then(data => {
+        if (data === null) {
+          return;
+        }
+        // Set the inner HTML of the element
+        embedViewer.innerHTML = data.html;
+      })
+      .catch(error => {
+        console.error('Error fetching embed data:', error);
+      });
+  });
+}
+
+export { oEmbed as default };
+//# sourceMappingURL=oembed.esm.js.map

data/app/assets/javascripts/blacklight_oembed/oembed.esm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oembed.esm.js","sources":["../../../javascript/blacklight-oembed/oembed.js"],"sourcesContent":["export default function oEmbed(elements) {\n  if (!elements) return;\n\n  // Ensure elements is an array-like collection\n  elements = elements instanceof NodeList ? Array.from(elements) : [elements];\n\n  elements.forEach(function(embedViewer) {\n    const embedURL = embedViewer.dataset.embedUrl; // Get the embed URL from the data attribute\n\n    if (!embedURL) return;\n\n    // Fetch JSON data from the embed URL\n    fetch(embedURL)\n      .then(response => {\n        if (!response.ok) {\n          throw new Error('Network response was not ok');\n        }\n        return response.json();\n      })\n      .then(data => {\n        if (data === null) {\n          return;\n        }\n        // Set the inner HTML of the element\n        embedViewer.innerHTML = data.html;\n      })\n      .catch(error => {\n        console.error('Error fetching embed data:', error);\n      });\n  });\n}\n"],"names":[],"mappings":"AAAe,SAAS,MAAM,CAAC,QAAQ,EAAE;AACzC,EAAE,IAAI,CAAC,QAAQ,EAAE;;AAEjB;AACA,EAAE,QAAQ,GAAG,QAAQ,YAAY,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;;AAE7E,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,WAAW,EAAE;AACzC,IAAI,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;;AAElD,IAAI,IAAI,CAAC,QAAQ,EAAE;;AAEnB;AACA,IAAI,KAAK,CAAC,QAAQ;AAClB,OAAO,IAAI,CAAC,QAAQ,IAAI;AACxB,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;AAC1B,UAAU,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;AACxD;AACA,QAAQ,OAAO,QAAQ,CAAC,IAAI,EAAE;AAC9B,OAAO;AACP,OAAO,IAAI,CAAC,IAAI,IAAI;AACpB,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;AAC3B,UAAU;AACV;AACA;AACA,QAAQ,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI;AACzC,OAAO;AACP,OAAO,KAAK,CAAC,KAAK,IAAI;AACtB,QAAQ,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC;AAC1D,OAAO,CAAC;AACR,GAAG,CAAC;AACJ;;;;"}

data/app/assets/javascripts/blacklight_oembed/oembed.js

@@ -1,31 +1,42 @@
-export default function oEmbed(elements) {
-  if (!elements) return;
+(function (global, factory) {
+  typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+  typeof define === 'function' && define.amd ? define(factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, global.oembed = factory());
+})(this, (function () { 'use strict';
 
-  // Ensure elements is an array-like collection
-  elements = elements instanceof NodeList ? Array.from(elements) : [elements];
+  function oEmbed(elements) {
+    if (!elements) return;
 
-  elements.forEach(function(embedViewer) {
-    const embedURL = embedViewer.dataset.embedUrl; // Get the embed URL from the data attribute
+    // Ensure elements is an array-like collection
+    elements = elements instanceof NodeList ? Array.from(elements) : [elements];
 
-    if (!embedURL) return;
+    elements.forEach(function(embedViewer) {
+      const embedURL = embedViewer.dataset.embedUrl; // Get the embed URL from the data attribute
 
-    // Fetch JSON data from the embed URL
-    fetch(embedURL)
-      .then(response => {
-        if (!response.ok) {
-          throw new Error('Network response was not ok');
-        }
-        return response.json();
-      })
-      .then(data => {
-        if (data === null) {
-          return;
-        }
-        // Set the inner HTML of the element
-        embedViewer.innerHTML = data.html;
-      })
-      .catch(error => {
-        console.error('Error fetching embed data:', error);
-      });
-  });
-}
+      if (!embedURL) return;
+
+      // Fetch JSON data from the embed URL
+      fetch(embedURL)
+        .then(response => {
+          if (!response.ok) {
+            throw new Error('Network response was not ok');
+          }
+          return response.json();
+        })
+        .then(data => {
+          if (data === null) {
+            return;
+          }
+          // Set the inner HTML of the element
+          embedViewer.innerHTML = data.html;
+        })
+        .catch(error => {
+          console.error('Error fetching embed data:', error);
+        });
+    });
+  }
+
+  return oEmbed;
+
+}));
+//# sourceMappingURL=oembed.js.map

data/app/assets/javascripts/blacklight_oembed/oembed.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oembed.js","sources":["../../../javascript/blacklight-oembed/oembed.js"],"sourcesContent":["export default function oEmbed(elements) {\n  if (!elements) return;\n\n  // Ensure elements is an array-like collection\n  elements = elements instanceof NodeList ? Array.from(elements) : [elements];\n\n  elements.forEach(function(embedViewer) {\n    const embedURL = embedViewer.dataset.embedUrl; // Get the embed URL from the data attribute\n\n    if (!embedURL) return;\n\n    // Fetch JSON data from the embed URL\n    fetch(embedURL)\n      .then(response => {\n        if (!response.ok) {\n          throw new Error('Network response was not ok');\n        }\n        return response.json();\n      })\n      .then(data => {\n        if (data === null) {\n          return;\n        }\n        // Set the inner HTML of the element\n        embedViewer.innerHTML = data.html;\n      })\n      .catch(error => {\n        console.error('Error fetching embed data:', error);\n      });\n  });\n}\n"],"names":[],"mappings":";;;;;;EAAe,SAAS,MAAM,CAAC,QAAQ,EAAE;EACzC,EAAE,IAAI,CAAC,QAAQ,EAAE;;EAEjB;EACA,EAAE,QAAQ,GAAG,QAAQ,YAAY,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;;EAE7E,EAAE,QAAQ,CAAC,OAAO,CAAC,SAAS,WAAW,EAAE;EACzC,IAAI,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC;;EAElD,IAAI,IAAI,CAAC,QAAQ,EAAE;;EAEnB;EACA,IAAI,KAAK,CAAC,QAAQ;EAClB,OAAO,IAAI,CAAC,QAAQ,IAAI;EACxB,QAAQ,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE;EAC1B,UAAU,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC;EACxD;EACA,QAAQ,OAAO,QAAQ,CAAC,IAAI,EAAE;EAC9B,OAAO;EACP,OAAO,IAAI,CAAC,IAAI,IAAI;EACpB,QAAQ,IAAI,IAAI,KAAK,IAAI,EAAE;EAC3B,UAAU;EACV;EACA;EACA,QAAQ,WAAW,CAAC,SAAS,GAAG,IAAI,CAAC,IAAI;EACzC,OAAO;EACP,OAAO,KAAK,CAAC,KAAK,IAAI;EACtB,QAAQ,OAAO,CAAC,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC;EAC1D,OAAO,CAAC;EACR,GAAG,CAAC;EACJ;;;;;;;;"}

data/app/javascript/blacklight-oembed/oembed.js

@@ -0,0 +1,31 @@
+export default function oEmbed(elements) {
+  if (!elements) return;
+
+  // Ensure elements is an array-like collection
+  elements = elements instanceof NodeList ? Array.from(elements) : [elements];
+
+  elements.forEach(function(embedViewer) {
+    const embedURL = embedViewer.dataset.embedUrl; // Get the embed URL from the data attribute
+
+    if (!embedURL) return;
+
+    // Fetch JSON data from the embed URL
+    fetch(embedURL)
+      .then(response => {
+        if (!response.ok) {
+          throw new Error('Network response was not ok');
+        }
+        return response.json();
+      })
+      .then(data => {
+        if (data === null) {
+          return;
+        }
+        // Set the inner HTML of the element
+        embedViewer.innerHTML = data.html;
+      })
+      .catch(error => {
+        console.error('Error fetching embed data:', error);
+      });
+  });
+}

data/config/importmap.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+pin_all_from File.expand_path("../app/javascript/blacklight-oembed", __dir__), under: "blacklight-oembed"

data/lib/blacklight/oembed/engine.rb

@@ -10,6 +10,11 @@ module Blacklight
       # Allows an adopter to pass additional parameters through to an OEmbed
       # service. Examples of this could include `:canvas_index`, or `:max_width`
       config.additional_params = []
+
+      initializer 'blacklight_oembed.importmap', before: 'importmap' do |app|
+        app.config.assets.paths << Engine.root.join("app/javascript")
+        app.config.importmap.paths << Engine.root.join('config/importmap.rb') if app.config.respond_to?(:importmap)
+      end
     end
   end
 end

data/lib/blacklight/oembed/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Oembed
-    VERSION = '1.3.0'
+    VERSION = '1.4.1'
   end
 end

data/lib/generators/blacklight_oembed/install_generator.rb

@@ -18,6 +18,10 @@ module BlacklightOembed
       copy_file "oembed_providers.rb", "config/initializers/oembed_providers.rb"
     end
 
+    def appease_sprockets4
+      append_to_file 'app/assets/config/manifest.js', "\n//= link blacklight-oembed/oembed.js"
+    end
+
     def configuration
       inject_into_file 'app/controllers/catalog_controller.rb', after: 'configure_blacklight do |config|' do
         if ENV['CI_TEST_LEGACY_CONFIGURATION'].present? || Gem::Version.new(Blacklight::VERSION) < Gem::Version.new('8.0')

data/package.json

@@ -1,13 +1,15 @@
 {
   "name": "blacklight-oembed",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "description": "Oembed behavior for Blacklight",
   "main": "app/assets/javascripts/blacklight_oembed/oembed.js",
+  "type": "module",
   "files": [
     "app/assets/javascripts/blacklight_oembed/*.js"
   ],
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "prepare": "rollup --config rollup.config.js --sourcemap && ESM=true rollup --config rollup.config.js --sourcemap"
   },
   "repository": {
     "type": "git",
@@ -19,5 +21,8 @@
     "url": "https://github.com/projectblacklight/blacklight-oembed/issues"
   },
   "homepage": "https://github.com/projectblacklight/blacklight-oembed#readme",
-  "dependencies": {}
+  "dependencies": {
+    "rollup": "^4.30.1",
+    "rollup-plugin-includepaths": "^0.2.4"
+  }
 }

data/rollup.config.js

@@ -0,0 +1,27 @@
+import includePaths from 'rollup-plugin-includepaths';
+
+
+const BUNDLE = process.env.BUNDLE === 'true'
+const ESM = process.env.ESM === 'true'
+
+const fileDest = `oembed${ESM ? '.esm' : ''}`
+
+let includePathOptions = {
+  include: {},
+  paths: ['app/javascript'],
+  external: [],
+  extensions: ['.js']
+};
+
+const rollupConfig = {
+  input: 'app/javascript/blacklight-oembed/oembed.js',
+  output: {
+    file: `app/assets/javascripts/blacklight_oembed/${fileDest}.js`,
+    format: ESM ? 'es' : 'umd',
+    generatedCode: { preset: 'es2015' },
+    name: ESM ? undefined : 'oembed'
+  },
+  plugins: [includePaths(includePathOptions)]
+}
+
+export default rollupConfig

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-oembed
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-08 00:00:00.000000000 Z
+date: 2025-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -212,14 +212,20 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/assets/config/manifest.js
 - app/assets/javascripts/blacklight_oembed/jquery.oembed.js
+- app/assets/javascripts/blacklight_oembed/oembed.esm.js
+- app/assets/javascripts/blacklight_oembed/oembed.esm.js.map
 - app/assets/javascripts/blacklight_oembed/oembed.js
+- app/assets/javascripts/blacklight_oembed/oembed.js.map
 - app/components/blacklight/oembed/document_oembed_component.html.erb
 - app/components/blacklight/oembed/document_oembed_component.rb
 - app/controllers/blacklight/oembed/embed_controller.rb
 - app/helpers/blacklight/oembed/oembed_helper.rb
+- app/javascript/blacklight-oembed/oembed.js
 - app/views/catalog/_oembed_default.html.erb
 - blacklight-oembed.gemspec
+- config/importmap.rb
 - config/jetty.yml
 - config/locales/blacklight-oembed.ar.yml
 - config/locales/blacklight-oembed.en.yml
@@ -232,6 +238,7 @@ files:
 - lib/generators/blacklight_oembed/templates/blacklight_oembed.js
 - lib/generators/blacklight_oembed/templates/oembed_providers.rb
 - package.json
+- rollup.config.js
 - solr/conf/_rest_managed.json
 - solr/conf/admin-extra.html
 - solr/conf/elevate.xml