blacklight 5.19.2 → 6.0.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 761dc2c92919a348edb283346eed0c9c5a5fb098
-  data.tar.gz: 36d788152cb804ca30d4414da33fa7796554d630
+  metadata.gz: c84e27929bc5c308f60b44bf8308bd12fff0f611
+  data.tar.gz: 9fc7f3e715f61d045128e0eade0ee748f933779c
 SHA512:
-  metadata.gz: 3b301e9391b46a513548988d0e3e3047b30e37ad75e9151a9797185820651e55831b637436bac45e8192e60561d94d72628dcfaa97146634b5f8a7626e02e3a2
-  data.tar.gz: d5ac69b68ce1d3fb8eb0efaa3679b5d758549c4e7fb5040e392656f14a107d0b73a1aa0eacdaa3201b4e7d63c443602c650ea94cade8ca1fedd2889bf7e06fc3
+  metadata.gz: 59a8e9e76e5bf91d854c742d98d357bd22040e9910661f164ea56ca41494dc28d18878533e71acaa0d29b0a272544f9a27af619b3f0b8cf8ca6da46f8c597f87
+  data.tar.gz: f68961e3673557464a4c67359812097453d707828d020a8cfbd7611a00912cb7c51aa53e80850c04f96bbf0745a3bbac537d7e09f97975dc2d53a803787d6f11

data/.gitignore

@@ -8,9 +8,6 @@ coverage/
 gemfiles/*.gemfile.lock
 jetty/
 log/*
-solr_marc/solrmarc.log
-lib/solrmarc.log.*
 tmp/*
 pkg/*
 .internal_test_app
-/spec/examples.txt

data/.hound.yml

@@ -1,2 +1,4 @@
 ruby:
   config_file: .rubocop.yml
+javascript:
+  config_file: .jshintrc

data/.jshintrc

@@ -0,0 +1,67 @@
+{
+  /*
+   * ENVIRONMENTS
+   * =================
+   */
+
+  // Define globals exposed by modern browsers.
+  "browser": true,
+
+  // Define globals exposed by jQuery.
+  "jquery": true,
+
+  // Define globals exposed by Node.js.
+  "node": true,
+
+  // Allow ES6.
+  "esnext": true,
+
+  /*
+   * ENFORCING OPTIONS
+   * =================
+   */
+
+  // Force all variable names to use either camelCase style or UPPER_CASE
+  // with underscores.
+  "camelcase": true,
+
+  // Prohibit use of == and != in favor of === and !==.
+  "eqeqeq": true,
+
+  // Enforce tab width of 2 spaces.
+  "indent": 2,
+
+  // Prohibit use of a variable before it is defined.
+  "latedef": true,
+
+  // Enforce line length to 80 characters
+  "maxlen": 80,
+
+  // Require capitalized names for constructor functions.
+  "newcap": true,
+
+  // Enforce use of single quotation marks for strings.
+  "quotmark": "single",
+
+  // Enforce placing 'use strict' at the top function scope
+  "strict": true,
+
+  // Prohibit use of explicitly undeclared variables.
+  "undef": true,
+
+  // Warn when variables are defined but never used.
+  "unused": true,
+
+  /*
+   * RELAXING OPTIONS
+   * =================
+   */
+
+  // Suppress warnings about == null comparisons.
+  "eqnull": true,
+
+  // Custom predefined javascript objects that should be defined
+  "predef": [
+    "Blacklight"
+  ]
+}

data/.rubocop_hound.yml

@@ -648,6 +648,10 @@ Style/Blocks:
     ugly). Prefer {...} over do...end for single-line blocks.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#single-line-blocks
   Enabled: true
+Style/CaseEquality:
+  Description: Avoid explicit use of the case equality operator(===).
+  StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-case-equality
+  Enabled: false
 Style/CharacterLiteral:
   Description: Checks for uses of character literals.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-character-literals

data/.travis.yml

@@ -1,29 +1,32 @@
 language: ruby
 sudo: false
+cache:
+  directories:
+  - /tmp/solr-5.3.0
 
 notifications:
   email: false
 
 rvm:
-  - 2.3.1
+  - 2.2.3
 
 matrix:
   include:
-    - rvm: 2.2.5
+    - rvm: 2.2.2
       env: "RAILS_VERSION=4.1.13"
-    - rvm: 2.1.5
-      env: "RAILS_VERSION=4.2.7.1"
-    - rvm: jruby-9.0.5.0
-      env: "RAILS_VERSION=4.2.7.1 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
+    - rvm: 2.1.6
+      env: "RAILS_VERSION=4.2.4"
+    - rvm: jruby-9.0.1.0
+      env: "RAILS_VERSION=4.2.4 JRUBY_OPTS=\"-J-Xms512m -J-Xmx1024m\""
   allow_failures:
-    - rvm: jruby-9.0.5.0
+    - rvm: jruby-9.0.1.0
   fast_finish: true
 
 before_install:
   - gem install bundler
 
 env:
- - "RAILS_VERSION=4.2.7.1"
+ - "RAILS_VERSION=4.2.4"
 
 notifications:
   irc: "irc.freenode.org#blacklight"

data/Gemfile

@@ -4,19 +4,17 @@ source 'https://rubygems.org'
 gemspec path: File.expand_path('..', __FILE__)
 
 gem 'simplecov', '~> 0.10', require: false
-gem 'coveralls', '~> 0.8.6', require: false
-gem 'autoprefixer-rails', '~> 6.0.0' if RUBY_VERSION < '2.0'
+gem 'coveralls', require: false
 
 group :test do
-  gem "blacklight-marc", '~> 5.0'
   gem 'activerecord-jdbcsqlite3-adapter', :platform => :jruby
 end
 
 # BEGIN ENGINE_CART BLOCK
-# engine_cart: 0.10.0
-# engine_cart stanza: 0.10.0
+# engine_cart: 0.8.0
+# engine_cart stanza: 0.8.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
@@ -27,22 +25,14 @@ if File.exist?(file)
 else
   Bundler.ui.warn "[EngineCart] Unable to find test application dependencies in #{file}, using placeholder dependencies"
 
-  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
+  gem 'rails', ENV['RAILS_VERSION'] if ENV['RAILS_VERSION']
 
-  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'
+  if ENV['RAILS_VERSION'].nil? || ENV['RAILS_VERSION'] =~ /^4.2/
+    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"
   end
 end
 # END ENGINE_CART BLOCK

data/Rakefile

@@ -10,5 +10,6 @@ end
 Bundler::GemHelper.install_tasks
 
 load "tasks/blacklight.rake"
+load "lib/railties/blacklight.rake"
 
 task :default => [:ci]

data/VERSION

@@ -1 +1 @@
-5.19.2
+6.0.0.pre1

data/app/assets/javascripts/blacklight/blacklight.js

@@ -10,6 +10,7 @@
 //= require blacklight/ajax_modal
 //= require blacklight/search_context
 //= require blacklight/collapsable
+//= require blacklight/facet_load
 //
 //Bootstrap JS for providing collapsable tablet/mobile menu/alert boxes
 //= require bootstrap/transition

data/app/assets/javascripts/blacklight/core.js

@@ -9,31 +9,17 @@ Blacklight = function() {
       for(var i = 0; i < buffer.length; i++) {
         buffer[i].call();
       }
-    },
-
-    listeners: function () {
-      var listeners = [];
-      if (typeof Turbolinks !== 'undefined' && Turbolinks.supported) {
-        // Turbolinks 5
-        if (Turbolinks.BrowserAdapter) {
-          listeners.push('turbolinks:load');
-        } else {
-          // Turbolinks < 5
-          listeners.push('page:load', 'ready');
-        }
-      } else {
-        listeners.push('ready');
-      }
-
-      return listeners.join(' ');
     }
-  };
+  }
 }();
 
 // turbolinks triggers page:load events on page transition
 // If app isn't using turbolinks, this event will never be triggered, no prob. 
-$(document).on(Blacklight.listeners(), function() {
+$(document).on('page:load', function() {
   Blacklight.activate();  
 });
 
+$(document).ready(function() {
+  Blacklight.activate();  
+});
 

data/app/assets/javascripts/blacklight/facet_load.js

@@ -0,0 +1,23 @@
+/*global Blacklight */
+
+(function($) {
+  'use strict';
+  
+  Blacklight.doResizeFacetLabelsAndCounts = function() {
+    // adjust width of facet columns to fit their contents
+    function longer (a,b){ return b.textContent.length - a.textContent.length; }
+
+    $('ul.facet-values, ul.pivot-facet').each(function(){
+      var longest = $(this).find('span.facet-count').sort(longer).first();
+      var clone = longest.clone()
+        .css('visibility','hidden').css('width', 'auto');
+      $('body').append(clone);
+      $(this).find('.facet-count').first().width(clone.width());
+      clone.remove();
+    });
+  };
+
+  Blacklight.onLoad(function() {
+    Blacklight.doResizeFacetLabelsAndCounts();
+  });
+})(jQuery);

data/app/assets/stylesheets/blacklight/_balanced_list.scss

@@ -0,0 +1,18 @@
+.dl-horizontal {
+  dd {
+    margin-bottom: $padding-base-vertical;
+
+    &:after {
+      clear: none;
+    }
+  }
+}
+
+.dl-invert {
+  dt {
+    font-weight: normal;
+    color: $field_name_color;
+  }
+}
+
+

data/app/assets/stylesheets/blacklight/_blacklight_base.scss

@@ -10,9 +10,13 @@
 
 @import "blacklight/layout";
 @import "blacklight/header";
-@import "blacklight/catalog";
+@import "blacklight/constraints";
+@import "blacklight/controls";
+@import "blacklight/search_results";
+@import "blacklight/pagination";
 @import "blacklight/group";
 @import "blacklight/bookmark";
+@import "blacklight/balanced_list";
 @import "blacklight/facets";
 @import "blacklight/search_history";
 @import "blacklight/modal";

data/app/assets/stylesheets/blacklight/_bookmark.scss

@@ -1,8 +1,16 @@
-/* refworks uses a form; we need to give it some additional padding to make it look like a link */
-#refworks-form .btn {
-  padding: $nav-link-padding;
-}
-
 .clear-bookmarks {
   margin-left: $border-radius-base;
-}
+}
+
+label.toggle_bookmark {
+	font-weight: inherit;
+	min-width: 8.5em;
+}
+
+// Tools link on document show page
+.show-tools {
+  .bookmark_toggle {
+    padding: $nav-link-padding;
+  }
+}
+

data/app/assets/stylesheets/blacklight/_constraints.scss

@@ -0,0 +1,52 @@
+.constraints-container {
+  @extend .well;
+  line-height: 2.5;
+  padding: 16px 19px;
+}
+
+span.constraints-label {
+  @extend .h5;
+}
+
+.appliedFilter {
+  .constraint-value {
+    cursor: default;
+    text-overflow: ellipsis;
+    overflow: hidden;
+
+    @media (max-width: $screen-xs-max) {
+      max-width: $screen-xs-min / 2;
+    }
+
+    @media (min-width: $screen-sm-min) and (max-width: $screen-sm-max) {
+      max-width: $screen-sm-min / 2;
+    }
+
+    @media (min-width: $screen-md-min) and (max-width: $screen-md-max) {
+      max-width: $screen-md-min / 2;
+    }
+
+    @media (min-width: $screen-lg-min) {
+      max-width: $screen-lg-min / 2;
+    }
+
+    &:hover, &:active {
+      background-color: $btn-default-bg;
+      border-color: $btn-default-border;
+      box-shadow: none;
+    }
+  }
+
+  .filterName:after {
+    @extend .text-muted;
+    font-family: 'Glyphicons Halflings';
+    /* glyphicon-chevron-right */
+    content: "\e080";
+    font-size: 70%;
+    padding-left: $caret-width-base;
+  }
+
+  .remove:hover, .remove:active {
+    @extend .btn-danger;
+  }
+}

data/app/assets/stylesheets/blacklight/_controls.scss

@@ -0,0 +1,61 @@
+#sortAndPerPage, .pagination-search-widgets {
+  border-bottom: 1px solid $pagination-border;
+  margin-bottom: 1em;
+  padding-bottom: 1em;
+}
+
+.pagination-search-widgets {
+  @extend .clearfix;
+  padding-top: 1px;
+  padding-bottom: $padding-base-vertical;
+}
+
+#sortAndPerPage .dropdown-toggle {
+  cursor: pointer;
+}
+
+.no-js #sortAndPerPage {
+  & {
+    @extend .clearfix;
+  }
+  .dropdown-menu {
+    background: none;
+    box-shadow: none;
+    border: none;
+    position: relative;
+    display: block;
+    float: none;
+  }
+
+}
+
+.view-type {
+  display: inline-block;
+
+  .caption {
+    @extend .sr-only;
+  }
+}
+
+#sort-dropdown .dropdown-toggle, #per_page-dropdown .dropdown-toggle {
+  color: $link-color;
+
+  .caret {
+    color: $text-color;
+  }
+}
+
+.search-input-group {
+  width: 80%;
+}
+
+@media (max-width: $screen-sm-min) {
+  .search-input-group {
+    width: auto;
+  }
+}
+
+.ajax_form {
+  margin-bottom: 0;
+}
+