blacklight 6.6.1 → 6.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a591d2faa2186e933585bfbda29802ab1b185714
-  data.tar.gz: 12580c6806aa5dc22d4977594796013f75705fb3
+  metadata.gz: 8a1212427a6ef925e7c442010f44118a4931ae67
+  data.tar.gz: 20da8e50afe0876f9ca7f79a22667933ed3562a8
 SHA512:
-  metadata.gz: 4c80858411a22e4444b5a72a95fc72cb64eb1588c24a0f399494b7a08e2c3cd506fd7728a8152f221fc39161fe497b995909eaefdf4de67efc2b6e61abdd9831
-  data.tar.gz: 8645a1a9d3a74dcc07b49f0afa12abaee10185f3403155823d057d3fa225df29f0f40a0e03e9b0acdb8946fb8f6639b6fd659b2b785f7666c29a87929cce493f
+  metadata.gz: 50044f685027f9733d984402f93891a2cb8969b6d97fdb729a0174f5a1bd118963292ab301bc7aa396a6e5dc4e792a67229a382352fba6ab0e187985bac004e2
+  data.tar.gz: 1b98e3acfe972a79d3ae486ee7c178ce32f4ebf17277fa44a439cf5136d7b5fcd32af12be96b301f556996cd8069b77252f98175cafb7b4a7b9ca802385f032e

data/.rubocop.yml

@@ -21,4 +21,8 @@ Style/IndentationConsistency:
   Enabled: false
 
 Rails/OutputSafety:
-  Enabled: false
+  Enabled: false
+
+Style/MethodMissing:
+  Exclude:
+  - 'lib/blacklight/utils.rb'

data/VERSION

@@ -1 +1 @@
-6.6.1
+6.6.2

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

@@ -224,7 +224,7 @@ module Blacklight::Catalog
     def validate_email_params
       if params[:to].blank?
         flash[:error] = I18n.t('blacklight.email.errors.to.blank')
-      elsif !params[:to].match(defined?(Devise) ? Devise.email_regexp : /^[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+\.[A-Za-z]{2,4}$/)
+      elsif !params[:to].match(Blacklight::Engine.config.email_regexp)
         flash[:error] = I18n.t('blacklight.email.errors.to.invalid', :to => params[:to])
       end
 

data/lib/blacklight/engine.rb

@@ -43,5 +43,7 @@ module Blacklight
     }
 
     config.bookmarks_http_method = :post
+    
+    config.email_regexp = defined?(Devise) ? Devise.email_regexp : /\A[^@\s]+@[^@\s]+\z/
   end
 end

data/lib/blacklight/utils.rb

@@ -167,10 +167,6 @@ module Blacklight
         super
       end
     end
-    
-    def respond_to_missing?(*_)
-      true
-    end
 
     private
 

data/lib/generators/blacklight/search_builder_generator.rb

@@ -16,5 +16,17 @@ module Blacklight
     def create_search_builder
       template "search_builder.rb", "app/models/#{model_name}.rb"
     end
+
+    def create_search_builder_spec
+      return unless rspec_installed?
+
+      template "search_builder_spec.rb", "spec/models/#{model_name}_spec.rb"
+    end
+
+    private
+
+    def rspec_installed?
+      defined?(RSpec) && defined?(RSpec::Rails)
+    end
   end
 end

data/lib/generators/blacklight/templates/search_builder.rb

@@ -1,4 +1,12 @@
 # frozen_string_literal: true
-class SearchBuilder < Blacklight::SearchBuilder
+class <%= model_name.classify %> < Blacklight::SearchBuilder
   include Blacklight::Solr::SearchBuilderBehavior
+
+  ##
+  # @example Adding a new step to the processor chain
+  #   self.default_processor_chain += [:add_custom_data_to_query]
+  #
+  #   def add_custom_data_to_query(solr_parameters)
+  #     solr_parameters[:custom] = blacklight_params[:user_value]
+  #   end
 end

data/lib/generators/blacklight/templates/search_builder_spec.rb

@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+describe <%= model_name.classify %> do
+  let(:user_params) { Hash.new }
+  let(:blacklight_config) { Blacklight::Configuration.new }
+  let(:scope) { double blacklight_config: blacklight_config }
+  subject(:search_builder) { described_class.new scope }
+
+  # describe "my custom step" do
+  #   subject(:query_parameters) do
+  #     search_builder.with(user_params).processed_parameters
+  #   end
+  #
+  #   it "adds my custom data" do
+  #     expect(query_parameters).to include :custom_data
+  #   end
+  # end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight
 version: !ruby/object:Gem::Version
-  version: 6.6.1
+  version: 6.6.2
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-09 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -380,7 +380,6 @@ files:
 - app/controllers/concerns/blacklight/search_helper.rb
 - app/controllers/concerns/blacklight/search_history.rb
 - app/controllers/concerns/blacklight/suggest.rb
-- app/controllers/concerns/blacklight/suggest_search.rb
 - app/controllers/concerns/blacklight/token_based_user.rb
 - app/controllers/saved_searches_controller.rb
 - app/controllers/search_history_controller.rb
@@ -411,6 +410,7 @@ files:
 - app/helpers/suggest_helper.rb
 - app/models/blacklight/facet_paginator.rb
 - app/models/blacklight/solr/facet_paginator.rb
+- app/models/blacklight/suggest_search.rb
 - app/models/bookmark.rb
 - app/models/concerns/blacklight/configurable.rb
 - app/models/concerns/blacklight/document.rb
@@ -592,6 +592,7 @@ files:
 - lib/generators/blacklight/templates/config/blacklight.yml
 - lib/generators/blacklight/templates/config/jetty.yml
 - lib/generators/blacklight/templates/search_builder.rb
+- lib/generators/blacklight/templates/search_builder_spec.rb
 - lib/generators/blacklight/templates/solr_document.rb
 - lib/generators/blacklight/test_support_generator.rb
 - lib/generators/blacklight/user_generator.rb
@@ -621,7 +622,6 @@ files:
 - spec/controllers/blacklight/facet_spec.rb
 - spec/controllers/blacklight/search_fields_spec.rb
 - spec/controllers/blacklight/search_helper_spec.rb
-- spec/controllers/blacklight/suggest_search_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/saved_searches_controller_spec.rb
@@ -681,6 +681,7 @@ files:
 - spec/models/blacklight/solr/response_spec.rb
 - spec/models/blacklight/solr/search_builder_spec.rb
 - spec/models/blacklight/suggest/response_spec.rb
+- spec/models/blacklight/suggest_search_spec.rb
 - spec/models/blacklight/user_spec.rb
 - spec/models/bookmark_spec.rb
 - spec/models/record_mailer_spec.rb
@@ -758,7 +759,6 @@ test_files:
 - spec/controllers/blacklight/facet_spec.rb
 - spec/controllers/blacklight/search_fields_spec.rb
 - spec/controllers/blacklight/search_helper_spec.rb
-- spec/controllers/blacklight/suggest_search_spec.rb
 - spec/controllers/bookmarks_controller_spec.rb
 - spec/controllers/catalog_controller_spec.rb
 - spec/controllers/saved_searches_controller_spec.rb
@@ -818,6 +818,7 @@ test_files:
 - spec/models/blacklight/solr/response_spec.rb
 - spec/models/blacklight/solr/search_builder_spec.rb
 - spec/models/blacklight/suggest/response_spec.rb
+- spec/models/blacklight/suggest_search_spec.rb
 - spec/models/blacklight/user_spec.rb
 - spec/models/bookmark_spec.rb
 - spec/models/record_mailer_spec.rb