iqvoc_similar_terms 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab6e1a52bdf7c9b433aa8793ee99c7f33f9856c
-  data.tar.gz: aa3a4dc8b7cd9e38220e9a3ca1691bec0081468e
+  metadata.gz: 678825bf98b35eb1efde46b62dee95e589153df3
+  data.tar.gz: fe480e5b3fc2c6cce66b23843a6ab87a41ea740f
 SHA512:
-  metadata.gz: 03ff663565c62aced948707330dbee0f14029390fd3c6b233c531a27aafbdcc30aec72f714db7ce8b232bdf169b6f7351524ddf7ada1f2fe99e65ed8c9ea92b7
-  data.tar.gz: 60d19cb18ae35ad602c4b21dc7d6240a9b98efd59fdddc4446144daf3075171b5913fe3ab4ff4b8f05d5c969430ba5499be96e4106b5dd29a686d849161008aa
+  metadata.gz: b24fbe1ac5958cc4df9d4d0959529faf8278d3127339cdd397710faa8ebfb15f619b18fea1c9bcae2197af4ec49c7971ff4e48d27d9eb40aeb9f856465a7434c
+  data.tar.gz: b575c7488f9c3a39f2529ab29254702f735af26d552119e9bfd0e5d2f1b549d73a5a8f45517f0acc4a70d4fc62661d9769ef656775fa52486e9fc5ec23fdab7e

data/app/controllers/similar_terms_controller.rb

@@ -17,11 +17,27 @@ class SimilarTermsController < ApplicationController
 
 
     respond_to do |format|
-      format.any(:html, :ttl, :rdf) do
+      format.html do
         @results = Iqvoc::SimilarTerms.ranked(lang, *@terms)
       end
-      format.text do
-        render :text => Iqvoc::SimilarTerms.alphabetical(lang, *@terms).join("\n")
+      format.ttl do
+        @results = Iqvoc::SimilarTerms.alphabetical(lang, *@terms)
+
+        # manually generating Turtle here to allow users to process the data
+        # without requiring an RDF parser (not using IqRdf because it doesn't
+        # appear to support this format and we want to avoid subtle changes in
+        # the serialization).
+        query = url_for(request.query_parameters.
+            merge(:only_path => false, :anchor => ""))
+        literals = @results.
+            map { |label| IqRdf::Literal.new label.value, label.language }.
+            join(", ")
+        render :text => <<-rdf.strip
+@prefix skos: <http://www.w3.org/2004/02/skos/core#>.
+@prefix query: <#{query}>.
+
+query:top skos:altLabel #{literals}.
+        rdf
       end
     end
   end

data/app/views/similar_terms/show.html.erb

@@ -6,7 +6,6 @@
     <%= sidebar_item :icon => 'share', :text => 'HTML', :path => similar_path(:terms => params[:terms], :format => :html) %>
     <%= sidebar_item :icon => 'share', :text => 'RDF/XML', :path => similar_path(:terms => params[:terms], :format => :rdf) %>
     <%= sidebar_item :icon => 'share', :text => 'RDF/Turtle', :path => similar_path(:terms => params[:terms], :format => :ttl) %>
-    <%= sidebar_item :icon => 'share', :text => 'text/plain', :path => similar_path(:terms => params[:terms], :format => :text) %>
   <% end %>
 <% end %>
 

data/lib/iqvoc/similar_terms/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SimilarTerms
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

data/lib/iqvoc/similar_terms.rb

@@ -1,7 +1,7 @@
 module Iqvoc
   module SimilarTerms # TODO: make language constraints optional
 
-    WEIGHTINGS = { # XXX: hard-coded - should be read from configuration
+    WEIGHTINGS = { # XXX: hard-coded - should be read from configuration -- XXX: unused/deprecated
       "Labeling::SKOS::PrefLabel"     => 5,
       "Labeling::SKOS::AltLabel"      => 2,
       "Labeling::SKOS::HiddenLabel"   => 1,
@@ -11,13 +11,13 @@ module Iqvoc
       "Labeling::SKOSXL::HiddenLabel" => 1
     }
 
-    # returns an array of label/concepts pairs, sorted descendingly by weighting
+    # returns an array of label/concepts pairs, sorted descendingly by weighting -- XXX: unused/deprecated
     def self.ranked(lang, *terms) # TODO: rename
       weighted(lang, *terms).sort_by { |label, data| data[0] }.reverse.
           map { |label, data| [label] + data[1..-1] } # drop weighting
     end
 
-    # returns a hash of label/weighting+concepts pairs
+    # returns a hash of label/weighting+concepts pairs -- XXX: unused/deprecated
     def self.weighted(lang, *terms) # TODO: rename
       concepts = terms_to_concepts(lang, *terms).
           includes(:labelings => [:owner, :target]).

data/test/functional/api_test.rb

@@ -39,93 +39,25 @@ class SimilarTermsTest < ActionController::TestCase
     get :show, :lang => "en", :format => "ttl", :terms => "forest"
     assert_response :success
     assert @response.body.include?(<<-EOS)
-@prefix sdc: <http://sindice.com/vocab/search#>.
-    EOS
-    assert @response.body.include?(<<-EOS)
 @prefix skos: <http://www.w3.org/2004/02/skos/core#>.
     EOS
     assert @response.body.include?(<<-EOS)
 @prefix query: <http://test.host/en/similar.ttl?terms=forest#>.
     EOS
-    assert @response.body.include?(<<-EOS)
-query:top a sdc:Query;
-          sdc:totalResults 2;
-          sdc:itemsPerPage 2;
-          sdc:searchTerms ("forest");
-          sdc:result query:result1;
-          sdc:result query:result2.
-    EOS
-    assert @response.body.include?(<<-EOS)
-query:result1 a sdc:Result;
-              rdfs:label "forest"@en;
-              sdc:rank 1;
-              sdc:link :forest.
+    assert @response.body.include?(<<-EOS.strip)
+query:top skos:altLabel "forest"@en, "woods"@en.
     EOS
-    assert @response.body.include?(<<-EOS)
-query:result2 a sdc:Result;
-              rdfs:label "woods"@en;
-              sdc:rank 2;
-              sdc:link :forest.
-    EOS
-    assert @response.body.include?(<<-EOS)
-:forest a skos:Concept.
-    EOS
-    # ensure there are no duplicates
-    assert_equal 2, @response.body.split("a skos:Concept").length
 
     get :show, :lang => "en", :format => "ttl", :terms => "forest,automobile"
     assert_response :success
     assert @response.body.include?(<<-EOS)
-query:top a sdc:Query;
-          sdc:totalResults 4;
-          sdc:itemsPerPage 4;
-          sdc:searchTerms ("forest" "automobile");
-          sdc:result query:result1;
-          sdc:result query:result2;
-          sdc:result query:result3;
-          sdc:result query:result4.
-    EOS
-    assert @response.body.include?(<<-EOS)
-query:result1 a sdc:Result;
-              rdfs:label "forest"@en;
-              sdc:rank 1;
-              sdc:link :forest.
-    EOS
-    assert @response.body.include?(<<-EOS)
-query:result2 a sdc:Result;
-              rdfs:label "car"@en;
-              sdc:rank 2;
-              sdc:link :car.
-    EOS
-    assert @response.body.include?(<<-EOS)
-query:result3 a sdc:Result;
-              rdfs:label "woods"@en;
-              sdc:rank 3;
-              sdc:link :forest.
+@prefix skos: <http://www.w3.org/2004/02/skos/core#>.
     EOS
     assert @response.body.include?(<<-EOS)
-query:result4 a sdc:Result;
-              rdfs:label "automobile"@en;
-              sdc:rank 4;
-              sdc:link :car.
+@prefix query: <http://test.host/en/similar.ttl?terms=forest%2Cautomobile#>.
     EOS
-  end
-
-  test "plain text representation" do
-    get :show, :lang => "en", :format => "text", :terms => "car"
-    assert_response :success
-    assert_equal @response.body, <<-EOS.strip
-automobile
-car
-    EOS
-
-    get :show, :lang => "en", :format => "text", :terms => "forest,automobile"
-    assert_response :success
-    assert_equal @response.body, <<-EOS.strip
-automobile
-car
-forest
-woods
+    assert @response.body.include?(<<-EOS.strip)
+query:top skos:altLabel "automobile"@en, "car"@en, "forest"@en, "woods"@en.
     EOS
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_similar_terms
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Frederik Dohr
@@ -41,7 +41,6 @@ files:
 - Rakefile
 - app/controllers/similar_terms_controller.rb
 - app/views/similar_terms/show.html.erb
-- app/views/similar_terms/show.iqrdf
 - config.ru
 - config/application.rb
 - config/boot.rb

data/app/views/similar_terms/show.iqrdf

@@ -1,41 +0,0 @@
-Iqvoc.default_rdf_namespace_helper_methods.each do |meth|
-  document.namespaces(self.send(meth))
-end
-
-subject = url_for(request.query_parameters.
-    merge(:only_path => false, :anchor => ""))
-
-document.namespaces(:sdc => "http://sindice.com/vocab/search#",
-    :query => subject)
-
-document << IqRdf::Query.build_uri("top",
-    IqRdf::Sdc::build_uri("Query")) do |query|
-  query.Sdc::totalResults(@results.length)
-  query.Sdc::itemsPerPage(@results.length) # XXX: preliminary
-  query.Sdc::searchTerms(@terms)
-
-  skos = IqRdf::Namespace.find_namespace_class("skos")
-  processed_concepts = {} # XXX: crutch
-  @results.each_with_index do |data, i|
-    i += 1
-
-    # XXX: data structure smell
-    label = data[0]
-    concepts = data[1..-1]
-
-    result = "result#{i}"
-    query.Sdc::result(IqRdf::Query::build_uri(result))
-    document << IqRdf::Query::build_uri(result,
-        IqRdf::Sdc::build_uri("Result")) do |sbj|
-      sbj.Rdfs::label(label.value, :lang => label.language)
-      sbj.Sdc::rank(i)
-      concepts.each do |concept|
-        sbj.Sdc::link(IqRdf.build_uri(concept.origin))
-        unless processed_concepts[concept.origin]
-          document << IqRdf.build_uri(concept.origin, skos.build_uri("Concept"))
-          processed_concepts[concept.origin] = true
-        end
-      end
-    end
-  end
-end