krikri 0.14.0 → 0.15.0

data/spec/internal/solr_conf/solrconfig.xml

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+<!--
+ This is a stripped down config file used for a simple example...  
+ It is *not* a good example to work from. 
+-->
+<config>
+  <luceneMatchVersion>LUCENE_40</luceneMatchVersion>
+  <!--  The DirectoryFactory to use for indexes.
+        solr.StandardDirectoryFactory, the default, is filesystem based.
+        solr.RAMDirectoryFactory is memory based, not persistent, and doesn't work with replication. -->
+  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
+
+  <lib dir="../lib/contrib/analysis-extras/lib" />
+  <lib dir="../lib/contrib/analysis-extras/lucene-libs" />
+
+  <dataDir>${solr.blacklight-core.data.dir:}</dataDir>
+  
+  <requestHandler name="/replication" class="solr.ReplicationHandler" startup="lazy" /> 
+
+  <requestDispatcher handleSelect="true" >
+    <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" />
+  </requestDispatcher>
+  
+  <requestHandler name="standard" class="solr.StandardRequestHandler" />
+  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
+  <requestHandler name="/update" class="solr.UpdateRequestHandler"  />
+  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
+     
+  <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
+    <lst name="invariants">
+      <str name="q">solrpingquery</str>
+    </lst>
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+    </lst>
+  </requestHandler>
+   
+  <!-- config for the admin interface --> 
+  <admin>
+    <defaultQuery>solr</defaultQuery>
+  </admin>
+
+  <!-- SearchHandler
+
+       http://wiki.apache.org/solr/SearchHandler
+
+       For processing Search Queries, the primary Request Handler
+       provided with Solr is "SearchHandler" It delegates to a sequent
+       of SearchComponents (see below) and supports distributed
+       queries across multiple shards
+    -->
+  <requestHandler name="search" class="solr.SearchHandler" default="true">
+    <!-- default values for query parameters can be specified, these
+         will be overridden by parameters in the request
+      -->
+     <lst name="defaults">
+       <str name="defType">dismax</str>
+       <str name="echoParams">explicit</str>
+       <int name="rows">10</int>
+
+       <str name="q.alt">*:*</str>
+       <str name="mm">2&lt;-1 5&lt;-2 6&lt;90%</str>
+
+       <!-- TODO: Configure qf and pf for better search results -->
+
+       <!-- this qf and pf are used by default, if not otherwise specified by
+            client. The default blacklight_config will use these for the
+            "keywords" search. See the author_qf/author_pf, title_qf, etc 
+            below, which the default blacklight_config will specify for
+            those searches. You may also be interested in:
+            http://wiki.apache.org/solr/LocalParams
+       -->
+
+       <str name="qf">
+         dataProvider_providedLabel
+         sourceResource_collection_title
+         sourceResource_creator_providedLabel
+         sourceResource_date_providedLabel
+         sourceResource_description
+         sourceResource_format
+         sourceResource_rights
+         sourceResource_spatial_providedLabel
+         sourceResource_subject_providedLabel
+         sourceResource_title
+         sourceResource_type_name
+         text
+       </str>
+
+       <str name="pf">
+         dataProvider_providedLabel
+         sourceResource_collection_title
+         sourceResource_creator_providedLabel
+         sourceResource_date_providedLabel
+         sourceResource_description
+         sourceResource_format
+         sourceResource_rights
+         sourceResource_spatial_providedLabel
+         sourceResource_subject_providedLabel
+         sourceResource_title
+         sourceResource_type_name
+         text
+       </str>
+       
+       <int name="ps">3</int>
+       <float name="tie">0.01</float>
+
+       <str name="fl">
+         id,
+         dataProvider_providedLabel,
+         preview_id,
+         sourceResource_collection_title,
+         sourceResource_creator_providedLabel,
+         sourceResource_date_providedLabel,
+         sourceResource_description,
+         sourceResource_format,
+         sourceResource_rights,
+         sourceResource_spatial_providedLabel,
+         sourceResource_subject_providedLabel,
+         sourceResource_title,
+         sourceResource_type_name
+       </str>
+
+       <str name="facet">true</str>
+       <str name="facet.mincount">1</str>
+       <str name="facet.limit">10</str>
+       <str name="facet.field">dataProvider_providedLabel</str>
+
+     </lst>
+      
+  </requestHandler>
+
+  <!-- for requests to get a single document; use id=666 instead of q=id:666 -->
+  <requestHandler name="document" class="solr.SearchHandler" >
+    <lst name="defaults">
+      <str name="echoParams">all</str>
+      <str name="fl">*</str>
+      <str name="rows">1</str>
+      <str name="q">{!raw f=id v=$id}</str> <!-- use id=666 instead of q=id:666 -->
+    </lst>
+  </requestHandler>
+
+</config>
+

data/spec/internal/test/factories/users.rb

@@ -0,0 +1,6 @@
+# Read about factories at https://github.com/thoughtbot/factory_girl
+
+FactoryGirl.define do
+  factory :user do
+  end
+end

data/spec/internal/test/models/user_test.rb

@@ -0,0 +1,7 @@
+require 'test_helper'
+
+class UserTest < ActiveSupport::TestCase
+  # test "the truth" do
+  #   assert true
+  # end
+end

data/spec/internal/test/test_helper.rb

@@ -0,0 +1,10 @@
+ENV['RAILS_ENV'] ||= 'test'
+require File.expand_path('../../config/environment', __FILE__)
+require 'rails/test_help'
+
+class ActiveSupport::TestCase
+  # Setup all fixtures in test/fixtures/*.yml for all tests in alphabetical order.
+  fixtures :all
+
+  # Add more helper methods to be used by all tests here...
+end

data/spec/lib/krikri/mapper_spec.rb

@@ -25,6 +25,12 @@ describe Krikri::Mapper do
             providedLabel ident
           end
 
+          relation :class => DPLA::MAP::Agent,
+                   :each => record.field_names,
+                   :as => :rel do
+            providedLabel rel
+          end
+
           spatial :class => DPLA::MAP::Place,
                   :each => %w('nyc bos pdx'),
                   :as => :place do
@@ -62,6 +68,9 @@ describe Krikri::Mapper do
               .contributor.map(&:providedLabel).flatten)
         .to eq record.root['dc:creator'].to_a.map(&:value)
 
+      expect(mapped.sourceResource.first.relation.map(&:providedLabel).flatten)
+        .to contain_exactly(*record.root.children.uniq)
+
       expect(mapped.sourceResource.first.spatial.map(&:providedLabel).flatten)
         .to eq %w('nyc bos pdx')
 

data/spec/lib/krikri/parser_value_array_spec.rb

@@ -254,6 +254,22 @@ describe Krikri::Parser::ValueArray do
     end
   end
 
+  describe '#field_names' do
+    include_context 'with fields'
+
+    let(:child_nodes) { ['first:child', 'second:child']}
+    
+    before do
+      values.each do |val| 
+        allow(val).to receive(:children).and_return(child_nodes)
+      end
+    end
+    
+    it 'contains immediate child node field names' do
+      expect(subject.field_names).to contain_exactly(*child_nodes)
+    end
+  end
+
   describe '#first_value' do
     it 'returns a single item ValueArray without an arguments' do
       expect(subject.first_value).to contain_exactly values[0]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: krikri
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Audrey Altman
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2016-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -611,6 +611,72 @@ files:
 - spec/factories/krikri_users.rb
 - spec/helpers/krikri/application_helper_spec.rb
 - spec/helpers/krikri/records_helper_spec.rb
+- spec/internal/Gemfile
+- spec/internal/Gemfile.lock
+- spec/internal/README.rdoc
+- spec/internal/Rakefile
+- spec/internal/app/assets/javascripts/application.js
+- spec/internal/app/assets/javascripts/blacklight_gallery.js
+- spec/internal/app/assets/javascripts/openseadragon.js
+- spec/internal/app/assets/stylesheets/application.css
+- spec/internal/app/assets/stylesheets/blacklight.css.scss
+- spec/internal/app/assets/stylesheets/blacklight_gallery.css.scss
+- spec/internal/app/assets/stylesheets/openseadragon.css
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/catalog_controller.rb
+- spec/internal/app/helpers/application_helper.rb
+- spec/internal/app/models/solr_document.rb
+- spec/internal/app/models/user.rb
+- spec/internal/app/views/layouts/application.html.erb
+- spec/internal/bin/bundle
+- spec/internal/bin/rails
+- spec/internal/bin/rake
+- spec/internal/config.ru
+- spec/internal/config/application.rb
+- spec/internal/config/boot.rb
+- spec/internal/config/database.yml
+- spec/internal/config/environment.rb
+- spec/internal/config/environments/development.rb
+- spec/internal/config/environments/production.rb
+- spec/internal/config/environments/test.rb
+- spec/internal/config/initializers/assets.rb
+- spec/internal/config/initializers/backtrace_silencers.rb
+- spec/internal/config/initializers/blacklight_initializer.rb
+- spec/internal/config/initializers/cookies_serializer.rb
+- spec/internal/config/initializers/devise.rb
+- spec/internal/config/initializers/filter_parameter_logging.rb
+- spec/internal/config/initializers/inflections.rb
+- spec/internal/config/initializers/mime_types.rb
+- spec/internal/config/initializers/session_store.rb
+- spec/internal/config/initializers/wrap_parameters.rb
+- spec/internal/config/jetty.yml
+- spec/internal/config/locales/blacklight.en.yml
+- spec/internal/config/locales/devise.en.yml
+- spec/internal/config/locales/en.yml
+- spec/internal/config/routes.rb
+- spec/internal/config/secrets.yml
+- spec/internal/config/solr.yml
+- spec/internal/db/development.sqlite3
+- spec/internal/db/migrate/20160909235528_devise_create_users.rb
+- spec/internal/db/migrate/20160909235614_create_searches.blacklight.rb
+- spec/internal/db/migrate/20160909235615_create_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20160909235616_add_polymorphic_type_to_bookmarks.blacklight.rb
+- spec/internal/db/schema.rb
+- spec/internal/db/seeds.rb
+- spec/internal/db/test.sqlite3
+- spec/internal/lib/generators/test_app_generator.rb
+- spec/internal/log/development.log
+- spec/internal/log/test.log
+- spec/internal/public/404.html
+- spec/internal/public/422.html
+- spec/internal/public/500.html
+- spec/internal/public/favicon.ico
+- spec/internal/public/robots.txt
+- spec/internal/solr_conf/schema.xml
+- spec/internal/solr_conf/solrconfig.xml
+- spec/internal/test/factories/users.rb
+- spec/internal/test/models/user_test.rb
+- spec/internal/test/test_helper.rb
 - spec/krikri_spec.rb
 - spec/ldp/resource_spec.rb
 - spec/lib/krikri/aggregation_entity_behavior_spec.rb
@@ -758,6 +824,72 @@ test_files:
 - spec/factories/krikri_users.rb
 - spec/helpers/krikri/application_helper_spec.rb
 - spec/helpers/krikri/records_helper_spec.rb
+- spec/internal/app/assets/javascripts/application.js
+- spec/internal/app/assets/javascripts/blacklight_gallery.js
+- spec/internal/app/assets/javascripts/openseadragon.js
+- spec/internal/app/assets/stylesheets/application.css
+- spec/internal/app/assets/stylesheets/blacklight.css.scss
+- spec/internal/app/assets/stylesheets/blacklight_gallery.css.scss
+- spec/internal/app/assets/stylesheets/openseadragon.css
+- spec/internal/app/controllers/application_controller.rb
+- spec/internal/app/controllers/catalog_controller.rb
+- spec/internal/app/helpers/application_helper.rb
+- spec/internal/app/models/solr_document.rb
+- spec/internal/app/models/user.rb
+- spec/internal/app/views/layouts/application.html.erb
+- spec/internal/bin/bundle
+- spec/internal/bin/rails
+- spec/internal/bin/rake
+- spec/internal/config/application.rb
+- spec/internal/config/boot.rb
+- spec/internal/config/database.yml
+- spec/internal/config/environment.rb
+- spec/internal/config/environments/development.rb
+- spec/internal/config/environments/production.rb
+- spec/internal/config/environments/test.rb
+- spec/internal/config/initializers/assets.rb
+- spec/internal/config/initializers/backtrace_silencers.rb
+- spec/internal/config/initializers/blacklight_initializer.rb
+- spec/internal/config/initializers/cookies_serializer.rb
+- spec/internal/config/initializers/devise.rb
+- spec/internal/config/initializers/filter_parameter_logging.rb
+- spec/internal/config/initializers/inflections.rb
+- spec/internal/config/initializers/mime_types.rb
+- spec/internal/config/initializers/session_store.rb
+- spec/internal/config/initializers/wrap_parameters.rb
+- spec/internal/config/jetty.yml
+- spec/internal/config/locales/blacklight.en.yml
+- spec/internal/config/locales/devise.en.yml
+- spec/internal/config/locales/en.yml
+- spec/internal/config/routes.rb
+- spec/internal/config/secrets.yml
+- spec/internal/config/solr.yml
+- spec/internal/config.ru
+- spec/internal/db/development.sqlite3
+- spec/internal/db/migrate/20160909235528_devise_create_users.rb
+- spec/internal/db/migrate/20160909235614_create_searches.blacklight.rb
+- spec/internal/db/migrate/20160909235615_create_bookmarks.blacklight.rb
+- spec/internal/db/migrate/20160909235616_add_polymorphic_type_to_bookmarks.blacklight.rb
+- spec/internal/db/schema.rb
+- spec/internal/db/seeds.rb
+- spec/internal/db/test.sqlite3
+- spec/internal/Gemfile
+- spec/internal/Gemfile.lock
+- spec/internal/lib/generators/test_app_generator.rb
+- spec/internal/log/development.log
+- spec/internal/log/test.log
+- spec/internal/public/404.html
+- spec/internal/public/422.html
+- spec/internal/public/500.html
+- spec/internal/public/favicon.ico
+- spec/internal/public/robots.txt
+- spec/internal/Rakefile
+- spec/internal/README.rdoc
+- spec/internal/solr_conf/schema.xml
+- spec/internal/solr_conf/solrconfig.xml
+- spec/internal/test/factories/users.rb
+- spec/internal/test/models/user_test.rb
+- spec/internal/test/test_helper.rb
 - spec/krikri_spec.rb
 - spec/ldp/resource_spec.rb
 - spec/lib/krikri/aggregation_entity_behavior_spec.rb
@@ -862,4 +994,3 @@ test_files:
 - spec/views/krikri/records/index.html.erb_spec.rb
 - spec/views/krikri/records/show.html.erb_spec.rb
 - spec/views/krikri/reports/index.html.erb_spec.rb
-has_rdoc: