openseadragon 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 67814ae82d0be47642e41c48f3d7b5bad24091a61cd4f64cf7ff1051058c12ff
-  data.tar.gz: 8ad5f8638aeb244c6c16edfc0e3c8fa929301b6e982e241ab27b46d148abe91f
+  metadata.gz: 8d2b4c84da4c039322fa16dd73d8c87f4036d7e16c32d73d42febf1721f309a8
+  data.tar.gz: 61aa2f0266974e33c7a047a79dda95ecb0636c67ab15f6083b8b96c71c9f14c4
 SHA512:
-  metadata.gz: 6c06d4052b7ef3b3f02b97ed260afe69e94910c6e19161bddbb5756d13a929356059843c24fd8d6c782298aefdb94f87c5ad7f89f5d02ba1fab43c206022cefd
-  data.tar.gz: a5d2d03f9472d3c6333c5ebdd390a4157e5d6f6f0eea10e66e1c9c03d43adf628284ca3043206548178df39c7b28b487acb0a8d4227fe6572a2d5abeb9405ee3
+  metadata.gz: db5a685f62b18680bff97b257254a71ab37c2de16713e08add72e1ff327d2b982913ddaf7d0e03035cd2d4ef5ea2f1aa570eab80903ce8bae00a692e046b25a9
+  data.tar.gz: 7d5b4b98750b6aa36cecf7b82feb6660d7312d353770e23044243803f27d96dc9c0069112ad664b3425befc8367497cd62262cbe5af408601b92804c946b3bc6

data/.github/workflows/ruby.yml

@@ -2,44 +2,33 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 jobs:
   test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        rails_version: [6.1.1, 6.0.3.2]
-        ruby: [2.7, 3.0]
+        rails_version: [7.2.0]
+        ruby: [3.2, 3.3]
+        include:
+          - ruby: 3.3
+            rails_version: 7.1.3.4
+          - ruby: 3.2
+            rails_version: 7.0.8.4
+          - ruby: 3.1
+            rails_version: 6.1.7.8
     env:
       RAILS_VERSION: ${{ matrix.rails_version }}
     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
-  test_rails52:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        rails_version: [5.2.4.4]
-        ruby: [2.7]
-    env:
-      RAILS_VERSION: ${{ matrix.rails_version }}
-    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/app/assets/javascripts/openseadragon/rails.js

@@ -2,11 +2,15 @@
 
 (function($) {
   function initOpenSeadragon() {
-    $('picture[data-openseadragon]').openseadragon();
+    $('picture[data-openseadragon]:not(:has(.openseadragon-container))').openseadragon();
   }
 
-  var handler = 'ready';
-  if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
+  const jquery3 = parseInt($.fn.jquery.split('.')[0]) >= 3;
+  let handler = 'ready';
+
+  if (typeof Turbo !== 'undefined') {
+    handler = 'turbo:load turbo:frame-load';
+  } else if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
     // Turbolinks 5
     if (Turbolinks.BrowserAdapter) {
       handler = 'turbolinks:load';
@@ -15,5 +19,14 @@
       handler = 'page:load ready';
     }
   }
-  $(document).on(handler, initOpenSeadragon);
+
+  // Support for $(document).on( "ready", handler ) was removed in jQuery 3
+  if (jquery3 && handler.includes('ready')) {
+    handler = handler.replace('ready', '').trim();
+    $(initOpenSeadragon);
+  }
+
+  if (handler) {
+    $(document).on(handler, initOpenSeadragon);
+  }
 })(jQuery);

data/lib/openseadragon/engine.rb

@@ -2,6 +2,18 @@ module Openseadragon
   class Engine < ::Rails::Engine
     isolate_namespace Openseadragon
 
+    config.before_configuration do
+      # see https://github.com/fxn/zeitwerk#for_gem
+      # openseadragon_rails puts a generator into LOCAL APP lib/generators, so tell
+      # zeitwerk to ignore the whole directory? If we're using a recent
+      # enough version of Rails to have zeitwerk config
+      #
+      # See: https://github.com/cbeer/engine_cart/issues/117
+      if Rails.try(:autoloaders).try(:main).respond_to?(:ignore)
+        Rails.autoloaders.main.ignore(Rails.root.join('lib/generators'))
+      end
+    end
+
     initializer 'openseadragon.assets.precompile' do |app|
       app.config.assets.precompile += %w[openseadragon/*.png]
     end

data/lib/openseadragon/version.rb

@@ -1,3 +1,3 @@
 module Openseadragon
-  VERSION = "0.6.0"
+  VERSION = "0.8.0"
 end

data/openseadragon.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ["justin@curationexperts.com", "cabeer@stanford.edu", "jchris@stanford.edu"],
   spec.summary       = %q{OpenSeadragon assets and helpers for Rails. http://openseadragon.github.io/}
   spec.description   = %q{OpenSeadragon is a javascript library for displaying tiling images. This gem packages those assets and some Rails helpers for using them}
-  spec.homepage      = "https://github.com/iiif/openseadragon-rails"
+  spec.homepage      = "https://github.com/sul-dlss/openseadragon-rails"
   spec.license       = "Apache 2.0"
 
   spec.files         = `git ls-files -z`.split("\x0")
@@ -21,9 +21,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "engine_cart"
-  spec.add_development_dependency "rspec-rails", '~> 3.1'
+  spec.add_development_dependency "rspec-rails", '~> 6.1'
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "sqlite3"
 
-  spec.add_dependency 'rails', '> 3.2.0'
+  spec.add_dependency 'rails', '> 6.1.0'
 end