iqvoc 4.0.8 → 4.0.9

data/lib/iqvoc/configuration/concept.rb

@@ -9,13 +9,13 @@ module Iqvoc
         Iqvoc.first_level_class_configuration_modules << self
 
         mattr_accessor :base_class_name, :root_class_name,
-        :broader_relation_class_name, :further_relation_class_names,
-        :pref_labeling_class_name,
-        :match_class_names,
-        :note_class_names,
-        :additional_association_class_names,
-        :view_sections,
-        :include_module_names
+            :broader_relation_class_name, :further_relation_class_names,
+            :pref_labeling_class_name,
+            :match_class_names,
+            :note_class_names,
+            :additional_association_class_names,
+            :view_sections,
+            :include_module_names
 
         self.base_class_name              = 'Concept::SKOS::Base'
         self.root_class_name              = 'Concept::SKOS::Scheme'

data/lib/iqvoc/configuration/core.rb

@@ -14,8 +14,11 @@ module Iqvoc
           :first_level_class_configuration_modules,
           :ability_class_name,
           :navigation_items,
+          :localized_routes,
           :core_assets
 
+        self.localized_routes = [] # routing extensibility hook
+
         self.navigation_items = [
           {
             :content => proc { link_to "Dashboard", dashboard_path },
@@ -58,7 +61,6 @@ module Iqvoc
           bootstrap/bootstrap.css
           bootstrap/bootstrap-responsive.css
           iqvoc/ie_fixes.css
-          json2.js
           bootstrap/bootstrap.js
           html5.js
         )
@@ -90,9 +92,9 @@ module Iqvoc
         # initialize
         self.config.register_settings({
           "title" => "iQvoc",
-          "available_languages" => ["en", "de"],
           "languages.pref_labeling" => ["en", "de"],
-          "languages.further_labelings.Labeling::SKOS::AltLabel" => ["en", "de"]
+          "languages.further_labelings.Labeling::SKOS::AltLabel" => ["en", "de"],
+          "note_languages" => ["en", "de"]
         })
         self.config.initialize_cache
       end
@@ -148,8 +150,12 @@ module Iqvoc
           return config["title"]
         end
 
-        def available_languages
-          return config["available_languages"]
+        def note_languages
+          return config["note_languages"]
+        end
+
+        def all_languages
+          (Iqvoc::Concept.pref_labeling_languages + Iqvoc::Concept.further_labeling_class_names.values.flatten + note_languages).compact.map(&:to_s).uniq
         end
 
         # @deprecated
@@ -158,11 +164,6 @@ module Iqvoc
           self.config.register_setting("title", value)
         end
 
-        # @deprecated
-        def available_languages=(value)
-          ActiveSupport::Deprecation.warn "available_languages has been moved into instance configuration", caller
-          self.config.register_setting("available_languages", value)
-        end
       end
 
     end

data/lib/iqvoc/controller_extensions.rb

@@ -19,7 +19,6 @@ module Iqvoc
 
     def default_url_options(options = nil)
       { :format => params[:format], :lang => I18n.locale }.
-        reject { |key, value| key == :lang and value.to_s.strip.blank? }. # Strip out the lang parameter if it's empty.
         merge(options || {})
     end
 
@@ -53,9 +52,7 @@ module Iqvoc
     end
 
     def set_locale
-      if Iqvoc::Concept.pref_labeling_languages.include?(nil)
-        I18n.locale = " "
-      elsif params[:lang] && Iqvoc::Concept.pref_labeling_languages.include?(params[:lang])
+      if params[:lang].present? && Iqvoc::Concept.pref_labeling_languages.include?(params[:lang])
         I18n.locale = params[:lang]
       else
         I18n.locale = Iqvoc::Concept.pref_labeling_languages.first
@@ -65,7 +62,7 @@ module Iqvoc
     def concept_widget_data(concept, rank = nil)
       data = {
         :id => concept.origin,
-        :name => concept.pref_label.value.to_s + (concept.additional_info ? " (#{concept.additional_info })" : "")
+        :name => (concept.pref_label && concept.pref_label.value.presence || ":#{concept.origin}") + (concept.additional_info ? " (#{concept.additional_info })" : "")
       }
       data[:rank] = rank if rank
       data

data/lib/iqvoc/inline_data_helper.rb

@@ -14,12 +14,34 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require 'csv'
+
 module Iqvoc
   module InlineDataHelper
 
-    # delimiters for strings representing a list of values
-    Joiner = ", "
-    Splitter = /[,\n] */
+    # delimiters for strings representing a list of values - XXX: lacks encapsulation
+    JOINER = ", "
+    SPLITTER = /[,\n] */
+
+    CSV_OPTIONS = {
+      :col_sep => ", ",
+      :quote_char => '"'
+    }
+
+    def self.parse_inline_values(inline_values)
+      options = CSV_OPTIONS.clone
+      options[:col_sep] = options[:col_sep].strip
+      begin
+        values = inline_values.parse_csv(options)
+      rescue CSV::MalformedCSVError => exc
+        values = inline_values.parse_csv(CSV_OPTIONS)
+      end
+      values ? values.map(&:strip) : []
+    end
+
+    def self.generate_inline_values(values)
+      values.to_csv(CSV_OPTIONS).strip
+    end
 
   end
 end

data/lib/iqvoc/instance_configuration.rb

@@ -69,7 +69,7 @@ module Iqvoc
 
     # retrieve individual setting, using default value as fallback
     def [](key)
-      initialize_cache # relying on ActiveRecord query cache -- XXX: inefficient (caching doesn't include processing/indexing)
+      initialize_cache if @settings.blank?
       return @settings[key]
     end
 

data/lib/iqvoc/rdfapi.rb

@@ -0,0 +1,56 @@
+# encoding: UTF-8
+
+# Copyright 2011 innoQ Deutschland GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+module Iqvoc
+  module RDFAPI
+    FIRST_LEVEL_OBJECT_CLASSES  = [Iqvoc::Concept.base_class, Iqvoc::Collection.base_class]
+    SECOND_LEVEL_OBJECT_CLASSES = Iqvoc::Concept.labeling_classes.keys +
+                                  Iqvoc::Concept.note_classes +
+                                  Iqvoc::Concept.relation_classes +
+                                  Iqvoc::Concept.match_classes +
+                                  [Iqvoc::Collection.member_class]
+
+    OBJECT_DICTIONARY = FIRST_LEVEL_OBJECT_CLASSES.inject({}) do |hash, klass|
+      hash["#{klass.rdf_namespace}:#{klass.rdf_class}"] = klass
+      hash
+    end
+
+    PREDICATE_DICTIONARY = SECOND_LEVEL_OBJECT_CLASSES.inject({}) do |hash, klass|
+      hash["#{klass.rdf_namespace}:#{klass.rdf_predicate}"] = klass
+      hash
+    end
+
+    def self.devour(rdf_subject, rdf_predicate, rdf_object)
+      case rdf_predicate
+      when 'a', 'rdf:type'
+        case rdf_object
+        when String
+          target = OBJECT_DICTIONARY[rdf_object] || rdf_object.constantize
+        else
+          target = rdf_object
+        end
+        target.find_or_initialize_by_origin(rdf_subject)
+      when String
+        # dictionary lookup
+        target = PREDICATE_DICTIONARY[rdf_predicate] || rdf_predicate.constantize
+        target.build_from_rdf(rdf_subject, target, rdf_object)
+      else # is a class
+        rdf_predicate.build_from_rdf(rdf_subject, rdf_predicate, rdf_object)
+      end
+    end
+
+  end
+end

data/lib/iqvoc/skos_importer.rb

@@ -1,15 +1,16 @@
+require 'iqvoc/rdfapi'
+
 module Iqvoc
   class SkosImporter
 
     FIRST_LEVEL_OBJECT_CLASSES = [Iqvoc::Concept.base_class, Iqvoc::Collection.base_class]
     SECOND_LEVEL_OBJECT_CLASSES = Iqvoc::Concept.labeling_classes.keys +
-      Iqvoc::Concept.note_classes +
-      Iqvoc::Concept.relation_classes +
-      Iqvoc::Concept.match_classes +
-      Iqvoc::Collection.member_classes
+        Iqvoc::Concept.note_classes +
+        Iqvoc::Concept.relation_classes +
+        Iqvoc::Concept.match_classes +
+        [Iqvoc::Collection.member_class]
 
     def initialize(file, default_namespace_url, logger = Rails.logger)
-
       @logger = logger
 
       unless file.is_a?(File) || file.is_a?(Array)
@@ -28,69 +29,90 @@ module Iqvoc
         @prefixes[uri] = "#{pref.to_s}:"
       end
 
-      @seen_first_level_objects = {}
+      @seen_first_level_objects = {} # Concept cache (don't load any concept twice from db)
+      @new_subjects = [] # Concepts to be published later
+
+      # Triples the importer doesn't understand immediately. Example:
+      #
+      #     :a skos:prefLabel "foo". # => What is :a? Remember this and try again later
+      #     ....
+      #     :a rdf:type skos:Concept # => Now I know :a, good I remebered it's prefLabel...
+      @unknown_second_level_tripes = []
+
+      # Hash of arrays of arrays: { "_:n123" => [["pred1", "obj1"], ["pred2", "obj2"]] }
       @blank_nodes = {}
 
       @existing_origins = {} # To prevent the creation of first level objects we already have
-      FIRST_LEVEL_OBJECT_CLASSES.each do |klass|
-        klass.select("origin").all.each do |thing|
+      Iqvoc::RDFAPI::FIRST_LEVEL_OBJECT_CLASSES.each do |klass|
+        klass.select('origin').all.each do |thing|
           @existing_origins[thing.origin] = klass
         end
       end
 
-      import(file)
+      import file
     end
 
     private
 
     def import(file)
-      # Collect blank nodes
-      file.each do |line|
-        identify_blank_nodes(*extract_triple(line))
-      end
+      ActiveSupport.run_load_hooks(:skos_importer_before_import, self)
+
+      start = Time.now
 
-      file.rewind if file.is_a?(IO)
-      types = {} # type identifier ("namespace:SomeClass") to Iqvoc class assignment hash
+      first_level_types = {} # type identifier ("namespace:SomeClass") to Iqvoc class assignment hash
       FIRST_LEVEL_OBJECT_CLASSES.each do |klass|
-        types["#{klass.rdf_namespace}:#{klass.rdf_class}"] = klass
+        first_level_types["#{klass.rdf_namespace}:#{klass.rdf_class}"] = klass
+      end
+      second_level_types = {}
+      SECOND_LEVEL_OBJECT_CLASSES.each do |klass|
+        second_level_types["#{klass.rdf_namespace}:#{klass.rdf_predicate}"] = klass
       end
 
       file.each do |line|
-        import_first_level_objects(types, *extract_triple(line))
+        identify_blank_nodes(*extract_triple(line)) ||
+            import_first_level_objects(first_level_types, *extract_triple(line)) ||
+            import_second_level_objects(second_level_types, false, *extract_triple(line))
       end
-      new_subjects = @seen_first_level_objects.dup # Remember the objects seen yet, because they are the ones to be published later
 
-      file.rewind if file.is_a?(IO)
-      types = {}
-      SECOND_LEVEL_OBJECT_CLASSES.each do |klass|
-        types["#{klass.rdf_namespace}:#{klass.rdf_predicate}"] = klass
-      end
-      file.each do |line|
-        import_second_level_objects(types, *extract_triple(line))
+      @logger.debug("Computing 'forward' defined triples...")
+      @unknown_second_level_tripes.each do |s, p, o|
+        import_second_level_objects(second_level_types, true, s, p, o)
       end
 
-      new_subjects.each do |id, subject|
+      first_import_step_done = Time.now
+      @logger.debug("Basic import done (took #{(first_import_step_done - start).to_i} seconds).")
+
+      @logger.debug("Publishing #{@new_subjects.count} new subjects...")
+      published = 0
+      @new_subjects.each do |subject|
         if subject.valid_with_full_validation?
           subject.publish
           subject.save!
+          published += 1
         else
-          @logger.warn "WARNING: Subject not valid: '#{subject.origin}'. Won't be published automatically.."
+          @logger.warn "WARNING: Publishing failed! Subject ('#{subject.origin}') invalid: #{subject.errors.to_hash.inspect}"
         end
       end
 
+      done = Time.now
+      @logger.debug("Publishing of #{published} subjects done (took #{(done - first_import_step_done).to_i} seconds). #{@new_subjects.count - published} where invalid.")
+      puts "Imported #{published} valid and #{@new_subjects.count - published} invalid subjects in #{(done - start).to_i} seconds."
+      puts "  First step took  #{(first_import_step_done - start).to_i} seconds, publishing took #{(done - first_import_step_done).to_i} seconds."
+
+      ActiveSupport.run_load_hooks(:skos_importer_after_import, self)
     end
 
     def identify_blank_nodes(subject, predicate, object)
       if blank_node?(subject)
         @blank_nodes[subject] ||= []
         @blank_nodes[subject] << [predicate, object]
+        true
+      else
+        false
       end
     end
 
     def import_first_level_objects(types, subject, predicate, object)
-      @logger.debug "types: #{types}"
-      @logger.debug "predicate: #{predicate}"
-      @logger.debug "subject: #{subject}"
       if (predicate == "rdf:type" && types[object] && subject =~ /^:(.+)$/)
         # We've found a subject definition with a class we know and which is in our responsibility (":")
         origin = $1
@@ -103,20 +125,29 @@ module Iqvoc
           end
         else
           @seen_first_level_objects[origin] = types[object].create!(:origin => origin)
+          @new_subjects << @seen_first_level_objects[origin]
         end
+        true
+      else
+        false
       end
-
     end
 
-    def import_second_level_objects(types, subject, predicate, object)
+    def import_second_level_objects(types, final, subject, predicate, object)
       return unless (subject =~ /^:(.*)$/ && types[predicate]) # We're not responsible for this
 
+      initial_triple = [subject, predicate, object]
+
       # Load the subject and replace the string by the respective data object
       subject_origin = $1
       subject = load_first_level_object(subject_origin)
       unless subject
-        @logger.warn "Iqvoc::SkosImporter: Couldn't find Subject with origin '#{subject_origin}. Skipping entry '#{subject} #{predicate} #{object}.'"
-        return
+        if final
+          @logger.warn "Iqvoc::SkosImporter: Couldn't find Subject with origin '#{subject_origin}. Skipping entry '#{subject} #{predicate} #{object}.'"
+        else
+          @unknown_second_level_tripes << initial_triple
+        end
+        return false
       end
 
       # Load the data object for the object string if this is representing a thing in our domain
@@ -124,13 +155,28 @@ module Iqvoc
         object_origin = $1
         object = load_first_level_object(object_origin)
         unless object
-          @logger.warn "Iqvoc::SkosImporter: Couldn't find Object with origin '#{object_origin}. Skipping entry ':#{subject_origin} #{predicate} #{object}.'"
-          return
+          if final
+            @logger.warn "Iqvoc::SkosImporter: Couldn't find Object with origin '#{object_origin}. Skipping entry ':#{subject_origin} #{predicate} #{object}.'"
+          else
+            @unknown_second_level_tripes << initial_triple
+          end
+          return false
         end
       end
 
+      # If not in final mode every :my_concept :bla _:blank_node. triple should
+      # be saved for final mode. Why? Example:
+      #
+      #    :a iqvoc:changeNote _:b01 # => I do not know know anything about the blank node now
+      #    _:b01 dc:author "DHH"...
+      #
       if blank_node?(object)
-        object = @blank_nodes[object]
+        if final
+          object = @blank_nodes[object]
+        else
+          @unknown_second_level_tripes << initial_triple
+          return false
+        end
       end
 
       types[predicate].build_from_rdf(subject, predicate, object)
@@ -138,11 +184,12 @@ module Iqvoc
 
     def load_first_level_object(origin)
       unless @seen_first_level_objects[origin]
-        FIRST_LEVEL_OBJECT_CLASSES.each do |klass|
+        klass = @existing_origins[origin]
+        if klass
           @seen_first_level_objects[origin] = klass.by_origin(origin).last
-          break if @seen_first_level_objects[origin]
         end
       end
+
       @seen_first_level_objects[origin]
     end
 
@@ -151,7 +198,7 @@ module Iqvoc
     end
 
     def extract_triple(line)
-      raise "'#{line}' doesn't look like valid ntriples data." unless line =~ /^(.*)\.\w*$/
+      raise "'#{line}' doesn't look like valid ntriples data." unless line =~ /^(.*)\.\s*$/
       line = $1.squish
 
       triple = line.split(' ', 3) # The first one are uris the last can be a literal too
@@ -171,5 +218,6 @@ module Iqvoc
       triple
     end
 
+    ActiveSupport.run_load_hooks(:skos_importer, self)
   end
 end

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.0.8"
+  VERSION = "4.0.9"
 end

data/lib/multi_logger.rb

@@ -0,0 +1,38 @@
+class MultiLogger
+
+  attr_reader :loggers
+
+  def initialize(*args)
+    @loggers = args
+  end
+
+  def level=(level)
+    @loggers.each { |logger| logger.level = level }
+  end
+
+  def levels
+    @loggers.map(&:level)
+  end
+
+  def min_level
+    levels.min
+  end
+
+  def close
+    @loggers.map(&:close)
+  end
+
+  def add(level, *args)
+    @loggers.each { |logger| logger.add(level, *args) }
+  end
+
+  Logger::Severity.constants.each do |level|
+    define_method(level.downcase) do |*args|
+      @loggers.each { |logger| logger.send(level.downcase, *args) }
+    end
+
+    define_method("#{ level.downcase }?".to_sym) do
+      min_level <= Logger::Severity.const_get(level)
+    end
+  end
+end

data/lib/tasks/importer.rake

@@ -1,3 +1,5 @@
+require 'multi_logger'
+
 namespace :iqvoc do
 
   namespace :import do
@@ -8,7 +10,10 @@ namespace :iqvoc do
 
       raise "You have to specify an url for the data file to be imported. Example: rake iqvoc:import:url URL=... NAMESPACE=" unless ENV['URL']
       raise "You have to specify a default namespace for the data to be imported. Example: rake iqvoc:import:url URL=... NAMESPACE=" unless ENV['NAMESPACE']
-      Iqvoc::SkosImporter.new(open(URI.parse(ENV['URL']).to_s), URI.parse(ENV['NAMESPACE']).to_s)
+
+      stdout_logger = Logger.new(STDOUT)
+      stdout_logger.level = Logger::INFO
+      Iqvoc::SkosImporter.new(open(URI.parse(ENV['URL']).to_s), URI.parse(ENV['NAMESPACE']).to_s, MultiLogger.new(stdout_logger, Rails.logger))
     end
 
   end

data/test/integration/browse_concepts_and_labels_test.rb

@@ -58,4 +58,20 @@ class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
         "'#{@concepts[1].origin} a skos:Concept' missing in turtle view"
   end
 
+  test "showing expired concepts" do
+    # prepare database with expired concept
+    concepts = [[:en, "Method"], [:de, "Methode"]].map do |lang, text|
+      FactoryGirl.create(:concept,
+        :expired_at => 2.days.ago,
+        :pref_labelings => [
+          FactoryGirl.create(:pref_labeling, :target => FactoryGirl.create(:pref_label, :language => lang, :value => text))
+        ])
+    end
+
+    visit hierarchical_concepts_path(:lang => 'en')
+    click_link_or_button('Expired')
+    click_link_or_button('M')
+    assert page.has_content?(concepts.first.pref_label.to_s), 'should have one expired concept'
+  end
+
 end

data/test/integration/instance_configuration_test.rb

@@ -20,7 +20,7 @@ require 'integration_test_helper'
 class InstanceConfigurationTest < ActionDispatch::IntegrationTest
 
   test "configuration privileges" do
-    uri = "/config"
+    uri = "/en/config"
 
     # guest
     visit uri
@@ -37,7 +37,7 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
     visit uri
     assert_equal "/en/config.html", page.current_path
     assert page.has_css?("input#config_title")
-    assert page.has_css?("input#config_available_languages")
+    assert page.has_css?("input#config_note_languages")
     assert page.has_selector?(:xpath, '//input[@id="config_languages.pref_labeling"]')
     assert page.has_selector?(:xpath, '//input[@id="config_languages.further_labelings.Labeling::SKOS::AltLabel"]')
 
@@ -48,7 +48,7 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
     assert page.find("a.brand").has_content? "iQvoc"
 
     login "administrator"
-    visit "/config"
+    visit "/en/config"
 
     fill_in "config_title", :with => "lorem ipsum"
     click_button "Save"
@@ -62,9 +62,9 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
     }
     ["reader", "editor", "publisher", "administrator"].each do |role|
       login role
-      check_page.call "/config"
+      check_page.call "/en/config"
       logout
-      check_page.call "/search"
+      check_page.call "/en/search"
     end
 
     # TODO: test routes-by-language availability, post-modification

data/test/integration/search_test.rb

@@ -31,7 +31,8 @@ class SearchTest < ActionDispatch::IntegrationTest
     end
 
     # create collection
-    @collection = FactoryGirl.create(:collection, :concepts => @concepts,
+    @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"))
@@ -49,9 +50,9 @@ class SearchTest < ActionDispatch::IntegrationTest
         :type => 'Labels', :query => 'Forest', :query_type => 'contains',
         :amount => 1, :result => 'Forest'
       }].each { |q|
-      select q[:type], :from => "t"
+      find("#t").select q[:type]
       fill_in "Search term(s)", :with => q[:query]
-      select q[:query_type], :from => "qt"
+      find("#qt").select q[:query_type]
 
       # select all languages
       page.all(:css, ".lang_check").each do |cb|
@@ -72,8 +73,8 @@ class SearchTest < ActionDispatch::IntegrationTest
   test "collection/concept filter" do
     visit search_path(:lang => 'en', :format => 'html')
 
-    select "Labels", :from => "t"
-    select "contains", :from => "qt"
+    find("#t").select "Labels"
+    find("#qt").select "contains"
     fill_in "Search term(s)", :with => "Alpha"
     click_button("Search")
     assert page.has_css?("#search_results dt", :count => 1)
@@ -90,10 +91,10 @@ class SearchTest < ActionDispatch::IntegrationTest
   test "searching within collections" do
     visit search_path(:lang => 'en', :format => 'html')
 
-    select "Labels", :from => "t"
-    select "contains", :from => "qt"
+    find("#t").select "Labels"
+    find("#qt").select "contains"
     fill_in "Search term(s)", :with => "res"
-    select @collection.to_s, :from => "c"
+    find("#c").select @collection.to_s
 
     # select all languages
     page.all(:css, ".lang_check").each do |cb|
@@ -128,10 +129,10 @@ class SearchTest < ActionDispatch::IntegrationTest
 
     visit search_path(:lang => 'en', :format => 'html')
 
-    select "Notes", :from => "t"
-    select "contains", :from => "qt"
+    find("#t").select "Notes"
+    find("#qt").select "contains"
     fill_in "Search term(s)", :with => "ipsum"
-    select @collection.to_s, :from => "c"
+    find("#c").select @collection.to_s
 
     # select all languages
     page.all(:css, ".lang_check").each do |cb|
@@ -147,10 +148,10 @@ class SearchTest < ActionDispatch::IntegrationTest
   test "empty query with selected collection should return all collection members" do
     visit search_path(:lang => 'en', :format => 'html')
 
-    select "Labels", :from => "t"
-    select "exact match", :from => "qt"
+    find("#t").select "Labels"
+    find("#qt").select "exact match"
     fill_in "Search term(s)", :with => ""
-    select @collection.to_s, :from => "c"
+    find("#c").select @collection.to_s
 
     # select all languages
     page.all(:css, ".lang_check").each do |cb|
@@ -175,8 +176,8 @@ class SearchTest < ActionDispatch::IntegrationTest
 
     visit search_path(:lang => 'en', :format => 'html')
 
-    select "Labels", :from => "t"
-    select "contains", :from => "qt"
+    find("#t").select "Labels"
+    find("#qt").select "contains"
     fill_in "Search term(s)", :with => "sample_"
 
     click_button("Search")
@@ -184,7 +185,7 @@ class SearchTest < ActionDispatch::IntegrationTest
     assert page.has_css?("#search_results dt", :count => 5)
     assert page.has_css?(".pagination .page", :count => 3)
 
-    click_link("3")
+    find(".pagination").all(".page").last.find("a").click
 
     assert page.has_css?("#search_results dt", :count => 2)