uri_service 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ca89e65074aae6d21cde5a483a23f27d5aede54b
-  data.tar.gz: 45631b9e4b9bc8807a81ca2b688fd865c4fb6a9b
+SHA256:
+  metadata.gz: 2a5e8309e33cf98f187e5f1dc39e5b0c52ea9098146cec6d417c7b4304b7cadc
+  data.tar.gz: d05d94ac0bbb449c1492a93fe4ad121dc8399a07843179899794ebdd8293b000
 SHA512:
-  metadata.gz: d6de839ed335e958d9bf98289333d6284ca5c4b16a179dfc7fe67a1e205723a3c8764869c89759451ed283ad6e540bb90f53b1bfa83d250faadb0bc2485d19f5
-  data.tar.gz: 9f75d78623f741c1fab3938d1eb821b224528e1feefea23ae04a763a5f5b7fc29edafabe6ced75aa484d9ba34275e33f9c7edf24428ea6c0f45cbeacfd5fda57
+  metadata.gz: 419b95b61f9acd1f729543b49ba530f8f1112a3b5d22aebb1a9ea1308e2fd64057dfbd5a674ab65b2d617d04fc7158ab4367c8dac7e626b66264ad09969f86b6
+  data.tar.gz: 6de069fd580769f921b9ca9780a201bc2410f3e7b0f908740b93b37c1935b4b205db662b29c11e8e3d8faf381bfa6d44821f0d6299f21996d06a3a95d54f195c

data/README.md

@@ -2,6 +2,8 @@
 
 A database-backed and Solr-cached lookup/creation service for URIs.  Works with or without Rails.
 
+Note: Version 0.6.x and later are meant for use with Solr 8.
+
 ### Major Concepts:
 
 **External Term (UriService::TermType::EXTERNAL)**
@@ -31,7 +33,7 @@ UriService::init({
   'local_uri_base' => 'http://id.example.com/term/',
   'temporary_uri_base' => 'com:example:id:temporary:',
   'solr' => {
-    'url' => 'http://localhost:8983/solr/uri_service_test',
+    'url' => 'http://localhost:8983/solr/uri_service',
     'pool_size' => 5,
     'pool_timeout' => 5000
   }
@@ -53,7 +55,7 @@ client = UriService::Client.new({
   'local_uri_base' => 'http://id.example.com/term/',
   'temporary_uri_base' => 'com:example:id:temporary:',
   'solr' => {
-    'url' => 'http://localhost:8983/solr/uri_service_test',
+    'url' => 'http://localhost:8983/solr/uri_service',
     'pool_size' => 5,
     'pool_timeout' => 5000
   }
@@ -83,7 +85,7 @@ development:
   local_uri_base: 'http://id.example.com/term/'
   temporary_uri_base: 'com:example:id:temporary:'
   solr:
-    url: 'http://localhost:8983/solr/uri_service_development'
+    url: 'http://localhost:8983/solr/uri_service'
     pool_size: 5
     pool_timeout: 5000
   database:
@@ -96,7 +98,7 @@ test:
   local_uri_base: 'http://id.example.com/term/'
   temporary_uri_base: 'com:example:id:temporary:'
   solr:
-    url: 'http://localhost:8983/solr/uri_service_test'
+    url: 'http://localhost:9983/solr/uri_service'
     pool_size: 5
     pool_timeout: 5000
   database:
@@ -109,7 +111,7 @@ production:
   local_uri_base: 'http://id.example.com/term/'
   temporary_uri_base: 'com:example:id:temporary:'
   solr:
-    url: 'http://localhost:9983/solr/uri_service_production'
+    url: 'http://localhost:8983/solr/uri_service_prod'
     pool_size: 5
     pool_timeout: 5000
   database:

data/lib/tasks/uri_service/ci.rake

@@ -19,13 +19,15 @@ namespace :uri_service do
     puts "[Warning] Exception creating rspec rake tasks.  This message can be ignored in environments that intentionally do not pull in the RSpec gem (i.e. production)."
     puts e
   end
-  
+
   desc "CI build"
   task :ci do
-    Rake::Task["uri_service:ci_with_solr_6_wrapper"].invoke
-    #Rake::Task["uri_service:ci_with_jetty_wrapper"].invoke
+    ENV['APP_ENV'] = 'test'
+    Rake::Task["uri_service:ci_prepare"].invoke
+    Rake::Task["uri_service:docker:setup_config_files"].invoke
+    Rake::Task["uri_service:ci_impl"].invoke
   end
-  
+
   desc "Preparation steps for the CI run"
   task :ci_prepare do
     # Delete existing test database
@@ -36,65 +38,36 @@ namespace :uri_service do
     client.create_required_tables
     FileUtils.mkdir_p('tmp')
   end
-  
-  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)
-    
-    puts "Unpacking and starting solr...\n"
-    SolrWrapper.wrap({
-      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: 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-solr6-conf')) do |collection_name|
+
+  desc 'CI build just running specs'
+  task :ci_impl do
+    docker_wrapper do
+      duration = Benchmark.realtime do
         Rake::Task["uri_service:rspec"].invoke
       end
-      
-      puts 'Stopping solr...'
+      puts "\nCI run finished in #{duration} seconds."
     end
   end
-  
-  desc "CI build (using JettyWrapper)"
-  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')
-  
-    unless File.exists?(Jettywrapper.jetty_dir)
-      puts "\n" + 'No test jetty found.  Will download / unzip a copy now.' + "\n"
+
+  def docker_wrapper(&block)
+    unless ENV['APP_ENV'] == 'test'
+      raise 'This task should only be run in the test environment (because it clears docker volumes)'
     end
-    
-    Rake::Task["jetty:clean"].invoke # Clear and recreate previous jetty directory
-    
-    # Copy solr core fixture to new solr instance
-    FileUtils.cp_r('spec/fixtures/uri_service_test_cores/uri_service_test', File.join(Jettywrapper.jetty_dir, 'solr'))
-    # Update solr.xml configuration file so that it recognizes this code
-    solr_xml_data = File.read(File.join(Jettywrapper.jetty_dir, 'solr/solr.xml'))
-    solr_xml_data.gsub!('</cores>', '  <core name="uri_service_test" instanceDir="uri_service_test" />' + "\n" + '  </cores>')
-    File.open(File.join(Jettywrapper.jetty_dir, 'solr/solr.xml'), 'w') { |file| file.write(solr_xml_data) }
-    
-    jetty_params = Jettywrapper.load_config.merge({
-      jetty_home: Jettywrapper.jetty_dir,
-      solr_home: 'solr',
-      startup_wait: 75,
-      jetty_port: 9983,
-      java_version: '>= 1.8',
-      java_opts: ["-XX:MaxPermSize=128m", "-Xmx256m"]
-    })
-    error = Jettywrapper.wrap(jetty_params) do
-      Rake::Task["uri_service:rspec"].invoke
+
+    # Stop docker if it's currently running (so we can delete any old volumes)
+    Rake::Task['uri_service:docker:stop'].invoke
+    # Rake tasks must be re-enabled if you want to call them again later during the same run
+    Rake::Task['uri_service:docker:stop'].reenable
+
+    ENV['app_env_confirmation'] = ENV['APP_ENV'] # setting this to skip prompt in volume deletion task
+    Rake::Task['uri_service:docker:delete_volumes'].invoke
+
+    Rake::Task['uri_service:docker:start'].invoke
+    begin
+      block.call
+    ensure
+      Rake::Task['uri_service:docker:stop'].invoke
     end
-    raise "test failures: #{error}" if error
-    
   end
 
-end
+end

data/lib/tasks/uri_service/docker.rake

@@ -0,0 +1,127 @@
+# frozen_string_literal: true
+require 'open3'
+require 'net/http'
+require 'rainbow'
+
+namespace :uri_service do
+  namespace :docker do
+    def docker_compose_file_path
+      UriService.root.join("docker/docker-compose.#{ENV['APP_ENV']}.yml")
+    end
+
+    def docker_compose_config
+      YAML.load_file(docker_compose_file_path)
+    end
+
+    def wait_for_solr_cores_to_load
+      expected_port = docker_compose_config['services']['solr']['ports'][0].split(':')[0]
+      url_to_check = "http://localhost:#{expected_port}/solr/uri_service/admin/system"
+      puts "Waiting for Solr to become available (at #{url_to_check})..."
+      Timeout.timeout(20, Timeout::Error, 'Timed out during Solr startup check.') do
+        loop do
+          begin
+            sleep 0.25
+            status_code = Net::HTTP.get_response(URI(url_to_check)).code
+            if status_code == '200' # Solr is ready to receive requests
+              puts 'Solr is available.'
+              break
+            end
+          rescue EOFError, Errno::ECONNRESET => e
+            # Try again in response to the above error types
+            next
+          end
+        end
+      end
+    end
+
+    def running?
+      status = `docker compose -f #{UriService.root.join(docker_compose_file_path)} ps`
+      status.split("n").count > 1
+    end
+
+    task :setup_config_files do
+      docker_compose_template_dir = UriService.root.join('docker/templates')
+      docker_compose_dest_dir = UriService.root.join('docker')
+      Dir.foreach(docker_compose_template_dir) do |entry|
+        next unless entry.end_with?('.yml')
+        src_path = File.join(docker_compose_template_dir, entry)
+        dst_path = File.join(docker_compose_dest_dir, entry.gsub('.template', ''))
+        if File.exist?(dst_path)
+          puts Rainbow("File already exists (skipping): #{dst_path}").blue.bright + "\n"
+        else
+          FileUtils.cp(src_path, dst_path)
+          puts Rainbow("Created file at: #{dst_path}").green
+        end
+      end
+    end
+
+    task :start do
+      puts "Starting...\n"
+      if running?
+        puts "\nAlready running."
+      else
+        # NOTE: This command rebuilds the container images before each run, to ensure they're
+        # always up to date. In most cases, the overhead is minimal if the Dockerfile for an image
+        # hasn't changed since the last build.
+        `docker compose -f #{docker_compose_file_path} up --build --detach --wait`
+        wait_for_solr_cores_to_load
+        puts "\nStarted."
+      end
+    end
+
+    task :stop do
+      puts "Stopping...\n"
+      if running?
+        puts "\n"
+        `docker compose -f #{UriService.root.join(docker_compose_file_path)} down`
+        puts "\nStopped"
+      else
+        puts "Already stopped."
+      end
+    end
+
+    task :restart do
+      Rake::Task['uri_service:docker:stop'].invoke
+      Rake::Task['uri_service:docker:start'].invoke
+    end
+
+    task :status do
+      puts running? ? 'Running.' : 'Not running.'
+    end
+
+    task :delete_volumes do
+      if running?
+        puts 'Error: The volumes are currently in use. Please stop the docker services before deleting the volumes.'
+        next
+      end
+
+      puts Rainbow("This will delete ALL Solr data for the selected app "\
+        "environment (#{ENV['APP_ENV']}) and cannot be undone. Please confirm that you want to continue "\
+        "by typing the name of the selected Rails environment (#{ENV['APP_ENV']}):").red.bright
+      print '> '
+      response = ENV['app_env_confirmation'] || $stdin.gets.chomp
+
+      puts ""
+
+      if response != ENV['APP_ENV']
+        puts "Aborting because \"#{ENV['APP_ENV']}\" was not entered."
+        next
+      end
+
+      config = docker_compose_config
+      volume_prefix = config['name']
+      full_volume_names = config['volumes'].keys.map { |short_name| "#{volume_prefix}_#{short_name}" }
+
+      full_volume_names.map do |full_volume_name|
+        if JSON.parse(Open3.capture3("docker volume inspect '#{full_volume_name}'")[0]).length.positive?
+          `docker volume rm '#{full_volume_name}'`
+          puts Rainbow("Deleted: #{full_volume_name}").green
+        else
+          puts Rainbow("Skipped: #{full_volume_name} (already deleted)").blue.bright
+        end
+      end
+
+      puts 'Done.'
+    end
+  end
+end

data/lib/uri_service/client.rb

@@ -1,31 +1,33 @@
 class UriService::Client
-  
+
   attr_reader :db, :rsolr_pool, :local_uri_base, :temporary_uri_base
-  
+
   ALPHANUMERIC_UNDERSCORE_KEY_REGEX = /\A[a-z]+[a-z0-9_]*\z/
   CORE_FIELD_NAMES = ['uri', 'vocabulary_string_key', 'value', 'authority', 'type', 'internal_id']
   VALID_TYPES = [UriService::TermType::EXTERNAL, UriService::TermType::LOCAL, UriService::TermType::TEMPORARY]
-  
+
   def initialize(opts)
     raise UriService::InvalidOptsError, "Must supply opts['local_uri_base'] to initialize method." if opts['local_uri_base'].nil?
     raise UriService::InvalidOptsError, "Must supply opts['temporary_uri_base'] to initialize method." if opts['temporary_uri_base'].nil?
     raise UriService::InvalidOptsError, "Must supply opts['database'] to initialize method." if opts['database'].nil?
     raise UriService::InvalidOptsError, "Must supply opts['solr'] to initialize method." if opts['solr'].nil?
-    
+
     # Set local_uri_base and temporary_uri_base
     @local_uri_base = opts['local_uri_base']
     @temporary_uri_base = opts['temporary_uri_base']
-    
+
     # Create DB connection pool
     @db = Sequel.connect(opts['database'])
-    
+
     # Create Solr connection pool
     @rsolr_pool = ConnectionPool.new( size: opts['solr']['pool_size'], timeout: (opts['solr']['pool_timeout'].to_f/1000.to_f) ) { RSolr.connect(:url => opts['solr']['url']) }
+
+    @auto_commit_after_term_creation = opts['solr'].fetch('auto_commit_after_term_creation', true).to_s == 'true'
   end
-  
+
   def reindex_all_terms(clear=false, print_progress_to_console=false)
     self.handle_database_disconnect do
-      
+
       if print_progress_to_console
         puts "Getting database term count..."
         total = @db[UriService::TERMS].count
@@ -33,13 +35,13 @@ class UriService::Client
         puts "Number of terms to index: #{total.to_s}"
         puts ""
       end
-      
+
       if clear
         @rsolr_pool.with do |rsolr|
           rsolr.delete_by_query('*:*');
         end
       end
-      
+
       # Need to use unambiguous order when using paged_each, so we choose to order by DB :id
       @db[UriService::TERMS].order(:id).paged_each(:rows_per_fetch=>100) do |term_db_row|
         self.send_term_to_solr(
@@ -51,26 +53,26 @@ class UriService::Client
           term_db_row[:type],
           term_db_row[:id],
         false)
-        
+
         if print_progress_to_console
           reindex_counter += 1
           print "\rIndexed #{reindex_counter.to_s} of #{total.to_s}"
         end
       end
-      
+
       puts "\n" + "Committing solr updates..." if print_progress_to_console
       self.do_solr_commit
       puts "Done." if print_progress_to_console
     end
   end
-  
+
   def disconnect!
     unless @db.nil?
       db_reference = @db
       @db = nil
       db_reference.disconnect
     end
-    
+
     unless @rsolr_pool.nil?
       rsolr_pool_reference = @rsolr_pool
       @rsolr_pool = nil
@@ -79,10 +81,10 @@ class UriService::Client
                                               # but this doesn't hurt.
     end
   end
-  
+
   def connected?
     return false if @db.nil? || @rsolr_pool.nil?
-    
+
     begin
       self.test_connection
       return true
@@ -90,23 +92,23 @@ class UriService::Client
       return false
     end
   end
-  
+
   def test_connection
     @db.test_connection # Raises Sequel::DatabaseConnectionError if connection didn't work
     @rsolr_pool.with do |rsolr|
-      rsolr.get('admin/ping') # Raises Errno::ECONNREFUSED if connection didn't work
+      rsolr.get('admin/system') # Raises Errno::ECONNREFUSED if connection didn't work
     end
   end
-  
+
   def required_tables_exist?
     return (UriService.required_tables - @db.tables).length == 0
   end
-  
+
   def create_required_tables
     self.handle_database_disconnect do
-    
+
       current_tables = @db.tables
-      
+
       unless current_tables.include?(UriService::VOCABULARIES)
         @db.create_table UriService::VOCABULARIES do |t|
           primary_key :id
@@ -117,7 +119,7 @@ class UriService::Client
       else
         puts 'Skipped creation of table ' + UriService::VOCABULARIES.to_s + ' because it already exists.'
       end
-      
+
       unless current_tables.include?(UriService::TERMS)
         @db.create_table UriService::TERMS do |t|
           primary_key :id
@@ -134,14 +136,14 @@ class UriService::Client
       else
         puts 'Skipped creation of table ' + UriService::TERMS.to_s + ' because it already exists.'
       end
-      
+
     end
   end
-  
+
   ##################
   # Create methods #
   ##################
-  
+
   def create_vocabulary(string_key, display_label)
     self.handle_database_disconnect do
       if string_key.to_s == 'all'
@@ -151,7 +153,7 @@ class UriService::Client
       unless string_key =~ ALPHANUMERIC_UNDERSCORE_KEY_REGEX
         raise UriService::InvalidVocabularyStringKeyError, "Invalid key (can only include lower case letters, numbers or underscores, but cannot start with an underscore): " + string_key
       end
-      
+
       @db.transaction do
         begin
           @db[UriService::VOCABULARIES].insert(string_key: string_key, display_label: display_label)
@@ -161,27 +163,27 @@ class UriService::Client
       end
     end
   end
-  
+
   # Creates a new term
   def create_term(type, opts)
     raise UriService::InvalidTermTypeError, 'Invalid type: ' + type unless VALID_TYPES.include?(type)
-    
+
     vocabulary_string_key = opts.delete(:vocabulary_string_key)
     value = opts.delete(:value)
     uri = opts.delete(:uri)
     authority = opts.has_key?(:authority) ? opts.delete(:authority) : ''
     authority = '' if authority.nil?
     additional_fields = opts.delete(:additional_fields) || {}
-    
+
     if type == UriService::TermType::EXTERNAL
       # URI is required
       raise UriService::InvalidOptsError, "A uri must be supplied for terms of type #{type}." if uri.nil?
-      
+
       return create_term_impl(type, vocabulary_string_key, value, uri, authority, additional_fields)
     else
       # URI should not be present
       raise UriService::InvalidOptsError, "A uri cannot supplied for term type: #{type}" unless uri.nil?
-      
+
       if type == UriService::TermType::TEMPORARY
         # No two TEMPORARY terms within the same vocabulary can have the same value, so we generate a unique URI from a hash of the (vocabulary_string_key + value) to ensure uniqueness.
         uri = self.generate_uri_for_temporary_term(vocabulary_string_key, value)
@@ -204,15 +206,15 @@ class UriService::Client
         # Probabilistically, the error below should never be raised.
         raise UriService::CouldNotGenerateUriError, "UriService generated a duplicate random UUID (via SecureRandom.uuid) too many times in a row.  Probabilistically, this should never happen."
       end
-      
+
     end
   end
-  
+
   def generate_uri_for_temporary_term(vocabulary_string_key, term_value)
     uri = URI(@temporary_uri_base + Digest::SHA256.hexdigest(vocabulary_string_key + term_value))
     return uri.to_s
   end
-  
+
   def generate_frozen_term_hash(vocabulary_string_key, value, uri, authority, additional_fields, type, internal_id)
     hash_to_return = {}
     hash_to_return['uri'] = uri
@@ -221,20 +223,20 @@ class UriService::Client
     hash_to_return['authority'] = authority unless authority == ''
     hash_to_return['vocabulary_string_key'] = vocabulary_string_key
     hash_to_return['internal_id'] = internal_id
-    
+
     additional_fields.each do |key, val|
       hash_to_return[key] = val
     end
-    
+
     # Delete nil values
     hash_to_return.delete_if { |k, v| v.nil? }
-    
+
     # Freeze hash
     hash_to_return.freeze # To make this a read-only hash
-    
+
     return hash_to_return
   end
-  
+
   def create_term_solr_doc(vocabulary_string_key, value, uri, authority, additional_fields, type, internal_id)
     doc = {}
     doc['uri'] = uri
@@ -243,21 +245,21 @@ class UriService::Client
     doc['vocabulary_string_key'] = vocabulary_string_key
     doc['authority'] = authority
     doc['internal_id'] = internal_id
-    
+
     doc['additional_fields'] = JSON.generate(additional_fields)
-    
+
     return doc
   end
-  
+
   # Index the DB row term data into solr
-  def send_term_to_solr(vocabulary_string_key, value, uri, authority, additional_fields, type, internal_id, commit=true)
+  def send_term_to_solr(vocabulary_string_key, value, uri, authority, additional_fields, type, internal_id, commit = @auto_commit_after_term_creation)
     doc = create_term_solr_doc(vocabulary_string_key, value, uri, authority, additional_fields, type, internal_id)
     @rsolr_pool.with do |rsolr|
       rsolr.add(doc)
       rsolr.commit if commit
     end
   end
-  
+
   # Validates additional_fields and verifies that no reserved words are supplied
   def validate_additional_field_keys(additional_fields)
     additional_fields.each do |key, value|
@@ -269,41 +271,41 @@ class UriService::Client
       end
     end
   end
-  
+
   ################
   # Find methods #
   ################
-  
+
   def find_vocabulary(vocabulary_string_key)
     self.handle_database_disconnect do
       @db[UriService::VOCABULARIES].where(string_key: vocabulary_string_key).first
     end
   end
-  
+
   # Finds the term with the given uri
   def find_term_by_uri(uri)
     results = self.find_terms_where({uri: uri}, 1)
     return results.length == 1 ? results.first : nil
   end
-  
+
   # Finds the term with the given uri
   def find_term_by_internal_id(id)
     results = self.find_terms_where({internal_id: id}, 1)
     return results.length == 1 ? results.first : nil
   end
-  
+
   # Finds terms that match the specified conditions
   def find_terms_where(opts, limit=10)
     fqs = []
-    
+
     # Only search on allowed fields
     unsupported_search_fields = opts.map{|key, val| key.to_s} - CORE_FIELD_NAMES
     raise UriService::UnsupportedSearchFieldError, "Unsupported search fields: #{unsupported_search_fields.join(', ')}" if unsupported_search_fields.present?
-    
+
     opts.each do |field_name, val|
       fqs << (field_name.to_s + ':"' + UriService.solr_escape(val.to_s) + '"')
     end
-    
+
     @rsolr_pool.with do |rsolr|
       response = rsolr.get('select', params: {
         :q => '*:*',
@@ -323,9 +325,9 @@ class UriService::Client
       end
     end
   end
-  
+
   def term_solr_doc_to_frozen_term_hash(term_solr_doc)
-    
+
     uri = term_solr_doc.delete('uri')
     vocabulary_string_key = term_solr_doc.delete('vocabulary_string_key')
     value = term_solr_doc.delete('value')
@@ -333,19 +335,19 @@ class UriService::Client
     type = term_solr_doc.delete('type')
     additional_fields = JSON.parse(term_solr_doc.delete('additional_fields'))
     internal_id = term_solr_doc.delete('internal_id')
-    
+
     return generate_frozen_term_hash(vocabulary_string_key, value, uri, authority, additional_fields, type, internal_id)
   end
-  
+
   def find_terms_by_query(vocabulary_string_key, value_query, limit=10, start=0)
-    
+
     if value_query.blank?
       return self.list_terms(vocabulary_string_key, limit, start)
     end
-    
+
     terms_to_return = []
     @rsolr_pool.with do |rsolr|
-      
+
       solr_params = {
         :q => UriService.solr_escape(value_query),
         :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
@@ -353,15 +355,15 @@ class UriService::Client
         :start => start,
         :sort => 'score desc, value_ssort asc, uri asc' # For consistent sorting
       }
-      
+
       if value_query.length < 3
         # For efficiency, we only do whole term matches for queries < 3 characters
         solr_params[:qf] = 'value_suggest'
         solr_params[:pf] = 'value_suggest'
       end
-        
+
       response = rsolr.get('suggest', params: solr_params)
-      
+
       if response['response']['numFound'] > 0
         response['response']['docs'].each do |doc|
           terms_to_return << term_solr_doc_to_frozen_term_hash(doc)
@@ -370,11 +372,11 @@ class UriService::Client
     end
     return terms_to_return
   end
-  
+
   ################
   # List methods #
   ################
-  
+
   # Lists vocabularies alphabetically (by string key) and supports paging through results.
   def list_vocabularies(limit=10, start=0)
     self.handle_database_disconnect do
@@ -382,13 +384,13 @@ class UriService::Client
       return db_rows.map{|row| row.except(:id).stringify_keys!}
     end
   end
-  
+
   # Lists terms alphabetically and supports paging through results.
   # Useful for browsing through a term list without a query.
   def list_terms(vocabulary_string_key, limit=10, start=0)
     terms_to_return = []
     @rsolr_pool.with do |rsolr|
-      
+
       solr_params = {
         :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
         :q => '*:*',
@@ -396,7 +398,7 @@ class UriService::Client
         :start => start,
         :sort => 'value_ssort asc, uri asc' # Include 'uri asc' as part of sort to ensure consistent sorting
       }
-      
+
       response = rsolr.get('select', params: solr_params)
       if response['response']['numFound'] > 0
         response['response']['docs'].each do |doc|
@@ -406,17 +408,17 @@ class UriService::Client
     end
     return terms_to_return
   end
-  
+
   ##################
   # Delete methods #
   ##################
-  
+
   def delete_vocabulary(vocabulary_string_key)
     self.handle_database_disconnect do
       @db[UriService::VOCABULARIES].where(string_key: vocabulary_string_key).delete
     end
   end
-  
+
   def delete_term(uri, commit=true)
     self.handle_database_disconnect do
       @db.transaction do
@@ -428,37 +430,37 @@ class UriService::Client
       end
     end
   end
-  
+
   ##################
   # Update methods #
   ##################
-  
+
   def update_vocabulary(string_key, new_display_label)
     self.handle_database_disconnect do
       dataset = @db[UriService::VOCABULARIES].where(string_key: string_key)
       raise UriService::NonExistentVocabularyError, "No vocabulary found with string_key: " + string_key if dataset.count == 0
-      
+
       @db.transaction do
         dataset.update(display_label: new_display_label)
       end
     end
   end
-  
+
   # opts format: {:value => 'new value', :authority => 'newauthority', :additional_fields => {'key' => 'value'}}
   def update_term(uri, opts, merge_additional_fields=true)
     self.handle_database_disconnect do
       term_db_row = @db[UriService::TERMS].first(uri: uri)
       raise UriService::NonExistentUriError, "No term found with uri: " + uri if term_db_row.nil?
-      
+
       new_value = opts[:value] || term_db_row[:value]
       new_authority = opts[:authority] || term_db_row[:authority]
       new_additional_fields = term_db_row[:additional_fields].nil? ? {} : JSON.parse(term_db_row[:additional_fields])
-      
+
       if term_db_row[:type] == UriService::TermType::TEMPORARY && new_value != term_db_row[:value]
         # TEMPORARY terms cannot have their values changed, but it is possible to update other fields
         raise UriService::CannotChangeTemporaryTermValue, "The value of a temporary term cannot be changed. Delete unusued temporary terms or create a new one with a different value."
       end
-      
+
       unless opts[:additional_fields].nil?
         if merge_additional_fields
           new_additional_fields.merge!(opts[:additional_fields])
@@ -468,16 +470,16 @@ class UriService::Client
         end
       end
       validate_additional_field_keys(new_additional_fields)
-      
+
       @db.transaction do
         @db[UriService::TERMS].where(uri: uri).update(value: new_value, value_hash: Digest::SHA256.hexdigest(new_value), authority: new_authority, additional_fields: JSON.generate(new_additional_fields))
         self.send_term_to_solr(term_db_row[:vocabulary_string_key], new_value, uri, new_authority, new_additional_fields, term_db_row[:type], term_db_row[:id])
       end
-      
+
       return generate_frozen_term_hash(term_db_row[:vocabulary_string_key], new_value, uri, new_authority, new_additional_fields, term_db_row[:type], term_db_row[:id])
     end
   end
-  
+
   def handle_database_disconnect
     tries ||= 3
     begin
@@ -487,26 +489,26 @@ class UriService::Client
       retry unless tries == 0
     end
   end
-  
+
   def do_solr_commit
     @rsolr_pool.with do |rsolr|
       rsolr.commit
     end
   end
-  
+
   def clear_solr_index
     @rsolr_pool.with do |rsolr|
       rsolr.delete_by_query('*:*');
       rsolr.commit
     end
   end
-  
+
   #########################
   # BEGIN PRIVATE METHODS #
   #########################
-  
+
   private
-  
+
   # Backing implementation for actual term creation in db/solr.
   # - Performs some data validations.
   # - Ensures uniqueness of URIs in database.
@@ -514,11 +516,11 @@ class UriService::Client
   #   create a new TEMPORARY term with an existing value/vocabulary combo,
   #   also adding non-existent supplied additional_fields to the existing temporary term.
   def create_term_impl(type, vocabulary_string_key, value, uri, authority, additional_fields)
-    
+
     raise UriService::InvalidTermTypeError, 'Invalid type: ' + type unless VALID_TYPES.include?(type)
-    
+
     self.handle_database_disconnect do
-      
+
       if type == UriService::TermType::TEMPORARY
         # If this is a TEMPORARY term, we need to ensure that the temporary
         # passed in URI is a hash of the vocabulary + value, just in case this
@@ -529,20 +531,20 @@ class UriService::Client
           raise UriService::InvalidTemporaryTermUriError, "The supplied URI was not derived from the supplied (vocabulary_string_key+value) pair."
         end
       end
-      
+
       unless uri =~ UriService::VALID_URI_REGEX
         raise UriService::InvalidUriError, "Invalid URI supplied during term creation: #{uri}"
       end
-      
+
       #Ensure that vocabulary with vocabulary_string_key exists
       if self.find_vocabulary(vocabulary_string_key).nil?
         raise UriService::NonExistentVocabularyError, "There is no vocabulary with string key: " + vocabulary_string_key.to_s
       end
-      
+
       # Stringify and validate keys for additional_fields
       additional_fields.stringify_keys!
       validate_additional_field_keys(additional_fields) # This method call raises an error if an invalid additional_field key is supplied
-      
+
       @db.transaction do
         value_hash = Digest::SHA256.hexdigest(value)
 
@@ -559,41 +561,41 @@ class UriService::Client
           )
           send_term_to_solr(vocabulary_string_key, value, uri, authority, additional_fields, type, db_id)
         rescue Sequel::UniqueConstraintViolation
-          
+
           # If the user is trying to create a new TEMPORARY term and we ran into a Sequel::UniqueConstraintViolation,
           # that means that the term already exists.  We will return that existing term, but also update the term with
           # any non-existent additional_fields supplied by the user and during this create operation, and a supplied
           # authority if the term did not already have an authority.
           if type == UriService::TermType::TEMPORARY
             temporary_term = self.find_term_by_uri(uri)
-            
+
             opts = {}
             non_existent_additional_fields = additional_fields.keys - temporary_term.keys
-            
+
             if non_existent_additional_fields.length > 0
               additional_fields_to_merge_in = additional_fields.select{|k, v| non_existent_additional_fields.include?(k)}
               opts[:additional_fields] = additional_fields_to_merge_in
             end
-            
+
             if temporary_term['authority'].nil? && authority.length > 0 && authority != temporary_term['authority']
               opts[:authority] = authority
             end
-            
+
             if opts.size > 0
               temporary_term = UriService.client.update_term(temporary_term['uri'], opts, true)
             end
-            
+
             return temporary_term
           end
-          
+
           raise UriService::ExistingUriError, "A term already exists with uri: " + uri + " (conflict found via uri_hash check)"
         end
-        
+
         return generate_frozen_term_hash(vocabulary_string_key, value, uri, authority, additional_fields, type, db_id)
       end
     end
   end
-  
+
 end
 
 class UriService::Error < StandardError;end
@@ -610,4 +612,4 @@ class UriService::ExistingVocabularyStringKeyError < UriService::Error;end
 class UriService::NonExistentUriError < UriService::Error;end
 class UriService::NonExistentVocabularyError < UriService::Error;end
 class UriService::UnsupportedObjectTypeError < UriService::Error;end
-class UriService::UnsupportedSearchFieldError < UriService::Error;end
+class UriService::UnsupportedSearchFieldError < UriService::Error;end

data/lib/uri_service/version.rb

@@ -1,9 +1,9 @@
 module UriService
-  
-  VERSION = '0.5.5'
-  
+
+  VERSION = '0.6.0'
+
   def self.version
     VERSION
   end
-  
-end
+
+end

data/lib/uri_service.rb

@@ -6,36 +6,35 @@ require 'uri'
 require 'yaml'
 
 module UriService
-  
   # Constants
   VOCABULARY = :vocabulary
   VOCABULARIES = :vocabularies
   TERM = :term
   TERMS = :terms
   VALID_URI_REGEX = /\A#{URI::regexp}\z/
-  
+
   # Initialize the main instance of UriService::Client
   # opts format: { 'local_uri_base' => 'http://id.example.com/term/', temporary_uri_base: 'temporary:', 'solr' => {...solr config...}, 'database' => {...database config...} }
   def self.init(opts)
     if @client && @client.connected?
       @client.disconnect!
     end
-    
+
     @client = UriService::Client.new(opts)
   end
 
   def self.client
     return @client
   end
-  
+
   def self.version
     return UriService::VERSION
   end
-  
+
   def self.required_tables
     return [UriService::VOCABULARIES, UriService::TERMS]
   end
-  
+
   # Wrapper around escape method for different versions of RSolr
   def self.solr_escape(str)
     if RSolr.respond_to?(:solr_escape)
@@ -44,11 +43,14 @@ module UriService
       return RSolr.escape(str) # Fall back to older method
     end
   end
-  
+
+  def self.root
+    Pathname.new(File.dirname(__dir__))
+  end
 end
 
 require "uri_service/version"
 require "uri_service/term_type"
 require "uri_service/client"
 
-require 'uri_service/railtie' if defined?(Rails)
+require 'uri_service/railtie' if defined?(Rails)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: uri_service
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Eric O'Hanlon
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rsolr
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -25,21 +25,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: connection_pool
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.26.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.26.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: connection_pool
+  name: rdf
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: rsolr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,89 +67,89 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdf
+  name: sequel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 4.26.0
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: jettywrapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '10.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: jettywrapper
+  name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.18
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.18
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: solr_wrapper
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.6'
 description: A service for registering local URIs and performing both local and remote
   URI lookups.
 email: elo2112@columbia.edu
@@ -175,6 +189,7 @@ files:
 - lib/tasks/uri_service.rake
 - lib/tasks/uri_service/ci.rake
 - lib/tasks/uri_service/db.rake
+- lib/tasks/uri_service/docker.rake
 - lib/tasks/uri_service/solr.rake
 - lib/uri_service.rb
 - lib/uri_service/client.rb
@@ -185,7 +200,7 @@ homepage: https://github.com/cul/uri_service
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -200,9 +215,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3.1
+signing_key:
 specification_version: 4
 summary: A service for registering local URIs and performing both local and remote
   URI lookups.