iqvoc 4.3.3 → 4.4.0

data/test/integration/note_annotations_test.rb

@@ -18,62 +18,61 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 require 'iqvoc/rdfapi'
 
 class NoteAnnotationsTest < ActionDispatch::IntegrationTest
+  test 'creating and retrieving change notes' do
+    login 'administrator'
 
-  test "creating and retrieving change notes" do
-    login "administrator"
+    visit new_concept_path(lang: 'en', format: 'html', published: 0)
+    fill_in 'concept_labelings_by_text_labeling_skos_pref_labels_en',
+        with: 'Foo'
+    fill_in 'concept_note_skos_change_notes_attributes_0_value',
+        with: 'lorem ipsum'
+    click_button 'Save'
 
-    visit new_concept_path(:lang => "en", :format => "html", :published => 0)
-    fill_in "concept_labelings_by_text_labeling_skos_pref_labels_en",
-        :with => "Foo"
-    fill_in "concept_note_skos_change_notes_attributes_0_value",
-        :with => "lorem ipsum"
-    click_button "Save"
+    assert page.has_content? I18n.t('txt.controllers.versioned_concept.success')
 
-    assert page.has_content? I18n.t("txt.controllers.versioned_concept.success")
+    click_link_or_button I18n.t('txt.views.versioning.publishing')
+    assert page.has_content? I18n.t('txt.controllers.versioning.published')
 
-    click_link_or_button I18n.t("txt.views.versioning.publishing")
-    assert page.has_content? I18n.t("txt.controllers.versioning.published")
+    click_link_or_button I18n.t('txt.views.versioning.versioning_mode')
+    fill_in 'concept_note_skos_change_notes_attributes_1_value',
+        with: 'dolor sit amet'
+    click_button 'Save'
 
-    click_link_or_button I18n.t("txt.views.versioning.versioning_mode")
-    fill_in "concept_note_skos_change_notes_attributes_1_value",
-        :with => "dolor sit amet"
-    click_button "Save"
+    assert page.has_css?('dl.note_annotations', count: 1)
 
-    assert page.has_css?("dl.note_annotations", :count => 1)
-
-    click_link_or_button I18n.t("txt.views.versioning.publishing")
-    assert page.has_content? I18n.t("txt.controllers.versioning.published")
-    assert page.has_css?("dl.note_annotations", :count => 1)
+    click_link_or_button I18n.t('txt.views.versioning.publishing')
+    assert page.has_content? I18n.t('txt.controllers.versioning.published')
+    assert page.has_css?('dl.note_annotations', count: 1)
 
     # TTL & RDF/XML
 
-    ttl_uri = page.find("#rdf_link_ttl")[:href]
-    xml_uri = page.find("#rdf_link_xml")[:href]
+    ttl_uri = page.find('#rdf_link_ttl')[:href]
+    xml_uri = page.find('#rdf_link_xml')[:href]
 
     visit ttl_uri
     ttl = page.source.
-        gsub(/^ *| *$/, ""). # ignore indentation
-        gsub(/\d/, "#").     # neutralize timestamps
-        gsub(/#\+#/, "#-#")  # neutralize eventually positive timezone shifts (server time)
+        gsub(/^ *| *$/, ''). # ignore indentation
+        gsub(/\d/, '#').     # neutralize timestamps
+        gsub(/#\+#/, '#-#')  # neutralize eventually positive timezone shifts (server time)
     assert ttl.include?("skos:changeNote [\n" +
         "rdfs:comment \"lorem ipsum\"@en\n" +
-        "]")
+        ']')
     assert ttl.include?("skos:changeNote [\n" +
         "rdfs:comment \"dolor sit amet\"@en;\n" +
         "dct:creator \"Test User\";\n" +
         "dct:modified \"####-##-##T##:##:##-##:##\"\n" +
-        "]")
+        ']')
 
     visit xml_uri
     xml = page.source.
-        gsub(/^ *| *$/, ""). # ignore indentation
-        gsub(/\d/, "#").     # neutralize timestamps
-        gsub(/#\+#/, "#-#")  # neutralize eventually positive timezone shifts (server time)
+        gsub(/^ *| *$/, ''). # ignore indentation
+        gsub(/\d/, '#').     # neutralize timestamps
+        gsub(/#\+#/, '#-#')  # neutralize eventually positive timezone shifts (server time)
     assert xml.include?("<skos:changeNote>\n" +
         "<rdf:Description>\n" +
         "<rdfs:comment xml:lang=\"en\">lorem ipsum</rdfs:comment>\n" +
         "</rdf:Description>\n" +
-        "</skos:changeNote>")
+        '</skos:changeNote>')
     assert xml.include?("<skos:changeNote>\n" +
         "<rdf:Description>\n" +
         "<rdfs:comment xml:lang=\"en\">dolor sit amet</rdfs:comment>\n" +
@@ -83,7 +82,7 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
         "</skos:changeNote>\n")
   end
 
-  test "rdf for localized note annotations" do
+  test 'rdf for localized note annotations' do
     rdfapi = Iqvoc::RDFAPI
 
     concept = rdfapi.devour *%w(foobar a skos:Concept)
@@ -92,9 +91,9 @@ class NoteAnnotationsTest < ActionDispatch::IntegrationTest
 
     rdfapi.devour concept, 'skos:prefLabel', '"foo"@en'
 
-    note = Note::RDFS::SeeAlso.create :owner => concept, :value => 'foo', :language => 'en'
-    note.annotations.create :namespace => 'dct', :predicate => 'title', :value => 'Foo Bar', :language => 'en'
-    note.annotations.create :namespace => 'foaf', :predicate => 'page', :value => 'http://google.de/'
+    note = Note::RDFS::SeeAlso.create owner: concept, value: 'foo', language: 'en'
+    note.annotations.create namespace: 'dct', predicate: 'title', value: 'Foo Bar', language: 'en'
+    note.annotations.create namespace: 'foaf', predicate: 'page', value: 'http://google.de/'
 
     visit "/#{concept.origin}.ttl"
 
@@ -108,5 +107,4 @@ RDF
 
     assert page.body.include?(ttl)
   end
-
 end

data/test/integration/search_test.rb

@@ -17,102 +17,105 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class SearchTest < ActionDispatch::IntegrationTest
-
   setup do
     @pagination_setting = Kaminari.config.default_per_page
     Kaminari.config.default_per_page = 5
 
-    @concepts =  ["Tree", "Forest"].map do |english_label_value|
-      FactoryGirl.create(:concept, :pref_labelings => [
-          FactoryGirl.create(:pref_labeling, :target => FactoryGirl.create(:pref_label,
-              :language => :en, :value => english_label_value))
-        ])
+    @concepts = %w("Tree"@en "Forest"@en).map do |literal|
+      Concept::SKOS::Base.new.tap do |c|
+        Iqvoc::RDFAPI.devour c, 'skos:prefLabel', literal
+        c.publish
+        c.save
+      end
     end
 
-    # create collection
-    @collection = FactoryGirl.create(:collection,
-      :members => @concepts.map { |c| Iqvoc::Collection.member_class.new(:target => c) },
-        :labelings => [], :pref_labelings => [
-            FactoryGirl.create(:pref_labeling,
-                :target => FactoryGirl.create(:pref_label, :language => :en, :value => "Alpha"))
-        ])
+    @collection = Collection::SKOS::Unordered.new.tap do |c|
+      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Alpha"@en'
+      c.publish
+      c.save
+    end
+
+    # assign concepts to collection
+    @concepts.each do |c|
+      Iqvoc::RDFAPI.devour @collection, 'skos:member', c
+    end
   end
 
   teardown do
     Kaminari.config.default_per_page = @pagination_setting
   end
 
-  test "searching" do
-    visit search_path(:lang => 'en', :format => 'html')
+  test 'searching' do
+    visit search_path(lang: 'en', format: 'html')
 
     [{
-        :type => 'Labels', :query => 'Forest', :query_type => 'contains',
-        :amount => 1, :result => 'Forest'
+        type: 'Labels', query: 'Forest', query_type: 'contains',
+        amount: 1, result: 'Forest'
       }].each { |q|
-      find("#t").select q[:type]
-      fill_in "Search term(s)", :with => q[:query]
-      find("#qt").select q[:query_type]
+      find('#t').select q[:type]
+      fill_in 'Search term(s)', with: q[:query]
+      find('#qt').select q[:query_type]
 
       # select all languages
-      page.all(:css, ".lang_check").each do |cb|
+      page.all(:css, '.lang_check').each do |cb|
         check cb[:id]
       end
 
-      click_button("Search")
+      click_button('Search')
 
-      assert page.has_css?(".search-result", :count => q[:amount]),
-      "Page has #{page.all(:css, ".search-result").count} '.search-result' nodes. Should be #{q[:amount]}."
+      assert page.has_css?('.search-result', count: q[:amount]),
+      "Page has #{page.all(:css, '.search-result').count} '.search-result' nodes. Should be #{q[:amount]}."
 
-      within(".search-result") do
+      within('.search-result') do
         assert page.has_content?(q[:result]), "Could not find '#{q[:result]}' within '.search-result'."
       end
     }
   end
 
-  test "collection/concept filter" do
-    visit search_path(:lang => 'en', :format => 'html')
+  test 'collection/concept filter' do
+    visit search_path(lang: 'en', format: 'html')
 
-    find("#t").select "Labels"
-    find("#qt").select "contains"
-    fill_in "Search term(s)", :with => "Alpha"
-    click_button("Search")
-    assert page.has_css?(".search-result", :count => 1)
+    find('#t').select 'Labels'
+    find('#qt').select 'contains'
+    fill_in 'Search term(s)', with: 'Alpha'
+    click_button('Search')
+    assert page.has_css?('.search-result', count: 1)
 
-    choose "Concepts"
-    click_button "Search"
-    assert page.has_no_css?(".search-result")
+    choose 'Concepts'
+    click_button 'Search'
+    assert page.has_no_css?('.search-result')
 
-    choose "Collections"
-    click_button "Search"
-    assert page.has_css?(".search-result")
+    choose 'Collections'
+    click_button 'Search'
+    assert page.has_css?('.search-result')
   end
 
-  test "searching within collections" do
-    visit search_path(:lang => 'en', :format => 'html')
+  test 'searching within collections' do
+    visit search_path(lang: 'en', format: 'html')
 
-    find("#t").select "Labels"
-    find("#qt").select "contains"
-    fill_in "Search term(s)", :with => "res"
-    find("#c").select @collection.to_s
+    find('#t').select 'Labels'
+    find('#qt').select 'contains'
+    fill_in 'Search term(s)', with: 'res'
+    find('#c').select @collection.to_s
 
     # select all languages
-    page.all(:css, ".lang_check").each do |cb|
+    page.all(:css, '.lang_check').each do |cb|
       check cb[:id]
     end
 
-    click_button("Search")
+    click_button('Search')
 
-    assert page.has_css?(".search-result", :count => 1)
-    assert page.find(".search-results").has_content?("Forest")
+    assert page.has_css?('.search-result', count: 1)
+    assert page.find('.search-results').has_content?('Forest')
 
     # TTL & RDF/XML
 
-    ttl_uri = page.find("#rdf_link_ttl")[:href]
-    xml_uri = page.find("#rdf_link_xml")[:href]
+    ttl_uri = page.find('#rdf_link_ttl')[:href]
+    xml_uri = page.find('#rdf_link_xml')[:href]
 
     visit ttl_uri
-    assert page.has_content?("search:result1 a sdc:Result")
-    assert page.has_no_content?("search:result2 a sdc:Result")
+    assert page.has_content?('search:result1 a sdc:Result')
+    assert page.has_no_content?('search:result2 a sdc:Result')
     assert page.has_content?("sdc:link :#{@concepts[1].origin}")
     assert page.has_content?('skos:prefLabel "Forest"@en')
 
@@ -121,84 +124,87 @@ class SearchTest < ActionDispatch::IntegrationTest
     assert page.source.include?("<skos:prefLabel xml:lang=\"en\">#{@concepts[1].to_s}</skos:prefLabel>")
   end
 
-  test "searching specific classes within collections" do
-    concept = FactoryGirl.create(:concept, { :notes => [
-          Iqvoc::Concept.note_classes[1].new(:language => "en", :value => "lorem ipsum")
-        ] })
+  test 'searching specific classes within collections' do
+    concept = Concept::SKOS::Base.new.tap do |c|
+      Iqvoc::RDFAPI.devour c, 'skos:definition', '"lorem ipsum"@en'
+      c.publish
+      c.save
+    end
 
-    visit search_path(:lang => 'en', :format => 'html')
+    visit search_path(lang: 'en', format: 'html')
 
-    find("#t").select "Notes"
-    find("#qt").select "contains"
-    fill_in "Search term(s)", :with => "ipsum"
-    find("#c").select @collection.to_s
+    find('#t').select 'Notes'
+    find('#qt').select 'contains'
+    fill_in 'Search term(s)', with: 'ipsum'
+    find('#c').select @collection.to_s
 
     # select all languages
-    page.all(:css, ".lang_check").each do |cb|
+    page.all(:css, '.lang_check').each do |cb|
       check cb[:id]
     end
 
-    click_button("Search")
+    click_button('Search')
 
-    assert page.has_css?(".search-result", :count => 1)
-    assert page.find(".search-results").has_content?(concept.pref_label.to_s)
+    assert page.has_css?('.search-result', count: 1)
+    assert page.find('.search-results').has_content?(concept.pref_label.to_s)
   end
 
-  test "empty query with selected collection should return all collection members" do
-    visit search_path(:lang => 'en', :format => 'html')
+  test 'empty query with selected collection should return all collection members' do
+    visit search_path(lang: 'en', format: 'html')
 
-    find("#t").select "Labels"
-    find("#qt").select "exact match"
-    fill_in "Search term(s)", :with => ""
-    find("#c").select @collection.to_s
+    find('#t').select 'Labels'
+    find('#qt').select 'exact match'
+    fill_in 'Search term(s)', with: ''
+    find('#c').select @collection.to_s
 
     # select all languages
-    page.all(:css, ".lang_check").each do |cb|
+    page.all(:css, '.lang_check').each do |cb|
       check cb[:id]
     end
 
-    click_button("Search")
+    click_button('Search')
 
-    assert page.has_css?(".search-result", :count => 2)
-    assert page.find(".search-results").has_content?("Tree")
-    assert page.find(".search-results").has_content?("Forest")
+    assert page.has_css?('.search-result', count: 2)
+    assert page.find('.search-results').has_content?('Tree')
+    assert page.find('.search-results').has_content?('Forest')
   end
 
-  test "pagination" do
+  test 'pagination' do
     # create a large number of concepts
-    12.times { |i|
-      FactoryGirl.create(:concept,
-        :pref_labelings => [FactoryGirl.create(:pref_labeling,
-            :target => FactoryGirl.create(:pref_label, :language => :en,
-              :value => "sample_#{sprintf("_%04d", i + 1)}"))])
-    }
+    1.upto(12) do |i|
+      Concept::SKOS::Base.new.tap do |c|
+        Iqvoc::RDFAPI.devour c, 'skos:prefLabel', "\"sample_#{sprintf('_%04d', i)}\"@en"
+        c.publish
+        c.save
+      end
+    end
 
-    visit search_path(:lang => 'en', :format => 'html')
+    visit search_path(lang: 'en', format: 'html')
 
-    find("#t").select "Labels"
-    find("#qt").select "contains"
-    fill_in "Search term(s)", :with => "sample_"
+    find('#t').select 'Labels'
+    find('#qt').select 'contains'
+    fill_in 'Search term(s)', with: 'sample_'
 
-    click_button("Search")
+    click_button('Search')
 
-    assert page.has_css?(".search-result", :count => 5)
-    assert page.has_css?(".pagination .page", :count => 3)
+    assert page.has_css?('.search-result', count: 5)
+    assert page.has_css?('.pagination .page', count: 3)
 
-    find(".pagination").all(".page").last.find("a").click
+    find('.pagination').all('.page').last.find('a').click
 
-    assert page.has_css?(".search-result", :count => 2)
+    assert page.has_css?('.search-result', count: 2)
 
     # TTL & RDF/XML
 
-    ttl_uri = page.find("#rdf_link_ttl")[:href]
-    xml_uri = page.find("#rdf_link_xml")[:href]
+    ttl_uri = page.find('#rdf_link_ttl')[:href]
+    xml_uri = page.find('#rdf_link_xml')[:href]
 
     visit ttl_uri
-    assert page.has_content?("sdc:totalResults 12;")
-    assert page.has_content?("sdc:itemsPerPage 5;")
-    assert page.has_content?("search:result1 a sdc:Result;")
-    assert page.has_content?("search:result2 a sdc:Result;")
-    assert page.has_no_content?("search:result3 a sdc:Result;") # we're on page 3/3
+    assert page.has_content?('sdc:totalResults 12;')
+    assert page.has_content?('sdc:itemsPerPage 5;')
+    assert page.has_content?('search:result1 a sdc:Result;')
+    assert page.has_content?('search:result2 a sdc:Result;')
+    assert page.has_no_content?('search:result3 a sdc:Result;') # we're on page 3/3
 
     visit xml_uri
     assert page.source.include?('<sdc:totalResults rdf:datatype="http://www.w3.org/2001/XMLSchema#integer">12</sdc:totalResults>')
@@ -207,5 +213,4 @@ class SearchTest < ActionDispatch::IntegrationTest
     assert page.source.include?('#result2">')
     assert !page.source.include?('#result3">') # we're on page 3/3
   end
-
 end

data/test/integration/tree_test.rb

@@ -17,16 +17,24 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class TreeTest < ActionDispatch::IntegrationTest
+  test 'browse hierarchical concepts tree' do
+    narrower_concept = Concept::SKOS::Base.new.tap do |c|
+      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Narrower"@en'
+      c.publish
+      c.save
+    end
 
-  test "browse hierarchical concepts tree" do
-    concept = FactoryGirl.create(:concept, :broader_relations => [])
-    narrower_concept = concept.narrower_relations.first.target
+    concept = Concept::SKOS::Base.new(top_term: true).tap do |c|
+      Iqvoc::RDFAPI.devour c, 'skos:prefLabel', '"Foo"@en'
+      Iqvoc::RDFAPI.devour c, 'skos:narrower', narrower_concept
+      c.publish
+      c.save
+    end
 
-    visit hierarchical_concepts_path(:lang => :de, :format => :html)
+    visit hierarchical_concepts_path(lang: :de, format: :html)
     assert page.has_link?(concept.pref_label.to_s),
       "Concept #{concept.pref_label} isn't visible in the hierarchical concepts list"
     assert !page.has_content?(narrower_concept.pref_label.to_s),
       "Narrower relation (#{narrower_concept.pref_label}) shouldn't be visible in the hierarchical concepts list"
   end
-
 end

data/test/integration/untranslated_test.rb

@@ -17,46 +17,43 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test_helper')
 
 class UntranslatedConceptsTest < ActionDispatch::IntegrationTest
-
   setup do
-    [ {:en => "Xen1", :de => "Xde1"},
-      {:en => "Xen2"},
-      {:en => "Yen1", :de => "Yde1"},
-      {:en => "Yen2"}
-    ].map do |hsh|
-      labelings = []
-      hsh.each do |lang, val|
-        labelings << FactoryGirl.create(:pref_labeling,
-            :target => FactoryGirl.create(:pref_label, :language => lang, :value => val))
+    [ { en: 'Xen1', de: 'Xde1' },
+      { en: 'Xen2' },
+      { en: 'Yen1', de: 'Yde1' },
+      { en: 'Yen2' }
+    ].each do |hsh|
+      concept = Concept::SKOS::Base.new
+      hsh.each do |lang, value|
+        Iqvoc::RDFAPI.devour concept, 'skos:prefLabel', "\"#{value}\"@#{lang}"
       end
-      FactoryGirl.create(:concept, :pref_labelings => labelings)
+      concept.publish.save
     end
   end
 
   # FIXME: apparently these tests are bogus, as they passed even when they
   # should fail (see the commit that introduced this very comment for details)
 
-  test "showing only concepts without pref label in respective language" do
-    visit untranslated_concepts_path(:lang => :de, :prefix => "x", :format => :html)
-    concepts = page.all("#content ul")[1].all("li") # XXX: too unspecific
+  test 'showing only concepts without pref label in respective language' do
+    visit untranslated_concepts_path(lang: :de, prefix: 'x', format: :html)
+    concepts = page.all('#content ul')[1].all('li') # XXX: too unspecific
 
     assert_equal :de, I18n.locale
     assert_equal 1, concepts.length
-    assert_equal 1, concepts[0].all("a").length
-    assert_equal "Xen2", concepts[0].find("a").text.strip
+    assert_equal 1, concepts[0].all('a').length
+    assert_equal 'Xen2', concepts[0].find('a').text.strip
 
-    visit untranslated_concepts_path(:lang => :de, :prefix => "y", :format => :html)
-    concepts = page.all("#content ul")[1].all("li") # XXX: too unspecific
+    visit untranslated_concepts_path(lang: :de, prefix: 'y', format: :html)
+    concepts = page.all('#content ul')[1].all('li') # XXX: too unspecific
 
     assert_equal 1, concepts.length
-    assert_equal "Yen2", concepts[0].find("a").text.strip
+    assert_equal 'Yen2', concepts[0].find('a').text.strip
   end
 
   test "showing error message for thesaurus's main language" do
-    visit untranslated_concepts_path(:lang => :en, :prefix => "x", :format => :html)
+    visit untranslated_concepts_path(lang: :en, prefix: 'x', format: :html)
 
     assert_equal :en, I18n.locale
-    assert_equal 1, page.all("#content .alert-error").length
+    assert_equal 1, page.all('.alert-danger').length
   end
-
 end