iqvoc 4.3.3 → 4.4.0

data/app/models/concept/relation/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Concept::Relation::Base < ActiveRecord::Base
-
   # ATTENTION:
   # This class (and the inheriting subclasses) should not reference the
   # Concept::Base class directly at load time!
@@ -36,13 +35,13 @@ class Concept::Relation::Base < ActiveRecord::Base
 
   # ********* Associations
 
-  belongs_to :owner,  :class_name => "Concept::Base"
-  belongs_to :target, :class_name => "Concept::Base"
+  belongs_to :owner,  class_name: 'Concept::Base'
+  belongs_to :target, class_name: 'Concept::Base'
 
   # ********* Scopes
 
   def self.by_owner(owner_id)
-    where(:owner_id => owner_id)
+    where(owner_id: owner_id)
   end
 
   def self.by_owner_origin(owner_origin)
@@ -78,7 +77,7 @@ class Concept::Relation::Base < ActiveRecord::Base
   end
 
   def self.view_section(obj)
-    "relations"
+    'relations'
   end
 
   def self.view_section_sort_key(obj)
@@ -86,11 +85,11 @@ class Concept::Relation::Base < ActiveRecord::Base
   end
 
   def self.partial_name(obj)
-    "partials/concept/relation/base"
+    'partials/concept/relation/base'
   end
 
   def self.edit_partial_name(obj)
-    "partials/concept/relation/edit_base"
+    'partials/concept/relation/edit_base'
   end
 
   # if `singular` is true, only a single occurrence is allowed per instance
@@ -100,7 +99,7 @@ class Concept::Relation::Base < ActiveRecord::Base
 
   def rank
     unless self.class.rankable?
-      raise "Use `include Rankable` to make a concept relation rankable."
+      raise 'Use `include Rankable` to make a concept relation rankable.'
     else
       super
     end
@@ -108,7 +107,7 @@ class Concept::Relation::Base < ActiveRecord::Base
 
   def rank=(val)
     unless self.class.rankable?
-      raise "Use `include Rankable` to make a concept relation rankable."
+      raise 'Use `include Rankable` to make a concept relation rankable.'
     else
       super
     end
@@ -117,5 +116,4 @@ class Concept::Relation::Base < ActiveRecord::Base
   def self.rankable?
     self.class.included_modules.include?(Iqvoc::Rankable)
   end
-
 end

data/app/models/concept/relation/reverse_relation_extension.rb

@@ -17,17 +17,16 @@
 module Concept
   module Relation
     module ReverseRelationExtension
-
       def create_with_reverse_relation(target_concept, attributes = {})
         relation_class = proxy_association.reflection.class_name.constantize
         ActiveRecord::Base.transaction do
           # The one direction
-          scope = relation_class.where(:owner_id => proxy_association.owner.id, :target_id => target_concept.id)
+          scope = relation_class.where(owner_id: proxy_association.owner.id, target_id: target_concept.id)
           attributes = attributes.except(:rank) unless relation_class.rankable?
           scope.any? || scope.create!(attributes)
 
           # The reverse direction
-          scope = relation_class.reverse_relation_class.where(:owner_id => target_concept.id, :target_id => proxy_association.owner.id)
+          scope = relation_class.reverse_relation_class.where(owner_id: target_concept.id, target_id: proxy_association.owner.id)
           scope.any? || scope.create!(attributes)
         end
       end
@@ -35,16 +34,15 @@ module Concept
       def destroy_with_reverse_relation(target_concept)
         relation_class = proxy_association.reflection.class_name.constantize
         ActiveRecord::Base.transaction do
-          relation_class.where(:owner_id => proxy_association.owner.id, :target_id => target_concept.id).load.each do |relation|
+          relation_class.where(owner_id: proxy_association.owner.id, target_id: target_concept.id).load.each do |relation|
             relation.destroy
           end
 
-          relation_class.reverse_relation_class.where(:owner_id => target_concept.id, :target_id => proxy_association.owner.id).load.each do |relation|
+          relation_class.reverse_relation_class.where(owner_id: target_concept.id, target_id: proxy_association.owner.id).load.each do |relation|
             relation.destroy
           end
         end
       end
-
     end
   end
 end

data/app/models/concept/relation/skos/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Concept::Relation::SKOS::Base < Concept::Relation::Base
-
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
@@ -24,17 +23,17 @@ class Concept::Relation::SKOS::Base < Concept::Relation::Base
 
     relation_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
 
-    relation_instance = rdf_subject.send(self.name.to_relation_name).select{|rel| rel.target == rdf_object}
+    relation_instance = rdf_subject.send(self.name.to_relation_name).select{ |rel| rel.target == rdf_object }
     if relation_instance.empty?
-      relation_instance = relation_class.new(:target => rdf_object)
+      relation_instance = relation_class.new(target: rdf_object)
       rdf_subject.send(self.name.to_relation_name) << relation_instance
     end
 
     if relation_class.bidirectional?
       reverse_class      = relation_class.reverse_relation_class
       reverse_collection = rdf_object.send(reverse_class.name.to_relation_name)
-      if reverse_collection.select{|rel| rel.target == rdf_subject}.empty?
-        reverse_instance = reverse_class.new(:target => rdf_subject)
+      if reverse_collection.select{ |rel| rel.target == rdf_subject }.empty?
+        reverse_instance = reverse_class.new(target: rdf_subject)
         reverse_collection << reverse_instance
       end
     end
@@ -48,10 +47,9 @@ class Concept::Relation::SKOS::Base < Concept::Relation::Base
       document << IqRdf::build_uri(target.origin) do |subject|
         target.pref_labelings.each do |labeling|
           subject.send(labeling.rdf_namespace).send(labeling.rdf_predicate, labeling.target.value.to_s,
-              :lang => labeling.target.language)
+              lang: labeling.target.language)
         end
       end
     end
   end
-
 end

data/app/models/concept/relation/skos/broader/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Concept::Relation::SKOS::Broader::Base < Concept::Relation::SKOS::Base
-
   self.rdf_predicate = 'broader'
 
   def self.narrower_class
@@ -27,7 +26,7 @@ class Concept::Relation::SKOS::Broader::Base < Concept::Relation::SKOS::Base
   end
 
   def self.view_section(obj)
-    "main"
+    'main'
   end
 
   def self.view_section_sort_key(obj)
@@ -37,5 +36,4 @@ class Concept::Relation::SKOS::Broader::Base < Concept::Relation::SKOS::Base
   def self.narrower_editable
     !singular?
   end
-
 end

data/app/models/concept/relation/skos/broader/mono.rb

@@ -15,14 +15,12 @@
 # limitations under the License.
 
 class Concept::Relation::SKOS::Broader::Mono < Concept::Relation::SKOS::Broader::Base
-
   def self.partial_name(obj)
-    "partials/concept/relation/skos/broader/mono"
+    'partials/concept/relation/skos/broader/mono'
   end
 
   # if `singular` is true, only a single occurrence is allowed per instance
   def self.singular?
     true
   end
-
 end

data/app/models/concept/relation/skos/broader/poly.rb

@@ -15,9 +15,7 @@
 # limitations under the License.
 
 class Concept::Relation::SKOS::Broader::Poly < Concept::Relation::SKOS::Broader::Base
-
   def self.partial_name(obj)
-    "partials/concept/relation/skos/broader/poly"
+    'partials/concept/relation/skos/broader/poly'
   end
-
 end

data/app/models/concept/relation/skos/narrower/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Concept::Relation::SKOS::Narrower::Base < Concept::Relation::SKOS::Base
-
   self.rdf_predicate = 'narrower'
 
   def self.reverse_relation_class
@@ -23,7 +22,7 @@ class Concept::Relation::SKOS::Narrower::Base < Concept::Relation::SKOS::Base
   end
 
   def self.view_section(obj)
-    "main"
+    'main'
   end
 
   def self.view_section_sort_key(obj)
@@ -31,7 +30,6 @@ class Concept::Relation::SKOS::Narrower::Base < Concept::Relation::SKOS::Base
   end
 
   def self.partial_name(obj)
-    "partials/concept/relation/skos/narrower"
+    'partials/concept/relation/skos/narrower'
   end
-
 end

data/app/models/concept/relation/skos/related.rb

@@ -15,7 +15,5 @@
 # limitations under the License.
 
 class Concept::Relation::SKOS::Related < Concept::Relation::SKOS::Base
-
   self.rdf_predicate = 'related'
-
 end

data/app/models/concept/skos/base.rb

@@ -15,9 +15,8 @@
 # limitations under the License.
 
 class Concept::SKOS::Base < Concept::Base
-
-  self.rdf_namespace = "skos"
-  self.rdf_class = "Concept"
+  self.rdf_namespace = 'skos'
+  self.rdf_class = 'Concept'
 
   def build_rdf_subject(&block)
     ns = IqRdf::Namespace.find_namespace_class(self.rdf_namespace)
@@ -25,8 +24,8 @@ class Concept::SKOS::Base < Concept::Base
     subject = IqRdf.build_uri(self.origin, ns.build_uri(self.rdf_class), &block)
 
     # ensure skos:Concept type is present
-    unless self.rdf_namespace == "skos" && self.rdf_class == "Concept"
-      subject.Rdf.build_predicate("type", IqRdf::Skos.build_uri("Concept"))
+    unless self.rdf_namespace == 'skos' && self.rdf_class == 'Concept'
+      subject.Rdf.build_predicate('type', IqRdf::Skos.build_uri('Concept'))
     end
 
     return subject

data/app/models/concept/skos/scheme.rb

@@ -36,16 +36,16 @@ class Concept::SKOS::Scheme < Concept::Base
   end
 
   def self.instance
-    first_or_create!(:origin => 'scheme', :published_at => Time.now)
+    first_or_create!(origin: 'scheme', published_at: Time.now)
   end
 
-  def self.create(attributes = nil, options = {}, &block)
-    raise TypeError, "Singleton" if first
+  def self.create(attributes = nil, &block)
+    raise TypeError, 'Singleton' if first
     super
   end
 
-  def self.create!(attributes = nil, options = {}, &block)
-    raise TypeError, "Singleton" if first
+  def self.create!(attributes = nil, &block)
+    raise TypeError, 'Singleton' if first
     super
   end
 
@@ -70,7 +70,7 @@ class Concept::SKOS::Scheme < Concept::Base
 
   def inline_top_concepts
     if @inline_top_concept_origins
-      Iqvoc::Concept.base_class.editor_selectable.where(:origin => @inline_top_concept_origins)
+      Iqvoc::Concept.base_class.editor_selectable.where(origin: @inline_top_concept_origins)
     else
       top_concepts.select { |c| c.editor_selectable? }
     end
@@ -80,8 +80,8 @@ class Concept::SKOS::Scheme < Concept::Base
     return if inline_top_concept_origins.nil? # There is nothing to do
 
     Iqvoc::Concept.base_class.transaction do
-      Iqvoc::Concept.base_class.tops.update_all :top_term => false
-      Iqvoc::Concept.base_class.where(:origin => @inline_top_concept_origins).update_all(:top_term => true)
+      Iqvoc::Concept.base_class.tops.update_all top_term: false
+      Iqvoc::Concept.base_class.where(origin: @inline_top_concept_origins).update_all(top_term: true)
     end
   end
 end

data/app/models/concept/validations.rb

@@ -3,10 +3,9 @@ module Concept
     extend ActiveSupport::Concern
 
     included do
-      validates :origin, :presence => true, :on => :update
+      validates :origin, presence: true, on: :update
 
-      validate :distinct_versions, :on => :create
-      validate :pref_label_in_primary_thesaurus_language, :on => :update
+      validate :pref_label_in_primary_thesaurus_language
       validate :unique_pref_label_language
       validate :exclusive_top_term
       validate :rooted_top_terms
@@ -14,24 +13,11 @@ module Concept
       validate :unique_pref_label
     end
 
-    def distinct_versions
-      query = Concept::Base.by_origin(origin)
-      existing_total = query.count
-      if existing_total >= 2
-        errors.add :base, I18n.t("txt.models.concept.version_error", :origin => origin)
-      elsif existing_total == 1
-        unless (query.published.count == 0 and published?) or
-               (query.published.count == 1 and not published?)
-          errors.add :base, I18n.t("txt.models.concept.version_error", :origin => origin)
-        end
-      end
-    end
-
     # top term and broader relations are mutually exclusive
     def exclusive_top_term
-      if @full_validation
+      if validatable_for_publishing?
         if top_term && broader_relations.any?
-          errors.add :base, I18n.t("txt.models.concept.top_term_exclusive_error")
+          errors.add :base, I18n.t('txt.models.concept.top_term_exclusive_error')
         end
       end
     end
@@ -39,21 +25,21 @@ module Concept
     # top terms must never be used as descendants (narrower relation targets)
     # NB: for top terms themselves, this is covered by `ensure_exclusive_top_term`
     def rooted_top_terms
-      if @full_validation
+      if validatable_for_publishing?
         if narrower_relations.includes(:target). # XXX: inefficient?
             select { |rel| rel.target && rel.target.top_term? }.any?
-          errors.add :base, I18n.t("txt.models.concept.top_term_rooted_error")
+          errors.add :base, I18n.t('txt.models.concept.top_term_rooted_error')
         end
       end
     end
 
     def pref_label_in_primary_thesaurus_language
-      if @full_validation
-        labels = pref_labels.select{|l| l.published?}
-        if labels.count == 0
-          errors.add :base, I18n.t("txt.models.concept.no_pref_label_error")
+      if validatable_for_publishing?
+        labels = pref_labels.select{ |l| l.published? }
+        if labels.none?
+          errors.add :base, I18n.t('txt.models.concept.no_pref_label_error')
         elsif not labels.map(&:language).map(&:to_s).include?(Iqvoc::Concept.pref_labeling_languages.first.to_s)
-          errors.add :base, I18n.t("txt.models.concept.main_pref_label_language_missing_error")
+          errors.add :base, I18n.t('txt.models.concept.main_pref_label_language_missing_error')
         end
       end
     end
@@ -62,56 +48,55 @@ module Concept
       # We have many sources a prefLabel can be defined in
       pls = pref_labelings.map(&:target) +
         send(Iqvoc::Concept.pref_labeling_class_name.to_relation_name).map(&:target) +
-        labelings.select{|l| l.is_a?(Iqvoc::Concept.pref_labeling_class)}.map(&:target)
+        labelings.select{ |l| l.is_a?(Iqvoc::Concept.pref_labeling_class) }.map(&:target)
       languages = {}
       pls.compact.each do |pref_label|
         lang = pref_label.language.to_s
         origin = (pref_label.origin || pref_label.id || pref_label.value).to_s
         if (languages.keys.include?(lang) && languages[lang] != origin)
-          errors.add :pref_labelings, I18n.t("txt.models.concept.pref_labels_with_same_languages_error")
+          errors.add :pref_labelings, I18n.t('txt.models.concept.pref_labels_with_same_languages_error')
         end
         languages[lang] = origin
       end
     end
 
     def unique_pref_label
-      if @full_validation
+      if validatable_for_publishing?
         # checks if there are any existing pref labels with the same
         # language and value
         conflicting_pref_labels = pref_labels.select do |l|
           Labeling::SKOS::PrefLabel.
             joins(:owner, :target).
-            where(:labels => { :value => l.value, :language => l.language }).
-            where("labelings.owner_id != ?", id).
-            where("concepts.origin != ?", origin).
+            where(labels: { value: l.value, language: l.language }).
+            where('labelings.owner_id != ?', id).
+            where('concepts.origin != ?', origin).
             any?
         end
 
         if conflicting_pref_labels.any?
           if conflicting_pref_labels.one?
             errors.add :base,
-              I18n.t("txt.models.concept.pref_label_not_unique",
-                :label => conflicting_pref_labels.last.value)
+              I18n.t('txt.models.concept.pref_label_not_unique',
+                label: conflicting_pref_labels.last.value)
           else
             errors.add :base,
-              I18n.t("txt.models.concept.pref_labels_not_unique",
-                :label => conflicting_pref_labels.map(&:value).join(", "))
+              I18n.t('txt.models.concept.pref_labels_not_unique',
+                label: conflicting_pref_labels.map(&:value).join(', '))
           end
         end
       end
     end
 
     def valid_rank_for_ranked_relations
-      if @full_validation
+      if validatable_for_publishing?
         relations.each do |relation|
           if relation.class.rankable? && !(0..100).include?(relation.rank)
-            errors.add :base, I18n.t("txt.models.concept.invalid_rank_for_ranked_relations",
-              :relation => relation.class.model_name.human.downcase,
-              :relation_target_label => relation.target.pref_label.to_s)
+            errors.add :base, I18n.t('txt.models.concept.invalid_rank_for_ranked_relations',
+              relation: relation.class.model_name.human.downcase,
+              relation_target_label: relation.target.pref_label.to_s)
           end
         end
       end
     end
-
   end
 end

data/app/models/configuration_setting.rb

@@ -16,7 +16,5 @@
 
 # NB: not to be used directly, but only through Iqvoc::InstanceConfiguration
 class ConfigurationSetting < ActiveRecord::Base # TODO: make private, somehow?
-
-  validates :key, :uniqueness => true
-
+  validates :key, uniqueness: true
 end