uri_service 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34c4dd9a5b43b9111f59c0577fd2046bb2f00b9
-  data.tar.gz: 94d3fc905ad56a6aaabb9b0bcad622343877ebfe
+  metadata.gz: 5d86291e7f55d8b02a1bda38a3ce2442c57369ed
+  data.tar.gz: 1646c0c6ac51556df8823c9c23db7e1a64682692
 SHA512:
-  metadata.gz: 5566e17cb45ae010a502a9afbcd06325c9b56fe7acde4114861847b64b2f9dd91164ac93e8b6144081f17d21289f2442552b8553e9b342416be30c5b7669113f
-  data.tar.gz: 2b3ebc888583e86f6ee879b03416524c7cf7b10fde9dc184dd501238035b3a0ce95a40a51c2316ba09bd25007f8f9eff0d74549688fcae05c22eceff33ca8c18
+  metadata.gz: 7b9a6958a9f48b28a238d79d66ac490e24317d1ffffaa4bfa8d5a29d6fc075b75bcae0c6ff8d6963f61937f499288b69543adfc59d7b2539ee644c254cf90cf6
+  data.tar.gz: 3c50a6fd5cdf0d0f16092a8fd5be1e83a2af3a8d689cb9b580a339067374e1fc0dbcbe23836cfc7130d71e0b745d9cfa5d1cf170851aac951df09f247b352988

data/lib/uri_service/client.rb

@@ -92,22 +92,23 @@ class UriService::Client
   ##################
   
   def create_vocabulary(string_key, display_label)
-    if string_key.to_s == 'all'
-      # Note: There isn't currently a use case for searching across 'all' vocabularies, but I'm leaving this restriction as a placeholder in case that changes.
-      raise UriService::InvalidVocabularyStringKeyError, 'The value "all" is a reserved word and cannot be used as the string_key value for a vocabulary.'
-    end
-    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)
-      rescue Sequel::UniqueConstraintViolation
-        raise UriService::ExistingVocabularyStringKeyError, "A vocabulary already exists with string key: " + string_key
+    self.handle_database_disconnect do
+      if string_key.to_s == 'all'
+        # Note: There isn't currently a use case for searching across 'all' vocabularies, but I'm leaving this restriction as a placeholder in case that changes.
+        raise UriService::InvalidVocabularyStringKeyError, 'The value "all" is a reserved word and cannot be used as the string_key value for a vocabulary.'
+      end
+      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)
+        rescue Sequel::UniqueConstraintViolation
+          raise UriService::ExistingVocabularyStringKeyError, "A vocabulary already exists with string key: " + string_key
+        end
       end
     end
-    
   end
   
   # Creates a new term.
@@ -136,35 +137,37 @@ class UriService::Client
   end
   
   def create_term_impl(vocabulary_string_key, value, term_uri, additional_fields, is_local)
+    self.handle_database_disconnect do
     
-    additional_fields.stringify_keys!
-    
-    #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
-    end
-    unless term_uri =~ VALID_URI_REGEX
-      raise UriService::InvalidUriError, "Invalid URI supplied: #{term_uri}, with result #{(VALID_URI_REGEX.match(term_uri)).to_s}"
-    end
-    validate_additional_fields(additional_fields) # This method call raises an error if an invalid additional_field key is supplied
-    
-    @db.transaction do
-      begin
-        @db[UriService::TERMS].insert(
-          is_local: is_local,
-          uri: term_uri,
-          uri_hash: Digest::SHA256.hexdigest(term_uri),
-          value: value,
-          vocabulary_string_key: vocabulary_string_key,
-          additional_fields: JSON.generate(additional_fields)
-        )
-        send_term_to_solr(vocabulary_string_key, value, term_uri, additional_fields, is_local)
-      rescue Sequel::UniqueConstraintViolation
-        raise UriService::ExistingUriError, "A term already exists with uri: " + term_uri + " (conflict found via uri_hash check)"
+      additional_fields.stringify_keys!
+      
+      #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
+      end
+      unless term_uri =~ VALID_URI_REGEX
+        raise UriService::InvalidUriError, "Invalid URI supplied: #{term_uri}, with result #{(VALID_URI_REGEX.match(term_uri)).to_s}"
       end
+      validate_additional_fields(additional_fields) # This method call raises an error if an invalid additional_field key is supplied
+      
+      @db.transaction do
+        begin
+          @db[UriService::TERMS].insert(
+            is_local: is_local,
+            uri: term_uri,
+            uri_hash: Digest::SHA256.hexdigest(term_uri),
+            value: value,
+            vocabulary_string_key: vocabulary_string_key,
+            additional_fields: JSON.generate(additional_fields)
+          )
+          send_term_to_solr(vocabulary_string_key, value, term_uri, additional_fields, is_local)
+        rescue Sequel::UniqueConstraintViolation
+          raise UriService::ExistingUriError, "A term already exists with uri: " + term_uri + " (conflict found via uri_hash check)"
+        end
+      end
+      
+      return generate_frozen_term_hash(vocabulary_string_key, value, term_uri, additional_fields, is_local)
     end
-    
-    return generate_frozen_term_hash(vocabulary_string_key, value, term_uri, additional_fields, is_local)
   end
   
   def generate_frozen_term_hash(vocabulary_string_key, value, uri, additional_fields, is_local)
@@ -245,7 +248,9 @@ class UriService::Client
   ################
   
   def find_vocabulary(vocabulary_string_key)
-    @db[UriService::VOCABULARIES].where(string_key: vocabulary_string_key).first
+    self.handle_database_disconnect do
+      @db[UriService::VOCABULARIES].where(string_key: vocabulary_string_key).first
+    end
   end
   
   def find_term_by_uri(uri)
@@ -310,8 +315,10 @@ class UriService::Client
   
   # Lists vocabularies alphabetically (by string key) and supports paging through results.
   def list_vocabularies(limit=10, start=0)
-    db_rows = @db[UriService::VOCABULARIES].order(:string_key).limit(limit, start)
-    return db_rows.map{|row| row.except(:id).stringify_keys!}
+    self.handle_database_disconnect do
+      db_rows = @db[UriService::VOCABULARIES].order(:string_key).limit(limit, start)
+      return db_rows.map{|row| row.except(:id).stringify_keys!}
+    end
   end
   
   # Lists terms alphabetically and supports paging through results.
@@ -342,15 +349,19 @@ class UriService::Client
   ##################
   
   def delete_vocabulary(vocabulary_string_key)
-    @db[UriService::VOCABULARIES].where(string_key: vocabulary_string_key).delete
+    self.handle_database_disconnect do
+      @db[UriService::VOCABULARIES].where(string_key: vocabulary_string_key).delete
+    end
   end
   
   def delete_term(term_uri, commit=true)
-    @db.transaction do
-      @db[UriService::TERMS].where(uri: term_uri).delete
-      @rsolr_pool.with do |rsolr|
-        rsolr.delete_by_query('uri:' + UriService.solr_escape(term_uri))
-        rsolr.commit if commit
+    self.handle_database_disconnect do
+      @db.transaction do
+        @db[UriService::TERMS].where(uri: term_uri).delete
+        @rsolr_pool.with do |rsolr|
+          rsolr.delete_by_query('uri:' + UriService.solr_escape(term_uri))
+          rsolr.commit if commit
+        end
       end
     end
   end
@@ -360,40 +371,54 @@ class UriService::Client
   ##################
   
   def update_vocabulary(string_key, new_display_label)
-    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)
+    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', :additional_fields => {'key' => 'value'}}
   def update_term(term_uri, opts, merge_additional_fields=true)
-    dataset = @db[UriService::TERMS].where(uri: term_uri)
-    raise UriService::NonExistentUriError, "No term found with uri: " + term_uri if dataset.count == 0
+    self.handle_database_disconnect do
+      dataset = @db[UriService::TERMS].where(uri: term_uri)
+      raise UriService::NonExistentUriError, "No term found with uri: " + term_uri if dataset.count == 0
+        
+      term_db_row = dataset.first
       
-    term_db_row = dataset.first
-    
-    new_value = opts[:value] || term_db_row[:value]
-    new_additional_fields = term_db_row[:additional_fields].nil? ? {} : JSON.parse(term_db_row[:additional_fields])
-    
-    unless opts[:additional_fields].nil?
-      if merge_additional_fields
-        new_additional_fields.merge!(opts[:additional_fields])
-        new_additional_fields.delete_if { |k, v| v.nil? } # Delete nil values. This is a way to clear data in additional_fields.
-      else
-        new_additional_fields = opts[:additional_fields]
+      new_value = opts[:value] || term_db_row[:value]
+      new_additional_fields = term_db_row[:additional_fields].nil? ? {} : JSON.parse(term_db_row[:additional_fields])
+      
+      unless opts[:additional_fields].nil?
+        if merge_additional_fields
+          new_additional_fields.merge!(opts[:additional_fields])
+          new_additional_fields.delete_if { |k, v| v.nil? } # Delete nil values. This is a way to clear data in additional_fields.
+        else
+          new_additional_fields = opts[:additional_fields]
+        end
       end
+      validate_additional_fields(new_additional_fields)
+      
+      @db.transaction do
+        dataset.update(value: 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
+      
+      return generate_frozen_term_hash(term_db_row[:vocabulary_string_key], new_value, term_uri, new_additional_fields, term_db_row[:is_local])
     end
-    validate_additional_fields(new_additional_fields)
-    
-    @db.transaction do
-      dataset.update(value: 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
+  
+  def handle_database_disconnect
+    tries ||= 3
+    begin
+      yield
+    rescue Sequel::DatabaseDisconnectError
+      tries -= 1
+      retry unless tries == 0
     end
-    
-    return generate_frozen_term_hash(term_db_row[:vocabulary_string_key], new_value, term_uri, new_additional_fields, term_db_row[:is_local])
   end
   
 end

data/lib/uri_service/version.rb

@@ -1,6 +1,6 @@
 module UriService
   
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
   
   def self.version
     VERSION

metadata

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