iqvoc_similar_terms 0.8.0 → 2.7.0

data/test/{functional → controllers}/api_test.rb

@@ -1,38 +1,22 @@
 # encoding: UTF-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/rdfapi' # XXX: only required with Zeus
 
 class SimilarTermsTest < ActionController::TestCase
 
   setup do
     @controller = SimilarTermsController.new
-
-    forest = Iqvoc::RDFAPI.devour("forest", "a", "skos:Concept") # FIXME: should be ":forest", but https://github.com/innoq/iqvoc/issues/195
-    Iqvoc::RDFAPI.devour(forest, "skos:prefLabel", '"forest"@en')
-    Iqvoc::RDFAPI.devour(forest, "skos:altLabel", '"woods"@en')
-    forest.save
-
-    car = Iqvoc::RDFAPI.devour("car", "a", "skos:Concept") # FIXME: should be ":car"; see above
-    Iqvoc::RDFAPI.devour(car, "skos:prefLabel", '"car"@en')
-    Iqvoc::RDFAPI.devour(car, "skos:altLabel", '"automobile"@en')
-    car.save
+    
+    load_test_data
   end
 
   test "routing" do
-    assert_raises ActionController::RoutingError do
-      get :show
-    end
-    assert_raises ActionController::RoutingError do
-      get :show, :format => "ttl"
-    end
-
     get :show, :lang => "en", :format => "ttl"
     assert_response 400
 
     get :show, :lang => "en", :format => "ttl", :terms => "foo"
     assert_response 200
-    assert !@response.body.include?("skos:altLabel")
+    assert !@response.body.include?("skosxl:altLabel")
   end
 
   test "RDF representations" do
@@ -42,6 +26,9 @@ class SimilarTermsTest < ActionController::TestCase
 @prefix skos: <http://www.w3.org/2004/02/skos/core#>.
     EOS
     assert @response.body.include?(<<-EOS)
+@prefix skosxl: <http://www.w3.org/2008/05/skos-xl#>.
+    EOS
+    assert @response.body.include?(<<-EOS)
 @prefix query: <http://test.host/en/similar.ttl?terms=forest#>.
     EOS
     assert @response.body.include?(<<-EOS.strip)
@@ -55,6 +42,9 @@ query:top skos:altLabel "forest"@en;
 @prefix skos: <http://www.w3.org/2004/02/skos/core#>.
     EOS
     assert @response.body.include?(<<-EOS)
+@prefix skosxl: <http://www.w3.org/2008/05/skos-xl#>.
+    EOS
+    assert @response.body.include?(<<-EOS)
 @prefix query: <http://test.host/en/similar.ttl?terms=forest%2Cautomobile#>.
     EOS
     assert @response.body.include?(<<-EOS.strip)

data/test/controllers/onebox_test.rb

@@ -0,0 +1,37 @@
+# encoding: UTF-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class OneBoxTest < ActionController::TestCase
+
+  setup do
+    @controller = SimilarTermsController.new
+
+    load_test_data
+  end
+
+  test "XML representation" do
+    get :show, :lang => "en", :format => "xml", :terms => "foo"
+    assert_response 200
+    assert @response.body.starts_with?(<<-EOS.strip)
+<?xml version="1.0" encoding="UTF-8"?>
+<OneBoxResults xmlns:xlink="http://www.w3.org/1999/xlink">
+  <resultCode>success</resultCode>
+  <totalResults>0</totalResults>
+  <urlText>Similar Terms</urlText>
+  <urlLink>http://test.host/en/similar.xml?terms=foo#</urlLink>
+    EOS
+    assert !@response.body.include?("<MODULE_RESULT>")
+
+    get :show, :lang => "en", :format => "xml", :terms => "forest"
+    assert_response 200
+    assert @response.body.include?("<totalResults>2</totalResults>")
+    assert @response.body.include?(<<-EOS.strip)
+  <MODULE_RESULT>
+    <title>similar terms for 'forest'</title>
+    EOS
+    assert @response.body.include? '<Field name="forest">forest</Field>'
+    assert @response.body.include? '<Field name="woods">woods</Field>'
+  end
+
+end

data/test/{unit → models}/entity_resolution_test.rb

@@ -1,24 +1,19 @@
 # encoding: UTF-8
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/rdfapi' # XXX: only required with Zeus
-require 'iqvoc/similar_terms' # XXX: should not be necessary!?
 
 class EntityResolutionTest < ActiveSupport::TestCase
 
   setup do
-    forest = Iqvoc::RDFAPI.devour(":forest", "a", "skos:Concept")
-    Iqvoc::RDFAPI.devour(forest, "skos:prefLabel", '"forest"@en')
-    Iqvoc::RDFAPI.devour(forest, "skos:altLabel", '"woods"@en')
-    forest.save
+    load_test_data
   end
 
   test "concept resolution" do
-    concepts = Iqvoc::SimilarTerms.terms_to_concepts("en","forest")
+    concepts = Iqvoc::SimilarTerms.terms_to_concepts("en", "forest")
     assert_equal 1, concepts.length
     assert_equal Iqvoc::Concept.base_class, concepts[0].class
 
-    concepts = Iqvoc::SimilarTerms.terms_to_concepts("de","forest")
+    concepts = Iqvoc::SimilarTerms.terms_to_concepts("de", "forest")
     assert_equal 0, concepts.count
 
     concepts = Iqvoc::SimilarTerms.terms_to_concepts("en", "foo")
@@ -27,10 +22,11 @@ class EntityResolutionTest < ActiveSupport::TestCase
 
   test "label resolution" do
     labels = Iqvoc::SimilarTerms.terms_to_labels("en", "forest")
-    assert_equal ActiveRecord::Relation, labels.class
+    # assert_equal ActiveRecord::Relation, labels.class
     labels = labels.all
+
     assert_equal 1, labels.length
-    assert_equal Iqvoc::Label.base_class, labels[0].class
+    assert_equal Iqvoc::XLLabel.base_class, labels[0].class
     assert_equal "forest", labels[0].value
     assert_equal "en", labels[0].language
 

data/test/models/results_test.rb

@@ -0,0 +1,79 @@
+# encoding: UTF-8
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class ResultsTest < ActiveSupport::TestCase
+
+  setup do
+    load_test_data
+    SkosImporter.new('test/concept_test.nt', 'http://localhost:3000/').run
+  end
+
+  test "ranked results" do
+    results = Iqvoc::SimilarTerms.ranked("en", "forest")
+    assert_equal 2, results.length
+    assert_equal Iqvoc::XLLabel.base_class, results[0][0].class
+    assert_equal "forest", results[0][0].value
+    assert_equal "forest", results[0][1].origin
+    assert_equal "woods", results[1][0].value
+    assert_equal "forest", results[1][1].origin
+
+    results = Iqvoc::SimilarTerms.ranked("en", "woods", "car")
+    assert_equal 4, results.length
+    assert_equal "forest", results[0][0].value
+    assert_equal "forest", results[0][1].origin
+    assert_equal "car", results[1][0].value
+    assert_equal "car", results[1][1].origin
+    assert_equal "woods", results[2][0].value
+    assert_equal "forest", results[2][1].origin
+    assert_equal "automobile", results[3][0].value
+    assert_equal "car", results[3][1].origin
+    assert_equal results[0].length, results[0].uniq.length
+  end
+
+  test "weighted results" do
+    results = Iqvoc::SimilarTerms.weighted("en", "forest")
+    assert_equal 2, results.keys.length
+    expected = { "forest" => 5, "woods" => 2 }
+    results.each do |label, data|
+      assert_equal Iqvoc::XLLabel.base_class, label.class
+      assert_equal 2, data.length
+      assert_equal expected[label.value], data[0]
+      assert_equal Iqvoc::Concept.base_class, data[1].class
+    end
+  end
+
+  test "inclusion of pref labels of sub concepts" do
+    results = Iqvoc::SimilarTerms.weighted("en", "water")
+    assert_equal 4, results.length
+    assert_equal "water", results.keys.first.value
+    assert_equal 5, results[results.keys.first][0]
+    assert_equal "used water", results.keys.second.value
+    assert_equal 0, results[results.keys.second][0]
+    assert_equal "new water", results.keys.third.value
+    assert_equal 0, results[results.keys.third][0]
+    assert_equal "real water", results.keys.fourth.value
+    assert_equal 2, results[results.keys.fourth][0]
+  end
+
+  test "no results" do
+    results = Iqvoc::SimilarTerms.weighted("de", "water")
+    assert_equal 0, results.length
+  end
+
+  test "compound returns" do
+    SkosImporter.new('test/compound_forms.nt', 'http://hobbies.com/').run
+    results = Iqvoc::SimilarTerms.weighted("de", "Computer")
+    assert_equal 1, results.length
+    assert_equal "Computer programming", results.keys.first.value
+    assert_equal 0, results[results.keys.first][0]
+  end
+
+  test "nothing unpublished" do
+    concept = Iqvoc::XLLabel.base_class.where(value: "forest").first.concepts.first
+    concept.update_attributes published_at: nil
+    results = Iqvoc::SimilarTerms.weighted("en", "forest")
+    assert_equal 0, results.length
+  end
+
+end

data/test/similar_terms.nt

@@ -0,0 +1,14 @@
+<http://localhost:3000/forest_label> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://localhost:3000/forest_label> <http://www.w3.org/2008/05/skos-xl#literalForm> "forest"@en .
+<http://localhost:3000/woods_label> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://localhost:3000/woods_label> <http://www.w3.org/2008/05/skos-xl#literalForm> "woods"@en .
+<http://localhost:3000/forest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
+<http://localhost:3000/forest> <http://www.w3.org/2008/05/skos-xl#prefLabel> <http://localhost:3000/forest_label> .
+<http://localhost:3000/forest> <http://www.w3.org/2008/05/skos-xl#altLabel> <http://localhost:3000/woods_label> .
+<http://localhost:3000/car_label> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://localhost:3000/car_label> <http://www.w3.org/2008/05/skos-xl#literalForm> "car"@en .
+<http://localhost:3000/auto_label> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos-xl#Label> .
+<http://localhost:3000/auto_label> <http://www.w3.org/2008/05/skos-xl#literalForm> "automobile"@en .
+<http://localhost:3000/car> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2004/02/skos/core#Concept> .
+<http://localhost:3000/car> <http://www.w3.org/2008/05/skos-xl#prefLabel> <http://localhost:3000/car_label> .
+<http://localhost:3000/car> <http://www.w3.org/2008/05/skos-xl#altLabel> <http://localhost:3000/auto_label> .

data/test/similar_terms.ttl

@@ -0,0 +1,19 @@
+@prefix : <http://localhost:3000/>.
+@prefix skos: <http://www.w3.org/2004/02/skos/core#>.
+@prefix skosxl: <http://www.w3.org/2008/05/skos-xl#>.
+
+:forest_label a skosxl:Label;
+  skosxl:literalForm "forest"@en.
+:woods_label a skosxl:Label;
+  skosxl:literalForm "woods"@en.
+:forest a skos:Concept;
+  skosxl:prefLabel :forest_label;
+  skosxl:altLabel :woods_label.
+
+:car_label a skosxl:Label;
+  skosxl:literalForm "car"@en.
+:auto_label a skosxl:Label;
+  skosxl:literalForm "automobile"@en.
+:car a skos:Concept;
+  skosxl:prefLabel :car_label;
+  skosxl:altLabel :auto_label.

data/test/test_helper.rb

@@ -1,3 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
+
+def load_test_data
+  SkosImporter.new('test/similar_terms.nt', 'http://localhost:3000/').run
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc_similar_terms
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Frederik Dohr
@@ -10,22 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-02 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iqvoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.4.0
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: '4.6'
 description: ''
 email:
 - robert.glaser@innoq.com
@@ -33,8 +39,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -42,6 +48,10 @@ files:
 - app/controllers/similar_terms_controller.rb
 - app/views/similar_terms/show.html.erb
 - app/views/similar_terms/show.iqrdf
+- app/views/similar_terms/show.xml.builder
+- bin/rails
+- bin/rake
+- bin/spring
 - config.ru
 - config/application.rb
 - config/boot.rb
@@ -52,24 +62,33 @@ files:
 - config/environments/development.rb
 - config/environments/production.rb
 - config/environments/test.rb
+- config/initializers/apipie.rb
 - config/initializers/iqvoc.rb
-- config/initializers/secret_token.rb.template
+- config/initializers/iqvoc_similiar_terms.rb
 - config/initializers/session_store.rb
 - config/initializers/wrap_parameters.rb
+- config/locales/de.yml
+- config/locales/en.yml
 - config/routes.rb
+- config/secrets.yml
 - db/.gitkeep
+- db/migrate/.gitkeep
 - iqvoc_similar_terms.gemspec
 - lib/iqvoc/similar_terms.rb
 - lib/iqvoc/similar_terms/version.rb
 - lib/iqvoc_similar_terms.rb
 - public/.gitkeep
-- script/ci/travis-before-build
-- script/ci/travis-build
 - script/rails
-- test/functional/api_test.rb
+- test/compound_forms.nt
+- test/concept_test.nt
+- test/concept_test.ttl
+- test/controllers/api_test.rb
+- test/controllers/onebox_test.rb
+- test/models/entity_resolution_test.rb
+- test/models/results_test.rb
+- test/similar_terms.nt
+- test/similar_terms.ttl
 - test/test_helper.rb
-- test/unit/entity_resolution_test.rb
-- test/unit/results_test.rb
 homepage: ''
 licenses: []
 metadata: {}
@@ -79,22 +98,28 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: iqvoc_similar_terms
-rubygems_version: 2.0.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: ''
 test_files:
-- test/functional/api_test.rb
+- test/compound_forms.nt
+- test/concept_test.nt
+- test/concept_test.ttl
+- test/controllers/api_test.rb
+- test/controllers/onebox_test.rb
+- test/models/entity_resolution_test.rb
+- test/models/results_test.rb
+- test/similar_terms.nt
+- test/similar_terms.ttl
 - test/test_helper.rb
-- test/unit/entity_resolution_test.rb
-- test/unit/results_test.rb

data/config/initializers/secret_token.rb.template

@@ -1,16 +0,0 @@
-# encoding: UTF-8
-
-# Be sure to restart your server when you modify this file.
-
-if Iqvoc::SimilarTerms.const_defined?(:Application)
-
-  # Your secret key for verifying the integrity of signed cookies.
-  # If you change this key, all old signed cookies will become invalid!
-  # Make sure the secret is at least 30 characters and all random,
-  # no regular words or you'll be exposed to dictionary attacks.
-
-  # Run `rake secret` and uncomment the following line
-  # Replace the secret-placeholder with your generated token
-  Iqvoc::SimilarTerms::Application.config.secret_token = "S-E-C-R-E-T"
-
-end

data/script/ci/travis-before-build

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-# Start virtual X frame buffer
-system "sh -e /etc/init.d/xvfb start"
-sleep 3
-
-# Create a database.yml for the current database env
-puts "Setting up database.yml for #{ENV["DB"]}"
-system "cp config/database.yml.#{ENV["DB"]} config/database.yml"
-
-# Generate and copy secret token initializer
-secret = `bundle exec rake secret`.strip
-path = File.join(File.dirname(__FILE__), '../../config/initializers/')
-template = File.read(File.join(path, 'secret_token.rb.template'))
-
-template.gsub!('S-E-C-R-E-T', secret)
-File.open(File.join(path, 'secret_token.rb'), 'w') do |file|
-  file.puts template
-end

data/script/ci/travis-build

@@ -1,11 +0,0 @@
-#!/usr/bin/env sh
-
-set -e
-set -x
-
-env="RAILS_ENV=test"
-
-export DISPLAY=:99.0
-bundle exec rake db:drop db:create $env
-bundle exec rake db:migrate $env
-bundle exec rake test $env