exhibits_solr_conf 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5cee09d58c05b918d68c80415268e4fdfac81e8
-  data.tar.gz: 1dfc24584788bcc00d6895ee97811e44300089ed
+  metadata.gz: 30dcb7832f59e8639f6252d753a151b714246f19
+  data.tar.gz: aa9d295624c868d5300151954671eabca60cca64
 SHA512:
-  metadata.gz: 2a74deca0682c0f8107d1407d2583cb3465912c714499b661a1a48e3603195e46c5ce70aeffd894599b7e689fd159e1df6cae301e6311669df336f31a2f1be08
-  data.tar.gz: ae6f6320d76570cd44b8f80dd7d0d861e8832bbcfd78680e2840995c0e1be7e0e924f413ac4022d90ce4f1e9c44084dfe5a61875a5ec64e0e248907dc52d91bf
+  metadata.gz: 77b57163e146c5cea170a841d0882e249de52bc5d74c33de0a0d327c80305c7c4dc31f4831d254c24a18e58d807a1ae28bbc0d5ad25449567ba3f4c18f88068d
+  data.tar.gz: 8b04363acf580dfad3abb498c66a71502ae523a062d1a83b739a246a262205fdb597385b3c8bb1cec11f6d1b308c3174b0aca0c96e7f86c301a4baeeb1a8511a

data/.rubocop.yml

@@ -6,3 +6,6 @@ inherit_from: .rubocop_todo.yml
 Style/StringLiterals:
   Enabled: true
   EnforcedStyle: single_quotes
+
+RSpec/ExampleLength:
+  Max: 15

data/.travis.yml

@@ -2,10 +2,12 @@ notifications:
   email: false
 
 rvm:
-  - 2.2.3
+  - 2.3.1
 
 sudo: false
 language: ruby
 
 script:
   - bundle exec rake
+
+jdk: oraclejdk8

data/Rakefile

@@ -11,7 +11,16 @@ task ci: [:spec, :rubocop]
 
 task default: :ci
 
-# the next 3 lines are useful for manual testing of THIS gem
-require 'jettywrapper'
-ZIP_URL = 'https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip'
-require 'exhibits_solr_conf'
+desc 'Run solr with the configuration loaded'
+task :server do
+  require 'solr_wrapper'
+  require 'exhibits_solr_conf'
+
+  SolrWrapper.wrap(port: '8983') do |solr|
+    solr.with_collection(name: 'blacklight-core', dir: ExhibitsSolrConf.path) do
+      loop do
+        sleep 1
+      end
+    end
+  end
+end

data/exhibits_solr_conf.gemspec

@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'jettywrapper'
-  spec.add_development_dependency 'hurley' # for http requests to Solr
+  spec.add_development_dependency 'solr_wrapper'
+  spec.add_development_dependency 'faraday' # for http requests to Solr
   spec.add_development_dependency 'rubocop'
   spec.add_development_dependency 'rubocop-rspec'
 end

data/lib/exhibits_solr_conf.rb

@@ -1,6 +1,7 @@
 require 'exhibits_solr_conf/version'
 
 module ExhibitsSolrConf
-  rake_file_path = File.join(File.dirname(__FILE__), 'exhibits_solr_conf/tasks/*.rake')
-  Dir[File.expand_path(rake_file_path)].each { |ext| load ext } if defined?(Rake)
+  def self.path
+    File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr_conf_4_testing'))
+  end
 end

data/lib/exhibits_solr_conf/version.rb

@@ -1,3 +1,3 @@
 module ExhibitsSolrConf
-  VERSION = '0.0.7'
+  VERSION = '0.1.0'.freeze
 end

data/solr_conf_4_testing/schema.xml

@@ -529,7 +529,7 @@
       http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
     -->
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
-      geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+      geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
 
   </types>
 

data/solr_conf_4_testing/solrconfig.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <config>
   <!-- NOTE:  these 2 lib dirs are here for testing only and do NOT go in the prod file -->
-  <lib dir="${solr.install.dir:..}/lib/contrib/analysis-extras/lib" />
-  <lib dir="${solr.install.dir:..}/lib/contrib/analysis-extras/lucene-libs" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
+  <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
 
   <!-- NOTE: various comments and unused configuration possibilities have been purged
      from this file.  Please refer to http://wiki.apache.org/solr/SolrConfigXml,
@@ -10,7 +10,7 @@
 
   <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
 
-  <luceneMatchVersion>LUCENE_4_10_4</luceneMatchVersion>
+  <luceneMatchVersion>6.1.0</luceneMatchVersion>
 
   <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
 
@@ -860,31 +860,5 @@
     <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
   </requestDispatcher>
 
-  <!-- realtime get handler, guaranteed to return the latest stored fields
-    of any document, without the need to commit or open a new searcher. The current
-    implementation relies on the updateLog feature being enabled. -->
-  <requestHandler name="/get" class="solr.RealTimeGetHandler">
-    <lst name="defaults">
-      <str name="omitHeader">true</str>
-    </lst>
-  </requestHandler>
-
   <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>search</defaultQuery>
-  </admin>
-
 </config>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exhibits_solr_conf
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Naomi Dushay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hurley
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -130,9 +130,7 @@ files:
 - bin/setup
 - exhibits_solr_conf.gemspec
 - lib/exhibits_solr_conf.rb
-- lib/exhibits_solr_conf/tasks/configure_solr.rake
 - lib/exhibits_solr_conf/version.rb
-- solr_conf_4_testing/_rest_managed.json
 - solr_conf_4_testing/schema.xml
 - solr_conf_4_testing/solrconfig.xml
 - solr_conf_4_testing/stopwords_punctuation.txt
@@ -160,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Solr config files for testing sul-dlss exhibit and spotlight git repos.
 test_files: []
-has_rdoc: 

data/lib/exhibits_solr_conf/tasks/configure_solr.rake

@@ -1,12 +0,0 @@
-DEFAULT_SOLR_CONF_DIR = 'jetty/solr/blacklight-core/conf/'
-
-namespace :exhibits do
-  desc 'Copies exhibits Solr config files to Solr in testing server'
-  task :configure_solr, :solr_conf_dir do |_task, args|
-    args.with_defaults solr_conf_dir: DEFAULT_SOLR_CONF_DIR
-    solr_conf_dir_path = File.expand_path(File.join(File.dirname(__FILE__), '/../../../solr_conf_4_testing'))
-    Dir["#{solr_conf_dir_path}/*"].each do |fname|
-      cp(fname, args.solr_conf_dir, verbose: true)
-    end
-  end
-end

data/solr_conf_4_testing/_rest_managed.json

@@ -1,3 +0,0 @@
-{
-  "initArgs":{},
-  "managedList":[]}