iqvoc 4.3.3 → 4.4.0

data/app/models/dataset/adaptors/iqvoc/alphabetical_search_adaptor.rb

@@ -1,6 +1,6 @@
 class Dataset::Adaptors::Iqvoc::AlphabeticalSearchAdaptor < Dataset::Adaptors::Iqvoc::SearchAdaptor
   def search(prefix, locale)
-    fetch_results("#{locale}/alphabetical_concepts/#{prefix}.html")
+    fetch_results("/#{locale}/alphabetical_concepts/#{prefix}.html")
     @results
   end
 
@@ -28,8 +28,8 @@ class Dataset::Adaptors::Iqvoc::AlphabeticalSearchAdaptor < Dataset::Adaptors::I
       label, path = link.text, link['data-resource-path'] # href
 
       options = {
-        :definition => element.at_css('.concept-item-definition').try(:content),
-        :definition_language => element.at_css('.concept-item-definition').try(:[], :lang)
+        definition: element.at_css('.concept-item-definition').try(:content),
+        definition_language: element.at_css('.concept-item-definition').try(:[], :lang)
       }
 
       result = AlphabeticalSearchResultRemote.new(url, path, label, options)

data/app/models/dataset/adaptors/iqvoc/http_adaptor.rb

@@ -5,7 +5,7 @@ class Dataset::Adaptors::Iqvoc::HTTPAdaptor
 
   def initialize(url)
     @url = url
-    @conn = Faraday.new(:url => url) do |conn|
+    @conn = Faraday.new(url: url) do |conn|
       #conn.use Faraday::Response::Logger if Rails.env.development?
       conn.adapter Faraday.default_adapter
     end
@@ -25,7 +25,7 @@ class Dataset::Adaptors::Iqvoc::HTTPAdaptor
     end
 
     if response.status == 302 && redirect_count < 3
-      response = http_get(response.headers["location"], redirect_count + 1)
+      response = http_get(response.headers['location'], redirect_count + 1)
     end
 
     response

data/app/models/dataset/adaptors/iqvoc/search_adaptor.rb

@@ -1,18 +1,18 @@
 class Dataset::Adaptors::Iqvoc::SearchAdaptor < Dataset::Adaptors::Iqvoc::HTTPAdaptor
   def search(raw_params = {})
     languages = raw_params.fetch(:languages, I18n.locale)
-    languages = Array.wrap(languages).flatten.join(",")
+    languages = Array.wrap(languages).flatten.join(',')
 
     params = {
-      :q => raw_params[:q],
-      :t => raw_params[:t],
-      :l => languages,
-      :c => raw_params[:c],
-      :qt => raw_params[:qt],
-      :page => 1 # hard code the first page as we need to follow pagination links
+      q: raw_params[:q],
+      t: raw_params[:t],
+      l: languages,
+      c: raw_params[:c],
+      qt: raw_params[:qt],
+      page: 1 # hard code the first page as we need to follow pagination links
     }
 
-    fetch_results('search.html', params)
+    fetch_results('/search.html', params)
     @results
   end
 

data/app/models/dataset/iqvoc_dataset.rb

@@ -5,7 +5,7 @@ class Dataset::IqvocDataset
 
   def initialize(url)
     @url = URI.parse(url)
-    @repository = RDF::Repository.load(URI.join(url, 'dataset.rdf')) rescue nil
+    @repository = RDF::Repository.load(URI.join(url, 'dataset.rdf').to_s) rescue nil
     @name = fetch_name
   end
 
@@ -30,7 +30,7 @@ class Dataset::IqvocDataset
     return 'unknown' if @repository.nil?
 
     void = RDF::Vocabulary.new('http://rdfs.org/ns/void#')
-    query = RDF::Query.new({:dataset => {RDF.type => void.Dataset, RDF::DC.title => :title}})
+    query = RDF::Query.new({ dataset: { RDF.type => void.Dataset, RDF::DC.title => :title } })
     results = query.execute(@repository)
 
     return 'unknown' if results.empty?

data/app/models/export.rb

@@ -0,0 +1,32 @@
+class Export < ActiveRecord::Base
+  belongs_to :user
+
+  enum file_type: [:ttl, :nt, :xml]
+
+  validates_presence_of :default_namespace
+
+  before_destroy :delete_dump_file
+
+  def finish!(messages)
+    self.output = messages
+    self.success = true
+    self.finished_at = Time.now
+    save!
+  end
+
+  def fail!(exception)
+    self.output = exception.to_s + "\n\n" + exception.backtrace.join("\n")
+    self.finished_at = Time.now
+    save!
+  end
+
+  def build_filename
+    File.join(Iqvoc.export_path, "#{self.token.to_s}.#{self.file_type}")
+  end
+
+  private
+
+  def delete_dump_file
+    File.delete(self.build_filename)
+  end
+end

data/app/models/import.rb

@@ -1,5 +1,7 @@
 class Import < ActiveRecord::Base
   belongs_to :user
+  mount_uploader :import_file, RdfUploader
+  validates_presence_of :import_file, :default_namespace
 
   def finish!(messages)
     self.output = messages

data/app/models/label/base.rb

@@ -15,31 +15,26 @@
 # limitations under the License.
 
 class Label::Base < ActiveRecord::Base
-
   self.table_name = 'labels'
 
-  # ********** Validations
-
-  validates :value, :presence => {:message => I18n.t("txt.models.label.value_error")}
-
   # ********** Associations
 
-  has_many :labelings, :foreign_key => 'target_id', :class_name => "Labeling::Base"
-  has_many :concepts, :through => :labelings, :source => :owner
+  has_many :labelings, foreign_key: 'target_id', class_name: 'Labeling::Base'
+  has_many :concepts, through: :labelings, source: :owner
 
-  has_many :pref_labelings, :foreign_key => 'target_id', :class_name => Iqvoc::Concept.pref_labeling_class_name
-  has_many :pref_labeled_concepts, :through => :pref_labelings, :source => :owner
+  has_many :pref_labelings, foreign_key: 'target_id', class_name: Iqvoc::Concept.pref_labeling_class_name
+  has_many :pref_labeled_concepts, through: :pref_labelings, source: :owner
 
   # ********* Scopes
 
   def self.by_language(lang_code)
-    lang_code = nil if lang_code.to_s == "none"
-    if (lang_code.is_a?(Array) && lang_code.include?("none"))
+    lang_code = nil if lang_code.to_s == 'none'
+    if (lang_code.is_a?(Array) && lang_code.include?('none'))
       where(arel_table[:language].eq(nil).or(arel_table[:language].in(lang_code.compact)))
     elsif lang_code.blank?
       where(arel_table[:language].eq(nil))
     else
-      where(:language => lang_code)
+      where(language: lang_code)
     end
   end
 
@@ -47,7 +42,7 @@ class Label::Base < ActiveRecord::Base
     prefix = prefix.to_s
     table = Label::Base.table_name
     where("LOWER(SUBSTR(#{table}.value, 1, :length)) = :prefix",
-        :length => prefix.length, :prefix => prefix.downcase)
+        length: prefix.length, prefix: prefix.downcase)
   end
 
   def self.missing_translation(lang, main_lang)
@@ -59,9 +54,9 @@ class Label::Base < ActiveRecord::Base
     joins(sanitize_sql(["LEFT OUTER JOIN labels pref_labels ON
         pref_labels.id = pref_labelings.target_id AND
         pref_labels.language = '%s'", lang])).
-    where('labelings.type = :class_name', :class_name => Iqvoc::Concept.pref_labeling_class_name).
+    where('labelings.type = :class_name', class_name: Iqvoc::Concept.pref_labeling_class_name).
     where('pref_labels.id IS NULL').
-    where('labels.language = :lang', :lang => main_lang).
+    where('labels.language = :lang', lang: main_lang).
     includes(:pref_labeled_concepts)
   end
 
@@ -94,11 +89,10 @@ class Label::Base < ActiveRecord::Base
   end
 
   def to_s
-    if (language.presence || "none") != I18n.locale.to_s
-      value.to_s + " [#{I18n.t("txt.common.translation_missing_for")} '#{I18n.locale}']"
+    if (language.presence || 'none') != I18n.locale.to_s
+      value.to_s + " [#{I18n.t('txt.common.translation_missing_for')} '#{I18n.locale}']"
     else
       value.to_s
     end
   end
-
 end

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

@@ -15,13 +15,13 @@
 # limitations under the License.
 
 class Label::SKOS::Base < Label::Base
-
   after_initialize :publish
 
+  validates :value, presence: { message: I18n.t('txt.models.label.value_error') }
+
   # ********** Methods
 
   def publish
     self.published_at = Time.now
   end
-
 end

data/app/models/labeling/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Labeling::Base < ActiveRecord::Base
-
   self.table_name = 'labelings'
 
   class_attribute :rdf_namespace, :rdf_predicate
@@ -24,17 +23,17 @@ class Labeling::Base < ActiveRecord::Base
 
   # ********** Associations
 
-  belongs_to :owner,  :class_name => "Concept::Base"
-  belongs_to :target, :class_name => "Label::Base"
+  belongs_to :owner,  class_name: 'Concept::Base'
+  belongs_to :target, class_name: 'Label::Base'
 
   # ********** Scopes
 
   def self.by_concept(concept)
-    where(:owner_id => concept.id)
+    where(owner_id: concept.id)
   end
 
   def self.by_label(label)
-    where(:target_id => label.id)
+    where(target_id: label.id)
   end
 
   def self.concept_published
@@ -71,7 +70,7 @@ class Labeling::Base < ActiveRecord::Base
   end
 
   def self.view_section(obj)
-    obj.is_a?(Label::Base) ? "concepts" : "labels"
+    obj.is_a?(Label::Base) ? 'concepts' : 'labels'
   end
 
   def self.view_section_sort_key(obj)
@@ -79,11 +78,10 @@ class Labeling::Base < ActiveRecord::Base
   end
 
   def self.partial_name(obj)
-    "partials/labeling/base"
+    'partials/labeling/base'
   end
 
   def self.edit_partial_name(obj)
-    "partials/labeling/edit_base"
+    'partials/labeling/edit_base'
   end
-
 end

data/app/models/labeling/skos/alt_label.rb

@@ -15,7 +15,5 @@
 # limitations under the License.
 
 class Labeling::SKOS::AltLabel < Labeling::SKOS::Base
-
   self.rdf_predicate = 'altLabel'
-
 end

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

@@ -15,17 +15,16 @@
 # limitations under the License.
 
 class Labeling::SKOS::Base < Labeling::Base
-
-  self.rdf_namespace = "skos"
+  self.rdf_namespace = 'skos'
 
   # ********** Associations
 
-  belongs_to :target, :class_name => "Label::Base", :dependent => :destroy # the destroy is new
+  belongs_to :target, class_name: 'Label::Base', dependent: :destroy # the destroy is new
 
   # ********** Scopes
 
   def self.by_label_with_language(label, language)
-    includes(:target).merge(self.label_class.where(:value => label, :language => language))
+    includes(:target).merge(self.label_class.where(value: label, language: language))
   end
 
   # ********** Methods
@@ -58,9 +57,9 @@ class Labeling::SKOS::Base < Labeling::Base
     end
 
     if params[:collection_origin].present?
-      collection = Collection::Base.where(:origin => params[:collection_origin]).last
+      collection = Collection::Base.where(origin: params[:collection_origin]).last
       if collection
-        scope = scope.includes(:owner => :collection_members)
+        scope = scope.includes(owner: :collection_members)
         scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection.id)
         scope = scope.references(:collection_members)
       else
@@ -82,6 +81,7 @@ class Labeling::SKOS::Base < Labeling::Base
     end
 
     scope = scope.merge(Concept::Base.published)
+    scope = yield(scope) if block_given?
     scope.map { |result| SearchResult.new(result) }
   end
 
@@ -94,38 +94,29 @@ class Labeling::SKOS::Base < Labeling::Base
       raise "#{self.name}#build_from_rdf: Subject (#{rdf_subject}) must be a Concept."
     end
 
-    unless rdf_object =~ /^"(.+)"(@(.+))?$/
+    unless rdf_object =~ Iqvoc::RDFAPI::LITERAL_REGEXP
       raise InvalidStringLiteralError, "#{self.name}#build_from_rdf: Object (#{rdf_object}) must be a string literal"
     end
 
     lang = $3
     value = begin
-      JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
+      JSON.parse(%Q{["#{$1}"]})[0].gsub('\\n', "\n") # Trick to decode \uHHHHH chars
     rescue JSON::ParserError
       $1
     end
 
     predicate_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
-    predicate_class.new(:target => self.label_class.new(:value => value, :language => lang)).tap do |labeling|
+    predicate_class.new(target: self.label_class.new(value: value, language: lang)).tap do |labeling|
       rdf_subject.send(predicate_class.name.to_relation_name) << labeling
     end
   end
 
   def build_rdf(document, subject)
-    subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, target.value.to_s, :lang => target.language)
+    subject.send(self.rdf_namespace.camelcase).send(self.rdf_predicate, target.value.to_s, lang: target.language)
   end
 
   def build_search_result_rdf(document, result)
     result.Sdc::link(IqRdf.build_uri(owner.origin))
     build_rdf(document, result)
   end
-
-end
-
-class InvalidStringLiteralError < StandardError
-  attr_reader :original
-  def initialize(msg, original = $!)
-    super(msg)
-    @original = original;
-  end
 end

data/app/models/labeling/skos/hidden_label.rb

@@ -15,11 +15,9 @@
 # limitations under the License.
 
 class Labeling::SKOS::HiddenLabel < Labeling::SKOS::Base
-
   self.rdf_predicate = 'hiddenLabel'
 
   def self.view_section(obj)
-    "hidden"
+    'hidden'
   end
-
 end

data/app/models/labeling/skos/pref_label.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Labeling::SKOS::PrefLabel < Labeling::SKOS::Base
-
   self.rdf_predicate = 'prefLabel'
 
   # if `singular` is true, only a single occurrence is allowed per instance
@@ -26,5 +25,4 @@ class Labeling::SKOS::PrefLabel < Labeling::SKOS::Base
   def self.view_section_sort_key(obj)
     50
   end
-
 end

data/app/models/match/base.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Match::Base < ActiveRecord::Base
-
   self.table_name = 'matches'
 
   class_attribute :rdf_namespace, :rdf_predicate
@@ -24,7 +23,7 @@ class Match::Base < ActiveRecord::Base
 
   # ********** Associations
 
-  belongs_to :concept, :class_name => "Concept::Base", :foreign_key => 'concept_id'
+  belongs_to :concept, class_name: 'Concept::Base', foreign_key: 'concept_id'
 
   # ********** Validations
 
@@ -32,14 +31,14 @@ class Match::Base < ActiveRecord::Base
     begin
       URI.parse(m.value)
     rescue URI::InvalidURIError => e
-      errors.add(:value, "Not a valid url")
+      errors.add(:value, 'Not a valid url')
     end
   end
 
   # ********** Methods
 
   def self.view_section(obj)
-    "matches"
+    'matches'
   end
 
   def self.view_section_sort_key(obj)
@@ -47,11 +46,10 @@ class Match::Base < ActiveRecord::Base
   end
 
   def self.partial_name(obj)
-    "partials/match/base"
+    'partials/match/base'
   end
 
   def self.edit_partial_name(obj)
-    "partials/match/edit_base"
+    'partials/match/edit_base'
   end
-
 end

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

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 class Match::SKOS::Base < Match::Base
-
   self.rdf_namespace = 'skos'
 
   def self.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
@@ -24,7 +23,7 @@ class Match::SKOS::Base < Match::Base
     uri = $1
 
     match_class = Iqvoc::RDFAPI::PREDICATE_DICTIONARY[rdf_predicate] || self
-    match_class.new(:value => uri).tap do |match|
+    match_class.new(value: uri).tap do |match|
       rdf_subject.send(self.name.to_relation_name) << match
     end
   end
@@ -38,5 +37,4 @@ class Match::SKOS::Base < Match::Base
       raise "#{self.class}#build_rdf: couldn't find Namespace '#{self.rdf_namespace.camelcase}'."
     end
   end
-
 end