uri_service 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 26abbeab1aeb4f9af6f93bd2d12ae38544150881
-  data.tar.gz: ab29aac65bf065a1795e665e4ba36dee75211a0b
+  metadata.gz: 4b458df27c7aeead867b7428323c726280b3665a
+  data.tar.gz: a792e2a0d892e8a31769e5f259088cdcf6c4d9b0
 SHA512:
-  metadata.gz: 72bedd843f188bdfa169a072aa0fb6abac30b86ac54d3c6b04f52565e118a31102a825c74be5d4330eec35e60151da3f8235ffb60d9e99e04ba3beaade62a013
-  data.tar.gz: 25aa75d96f0f34f919459bad7bc33c5a38f90844bf0347d45f61d94737fe86100b390f48575ee6360410d322106ae2564a1deb986e83c7e37de485e965d95b33
+  metadata.gz: 1c68e9eb488225cdc1756bbf32995c933d0b4884895f52c8c6debb8c402cca1153382fcfa75f9cf8238264fd084021e7a866bcf12c47ff22b1b50bb95e5815d4
+  data.tar.gz: 252acdb96ff30482a8f5c21e200dc311b9188a2490c9176cfe00e5a7b03c6addb9f175118a86bacad3162fb7d4005470a2fe8d904ee8c1aa17983fb7193f7d13

data/lib/uri_service/client.rb

@@ -114,6 +114,7 @@ class UriService::Client
           String :uri, text: true # This needs to be a text field because utf8 strings cannot be our desired 2000 characters long in MySQL. uri_hash will be used to verify uniqueness.
           String :uri_hash, fixed: true, size: 64, unique: true
           String :value, text: true
+          String :value_hash, fixed: true, size: 64
           TrueClass :is_local, default: false
           String :additional_fields, text: true
         end
@@ -150,11 +151,12 @@ class UriService::Client
   
   # Creates a new term.
   def create_term(vocabulary_string_key, value, term_uri, additional_fields={})
-    return self.create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, false)
+    return self.create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, false, false)
   end
   
   # Creates a new local term, auto-generating a URI
-  def create_local_term(vocabulary_string_key, value, additional_fields={})
+  # By default, if raise_error_if_local_term_value_exists_in_vocabulary param is true, rejects the creation of a local value if that exact value already exists in the specified vocabulary
+  def create_local_term(vocabulary_string_key, value, additional_fields={}, raise_error_if_local_term_value_exists_in_vocabulary=true)
   
     # Create a new URI for this local term, using the @local_uri_base
     term_uri = URI(@local_uri_base)
@@ -164,7 +166,7 @@ class UriService::Client
     # Getting a duplicate UUID from SecureRandom.uuid is EXTREMELY unlikely, but we'll account for it just in case (by making a few more attempts).
     5.times {
       begin
-        return self.create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, true)
+        return self.create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, true, raise_error_if_local_term_value_exists_in_vocabulary)
       rescue UriService::ExistingUriError
         raise UriService::ExistingUriError, "UriService generated a duplicate random UUID (via SecureRandom.uuid) and will now attempt to create another.  This type of problem is EXTREMELY rare."
       end
@@ -173,7 +175,7 @@ class UriService::Client
     return nil
   end
   
-  def create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, is_local)
+  def create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, is_local, raise_error_if_local_term_value_exists_in_vocabulary)
     self.handle_database_disconnect do
     
       additional_fields.stringify_keys!
@@ -188,12 +190,20 @@ class UriService::Client
       validate_additional_fields(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)
+        
+        if raise_error_if_local_term_value_exists_in_vocabulary && @db[UriService::TERMS].where(value_hash: value_hash, vocabulary_string_key: vocabulary_string_key).count > 0
+          raise UriService::DisallowedDuplicateLocalTermValueError, "A local term already exists with the value #{value}.  This is not allowed when param raise_error_if_local_term_value_exists_in_vocabulary == true."
+        end
+        
         begin
           @db[UriService::TERMS].insert(
             is_local: is_local,
             uri: term_uri,
             uri_hash: Digest::SHA256.hexdigest(term_uri),
             value: value,
+            value_hash: value_hash,
             vocabulary_string_key: vocabulary_string_key,
             additional_fields: JSON.generate(additional_fields)
           )
@@ -303,7 +313,12 @@ class UriService::Client
     end
     
     @rsolr_pool.with do |rsolr|
-      response = rsolr.get('select', params: {:q => '*:*', :fq => fqs })
+      response = rsolr.get('select', params: {
+        :q => '*:*',
+        :fq => fqs,
+        :rows => 1,
+        :sort => 'score desc, value_ssort asc, uri asc' # For consistent sorting
+      })
       if response['response']['numFound'] == 1
         return term_solr_doc_to_frozen_term_hash(response['response']['docs'].first)
       end
@@ -344,7 +359,8 @@ class UriService::Client
         :q => UriService.solr_escape(value_query),
         :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
         :rows => limit,
-        :start => start
+        :start => start,
+        :sort => 'score desc, value_ssort asc, uri asc' # For consistent sorting
       }
       
       if value_query.length < 3
@@ -384,9 +400,9 @@ class UriService::Client
       
       solr_params = {
         :fq => 'vocabulary_string_key:' + UriService.solr_escape(vocabulary_string_key),
-        :sort => 'value_ssort asc',
         :rows => limit,
-        :start => start
+        :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)
@@ -458,7 +474,7 @@ class UriService::Client
       validate_additional_fields(new_additional_fields)
       
       @db.transaction do
-        dataset.update(value: new_value, additional_fields: JSON.generate(new_additional_fields))
+        dataset.update(value: new_value, value_hash: Digest::SHA256.hexdigest(new_value), additional_fields: JSON.generate(new_additional_fields))
         self.send_term_to_solr(term_db_row[:vocabulary_string_key], new_value, term_uri, new_additional_fields, term_db_row[:is_local])
       end
       
@@ -493,4 +509,5 @@ class UriService::ExistingVocabularyStringKeyError < StandardError;end
 class UriService::NonExistentUriError < StandardError;end
 class UriService::NonExistentVocabularyError < StandardError;end
 class UriService::UnsupportedObjectTypeError < StandardError;end
-class UriService::UnsupportedSearchFieldError < StandardError;end
+class UriService::UnsupportedSearchFieldError < StandardError;end
+class UriService::DisallowedDuplicateLocalTermValueError < StandardError;end

data/lib/uri_service/version.rb

@@ -1,6 +1,6 @@
 module UriService
   
-  VERSION = '0.2.8'
+  VERSION = '0.2.9'
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_service
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Eric O'Hanlon
@@ -206,4 +206,3 @@ specification_version: 4
 summary: A service for registering local URIs and performing both local and remote
   URI lookups.
 test_files: []
-has_rdoc: