exhibits_solr_conf 0.0.7 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: d5cee09d58c05b918d68c80415268e4fdfac81e8
4
- data.tar.gz: 1dfc24584788bcc00d6895ee97811e44300089ed
3
+ metadata.gz: 30dcb7832f59e8639f6252d753a151b714246f19
4
+ data.tar.gz: aa9d295624c868d5300151954671eabca60cca64
5
5
  SHA512:
6
- metadata.gz: 2a74deca0682c0f8107d1407d2583cb3465912c714499b661a1a48e3603195e46c5ce70aeffd894599b7e689fd159e1df6cae301e6311669df336f31a2f1be08
7
- data.tar.gz: ae6f6320d76570cd44b8f80dd7d0d861e8832bbcfd78680e2840995c0e1be7e0e924f413ac4022d90ce4f1e9c44084dfe5a61875a5ec64e0e248907dc52d91bf
6
+ metadata.gz: 77b57163e146c5cea170a841d0882e249de52bc5d74c33de0a0d327c80305c7c4dc31f4831d254c24a18e58d807a1ae28bbc0d5ad25449567ba3f4c18f88068d
7
+ data.tar.gz: 8b04363acf580dfad3abb498c66a71502ae523a062d1a83b739a246a262205fdb597385b3c8bb1cec11f6d1b308c3174b0aca0c96e7f86c301a4baeeb1a8511a
data/.rubocop.yml CHANGED
@@ -6,3 +6,6 @@ inherit_from: .rubocop_todo.yml
6
6
  Style/StringLiterals:
7
7
  Enabled: true
8
8
  EnforcedStyle: single_quotes
9
+
10
+ RSpec/ExampleLength:
11
+ Max: 15
data/.travis.yml CHANGED
@@ -2,10 +2,12 @@ notifications:
2
2
  email: false
3
3
 
4
4
  rvm:
5
- - 2.2.3
5
+ - 2.3.1
6
6
 
7
7
  sudo: false
8
8
  language: ruby
9
9
 
10
10
  script:
11
11
  - bundle exec rake
12
+
13
+ jdk: oraclejdk8
data/Rakefile CHANGED
@@ -11,7 +11,16 @@ task ci: [:spec, :rubocop]
11
11
 
12
12
  task default: :ci
13
13
 
14
- # the next 3 lines are useful for manual testing of THIS gem
15
- require 'jettywrapper'
16
- ZIP_URL = 'https://github.com/projectblacklight/blacklight-jetty/archive/v4.10.4.zip'
17
- require 'exhibits_solr_conf'
14
+ desc 'Run solr with the configuration loaded'
15
+ task :server do
16
+ require 'solr_wrapper'
17
+ require 'exhibits_solr_conf'
18
+
19
+ SolrWrapper.wrap(port: '8983') do |solr|
20
+ solr.with_collection(name: 'blacklight-core', dir: ExhibitsSolrConf.path) do
21
+ loop do
22
+ sleep 1
23
+ end
24
+ end
25
+ end
26
+ end
@@ -22,8 +22,8 @@ Gem::Specification.new do |spec|
22
22
  spec.add_development_dependency 'bundler', '~> 1.10'
23
23
  spec.add_development_dependency 'rake', '~> 10.0'
24
24
  spec.add_development_dependency 'rspec'
25
- spec.add_development_dependency 'jettywrapper'
26
- spec.add_development_dependency 'hurley' # for http requests to Solr
25
+ spec.add_development_dependency 'solr_wrapper'
26
+ spec.add_development_dependency 'faraday' # for http requests to Solr
27
27
  spec.add_development_dependency 'rubocop'
28
28
  spec.add_development_dependency 'rubocop-rspec'
29
29
  end
@@ -1,6 +1,7 @@
1
1
  require 'exhibits_solr_conf/version'
2
2
 
3
3
  module ExhibitsSolrConf
4
- rake_file_path = File.join(File.dirname(__FILE__), 'exhibits_solr_conf/tasks/*.rake')
5
- Dir[File.expand_path(rake_file_path)].each { |ext| load ext } if defined?(Rake)
4
+ def self.path
5
+ File.expand_path(File.join(File.dirname(__FILE__), '..', 'solr_conf_4_testing'))
6
+ end
6
7
  end
@@ -1,3 +1,3 @@
1
1
  module ExhibitsSolrConf
2
- VERSION = '0.0.7'
2
+ VERSION = '0.1.0'.freeze
3
3
  end
@@ -529,7 +529,7 @@
529
529
  http://wiki.apache.org/solr/SolrAdaptersForLuceneSpatial4
530
530
  -->
531
531
  <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
532
- geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
532
+ geo="true" distErrPct="0.025" maxDistErr="0.000009" distanceUnits="degrees" />
533
533
 
534
534
  </types>
535
535
 
@@ -1,8 +1,8 @@
1
1
  <?xml version="1.0" encoding="UTF-8" ?>
2
2
  <config>
3
3
  <!-- NOTE: these 2 lib dirs are here for testing only and do NOT go in the prod file -->
4
- <lib dir="${solr.install.dir:..}/lib/contrib/analysis-extras/lib" />
5
- <lib dir="${solr.install.dir:..}/lib/contrib/analysis-extras/lucene-libs" />
4
+ <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lib" />
5
+ <lib dir="${solr.install.dir:../../../..}/contrib/analysis-extras/lucene-libs" />
6
6
 
7
7
  <!-- NOTE: various comments and unused configuration possibilities have been purged
8
8
  from this file. Please refer to http://wiki.apache.org/solr/SolrConfigXml,
@@ -10,7 +10,7 @@
10
10
 
11
11
  <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError>
12
12
 
13
- <luceneMatchVersion>LUCENE_4_10_4</luceneMatchVersion>
13
+ <luceneMatchVersion>6.1.0</luceneMatchVersion>
14
14
 
15
15
  <directoryFactory name="DirectoryFactory" class="${solr.directoryFactory:solr.StandardDirectoryFactory}"/>
16
16
 
@@ -860,31 +860,5 @@
860
860
  <requestParsers enableRemoteStreaming="true" multipartUploadLimitInKB="2048" />
861
861
  </requestDispatcher>
862
862
 
863
- <!-- realtime get handler, guaranteed to return the latest stored fields
864
- of any document, without the need to commit or open a new searcher. The current
865
- implementation relies on the updateLog feature being enabled. -->
866
- <requestHandler name="/get" class="solr.RealTimeGetHandler">
867
- <lst name="defaults">
868
- <str name="omitHeader">true</str>
869
- </lst>
870
- </requestHandler>
871
-
872
863
  <requestHandler name="/analysis/field" startup="lazy" class="solr.FieldAnalysisRequestHandler" />
873
- <requestHandler name="/update" class="solr.UpdateRequestHandler" />
874
- <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" />
875
-
876
- <requestHandler name="/admin/ping" class="solr.PingRequestHandler">
877
- <lst name="invariants">
878
- <str name="q">solrpingquery</str>
879
- </lst>
880
- <lst name="defaults">
881
- <str name="echoParams">all</str>
882
- </lst>
883
- </requestHandler>
884
-
885
- <!-- config for the admin interface -->
886
- <admin>
887
- <defaultQuery>search</defaultQuery>
888
- </admin>
889
-
890
864
  </config>
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: exhibits_solr_conf
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.7
4
+ version: 0.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Naomi Dushay
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-01-13 00:00:00.000000000 Z
11
+ date: 2016-07-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -53,7 +53,7 @@ dependencies:
53
53
  - !ruby/object:Gem::Version
54
54
  version: '0'
55
55
  - !ruby/object:Gem::Dependency
56
- name: jettywrapper
56
+ name: solr_wrapper
57
57
  requirement: !ruby/object:Gem::Requirement
58
58
  requirements:
59
59
  - - ">="
@@ -67,7 +67,7 @@ dependencies:
67
67
  - !ruby/object:Gem::Version
68
68
  version: '0'
69
69
  - !ruby/object:Gem::Dependency
70
- name: hurley
70
+ name: faraday
71
71
  requirement: !ruby/object:Gem::Requirement
72
72
  requirements:
73
73
  - - ">="
@@ -130,9 +130,7 @@ files:
130
130
  - bin/setup
131
131
  - exhibits_solr_conf.gemspec
132
132
  - lib/exhibits_solr_conf.rb
133
- - lib/exhibits_solr_conf/tasks/configure_solr.rake
134
133
  - lib/exhibits_solr_conf/version.rb
135
- - solr_conf_4_testing/_rest_managed.json
136
134
  - solr_conf_4_testing/schema.xml
137
135
  - solr_conf_4_testing/solrconfig.xml
138
136
  - solr_conf_4_testing/stopwords_punctuation.txt
@@ -160,9 +158,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
160
158
  version: '0'
161
159
  requirements: []
162
160
  rubyforge_project:
163
- rubygems_version: 2.4.5.1
161
+ rubygems_version: 2.6.4
164
162
  signing_key:
165
163
  specification_version: 4
166
164
  summary: Solr config files for testing sul-dlss exhibit and spotlight git repos.
167
165
  test_files: []
168
- has_rdoc:
@@ -1,12 +0,0 @@
1
- DEFAULT_SOLR_CONF_DIR = 'jetty/solr/blacklight-core/conf/'
2
-
3
- namespace :exhibits do
4
- desc 'Copies exhibits Solr config files to Solr in testing server'
5
- task :configure_solr, :solr_conf_dir do |_task, args|
6
- args.with_defaults solr_conf_dir: DEFAULT_SOLR_CONF_DIR
7
- solr_conf_dir_path = File.expand_path(File.join(File.dirname(__FILE__), '/../../../solr_conf_4_testing'))
8
- Dir["#{solr_conf_dir_path}/*"].each do |fname|
9
- cp(fname, args.solr_conf_dir, verbose: true)
10
- end
11
- end
12
- end
@@ -1,3 +0,0 @@
1
- {
2
- "initArgs":{},
3
- "managedList":[]}