uri_service 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 879564760db61c0716903bb264594cd5b2f9b253
-  data.tar.gz: e95ef3eb7ea32906187d43b0083dd59feca40ce9
+  metadata.gz: c4c7759f26cc8fd2713935214a4684ad39a7b774
+  data.tar.gz: 2a27ee4c723ae12aa3f04127898be45549dd660d
 SHA512:
-  metadata.gz: fde72bf25007a73820a50e055a928d94bff6d39841b7103b05b5abbfd5f596fdac9ecff6262145bf491ae21e970f99d14035d47cebc730f55cb79498a44ee47a
-  data.tar.gz: b88c039ab7d45323d2ac0b3cf79b5c49b9a48e6995d5aabcc29f0e17a361e002fa3467de65b6ead4104a103fb729d93ebb66eb6036ad6dfda9855a08fcf92a4b
+  metadata.gz: ec8f4754d28a70a71ac4d95ecff720cd68c4852c310013d2c41a067ac53111d1654391b87f6e5671a29c6c956768a5bfc537a8dbdeef07797c9242eec6c0014e
+  data.tar.gz: aa0b8c9fd0710acac275ae1734da2b43cdde92d41bd3fbe8e75b6ba59b0027aecf186f3fdfca7cf1200bbd2c3497fad4466d78496dbb5ba4cd10d3a5b862b4e7

data/lib/tasks/uri_service/ci.rake

@@ -22,8 +22,8 @@ namespace :uri_service do
   
   desc "CI build"
   task :ci do
-    #Rake::Task["uri_service:ci_with_solr_5_wrapper"].invoke
-    Rake::Task["uri_service:ci_with_jetty_wrapper"].invoke
+    Rake::Task["uri_service:ci_with_solr_6_wrapper"].invoke
+    #Rake::Task["uri_service:ci_with_jetty_wrapper"].invoke
   end
   
   desc "Preparation steps for the CI run"
@@ -34,11 +34,12 @@ namespace :uri_service do
     FileUtils.mkdir_p(File.dirname(uri_service_config['database']['database']))
     client = UriService::Client.new(uri_service_config)
     client.create_required_tables
+    FileUtils.mkdir_p('tmp')
   end
   
-  desc "CI build (using SolrWrapper and Solr 5)"
-  task :ci_with_solr_5_wrapper do
-    solr_version = '5.2.1'
+  desc "CI build (using SolrWrapper and Solr 6)"
+  task ci_with_solr_6_wrapper: :ci_prepare do
+    solr_version = '6.3.0'
     instance_dir = File.join('tmp', "solr-#{solr_version}")
     FileUtils.rm_rf(instance_dir)
     
@@ -47,14 +48,14 @@ namespace :uri_service do
       port: 9983,
       version: solr_version,
       verbose: false,
+      mirror_url: 'http://lib-solr-mirror.princeton.edu/dist/',
       managed: true,
       download_path: File.join('tmp', "solr-#{solr_version}.zip"),
-      instance_dir: File.join('tmp', "solr-#{solr_version}"),
+      instance_dir: instance_dir,
     }) do |solr_wrapper_instance|
       
       # Create collection
-      solr_wrapper_instance.with_collection(name: 'uri_service_test', dir: File.join('spec/fixtures', 'uri_service_test_cores/uri_service_test-solr5-conf')) do |collection_name|
-        Rake::Task["uri_service:ci_prepare"].invoke
+      solr_wrapper_instance.with_collection(name: 'uri_service_test', dir: File.join('spec/fixtures', 'uri_service_test_cores/uri_service_test-solr6-conf')) do |collection_name|
         Rake::Task["uri_service:rspec"].invoke
       end
       
@@ -63,7 +64,7 @@ namespace :uri_service do
   end
   
   desc "CI build (using JettyWrapper)"
-  task :ci_with_jetty_wrapper do
+  task ci_with_jetty_wrapper: :ci_prepare do
     
     Jettywrapper.url = "https://github.com/cul/hydra-jetty/archive/solr-only.zip"
     Jettywrapper.jetty_dir = File.join('tmp', 'jetty-test')
@@ -90,7 +91,6 @@ namespace :uri_service do
       java_opts: ["-XX:MaxPermSize=128m", "-Xmx256m"]
     })
     error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task["uri_service:ci_prepare"].invoke
       Rake::Task["uri_service:rspec"].invoke
     end
     raise "test failures: #{error}" if error

data/lib/uri_service/client.rb

@@ -391,6 +391,7 @@ class UriService::Client
       
       solr_params = {
         :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
+        :q => '*:*',
         :rows => limit,
         :start => start,
         :sort => 'value_ssort asc, uri asc' # Include 'uri asc' as part of sort to ensure consistent sorting

data/lib/uri_service/version.rb

@@ -1,6 +1,6 @@
 module UriService
   
-  VERSION = '0.5.3'
+  VERSION = '0.5.4'
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_service
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Eric O'Hanlon
@@ -201,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: A service for registering local URIs and performing both local and remote