blacklight_advanced_search 6.0.0 → 6.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f2ca7a7c57ac86d4f3c0dc385ef79561af1c1737
-  data.tar.gz: ed73c2995b52f221b639d0840ee2caef4f90fbb7
+  metadata.gz: 656aa169eecd81150115fea2e617b2d345676709
+  data.tar.gz: 70d003ffa0d3e363ad54d0e0b5b5a87c15ebcd72
 SHA512:
-  metadata.gz: d8dd353a79541d70fe0d026fb69d12c6957921c2805955533b2b0e181bd426a5ec0ce65f3e1feb06b7a1b9756a10ea364d1481f821127d0e91427ac187aad914
-  data.tar.gz: 17af4c42eb38f9649659c9667150c9a50a7bca920ce077fdaed12d90d7357be0ad3ca1aa0fd560dbd8c2ea695c340cef25d4ae9e2f342088dbb56afa484e4d7e
+  metadata.gz: 5ae65b233d287eab9f15e21f711b7eda5a464e1875a40404e2ee12cd98440bfb8884a136313dcfe192ce14ea22c61f14f08525a49645e7f207a74f7c92f56f9f
+  data.tar.gz: 76ececeffd3c0b342a9cb336ae03c5c032135cc1c9e12b56fd04e6816cf4ac222e00aef291ae6556c646396a0ff9db9e59474c2f514d6baf4afa23d43b2df11e

data/VERSION

@@ -1 +1 @@
-6.0.0
+6.0.1

data/blacklight_advanced_search.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'blacklight', '> 6.0.0.pre', '< 7'
+  s.add_dependency 'blacklight', '~> 6.0.1'
   s.add_dependency "parslet"
 
   s.add_development_dependency "rails"

data/lib/blacklight_advanced_search/controller.rb

@@ -6,13 +6,6 @@ module BlacklightAdvancedSearch::Controller
   extend ActiveSupport::Concern
 
   included do
-    # default advanced config values
-    blacklight_config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
-    #blacklight_config.advanced_search[:qt] ||= 'advanced'
-    blacklight_config.advanced_search[:url_key] ||= 'advanced'
-    blacklight_config.advanced_search[:query_parser] ||= 'dismax'
-    blacklight_config.advanced_search[:form_solr_parameters] ||= {}
-
     # Display advanced search constraints properly
     helper BlacklightAdvancedSearch::RenderConstraintsOverride
     helper BlacklightAdvancedSearch::CatalogHelperOverride

data/lib/blacklight_advanced_search/engine.rb

@@ -2,40 +2,5 @@ require 'blacklight'
 
 module BlacklightAdvancedSearch
   class Engine < Rails::Engine
-  
-    # Do these things in a to_prepare block, to try and make them work
-    # in development mode with class-reloading. The trick is we can't
-    # be sure if the controllers we're modifying are being reloaded in
-    # dev mode, if they are in the BL plugin and haven't been copied to
-    # local, they won't be. But we do our best.
-    config.to_prepare do    
-
-      
-
-      # Ordinary module over-ride to CatalogController
-      CatalogController.send(:include,  
-          BlacklightAdvancedSearch::Controller  
-      ) unless
-      CatalogController.include?(   
-          BlacklightAdvancedSearch::Controller 
-        )
-      
-      
-      
-      SearchHistoryController.send(:helper,
-        BlacklightAdvancedSearch::RenderConstraintsOverride 
-      ) unless
-        SearchHistoryController.helpers.is_a?( 
-          BlacklightAdvancedSearch::RenderConstraintsOverride 
-        )
-        
-      SavedSearchesController.send(:helper,
-        BlacklightAdvancedSearch::RenderConstraintsOverride 
-      ) unless
-        SearchHistoryController.helpers.is_a?( 
-          BlacklightAdvancedSearch::RenderConstraintsOverride 
-        )
-        
-    end
   end
 end

data/lib/generators/blacklight_advanced_search/install_generator.rb

@@ -15,6 +15,31 @@ module BlacklightAdvancedSearch
       end
     end
 
+    def install_catalog_controller_mixin
+      inject_into_class "app/controllers/catalog_controller.rb", "CatalogController" do
+        "  include BlacklightAdvancedSearch::Controller\n"
+      end
+    end
+
+    def configuration
+      inject_into_file 'app/controllers/catalog_controller.rb', after: "configure_blacklight do |config|" do
+        "\n    # default advanced config values" \
+        "\n    config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new" \
+        "\n    # config.advanced_search[:qt] ||= 'advanced'" \
+        "\n    config.advanced_search[:url_key] ||= 'advanced'" \
+        "\n    config.advanced_search[:query_parser] ||= 'dismax'" \
+        "\n    config.advanced_search[:form_solr_parameters] ||= {}\n"
+      end
+    end
+
+    def install_search_history_controller
+      copy_file "search_history_controller.rb", "app/controllers/search_history_controller.rb"
+    end
+
+    def install_saved_searches_controller
+      copy_file "saved_searches_controller.rb", "app/controllers/saved_searches_controller.rb"
+    end
+
     def inject_routes
       inject_into_file 'config/routes.rb', after: /mount Blacklight::Engine.*$/ do
         "\n  mount BlacklightAdvancedSearch::Engine => '/'\n"

data/lib/generators/blacklight_advanced_search/templates/saved_searches_controller.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class SavedSearchesController < ApplicationController
+  include Blacklight::SavedSearches
+
+  helper BlacklightAdvancedSearch::RenderConstraintsOverride
+end

data/lib/generators/blacklight_advanced_search/templates/search_history_controller.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class SearchHistoryController < ApplicationController
+  include Blacklight::SearchHistory
+
+  helper BlacklightAdvancedSearch::RenderConstraintsOverride
+end

data/spec/test_app_templates/app/controllers/catalog_controller.rb

@@ -1,25 +1,33 @@
 class CatalogController < ApplicationController
   include Blacklight::Catalog
+  include BlacklightAdvancedSearch::Controller
 
   configure_blacklight do |config|
-      config.default_solr_params = { 
-        :qt => 'search',
-        :rows => 10 
-      }
+    # default advanced config values
+    config.advanced_search ||= Blacklight::OpenStructWithHashAccess.new
+    # config.advanced_search[:qt] ||= 'advanced'
+    config.advanced_search[:url_key] ||= 'advanced'
+    config.advanced_search[:query_parser] ||= 'dismax'
+    config.advanced_search[:form_solr_parameters] ||= {}
 
-      config.add_facet_field 'language_facet'
+    config.default_solr_params = {
+      :qt => 'search',
+      :rows => 10
+    }
 
-      config.add_search_field('title') do |field|
-        field.solr_local_parameters = { :qf => "title_t", :pf => "title_t"}
-      end
+    config.add_facet_field 'language_facet'
 
-      config.add_search_field('author') do |field|
-        field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
-      end
+    config.add_search_field('title') do |field|
+      field.solr_local_parameters = { :qf => "title_t", :pf => "title_t"}
+    end
+
+    config.add_search_field('author') do |field|
+      field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
+    end
 
-      config.add_search_field('dummy_field') do |field|
-        field.include_in_advanced_search = false
-        field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
-      end
+    config.add_search_field('dummy_field') do |field|
+      field.include_in_advanced_search = false
+      field.solr_local_parameters = { :qf => "author_t", :pf => "author_t"}
     end
-  end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blacklight_advanced_search
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.0.1
 platform: ruby
 authors:
 - Jonathan Rochkind
@@ -9,28 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-22 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 6.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: 6.0.0.pre
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: 6.0.1
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +158,8 @@ files:
 - lib/generators/blacklight_advanced_search/blacklight_advanced_search_generator.rb
 - lib/generators/blacklight_advanced_search/install_generator.rb
 - lib/generators/blacklight_advanced_search/templates/advanced_controller.rb
+- lib/generators/blacklight_advanced_search/templates/saved_searches_controller.rb
+- lib/generators/blacklight_advanced_search/templates/search_history_controller.rb
 - lib/parsing_nesting/Readme.rdoc
 - lib/parsing_nesting/grammar.rb
 - lib/parsing_nesting/tree.rb