blacklight 6.6.2 → 6.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8a1212427a6ef925e7c442010f44118a4931ae67
-  data.tar.gz: 20da8e50afe0876f9ca7f79a22667933ed3562a8
+  metadata.gz: 8d9d1db7c5b929bb935e9ce41c06af1c4707856c
+  data.tar.gz: 328b4f96a2f73164e0ee3a8b298157ee4025e9ad
 SHA512:
-  metadata.gz: 50044f685027f9733d984402f93891a2cb8969b6d97fdb729a0174f5a1bd118963292ab301bc7aa396a6e5dc4e792a67229a382352fba6ab0e187985bac004e2
-  data.tar.gz: 1b98e3acfe972a79d3ae486ee7c178ce32f4ebf17277fa44a439cf5136d7b5fcd32af12be96b301f556996cd8069b77252f98175cafb7b4a7b9ca802385f032e
+  metadata.gz: 0690cbe4599e64337bbb09a07c9125b6828ee4734ec2f1d38311dbe178d519df9c8bed4fad85c2276d957d8c74d3089a46579c69e864501b41fe6066adba0fef
+  data.tar.gz: 9a11b1e9ebe49ae02dfb2395e94cd696a38949e4632dd204d4361254bb41d6f0cd5b90117cdae41434862d174daca5ca33fcaf5bb1d60b01a54105141a31fa21

data/LICENSE

@@ -1,15 +1,14 @@
-##########################################################################
-# Copyright 2008-2014 Rector and Visitors of the University of Virginia, The Board of Trustees of the Leland Stanford Junior University, Johns Hopkins Universities, and Data Curation Experts
-# Additional copyright may be held by others, as reflected in the commit log
-#
-# Licensed 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.
+Copyright 2008-2016 Rector and Visitors of the University of Virginia, The Board of Trustees of the Leland Stanford Junior University, Johns Hopkins Universities, and Data Curation Experts
+Additional copyright may be held by others, as reflected in the commit log
+
+Licensed 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.

data/VERSION

@@ -1 +1 @@
-6.6.2
+6.7.0

data/app/controllers/concerns/blacklight/search_context.rb

@@ -37,7 +37,7 @@ module Blacklight::SearchContext
 
   def find_search_session
     if params[:search_context].present?
-      find_or_initialize_search_session_from_params JSON.load(params[:search_context])
+      find_or_initialize_search_session_from_params JSON.parse(params[:search_context])
     elsif params[:search_id].present?
       begin
         # TODO: check the search id signature.

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -114,7 +114,7 @@ module Blacklight::FacetsHelperBehavior
   # a link to add that to your restrictions, with count in parens.
   #
   # @param [Blacklight::Solr::Response::Facets::FacetField] facet_field
-  # @param [String] item
+  # @param [Blacklight::Solr::Response::Facets::FacetItem] item
   # @param [Hash] options
   # @option options [Boolean] :suppress_link display the facet, but don't link to it
   # @return [String]

data/app/models/concerns/blacklight/document.rb

@@ -14,6 +14,9 @@
 # transformation formats.
 #
 module Blacklight::Document
+  extend Deprecation
+  self.deprecation_horizon = 'blacklight 7.0'
+
   autoload :ActiveModelShim, 'blacklight/document/active_model_shim'
   autoload :SchemaOrg, 'blacklight/document/schema_org'
   autoload :CacheKey, 'blacklight/document/cache_key'
@@ -38,6 +41,7 @@ module Blacklight::Document
 
   attr_reader :response, :_source
   alias_method :solr_response, :response
+  delegate :[], :key?, :keys, :to_h, to: :_source
 
   def initialize(source_doc={}, response=nil)
     @_source = ActiveSupport::HashWithIndifferentAccess.new(source_doc)
@@ -49,15 +53,20 @@ module Blacklight::Document
   # If a method is missing, it gets sent to @_source
   # with all of the original params and block
   def method_missing(m, *args, &b)
+    return super if m == :to_hash
+
     if _source_responds_to?(m)
+      Deprecation.warn(Blacklight::Solr::Document, "Blacklight::Document##{m} is deprecated; use obj.to_h.#{m} instead.")
       _source.send(m, *args, &b)
     else
       super
     end
   end
 
-  def respond_to_missing? *args
-    _source_responds_to?(*args) || super
+  def respond_to_missing? m, *args
+    return super if m == :to_hash
+
+    _source_responds_to?(m, *args) || super
   end
 
   # Helper method to check if value/multi-values exist for a given key.
@@ -87,8 +96,6 @@ module Blacklight::Document
     end
   end
   alias has_field? has?
-
-  delegate :key?, to: :_source
   alias has_key? key?
 
   def fetch key, *default

data/lib/blacklight/solr/response/spelling.rb

@@ -75,16 +75,14 @@ module Blacklight::Solr::Response::Spelling
     def collation
       # FIXME: DRY up with words
       spellcheck = self.response[:spellcheck]
-        if spellcheck && spellcheck[:suggestions]
-          suggestions = spellcheck[:suggestions]
-          unless suggestions.nil?
-            if suggestions.index("collation")
-              suggestions[suggestions.index("collation") + 1]
-            elsif spellcheck.key?("collations")
-              spellcheck['collations'].last
-            end
-          end
-        end
+      return unless spellcheck && spellcheck[:suggestions]
+      suggestions = spellcheck[:suggestions]
+
+      if suggestions.index("collation")
+        suggestions[suggestions.index("collation") + 1]
+      elsif spellcheck.key?("collations")
+        spellcheck['collations'].last
+      end
     end
   end
 end

data/lib/generators/blacklight/install_generator.rb

@@ -94,16 +94,16 @@ EOF
     end
 
     def generate_blacklight_marc_demo
-      if options[:marc]
-        blacklight_marc = String.new('blacklight-marc')
-        gem blacklight_marc, '~> 6.1'
+      return unless options[:marc]
 
-        Bundler.with_clean_env do
-          run "bundle install"
-        end
+      blacklight_marc = String.new('blacklight-marc')
+      gem blacklight_marc, '~> 6.1'
 
-        generate 'blacklight:marc:install'
+      Bundler.with_clean_env do
+        run "bundle install"
       end
+
+      generate 'blacklight:marc:install'
     end
 
     def add_routes

data/lib/generators/blacklight/user_generator.rb

@@ -17,29 +17,29 @@ module Blacklight
     EOS
     # Install Devise?
     def generate_devise_assets
-      if options[:devise]
-        gem "devise"
-        gem "devise-guests", "~> 0.5"
+      return unless options[:devise]
 
-        Bundler.with_clean_env do
-          run "bundle install"
-        end
+      gem "devise"
+      gem "devise-guests", "~> 0.5"
+
+      Bundler.with_clean_env do
+        run "bundle install"
+      end
 
-        generate "devise:install"
-        generate "devise", model_name.classify
-        generate "devise_guests", model_name.classify
+      generate "devise:install"
+      generate "devise", model_name.classify
+      generate "devise_guests", model_name.classify
 
-        # add the #to_s to the model.
-        insert_into_file("app/models/#{model_name}.rb", before: /end(\n| )*$/) do
-          "\n  # Method added by Blacklight; Blacklight uses #to_s on your\n" \
-          "  # user class to get a user-displayable login/identifier for\n" \
-          "  # the account.\n" \
-          "  def to_s\n" \
-          "    email\n" \
-          "  end\n"
-        end
-        gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
+      # add the #to_s to the model.
+      insert_into_file("app/models/#{model_name}.rb", before: /end(\n| )*$/) do
+        "\n  # Method added by Blacklight; Blacklight uses #to_s on your\n" \
+        "  # user class to get a user-displayable login/identifier for\n" \
+        "  # the account.\n" \
+        "  def to_s\n" \
+        "    email\n" \
+        "  end\n"
       end
+      gsub_file("config/initializers/devise.rb", "config.sign_out_via = :delete", "config.sign_out_via = :get")
     end
 
     # Add Blacklight to the user model

data/spec/controllers/blacklight/search_helper_spec.rb

@@ -80,7 +80,7 @@ describe Blacklight::SearchHelper do
 
           expect(Set.new(mash.keys)).to eq Set.new(solr_document.keys)
 
-          mash.each_key do |key|
+          mash.keys.each do |key|
             expect(mash[key]).to eq solr_document[key]
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.6.2
+  version: 6.7.0
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails