blacklight-gallery 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42e5096b63e6fe16c6c0ffa17ce12c9b31bdfc93
-  data.tar.gz: 7e85718d294bdce0c610e10c79c3ce447684450d
+  metadata.gz: b5a0b84a1efc7d86a7f11b10b7f5a666b2c2ab63
+  data.tar.gz: ad61ab7998fc16b34b758d8be691b3f9403cafd0
 SHA512:
-  metadata.gz: 7f82c9c461062b9d301de93c42c868de31e162e699397e0c68e0744c56c43b70ef79b74c44d22b59839f7276230df3a88ae0386854246faacd5f9e91979a73aa
-  data.tar.gz: 61b85e175bfd1d49936834846d64904cc303a7909d7ba3c4cf1688737250eb47de134631eb9476d00cec6afd333f4614cc30c6053d89ef914c92226f844629ae
+  metadata.gz: c9a93cab0726ced3167e57f71eb009f512762723720832793e738b7c7e196549c88e9e2f8ea6ca94f3413217a5366a4bb5e461ba4d2217cc71b42dfdda6895ea
+  data.tar.gz: 49884af489c148e0c61427775848bde4fe2b3c4788b68048c02fdd2566556fc1ec53c7fa98c0e11c7071fb5fdf5d9f274d666b339dd119839ab93e4e17365863

data/.travis.yml

@@ -1,15 +1,12 @@
 language: ruby
 sudo: false
-cache:
-  directories:
-  - /tmp/solr-5.3.0
 
 notifications:
   email: false
 
 rvm:
-  - 2.3.0
-  - 2.2.4
+  - 2.3.1
+  - 2.2.5
 
 notifications:
   irc: "irc.freenode.org#blacklight"
@@ -19,3 +16,5 @@ notifications:
 env:
   global:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
+
+jdk: oraclejdk8

data/Gemfile

@@ -6,10 +6,10 @@ gemspec
 gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.8.0
-# engine_cart stanza: 0.8.0
+# engine_cart: 0.10.0
+# engine_cart stanza: 0.10.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
@@ -20,15 +20,22 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
+  if ENV['RAILS_VERSION']
+    if ENV['RAILS_VERSION'] == 'edge'
+      gem 'rails', github: 'rails/rails'
+      ENV['ENGINE_CART_RAILS_OPTIONS'] = '--edge --skip-turbolinks'
+    else
+      gem 'rails', ENV['RAILS_VERSION']
+    end
+  end
 
-  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
-    gem 'bootstrap-sass', '>= 3.3.5.1'
-    gem 'responders', "~> 2.0"
-    gem 'sass-rails', ">= 5.0"
-  else
-    gem 'bootstrap-sass', '< 3.3.5' # 3.3.5 requires sass 3.3, incompatible with sass-rails 4.x
-    gem 'sass-rails', "< 5.0"
+  case ENV['RAILS_VERSION']
+  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

data/Rakefile

@@ -1,14 +1,11 @@
 require "bundler/gem_tasks"
 
-ZIP_URL = "https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip"
 APP_ROOT = File.dirname(__FILE__)
 
 require 'rspec/core/rake_task'
 require 'engine_cart/rake_task'
 EngineCart.fingerprint_proc = EngineCart.rails_fingerprint_proc
 
-require 'jettywrapper'
-
 task :default => :ci
 
 desc "Run specs"
@@ -25,37 +22,26 @@ task :fixtures => ['engine_cart:generate'] do
 end
 
 desc "Execute Continuous Integration build"
-task :ci => ['jetty:clean', 'engine_cart:generate'] do
-
-  require 'jettywrapper'
-  jetty_params = {
-    :jetty_home => File.expand_path(File.dirname(__FILE__) + '/jetty'),
-    :quiet => false,
-    :jetty_port => 8888,
-    :solr_home => File.expand_path(File.dirname(__FILE__) + '/jetty/solr'),
-    :startup_wait => 30
-  }
-
-  error = Jettywrapper.wrap(jetty_params) do
-    Rake::Task['fixtures'].invoke
-    Rake::Task['spec'].invoke
+task :ci => ['engine_cart:generate'] do
+
+  require 'solr_wrapper'
+  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
   end
-  raise "test failures: #{error}" if error
 end
 
 
 task :server do
-  unless File.exists? 'jetty'
-    Rake::Task['jetty:clean'].invoke
-  end
-
-  jetty_params = Jettywrapper.load_config
-  jetty_params[:startup_wait]= 60
-
-  Jettywrapper.wrap(jetty_params) do
-    within_test_app do
-      system "rake blacklight:index:seed"
-      system "bundle exec rails s"
+  require 'solr_wrapper'
+  SolrWrapper.wrap(port: '8983') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: File.join(File.expand_path(File.dirname(__FILE__)), 'solr', 'conf')) do
+      within_test_app do
+        system "rake blacklight:index:seed"
+        system "bundle exec rails s"
+      end
     end
   end
 end

data/app/assets/stylesheets/blacklight_gallery/_gallery.scss

@@ -10,6 +10,7 @@
   display: -webkit-flex;
   display: flex;
   flex-flow: row wrap;
+  -webkit-flex-wrap: wrap;
 
 
   .document {
@@ -17,12 +18,12 @@
 
     -webkit-box-flex: 1;
     -moz-box-flex: 1;
-    -webkit-flex: 1;
     -ms-flex: 1;
     flex: 1;
 
     min-width: 250px;
     min-height: 250px;
+    -webkit-flex: 1 0 250px;
   }
 
   .index_title {

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

@@ -1,7 +1,11 @@
 <div class="document">
   <div class="thumbnail">
     <%= link_to '#', data: { :'slide-to' => document_counter, toggle: "modal", target: "#slideshow-modal" } do %>
-      <%= image_tag thumbnail_url(document) %>
+      <% if thumbnail_url(document) %>
+          <%= image_tag thumbnail_url(document) %>
+        <% else %>
+          <%= t(:missing_image) %>
+        <% end %>
     <% end %>
   </div>
 </div>

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

@@ -1 +1 @@
-<%= link_to_document(document, truncate(presenter(document).render_document_index_label(document_show_link_field(document)), length: 89)) %>
+<%= link_to_document(document, truncate(presenter(document).label(document_show_link_field(document)), length: 89)) %>

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

@@ -1,8 +1,8 @@
 <div class="item<%= ' active' if document_counter == 0 %>">
   <div class="frame">
-      <%= image_tag thumbnail_url(document) %>
+      <%= image_tag thumbnail_url(document) if thumbnail_url(document) %>
       <div class="caption">
-        <%= render_index_field_value document, document_show_link_field(document) %>
+        <%= index_presenter(document).label(document_show_link_field(document)) %>
       </div>
       <span class="counter">
         <%= t :'blacklight_gallery.catalog.modal_slideshow.counter', counter: document_counter + 1, count: count %>

data/blacklight-gallery.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "rails"
-  spec.add_dependency 'blacklight', '> 6.0.0.pre', '< 7'
+  spec.add_dependency 'blacklight', '~> 6.3'
   spec.add_dependency "bootstrap-sass", "~> 3.0"
   spec.add_dependency "openseadragon", ">= 0.2.0"
 
@@ -29,7 +29,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec-its"
   spec.add_development_dependency "rspec-activemodel-mocks"
   spec.add_development_dependency "rspec-collection_matchers"
-  spec.add_development_dependency "jettywrapper"
+  spec.add_development_dependency "solr_wrapper"
   spec.add_development_dependency "engine_cart", "~> 0.8"
   spec.add_development_dependency "capybara"
   spec.add_development_dependency "poltergeist", ">= 1.5.0"

data/config/locales/blacklight-gallery.en.yml

@@ -7,6 +7,8 @@ en:
         masonry: "Masonry"
   blacklight_gallery:
     catalog:
+      grid_slideshow:
+        missing_image: 'Missing'
       document_slideshow:
         header: "Select an image to start the slideshow"
       modal_slideshow:

data/lib/blacklight/gallery/version.rb

@@ -1,5 +1,5 @@
 module Blacklight
   module Gallery
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/solr/conf/_rest_managed.json

@@ -0,0 +1,3 @@
+{
+  "initArgs":{},
+  "managedList":[]}

data/solr/conf/admin-extra.html

@@ -0,0 +1,31 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- The content of this page will be statically included into the top
+of the admin page.  Uncomment this as an example to see there the content
+will show up.
+
+<hr>
+<i>This line will appear before the first table</i>
+<tr>
+<td colspan="2">
+This row will be appended to the end of the first table
+</td>
+</tr>
+<hr>
+
+-->

data/solr/conf/elevate.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<!-- If this file is found in the config directory, it will only be
+     loaded once at startup.  If it is found in Solr's data
+     directory, it will be re-loaded every commit.
+-->
+
+<elevate>
+ <query text="foo bar">
+  <doc id="1" />
+  <doc id="2" />
+  <doc id="3" />
+ </query>
+ 
+ <query text="ipod">
+   <doc id="MA147LL/A" />  <!-- put the actual ipod at the top -->
+   <doc id="IW-02" exclude="true" /> <!-- exclude this cable -->
+ </query>
+ 
+</elevate>

data/solr/conf/mapping-ISOLatin1Accent.txt

@@ -0,0 +1,246 @@
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Syntax:
+#   "source" => "target"
+#     "source".length() > 0 (source cannot be empty.)
+#     "target".length() >= 0 (target can be empty.)
+
+# example:
+#   "??" => "A"
+#   "\u00C0" => "A"
+#   "\u00C0" => "\u0041"
+#   "??" => "ss"
+#   "\t" => " "
+#   "\n" => ""
+
+# ?? => A
+"\u00C0" => "A"
+
+# ?? => A
+"\u00C1" => "A"
+
+# ?? => A
+"\u00C2" => "A"
+
+# ?? => A
+"\u00C3" => "A"
+
+# ?? => A
+"\u00C4" => "A"
+
+# ?? => A
+"\u00C5" => "A"
+
+# ?? => AE
+"\u00C6" => "AE"
+
+# ?? => C
+"\u00C7" => "C"
+
+# ?? => E
+"\u00C8" => "E"
+
+# ?? => E
+"\u00C9" => "E"
+
+# ?? => E
+"\u00CA" => "E"
+
+# ?? => E
+"\u00CB" => "E"
+
+# ?? => I
+"\u00CC" => "I"
+
+# ?? => I
+"\u00CD" => "I"
+
+# ?? => I
+"\u00CE" => "I"
+
+# ?? => I
+"\u00CF" => "I"
+
+# ?? => IJ
+"\u0132" => "IJ"
+
+# ?? => D
+"\u00D0" => "D"
+
+# ?? => N
+"\u00D1" => "N"
+
+# ?? => O
+"\u00D2" => "O"
+
+# ?? => O
+"\u00D3" => "O"
+
+# ?? => O
+"\u00D4" => "O"
+
+# ?? => O
+"\u00D5" => "O"
+
+# ?? => O
+"\u00D6" => "O"
+
+# ?? => O
+"\u00D8" => "O"
+
+# ?? => OE
+"\u0152" => "OE"
+
+# ??
+"\u00DE" => "TH"
+
+# ?? => U
+"\u00D9" => "U"
+
+# ?? => U
+"\u00DA" => "U"
+
+# ?? => U
+"\u00DB" => "U"
+
+# ?? => U
+"\u00DC" => "U"
+
+# ?? => Y
+"\u00DD" => "Y"
+
+# ?? => Y
+"\u0178" => "Y"
+
+# ?? => a
+"\u00E0" => "a"
+
+# ?? => a
+"\u00E1" => "a"
+
+# ?? => a
+"\u00E2" => "a"
+
+# ?? => a
+"\u00E3" => "a"
+
+# ?? => a
+"\u00E4" => "a"
+
+# ?? => a
+"\u00E5" => "a"
+
+# ?? => ae
+"\u00E6" => "ae"
+
+# ?? => c
+"\u00E7" => "c"
+
+# ?? => e
+"\u00E8" => "e"
+
+# ?? => e
+"\u00E9" => "e"
+
+# ?? => e
+"\u00EA" => "e"
+
+# ?? => e
+"\u00EB" => "e"
+
+# ?? => i
+"\u00EC" => "i"
+
+# ?? => i
+"\u00ED" => "i"
+
+# ?? => i
+"\u00EE" => "i"
+
+# ?? => i
+"\u00EF" => "i"
+
+# ?? => ij
+"\u0133" => "ij"
+
+# ?? => d
+"\u00F0" => "d"
+
+# ?? => n
+"\u00F1" => "n"
+
+# ?? => o
+"\u00F2" => "o"
+
+# ?? => o
+"\u00F3" => "o"
+
+# ?? => o
+"\u00F4" => "o"
+
+# ?? => o
+"\u00F5" => "o"
+
+# ?? => o
+"\u00F6" => "o"
+
+# ?? => o
+"\u00F8" => "o"
+
+# ?? => oe
+"\u0153" => "oe"
+
+# ?? => ss
+"\u00DF" => "ss"
+
+# ?? => th
+"\u00FE" => "th"
+
+# ?? => u
+"\u00F9" => "u"
+
+# ?? => u
+"\u00FA" => "u"
+
+# ?? => u
+"\u00FB" => "u"
+
+# ?? => u
+"\u00FC" => "u"
+
+# ?? => y
+"\u00FD" => "y"
+
+# ?? => y
+"\u00FF" => "y"
+
+# ??? => ff
+"\uFB00" => "ff"
+
+# ??? => fi
+"\uFB01" => "fi"
+
+# ??? => fl
+"\uFB02" => "fl"
+
+# ??? => ffi
+"\uFB03" => "ffi"
+
+# ??? => ffl
+"\uFB04" => "ffl"
+
+# ??? => ft
+"\uFB05" => "ft"
+
+# ??? => st
+"\uFB06" => "st"