blacklight-oembed 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3c971144b04f02227444c36d711fb95b94dbcfe2a9127d2b89e15b194cb26296
-  data.tar.gz: ab3c66a5322c9d903ba28b00300b31191a1633ddd5baf7c4f471de8a90003286
+  metadata.gz: 5305c4c047c7deeee34c98b2d3197e69d584a6ca7308cb0d80ebebf81d666b9d
+  data.tar.gz: 695d6b4f7dce7c1b516f54653332f9c8b5bbe295c6151eff90be47da2f368fdf
 SHA512:
-  metadata.gz: 41af86fc4a6389c6e42168e5b59345c6c0ec45b05cd27585f5af8a8fdb2253ef55313062bd70f837c5522062627d258a125308858520c0ec980da33b593c1de0
-  data.tar.gz: 6cac86875cdfc798411c1fa5a433740521610712a32473c1d32b77743813ad7b5eebfd2e47c67d268cfc6ed6ab956f06eb7340fd25b5d321c167023eb5663107
+  metadata.gz: 044130e650ac8243abe3f5390d1bdd7b93f94130ecc0a17b1504a071738c8ffbaf6f9cb9979c6e8ec114da60b38d5a657c819c9e536f0af5acb8538e1a09f6b4
+  data.tar.gz: de08d089681ea0fdec9f7446ba702f8f63b32c9e6758fa9f1446cbdb660ffc029abf17fd053e1f4e535036f90776655270e1b8cb00622051f92c18373e4d40c4

data/.github/workflows/ruby.yml

@@ -2,29 +2,34 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
-  tests_rails:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [2.7, 3.0]
-        rails_version: [5.2.4.4, 6.0.3.2, 6.1.1]
-        exclude:
-          - ruby: '3.0'
-            rails_version: '5.2.4.4'
+        ruby: [2.7, '3.0']
+        rails_version: ['6.1.7', '7.0.4']
+        blacklight_version: ['~> 7.0']
+        include:
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+        - ruby: '3.1'
+          rails_version: '7.0.4'
+          blacklight_version: 'github'
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
+      BLACKLIGHT_VERSION: ${{ matrix.blacklight_version }}
     steps:
     - uses: actions/checkout@v2
-    - name: Set up Ruby
+    - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
+    - name: Install dependencies with Rails ${{ matrix.rails_version }}
       run: bundle install
     - name: Run tests
       run: bundle exec rake

data/blacklight-oembed.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails"
-  spec.add_dependency 'blacklight', '~> 7.0'
+  spec.add_dependency 'blacklight', '>= 7.0', '< 9'
   spec.add_dependency "ruby-oembed"
 
   spec.add_development_dependency "bundler", ">= 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec-rails", "~> 3.1"
+  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"

data/lib/blacklight/oembed/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Oembed
-    VERSION = '1.1.0'
+    VERSION = '1.1.1'
   end
 end

data/solr/conf/solrconfig.xml

@@ -18,6 +18,7 @@
 
   <!-- solr lib dirs -->
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/modules/analysis-extras/lib" />
   <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <dataDir>${solr.data.dir:}</dataDir>

data/spec/controllers/embed_controller_spec.rb

@@ -30,13 +30,13 @@ describe Blacklight::Oembed::EmbedController do
     end
 
     it 'passes along configured additional keys' do
-      allow(OEmbed::Providers).to receive(:get).with('http://some/uri', canvas_index: '5').and_return oembed_obj
+      allow(OEmbed::Providers).to receive(:get).with('http://some/uri', { canvas_index: '5' }).and_return oembed_obj
       get :show, params: { url: 'http://some/uri', canvas_index: '5' }
       expect(response.status).to eq 200
     end
 
     it 'URI encodes data from additional keys' do
-      allow(OEmbed::Providers).to receive(:get).with('http://some/uri', suggested_search: 'ep%C3%A9e').and_return oembed_obj
+      allow(OEmbed::Providers).to receive(:get).with('http://some/uri', { suggested_search: 'ep%C3%A9e' }).and_return oembed_obj
       get :show, params: { url: 'http://some/uri', suggested_search: 'epée' }
       expect(response.status).to eq 200
     end

data/spec/test_app_templates/Gemfile.extra

@@ -0,0 +1,5 @@
+if ENV['BLACKLIGHT_VERSION'] == 'github'
+  gem 'blacklight', github: 'projectblacklight/blacklight'
+elsif ENV['BLACKLIGHT_VERSION'] && !ENV['BLACKLIGHT_VERSION'].empty?
+  gem 'blacklight', ENV['BLACKLIGHT_VERSION']
+end

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

@@ -3,15 +3,21 @@ require 'rails/generators'
 class TestAppGenerator < Rails::Generators::Base
   source_root File.expand_path("../../../../test_app_templates", __FILE__)
 
-  def remove_index 
+  def remove_index
     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'
+    elsif ENV['BLACKLIGHT_VERSION'].present?
+      gem 'blacklight', ENV['BLACKLIGHT_VERSION']
+    end
 
     Bundler.with_clean_env do
-      run "bundle install"
+      run "bundle update"
     end
 
     generate 'blacklight:install'
@@ -21,4 +27,4 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'blacklight_oembed:install'
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blacklight-oembed
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Chris Beer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-01 00:00:00.000000000 Z
+date: 2022-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -28,16 +28,22 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9'
 - !ruby/object:Gem::Dependency
   name: ruby-oembed
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +92,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: rspec-its
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Oembed display for Blacklight