openseadragon 0.5.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 8d66f78f52a81526049f7be9b14ddc64669a5977
-  data.tar.gz: 248b34157489eb40c6cdfbf9e2dac3b2fd1aca87
+SHA256:
+  metadata.gz: 39aab662d767f7253ab361fd872a045e8052d5adf007e7daa0a3bd2cb02b9e31
+  data.tar.gz: 2b64d32f2c80655ac8e54cc413bbcfae54ecab8f8ead082ff4572b249a9997d6
 SHA512:
-  metadata.gz: 3aa9e60434688b0484bafd24a0a78c24a83331c85875f2e020ac5b0705de6419b7eab9a70d76479485f0ea8e0bc5ca46d9bb0b164a7ce0ce41b1a5696fbbc9a1
-  data.tar.gz: fd097f52ff4581b8da589e06ddd02e009539da2f632e545b6e97f211a51c71b46fb5f4f3caf50ac305842d46716f71af08d4238eccf18c6eac522f9f92f2614d
+  metadata.gz: 864860428049aeb71b90f7c5f4b9f779c2861384ba26554acb23d2fbb26e70a42f59921e52b38c4de04f6be3561255ac6f8b3bf9b752f903ac7511c75c4a0a30
+  data.tar.gz: e363a199c6c5dfe4fd23df36ba45a6cbb3c15d3aa31fff5d7d331c01f7866dc112afe02195fd02924d66560dc868b09c631a985e139165e8ef11ca0db207598a

data/.github/workflows/ruby.yml

@@ -0,0 +1,34 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        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

data/Gemfile

@@ -21,19 +21,12 @@ else
   if ENV['RAILS_VERSION']
     if ENV['RAILS_VERSION'] == 'edge'
       gem 'rails', github: 'rails/rails'
-      ENV['ENGINE_CART_RAILS_OPTIONS']= "--edge --skip-turbolinks"
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    elsif ENV['RAILS_VERSION'] < '6'
+      gem 'sprockets', '< 4'
     else
       gem 'rails', ENV['RAILS_VERSION']
     end
   end
-
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  elsif ENV['RAILS_VERSION'] =~ /^5.0/ || ENV['RAILS_VERSION'] == 'edge'
-    # nop
-  else
-    gem 'sass-rails', "< 5.0"
-  end
 end
 # END ENGINE_CART BLOCK

data/app/assets/config/openseadragon-assets.js

@@ -0,0 +1 @@
+//= link_tree ../../../vendor/assets/images

data/app/assets/javascripts/openseadragon/rails.js

@@ -5,7 +5,8 @@
     $('picture[data-openseadragon]').openseadragon();
   }
 
-  var handler = 'ready';
+  const jquery3 = parseInt($.fn.jquery.split('.')[0]) >= 3;
+  let handler = 'ready';
   if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
     // Turbolinks 5
     if (Turbolinks.BrowserAdapter) {
@@ -15,5 +16,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/generators/openseadragon/install_generator.rb

@@ -3,10 +3,14 @@ require 'rails/generators'
 module Openseadragon
   class Install < Rails::Generators::Base
     source_root File.expand_path('../templates', __FILE__)
-    
+
     def assets
       copy_file "openseadragon.css", "app/assets/stylesheets/openseadragon.css"
       copy_file "openseadragon.js", "app/assets/javascripts/openseadragon.js"
+
+      if File.exist? 'app/assets/config/manifest.js'
+        append_to_file 'app/assets/config/manifest.js', "\n//= link openseadragon-assets\n"
+      end
     end
 
     def inject_helper
@@ -15,4 +19,4 @@ module Openseadragon
       end
     end
   end
-end
+end

data/lib/openseadragon/engine.rb

@@ -1,7 +1,19 @@
-module Openseadragon 
+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.5.0"
+  VERSION = "0.7.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")
@@ -18,12 +18,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  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