uri_service 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5dfd4b23cd1ac5fd404ce7a52833497fcec6f17
-  data.tar.gz: cd29ef22f63ee376810d514be0a27c0e7210e866
+  metadata.gz: 125d8d44449e4c7132efa4e2f29cd44ae9a88fff
+  data.tar.gz: d3e72a5e1687b2d7f794689586a28b0750df52cf
 SHA512:
-  metadata.gz: 6fc35d8cd790eeebc46e670fad05890bc570522473bc9beaa25dd3b6f77d143f7d0765972a94f572f4029bd1aa7244896e96a9ca299d801d904df2f9ec39ea22
-  data.tar.gz: 5538858d331a40fa7ef8985068a4ff0c9c48586be93667830cfa1670b65b87205613d9471e66c7eae584373dd32b208786a8b8b6e6e77547a2c0dcd37e2f4f5c
+  metadata.gz: 4da2d67e2b91a38373fb672d9e012feb8e0ef722e8a72d324ff07ae10a19e10f2cf78d0d3d8d983e950ad34dd677d4a6397a1bc5c78c0ca0418391507a86402e
+  data.tar.gz: b8b1f5ec96d395c7109a34809a218f90c9f901f8511adead76c1731461c824fb9729a9998cb9f5caefeb52bf5eb3a371ea6d79b3dc201535d541aa4a9b312460

data/lib/uri_service/client.rb

@@ -509,7 +509,8 @@ class UriService::Client
   # - Performs some data validations.
   # - Ensures uniqueness of URIs in database.
   # - Returns an existing TEMPORARY term if a user attempts to
-  #   create a new TEMPORARY term with an existing value/vocabulary combo.
+  #   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)
@@ -557,19 +558,36 @@ class UriService::Client
           send_term_to_solr(vocabulary_string_key, value, uri, authority, additional_fields, type, db_id)
         rescue Sequel::UniqueConstraintViolation
           
-          # If this is a new TEMPORARY term and we ran into a Sequel::UniqueConstraintViolation,
-          # that mean that the term already exists.  We should return that existing term.
-          # don't create a new one. Instead, return the existing one.
+          # 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
-            return self.find_term_by_uri(uri)
+            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

data/lib/uri_service/version.rb

@@ -1,6 +1,6 @@
 module UriService
   
-  VERSION = '0.5.0'
+  VERSION = '0.5.1'
   
   def self.version
     VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uri_service
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Eric O'Hanlon