iqvoc_similar_terms 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 534136c29c633f4f69d114fdf7db46c252ad902c
-  data.tar.gz: 6baa639ef3f8326737d0735cc3150a57fb59ef77
+  metadata.gz: 0eaec0b3caf5fbb0da0d2d26d0e5872b3603337f
+  data.tar.gz: 4ef9b1d6d61ffea7e942ceab50a7d594bf79d87a
 SHA512:
-  metadata.gz: cb8a27150c4394a218029044fea0f43293da7286510811a968d643f2fd31a3a7f446808ebe81ce4b7cbd60d4861963b080896f85cf9fe33130ab36f890a8d208
-  data.tar.gz: 14ec8af8b2086c32a8b7a80a808b1ef587c686f2530b49291fd5851cfdafe6f89e2076349f2ecc2d4dedbbd8eede3b80750ad6273032b01b04e2e0012fc6f94a
+  metadata.gz: 0ada85feb7c1ab0ae5799c9c06df5b7fe2e0e1b285fd707bdbf3ef0f67097ea70efcaac5db9e84e4e5e80f9eb371f5f9f67d9bd2f679721653cca5206701a3ff
+  data.tar.gz: 5d92281ae57e7a1ff0a4ae6540e6acb69a1b7fe550994816c73e5c44d9ff7f5ebf72ded3cb4ae5ac035c968008aa9baab3af508918c02f084a05e344cd9b24a9

data/app/controllers/similar_terms_controller.rb

@@ -15,29 +15,12 @@ class SimilarTermsController < ApplicationController
     @terms = Iqvoc::InlineDataHelper.parse_inline_values(params[:terms])
     lang = params[:lang]
 
-
     respond_to do |format|
       format.html do
         @results = Iqvoc::SimilarTerms.ranked(lang, *@terms)
       end
-      format.ttl do
+      format.any(:rdf, :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

@@ -4,6 +4,7 @@
   <%= sidebar do %>
     <%= sidebar_header t('txt.common.representations') %>
     <%= 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) %>
   <% end %>
 <% end %>

data/app/views/similar_terms/show.iqrdf

@@ -0,0 +1,19 @@
+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(:query => subject)
+
+#document << IqRdf::query do |query|
+#  @results.each do |label|
+#    query::Skos.altLabel(label.value, :lang => label.language)
+#  end
+#end
+document << IqRdf::Query.top do |t|
+  @results.each do |label|
+    t.Skos.altLabel(label.value, :lang => label.language)
+  end
+end if @results.length > 0

data/lib/iqvoc/similar_terms/version.rb

@@ -1,5 +1,5 @@
 module Iqvoc
   module SimilarTerms
-    VERSION = "0.7.1"
+    VERSION = "0.8.0"
   end
 end

data/test/functional/api_test.rb

@@ -32,7 +32,7 @@ class SimilarTermsTest < ActionController::TestCase
 
     get :show, :lang => "en", :format => "ttl", :terms => "foo"
     assert_response 200
-    assert !@response.body.include?("a sdc:Result")
+    assert !@response.body.include?("skos:altLabel")
   end
 
   test "RDF representations" do
@@ -45,7 +45,8 @@ class SimilarTermsTest < ActionController::TestCase
 @prefix query: <http://test.host/en/similar.ttl?terms=forest#>.
     EOS
     assert @response.body.include?(<<-EOS.strip)
-query:top skos:altLabel "forest"@en, "woods"@en.
+query:top skos:altLabel "forest"@en;
+          skos:altLabel "woods"@en.
     EOS
 
     get :show, :lang => "en", :format => "ttl", :terms => "forest,automobile"
@@ -57,7 +58,10 @@ query:top skos:altLabel "forest"@en, "woods"@en.
 @prefix query: <http://test.host/en/similar.ttl?terms=forest%2Cautomobile#>.
     EOS
     assert @response.body.include?(<<-EOS.strip)
-query:top skos:altLabel "automobile"@en, "car"@en, "forest"@en, "woods"@en.
+query:top skos:altLabel "automobile"@en;
+          skos:altLabel "car"@en;
+          skos:altLabel "forest"@en;
+          skos:altLabel "woods"@en.
     EOS
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_similar_terms
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Frederik Dohr
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
@@ -41,6 +41,7 @@ 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