blacklight 4.7.0 → 4.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31257b25d32f93ef95d2451084d1126a7595af53
-  data.tar.gz: dba5f44c198f0708326a11b450219b4d84227c80
+  metadata.gz: 59ca505fb4e5d581f138d8174d2caf775d7be43d
+  data.tar.gz: 7ac6cd3f2052f63bb6073f516f1fe11e8b6e686e
 SHA512:
-  metadata.gz: c5c9a3f9d86b87a5eb9fd07e81a5fbefba16c909996e850dbeede4adc4ff1e87138fc4bdb126ff20a800fc1882fe3ef61470b294ca2523b5625c5f3812a59158
-  data.tar.gz: 8730f957f7cded439289206f80b62692f012d4f1f365ed70798fe422441b15ac863d8551fc152def010638406caa49e9bfc3e9624a7fe7dfca5eeb68b9a0900d
+  metadata.gz: 84be88f72ad3f58add443566068ed14e4a2806f7b27c88ec35e0c83c2df376930f374e468011dc6feae0381a97fef684a58928a080c86d6b97c8dec666250379
+  data.tar.gz: b6c6056b286a416c7a5f86a853717f7cc2b502f9e7c21d238e1aee94b354d95824dfb1119c9f042c25a3ad098b37bd2f54240fc098587131fe561294e28aaa52

data/.gitignore

@@ -20,3 +20,4 @@ spec/internal
 pkg/*
 *.sw[pon]
 gemfiles/*.gemfile.lock
+/.internal_test_app

data/.travis.yml

@@ -1,18 +1,19 @@
-notifications:
-  email: false
-
+sudo: false
+language: ruby
 rvm:
-  - 1.9.3
-  - jruby-19mode
-  - 2.0.0
+  - 2.3.7
 
-gemfile:
-  - gemfiles/rails3.gemfile
-  - gemfiles/rails4.gemfile
+matrix:
+  include:
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=4.0.13"
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=4.1.16"
+    - rvm: 2.3.7
+      env: "RAILS_VERSION=4.2.10"
 
 notifications:
   irc: "irc.freenode.org#blacklight"
-  email:
-      - blacklight-commits@googlegroups.com
+  email: false
 
-env: JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"        
+env: JRUBY_OPTS="-J-Xms512m -J-Xmx1024m"

data/Gemfile

@@ -1,19 +1,54 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Please see blacklight.gemspec for dependency information.
 gemspec
 
 gem 'simplecov', :platform => :mri
 gem 'simplecov-rcov', :platform => :mri
+gem 'json', '~> 1.8'
 
 group :test do
   gem 'devise'
   gem 'devise-guests'
-  gem "bootstrap-sass"
+  gem 'bootstrap-sass'
   gem 'turbolinks'
   gem 'poltergeist'
 end
 
+# BEGIN ENGINE_CART BLOCK
+# engine_cart: 1.0.1
+# 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__)))
+if File.exist?(file)
+  begin
+    eval_gemfile file
+  rescue Bundler::GemfileError => e
+    Bundler.ui.warn '[EngineCart] Skipping Rails application dependencies:'
+    Bundler.ui.warn e.message
+  end
+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
+  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
+
 if File.exists?('spec/test_app_templates/Gemfile.extra')
   eval File.read('spec/test_app_templates/Gemfile.extra'), nil, 'spec/test_app_templates/Gemfile.extra'
 end
+gem 'transpec'

data/VERSION

@@ -1 +1 @@
-4.7.0
+4.8.0

data/app/helpers/blacklight/blacklight_helper_behavior.rb

@@ -637,13 +637,13 @@ module Blacklight::BlacklightHelperBehavior
   end
 
   def link_to_previous_document(previous_document)
-    link_to_unless previous_document.nil?, raw(t('views.pagination.previous')), previous_document, search_session_params(search_session[:counter].to_i - 1).merge(:class => "previous", :rel => 'prev')  do
+    link_to_unless previous_document.nil?, raw(t('views.pagination.previous')), previous_document, search_session_params(search_session['counter'].to_i - 1).merge(:class => "previous", :rel => 'prev')  do
       content_tag :span, raw(t('views.pagination.previous')), :class => 'previous'
     end
   end
 
   def link_to_next_document(next_document)
-    link_to_unless next_document.nil?, raw(t('views.pagination.next')), next_document, search_session_params(search_session[:counter].to_i + 1).merge(:class => "next", :rel => 'next') do
+    link_to_unless next_document.nil?, raw(t('views.pagination.next')), next_document, search_session_params(search_session['counter'].to_i + 1).merge(:class => "next", :rel => 'next') do
       content_tag :span, raw(t('views.pagination.next')), :class => 'next'
     end
   end

data/app/helpers/blacklight/catalog_helper_behavior.rb

@@ -105,7 +105,7 @@ module Blacklight::CatalogHelperBehavior
   # Code should call this method rather than interrogating session directly,
   # because implementation of where this data is stored/retrieved may change.
   def item_page_entry_info
-    t('blacklight.search.entry_pagination_info.other', :current => number_with_delimiter(search_session[:counter]), :total => number_with_delimiter(search_session[:total]), :count => search_session[:total].to_i).html_safe
+    t('blacklight.search.entry_pagination_info.other', :current => number_with_delimiter(search_session['counter']), :total => number_with_delimiter(search_session['total']), :count => search_session['total'].to_i).html_safe
   end
 
   # Look up search field user-displayable label

data/app/helpers/blacklight/facets_helper_behavior.rb

@@ -195,6 +195,7 @@ module Blacklight::FacetsHelperBehavior
     p.delete :commit
     p[:f][field] = p[:f][field] - [value]
     p[:f].delete(field) if p[:f][field].size == 0
+    p.delete(:f) if p[:f].empty?
     p
   end
 

data/app/helpers/blacklight/search_history_constraints_helper_behavior.rb

@@ -17,13 +17,13 @@ module Blacklight::SearchHistoryConstraintsHelperBehavior
   end
 
   def render_search_to_s_q(params)
-    return "".html_safe if params[:q].blank?
+    return "".html_safe if params['q'].blank?
     
     label = (default_search_field && params[:search_field] == default_search_field[:key]) ? 
       nil :
       label_for_search_field(params[:search_field])
     
-    render_search_to_s_element(label , render_filter_value(params[:q]) )
+    render_search_to_s_element(label , render_filter_value(params['q']) )
   end
 
   def render_search_to_s_filters(params)

data/blacklight.gemspec

@@ -12,26 +12,25 @@ Gem::Specification.new do |s|
   s.description = %q{Blacklight is an open source Solr user interface discovery platform. You can use Blacklight to enable searching and browsing of your collections. Blacklight uses the Apache Solr search engine to search full text and/or metadata.}
   s.license     = "Apache 2.0"
   s.rubyforge_project = "blacklight"
-  
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
   # PRODUCTION GEM REQUIREMENTS
-  # ---------------------------------------   
-  s.add_dependency "rails",     ">= 3.2.6", "< 5"
+  # ---------------------------------------
+  s.add_dependency "rails",     "~> 4.0"
   s.add_dependency "nokogiri",  "~>1.6"     # XML Parser
   # Let's allow future versions of marc, count on
   # them to be backwards compat until 1.1
   s.add_dependency "marc",      ">= 0.4.3", "< 1.1"  # Marc record parser.
   s.add_dependency "rsolr",     "~> 1.0.6"  # Library for interacting with rSolr.
   s.add_dependency "kaminari", "~> 0.13"  # the pagination (page 1,2,3, etc..) of our search results
-  s.add_dependency "sass-rails" 
   s.add_dependency "bootstrap-sass", ">= 2.2.0", "< 2.4"
   s.add_dependency "deprecation", "~> 0.1"
   s.add_development_dependency "jettywrapper", ">= 1.4.1"
-  s.add_development_dependency "rspec-rails"
-  s.add_development_dependency 'engine_cart', ">= 0.1.0"
+  s.add_development_dependency "rspec-rails", "~> 3.0"
+  s.add_development_dependency 'engine_cart', "~> 2.0"
   s.add_development_dependency "equivalent-xml"
 end

data/lib/blacklight/catalog.rb

@@ -65,7 +65,7 @@ module Blacklight::Catalog
 
     # updates the search counter (allows the show view to paginate)
     def update
-      search_session[:counter] = params[:counter]
+      search_session['counter'] = params[:counter]
       redirect_to :action => "show"
     end
     

data/lib/blacklight/catalog/search_context.rb

@@ -37,16 +37,16 @@ module Blacklight::Catalog::SearchContext
       rescue ActiveRecord::RecordNotFound
         nil
       end
-    elsif search_session[:id]
+    elsif search_session['id']
       begin
-        searches_from_history.find(search_session[:id])
+        searches_from_history.find(search_session['id'])
       rescue ActiveRecord::RecordNotFound
         nil
       end
     end
 
     if @current_search_session
-      search_session[:id] = @current_search_session.id
+      search_session['id'] = @current_search_session.id
     end
 
     @current_search_session
@@ -94,11 +94,11 @@ module Blacklight::Catalog::SearchContext
   # calls setup_previous_document then setup_next_document.
   # used in the show action for single view pagination.
   def setup_next_and_previous_documents
-    if search_session[:counter] and current_search_session
-      index = search_session[:counter].to_i - 1
+    if search_session['counter'] and current_search_session
+      index = search_session['counter'].to_i - 1
       response, documents = get_previous_and_next_documents_for_search index, current_search_session.query_params
 
-      search_session[:total] = response.total
+      search_session['total'] = response.total
       @search_context_response = response
       @previous_document = documents.first
       @next_document = documents.last

data/lib/blacklight/solr/document.rb

@@ -35,7 +35,7 @@ module Blacklight::Solr::Document
   included do
     extend ActiveModel::Naming
     include Blacklight::Solr::Document::Extensions
-  end    
+  end
 
   attr_reader :solr_response
 
@@ -59,7 +59,7 @@ module Blacklight::Solr::Document
   # Helper method to check if value/multi-values exist for a given key.
   # The value can be a string, or a RegExp
   # Multiple "values" can be given; only one needs to match.
-  # 
+  #
   # Example:
   # doc.has?(:location_facet)
   # doc.has?(:location_facet, 'Clemons')
@@ -83,7 +83,7 @@ module Blacklight::Solr::Document
 
   def has_highlight_field? k
     return false if @solr_response['highlighting'].blank? or @solr_response['highlighting'][self.id].blank?
-    
+
     @solr_response['highlighting'][self.id].key? k.to_s
   end
 
@@ -128,33 +128,41 @@ module Blacklight::Solr::Document
     'catalog/document'
   end
 
-   
+
   # Returns a hash keyed by semantic tokens (see ExtendableClassMethods#semantic_fields), value is an array of
   # strings. (Array to handle multi-value fields). If no value(s)
-  # available, empty array is returned. 
+  # available, empty array is returned.
   #
   # Default implementation here uses ExtendableClassMethods#semantic_fields
-  # to just take values from Solr stored fields. 
+  # to just take values from Solr stored fields.
   # Extensions can over-ride this method to provide better/different lookup,
   # but extensions should call super and modify hash returned, to avoid
-  # unintentionally erasing values provided by other extensions. 
+  # unintentionally erasing values provided by other extensions.
   def to_semantic_values
     unless @semantic_value_hash
-      @semantic_value_hash = Hash.new([]) # default to empty array   
+      @semantic_value_hash = Hash.new([]) # default to empty array
       self.class.field_semantics.each_pair do |key, solr_field|
         value = self[solr_field]
         # Make single and multi-values all arrays, so clients
         # don't have to know.
         unless value.nil?
-          value = [value] unless value.kind_of?(Array)      
+          value = [value] unless value.kind_of?(Array)
           @semantic_value_hash[key] = value
         end
       end
     end
     return @semantic_value_hash
   end
-  
-  
+
+  def to_model
+    self
+  end
+
+  def persisted?
+    true
+  end
+
+
   # Certain class-level methods needed for the document-specific
   # extendability architecture
   module ClassMethods
@@ -164,9 +172,9 @@ module Blacklight::Solr::Document
       # XXX Blacklight.config[:unique_key] should be deprecated soon
       if Blacklight.respond_to?(:config) and Blacklight.config[:unique_key]
         Deprecation.warn(self, "Setting the unique key using Blacklight.config[:unique_key] has been deprecated. Use the SolrDocument.unique_key= setter instead")
-        @unique_key ||= Blacklight.config[:unique_key] 
+        @unique_key ||= Blacklight.config[:unique_key]
       end
-      @unique_key ||= 'id' 
+      @unique_key ||= 'id'
 
       @unique_key
     end
@@ -175,11 +183,11 @@ module Blacklight::Solr::Document
        Deprecation.warn(self, "Document.connection is deprecated and will be removed in Blacklight 5.0")
        @connection ||= Blacklight.solr
      end
-    
+
     # Returns array of hashes of registered extensions. Each hash
     # has a :module_obj key and a :condition_proc key. Usually this
     # method is only used internally in #apply_extensions, but if you
- 
+
     # Class-level method for accessing/setting semantic mappings
     # for solr stored fields. Can be set by local app, key is
     # a symbol for a semantic, value is a solr _stored_ field.
@@ -189,13 +197,13 @@ module Blacklight::Solr::Document
     #
     # Currently documented semantic tokens, not all may be
     # used by core BL, but some may be used by plugins present
-    # or future. 
-    # :title, :author, :year, :language => User-presentable strings. 
+    # or future.
+    # :title, :author, :year, :language => User-presentable strings.
     def field_semantics
       @field_semantics ||= {}
-    end    
+    end
   end
-  
- 
-  
+
+
+
 end

data/lib/blacklight/solr_helper.rb

@@ -281,11 +281,14 @@ module Blacklight::SolrHelper
       fq = case
         when (facet_config and facet_config.query)
           facet_config.query[value][:fq]
-        when (facet_config and facet_config.date),
-             (value.is_a?(TrueClass) or value.is_a?(FalseClass) or value == 'true' or value == 'false'),
+        when (facet_config and facet_config.date)
+          # in solr 3.2+, this could be replaced by a !term query
+          "#{prefix}#{facet_field}:#{RSolr.escape(value)}"
+        when (value.is_a?(DateTime) or value.is_a?(Date) or value.is_a?(Time))
+          "#{prefix}#{facet_field}:#{RSolr.escape(value.to_time.utc.strftime("%Y-%m-%dT%H:%M:%SZ"))}"
+        when (value.is_a?(TrueClass) or value.is_a?(FalseClass) or value == 'true' or value == 'false'),
              (value.is_a?(Integer) or (value.to_i.to_s == value if value.respond_to? :to_i)),
              (value.is_a?(Float) or (value.to_f.to_s == value if value.respond_to? :to_f))
-             (value.is_a?(DateTime) or value.is_a?(Date) or value.is_a?(Time))
           "#{prefix}#{facet_field}:#{value}"
         when value.is_a?(Range)
           "#{prefix}#{facet_field}:[#{value.first} TO #{value.last}]"
@@ -293,7 +296,6 @@ module Blacklight::SolrHelper
           "{!raw f=#{facet_field}#{(" " + local_params.join(" ")) unless local_params.empty?}}#{value}"
       end
 
-
     end
     
     ##

data/spec/controllers/application_controller_spec.rb

@@ -12,8 +12,8 @@ describe ApplicationController do
           controller.send(:default_html_head)
 
           # by default, these should be empty, but left in for backwards compatibility 
-          controller.javascript_includes.should be_empty
-          controller.stylesheet_links.should be_empty
+          expect(controller.javascript_includes).to be_empty
+          expect(controller.stylesheet_links).to be_empty
         end
       end
     end
@@ -21,7 +21,7 @@ describe ApplicationController do
     describe "#blacklight_config" do
 
       it "should provide a default blacklight_config everywhere" do
-        controller.blacklight_config.should == CatalogController.blacklight_config
+        expect(controller.blacklight_config).to eq(CatalogController.blacklight_config)
       end
     end