commonwealth-vlr-engine 0.0.1 → 0.0.2

data/spec/lib/commonwealth-vlr-engine/search_builder/flagged_search_builder_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe CommonwealthFlaggedSearchBuilder do
+
+  class CommonwealthFlaggedSearchBuilderTestClass < CommonwealthFlaggedSearchBuilder
+  end
+
+  before { @obj = CommonwealthFlaggedSearchBuilderTestClass.new(CatalogController.new) }
+
+  describe 'processor chain' do
+
+    it 'should add the right methods to the processor chain' do
+      expect(@obj.processor_chain).to include(:flagged_filter)
+    end
+
+  end
+
+
+end

data/spec/lib/commonwealth-vlr-engine/search_builder/institutions_search_builder_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe CommonwealthInstitutionsSearchBuilder do
+
+  class CommonwealthInstitutionsSearchBuilderTestClass < CommonwealthInstitutionsSearchBuilder
+  end
+
+  before { @obj = CommonwealthInstitutionsSearchBuilderTestClass.new(CatalogController.new) }
+
+  describe 'processor chain' do
+
+    it 'should add the right methods to the processor chain' do
+      expect(@obj.processor_chain).to include(:institutions_filter)
+    end
+
+  end
+
+
+end

data/spec/lib/commonwealth-vlr-engine/search_builder/mlt_search_builder_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe CommonwealthMltSearchBuilder do
+
+  class CommonwealthMltSearchBuilderTestClass < CommonwealthMltSearchBuilder
+  end
+
+  before { @obj = CommonwealthMltSearchBuilderTestClass.new(CatalogController.new) }
+
+  describe 'processor chain' do
+
+    it 'should add the right methods to the processor chain' do
+      expect(@obj.processor_chain).to include(:set_solr_id_for_mlt)
+    end
+
+  end
+
+
+end

data/spec/lib/commonwealth-vlr-engine/search_builder/ocr_search_builder_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe CommonwealthOcrSearchBuilder do
+
+  class CommonwealthOcrSearchBuilderTestClass < CommonwealthOcrSearchBuilder
+  end
+
+  before { @obj = CommonwealthOcrSearchBuilderTestClass.new(CatalogController.new) }
+
+  describe 'processor chain' do
+
+    it 'should add the right methods to the processor chain' do
+      expect(@obj.processor_chain).to include(:ocr_search_params)
+    end
+
+  end
+
+
+end

data/spec/test_app_templates/lib/generators/test_app_generator.rb

@@ -20,4 +20,6 @@ class TestAppGenerator < Rails::Generators::Base
     generate 'commonwealth_vlr_engine:install'
   end
 
+  # TODO: configure various YAML files, run db migrations, set institutions = true, etc.
+
 end

data/tasks/vlr_engine.rake

@@ -18,7 +18,7 @@ namespace :vlr_engine do
     @controller = BlacklightGeojsonTestClass.new
     @controller.request = ActionDispatch::TestRequest.new
 
-    (@response, @document_list) = @controller.search_results({},@controller.search_params_logic)
+    (@response, @document_list) = @controller.search_results({})
 
     geojson_features = serialize_geojson(map_facet_values, 'index')
     if geojson_features

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: commonwealth-vlr-engine
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Eben English
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-12 00:00:00.000000000 Z
+date: 2016-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -29,58 +29,58 @@ dependencies:
   name: blacklight
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 6.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: blacklight_advanced_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 6.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.4
+        version: 6.0.2
 - !ruby/object:Gem::Dependency
   name: blacklight-gallery
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: blacklight-maps
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -450,6 +450,7 @@ files:
 - app/assets/stylesheets/commonwealth-vlr-engine/searches.scss
 - app/assets/stylesheets/commonwealth-vlr-engine/show.scss
 - app/assets/stylesheets/commonwealth-vlr-engine/signin.scss
+- app/assets/stylesheets/commonwealth-vlr-engine/twitter_typeahead.scss
 - app/assets/stylesheets/commonwealth-vlr-engine/users.scss
 - app/assets/stylesheets/commonwealth-vlr-engine/vlr_dependencies.css
 - app/assets/stylesheets/ie_fixes.css
@@ -468,6 +469,8 @@ files:
 - app/controllers/institutions_controller.rb
 - app/controllers/ocr_search_controller.rb
 - app/controllers/pages_controller.rb
+- app/controllers/saved_searches_controller.rb
+- app/controllers/search_history_controller.rb
 - app/controllers/users/omniauth_callbacks_controller.rb
 - app/controllers/users/registrations_controller.rb
 - app/controllers/users/sessions_controller.rb
@@ -508,7 +511,6 @@ files:
 - app/views/advanced/_facet_limit.html.erb
 - app/views/advanced/index.html.erb
 - app/views/blacklight_advanced_search/_facet_limit.html.erb
-- app/views/bookmarks/_tools.html.erb
 - app/views/bookmarks/index.html.erb
 - app/views/bookmarks/update.js.erb
 - app/views/bpluser/folders/_folder.html.erb
@@ -526,8 +528,7 @@ files:
 - app/views/catalog/_index_gallery.html.erb
 - app/views/catalog/_index_header_default.html.erb
 - app/views/catalog/_index_list_collection.html.erb
-- app/views/catalog/_index_list_default.html.erb
-- app/views/catalog/_index_map_institutions.html.erb
+- app/views/catalog/_index_mapview_institutions.html.erb
 - app/views/catalog/_index_masonry.html.erb
 - app/views/catalog/_index_slideshow.html.erb
 - app/views/catalog/_more_like_this.html.erb
@@ -620,17 +621,18 @@ files:
 - app/views/shared/_header_navbar.html.erb
 - app/views/shared/_nav_links.html.erb
 - app/views/shared/_search_form_header.html.erb
+- app/views/shared/_sitelinks_search_box.html.erb
 - app/views/shared/_tools.html.erb
 - app/views/shared/_user_util_links.html.erb
 - app/views/users/show.html.erb
 - commonwealth-vlr-engine.gemspec
+- config/initializers/assets.rb
 - config/initializers/patch_blacklight_advanced_search.rb
 - config/initializers/patch_blacklight_maps.rb
 - config/jetty.yml
 - config/locales/commonwealth-vlr-engine.en.yml
 - config/routes.rb
 - lib/commonwealth-vlr-engine.rb
-- lib/commonwealth-vlr-engine/commonwealth_search_builder.rb
 - lib/commonwealth-vlr-engine/controller.rb
 - lib/commonwealth-vlr-engine/controller_override.rb
 - lib/commonwealth-vlr-engine/engine.rb
@@ -639,8 +641,12 @@ files:
 - lib/commonwealth-vlr-engine/notifier.rb
 - lib/commonwealth-vlr-engine/pages.rb
 - lib/commonwealth-vlr-engine/render_constraints_override.rb
-- lib/commonwealth-vlr-engine/route_sets.rb
-- lib/commonwealth-vlr-engine/routes.rb
+- lib/commonwealth-vlr-engine/search_builder/collections_search_builder.rb
+- lib/commonwealth-vlr-engine/search_builder/commonwealth_search_builder_behavior.rb
+- lib/commonwealth-vlr-engine/search_builder/flagged_search_builder.rb
+- lib/commonwealth-vlr-engine/search_builder/institutions_search_builder.rb
+- lib/commonwealth-vlr-engine/search_builder/mlt_search_builder.rb
+- lib/commonwealth-vlr-engine/search_builder/ocr_search_builder.rb
 - lib/commonwealth-vlr-engine/version.rb
 - lib/generators/commonwealth_vlr_engine/controller_generator.rb
 - lib/generators/commonwealth_vlr_engine/environment_generator.rb
@@ -648,7 +654,8 @@ files:
 - lib/generators/commonwealth_vlr_engine/localassets_generator.rb
 - lib/generators/commonwealth_vlr_engine/model_generator.rb
 - lib/generators/commonwealth_vlr_engine/routes_generator.rb
-- lib/generators/commonwealth_vlr_engine/templates/commonwealth_vlr_engine.css.scss
+- lib/generators/commonwealth_vlr_engine/templates/commonwealth_search_builder.rb
+- lib/generators/commonwealth_vlr_engine/templates/commonwealth_vlr_engine.scss
 - lib/generators/commonwealth_vlr_engine/templates/config/contact_emails.yml.sample
 - lib/generators/commonwealth_vlr_engine/templates/config/fedora.yml.sample
 - lib/generators/commonwealth_vlr_engine/templates/config/geojson_static_file.yml.sample
@@ -702,12 +709,16 @@ files:
 - spec/helpers/institutions_helper_spec.rb
 - spec/helpers/ocr_search_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
-- spec/lib/commonwealth-vlr-engine/commonwealth_search_builder_spec.rb
-- spec/lib/commonwealth-vlr-engine/controller_override_spec.rb
 - spec/lib/commonwealth-vlr-engine/controller_spec.rb
 - spec/lib/commonwealth-vlr-engine/finder_spec.rb
 - spec/lib/commonwealth-vlr-engine/iiif_manifest_spec.rb
 - spec/lib/commonwealth-vlr-engine/render_constraints_override_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/collections_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/commonwealth_search_builder_behavior_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/flagged_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/institutions_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/mlt_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/ocr_search_builder_spec.rb
 - spec/mailers/notifier_spec.rb
 - spec/models/carousel_slide_spec.rb
 - spec/spec_helper.rb
@@ -775,12 +786,16 @@ test_files:
 - spec/helpers/institutions_helper_spec.rb
 - spec/helpers/ocr_search_helper_spec.rb
 - spec/helpers/pages_helper_spec.rb
-- spec/lib/commonwealth-vlr-engine/commonwealth_search_builder_spec.rb
-- spec/lib/commonwealth-vlr-engine/controller_override_spec.rb
 - spec/lib/commonwealth-vlr-engine/controller_spec.rb
 - spec/lib/commonwealth-vlr-engine/finder_spec.rb
 - spec/lib/commonwealth-vlr-engine/iiif_manifest_spec.rb
 - spec/lib/commonwealth-vlr-engine/render_constraints_override_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/collections_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/commonwealth_search_builder_behavior_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/flagged_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/institutions_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/mlt_search_builder_spec.rb
+- spec/lib/commonwealth-vlr-engine/search_builder/ocr_search_builder_spec.rb
 - spec/mailers/notifier_spec.rb
 - spec/models/carousel_slide_spec.rb
 - spec/spec_helper.rb

data/app/views/bookmarks/_tools.html.erb

@@ -1,25 +0,0 @@
-<ul class="bookmarkTools nav nav-pills">
-  <li class="cite">
-    <%= link_to t('blacklight.tools.citation'),
-                citation_catalog_path(:sort=>params[:sort],
-                                      :per_page=>params[:per_page],
-                                      :id => @response.documents.map {|doc| doc.id}),
-                {:id => 'citeLink', :name => 'citation', :class => 'btn btn-default', :data => {:ajax_modal => 'trigger'}} %>
-  </li>
-  <li class="email">
-    <%= link_to t('blacklight.tools.email'),
-                email_catalog_path(:sort=>params[:sort],
-                                   :per_page=>params[:per_page],
-                                   :id => @response.documents.map {|doc| doc.id}),
-                :class => 'lightboxLink btn btn-default',
-                :id => 'emailLink',
-                :data => {:ajax_modal => 'trigger'} %>
-  </li>
-  <li>
-    <%= link_to t('blacklight.bookmarks.clear.action_title'),
-                clear_bookmarks_path,
-                :method => :delete,
-                :data => { :confirm => t('blacklight.bookmarks.clear.action_confirm') },
-                :class => 'btn btn-default' %>
-  </li>
-</ul>

data/app/views/catalog/_index_list_default.html.erb

@@ -1,13 +0,0 @@
-<%# copy of catalog/index_default %>
-<%# need this partial or catalog#index will attempt to render blacklight-maps/index_map %>
-<%# whenever rendering a doc with 'map' as the value of blacklight_config.display_type_field %>
-<dl class="document-metadata dl-horizontal dl-invert">
-
-  <% index_fields(document).each do |field_name, field| -%>
-      <% if should_render_index_field? document, field %>
-          <dt class="blacklight-<%= field_name.parameterize %>"><%= render_index_field_label document, field: field_name %></dt>
-          <dd class="blacklight-<%= field_name.parameterize %>"><%= render_index_field_value document, field: field_name %></dd>
-      <% end -%>
-  <% end -%>
-
-</dl>

data/lib/commonwealth-vlr-engine/route_sets.rb

@@ -1,49 +0,0 @@
-# monkey-patching Blacklight::Routes::RouteSets
-# to use 'search' as path with Blacklight::CatalogController routes
-# stopgap solution until patch can be submitted
-# that will allow local app to provide :path option for resources passed as
-# args to blacklight/lib/blacklight/rails/routes.rb#blacklight_for
-module CommonwealthVlrEngine
-  module RouteSets
-
-    extend ActiveSupport::Concern
-    included do
-
-      def map_resource(key)
-        add_routes do |options|
-          get "search/facet/:id", :to => "#{key}#facet", :as => "#{key}_facet"
-          get "search", :to => "#{key}#index", :as => "#{key}_index"
-        end
-      end
-
-      def export(primary_resource)
-        add_routes do |options|
-          get "search/opensearch", :to => "#{primary_resource}#opensearch", :as => "opensearch_#{primary_resource}"
-          get "search/citation", :to => "#{primary_resource}#citation", :as => "citation_#{primary_resource}"
-          match 'search/email', :to => "#{primary_resource}#email", :as => "email_#{primary_resource}", :via => [:get, :post]
-        end
-      end
-
-      def solr_document(primary_resource)
-        add_routes do |options|
-
-          args = {only: [:show]}
-          args[:constraints] = options[:constraints] if options[:constraints]
-
-          resources :solr_document, args.merge(path: "search", controller: primary_resource) do
-            member do
-              post "track"
-            end
-          end
-
-          # :show and :update are for backwards-compatibility with catalog_url named routes
-          resources primary_resource, args
-        end
-      end
-
-    end
-
-  end
-
-end
-Blacklight::Routes::RouteSets.send(:include, CommonwealthVlrEngine::RouteSets)

data/lib/commonwealth-vlr-engine/routes.rb

@@ -1,21 +0,0 @@
-module CommonwealthVlrEngine
-  module Routes
-
-    extend ActiveSupport::Concern
-    included do |klass|
-      klass.default_route_sets.unshift(:bookmark_item_actions)
-    end
-
-    # route bookmark items actions (cite, email, delete) to folder_items_actions
-    # this needs to be before BL bookmarks stuff, so we add it at the beginning of
-    # the default_route_sets array
-    def bookmark_item_actions(_)
-      add_routes do |options|
-        put 'bookmarks/item_actions', :to => 'folder_items_actions#folder_item_actions', :as => 'selected_bookmarks_actions'
-      end
-    end
-
-  end
-
-end
-Blacklight::Routes.send(:include, CommonwealthVlrEngine::Routes)

data/spec/lib/commonwealth-vlr-engine/commonwealth_search_builder_spec.rb

@@ -1,101 +0,0 @@
-require 'spec_helper'
-
-describe CommonwealthVlrEngine::CommonwealthSearchBuilder do
-
-  class CommonwealthSearchBuilderTestClass
-    cattr_accessor :blacklight_config, :blacklight_params
-
-    include Blacklight::SearchHelper
-    include CommonwealthVlrEngine::CommonwealthSearchBuilder
-
-    def initialize blacklight_config, blacklight_params
-      self.blacklight_config = blacklight_config
-      self.blacklight_params = blacklight_params
-    end
-
-  end
-
-  let(:blacklight_config) { CatalogController.blacklight_config }
-  let(:blacklight_params) { Hash.new }
-  let(:solr_parameters) { Blacklight::Solr::Request.new }
-
-  before { @obj = CommonwealthSearchBuilderTestClass.new blacklight_config, blacklight_params }
-
-  describe 'exclude_unwanted_models' do
-
-    it 'should add parameters to exclude unwanted models' do
-      expect(@obj.exclude_unwanted_models(solr_parameters).to_s).to include('afmodel:Bplmodels_File')
-    end
-
-  end
-
-  describe 'exclude_unpublished_items' do
-
-    let(:excluded_unpublished) { @obj.exclude_unpublished_items(solr_parameters).to_s }
-
-    it 'should add parameters to exclude non-published items' do
-      expect(excluded_unpublished).to include('draft')
-      expect(excluded_unpublished).to include('needs_review')
-      expect(excluded_unpublished).to include('derivatives')
-    end
-
-  end
-
-  describe 'exclude_institutions' do
-
-    it 'should add parameters to exclude institutions' do
-      expect(@obj.exclude_institutions(solr_parameters).to_s).to include('-active_fedora_model_suffix_ssi:\"Institution\"')
-    end
-
-  end
-
-  describe 'flagged_filter' do
-
-    it 'should add parameters to exclude flagged items' do
-      expect(@obj.flagged_filter(solr_parameters).to_s).to include("-#{blacklight_config.flagged_field}:[* TO *]")
-    end
-
-  end
-
-  describe 'institutions_filter' do
-
-    it 'should add parameters to require institutions' do
-      expect(@obj.institutions_filter(solr_parameters).to_s).to include('+active_fedora_model_suffix_ssi:\"Institution\"')
-    end
-
-  end
-
-  describe 'set_solr_id_for_mlt' do
-
-    before {blacklight_params[:mlt_id] = 'bpl-dev:12345678'}
-
-    it 'should set the id param to the mlt_id value' do
-      expect(@obj.set_solr_id_for_mlt(solr_parameters)).to eq('bpl-dev:12345678')
-    end
-
-  end
-
-  describe 'collections_filter' do
-
-    it 'should add parameters to require institutions' do
-      expect(@obj.collections_filter(solr_parameters).to_s).to include('+active_fedora_model_suffix_ssi:\"Collection\"')
-    end
-
-  end
-
-  describe 'ocr_search_params' do
-
-    before do
-      @obj.ocr_search_params(solr_parameters)
-    end
-
-    it 'should add parameters for field highlighting' do
-      expect(solr_parameters.to_s).to include('"hl"=>true')
-      expect(solr_parameters.to_s).to include('hl.fragsize')
-      expect(solr_parameters.to_s).to include("\"hl.fl\"=>\"#{blacklight_config.ocr_search_field}\"")
-    end
-
-  end
-
-
-end