iqvoc 3.5.6 → 3.5.7

data/lib/iqvoc/ability.rb

@@ -11,6 +11,7 @@ module Iqvoc
 
       if user # Every logged in user ...
         can :use, :dashboard
+        can :destroy, UserSession
 
         if user.owns_role?(:editor) || user.owns_role?(:publisher) || user.owns_role?(:administrator) # Editors and above ...
           can :manage, ::Collection::Base
@@ -36,7 +37,8 @@ module Iqvoc
           can :full_export, ::Concept::Base
           can :import, ::Concept::Base
         end
-
+      else # no user
+        can :create, UserSession
       end
 
     end

data/lib/iqvoc/controller_extensions.rb

@@ -7,7 +7,6 @@ module Iqvoc
     included do
       prepend_before_filter :set_locale
       before_filter :ensure_extension
-      before_filter :require_user
 
       helper :all
       helper_method :current_user_session, :current_user, :concept_widget_data, :collection_widget_data, :label_widget_data
@@ -26,7 +25,7 @@ module Iqvoc
 
     # Force an extension to every url. (LOD)
     def ensure_extension
-      unless params[:format] || request.method != "GET"
+      unless params[:format] || !request.get?
         flash.keep
         redirect_to url_for(params.merge(:format => (request.format && request.format.symbol) || :html))
       end
@@ -34,17 +33,15 @@ module Iqvoc
 
     def handle_access_denied(exception)
       @exception = exception
+      @status = current_user ? 403 : 401
+      @user_session = UserSession.new if @status == 401
+      @return_url = request.fullpath
       respond_to do |format|
-        format.html { render :template => 'errors/access_denied', :status => 403 }
-        format.any  { head 404 }
+        format.html { render :template => 'errors/access_denied', :status => @status }
+        format.any  { head @status }
       end
     end
 
-    def handle_multiple_choices(exception)
-      @exception = exception
-      render :template => 'errors/multiple_choices', :status => :multiple_choices
-    end
-
     def handle_not_found(exception)
       @exception = exception
       SearchResultsController.prepare_basic_variables(self)
@@ -65,11 +62,13 @@ module Iqvoc
       end
     end
 
-    def concept_widget_data(concept)
-      {
+    def concept_widget_data(concept, rank = nil)
+      data = {
         :id => concept.origin,
         :name => concept.pref_label.value.to_s + (concept.additional_info ? " (#{concept.additional_info })" : "")
       }
+      data[:rank] = rank if rank
+      data
     end
 
     def collection_widget_data(collection)
@@ -92,27 +91,11 @@ module Iqvoc
     end
 
     def current_user_session
-      return @current_user_session if defined?(@current_user_session)
-      @current_user_session = UserSession.find
+      @current_user_session ||= UserSession.find
     end
 
     def current_user
-      return @current_user if defined?(@current_user)
-      @current_user = current_user_session && current_user_session.user
-    end
-
-    # TODO: Don't require an user (this is skipped in nearly every controller).
-    # Use Abilitys instead and handle the AccessDeniedException: (#handle_access_denied)
-    # * User logged in: Exception!
-    # * User not logged in: Redirect to login path!
-    # Don't forget to delete this method and all the /.*before_filter :require_user/
-    # statements in the controllers.
-    def require_user
-      unless current_user
-        flash[:error] = I18n.t("txt.controllers.application.login_required")
-        redirect_to new_user_session_url(:back_to => request.fullpath)
-        return false
-      end
+      @current_user ||= current_user_session && current_user_session.user
     end
 
   end

data/lib/iqvoc/environments/production.rb

@@ -14,6 +14,8 @@ module Iqvoc::Environments
     # Specifies the header that your server uses for sending files
     config.action_dispatch.x_sendfile_header = "X-Sendfile"
 
+    config.autoflush_log = true
+
     # For nginx:
     # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect'
 

data/lib/iqvoc/environments/test.rb

@@ -32,9 +32,6 @@ module Iqvoc::Environments
     # like if you have constraints or database-specific column types
     # config.active_record.schema_format = :sql
 
-    # Print deprecation notices to the stderr
-    config.active_support.deprecation = :stderr
-
     # Configure static asset server for tests with Cache-Control for performance
     config.serve_static_assets = true
     config.static_cache_control = "public, max-age=3600"

data/lib/iqvoc/{data_helper.rb → inline_data_helper.rb}

@@ -15,9 +15,7 @@
 # limitations under the License.
 
 module Iqvoc
-  class InlineDataHelper # TODO: Module should have the same name as the file! "Helper" has an other meaning in Rails. I would suggest "InlineData".
-
-    # TODO: Non class constants should be written UPPER_CASE
+  module InlineDataHelper
 
     # delimiters for strings representing a list of values
     Joiner = ", "

data/lib/iqvoc/maker.rb

@@ -122,7 +122,8 @@ module Iqvoc
       }
       attributes = defaults.merge(attributes)
 
-      label = Iqvoc::XLLabel.base_class.create!(attributes)
+      klass = Iqvoc::XLLabel rescue Iqvoc::Label # FIXME: breaks encapsulation (hard-coded iqvoc_skosxl dependency)
+      label = klass.base_class.create!(attributes)
 
       inflectionals.each { |inf|
         label.inflectionals.create!(:value => inf)

data/lib/iqvoc/origin.rb

@@ -22,7 +22,7 @@
 # Just calling "to_s" runs all registered filters.
 # Prepending "to_s" with a specific filter method only runs the given filter:
 # Iqvoc::Origin.new("fübar").replace_umlauts.to_s # => "fuebar"
-# 
+#
 # Adding your own filter classes is easy:
 # class FoobarStripper < Iqvoc::Origin::Filters::GenericFilter
 #   def call(obj, str)
@@ -31,7 +31,7 @@
 #   end
 # end
 # Iqvoc::Origin::Filters.register(:strip_foobars, FoobarStripper)
-# 
+#
 module Iqvoc
   class Origin
     module Filters
@@ -41,7 +41,7 @@ module Iqvoc
           # afterwards: make sure to pass "obj" and your modified "str" to "run()"
           run(obj, str)
         end
-        
+
         def run(obj, str)
           obj.tap do |obj|
             obj.value = str
@@ -58,7 +58,7 @@ module Iqvoc
             gsub(/ä/, 'ae').
             gsub(/ü/, 'ue').
             gsub(/ß/, 'ss')
-            
+
           run(obj, str)
         end
       end
@@ -72,60 +72,59 @@ module Iqvoc
           run(obj, str)
         end
       end
-      
+
       class SpecialCharReplacer < GenericFilter
         def call(obj, str)
           str = str.gsub(/[(\[:]/, "--").
             gsub(/[)\]'""]/, "").
             gsub(/[,\.\/&;]/, '-')
-          
+
           run(obj, str)
         end
       end
-      
+
       class LeadingNumberHandler < GenericFilter
         def call(obj, str)
           str = str.gsub(/^[0-9].*$/) do |match|
             "_#{match}"
           end
-          
+
           run(obj, str)
         end
       end
-      
-      @filters = { 
-        :replace_umlauts => UmlautReplacer, 
-        :replace_whitespace => WhitespaceReplacer,
-        :replace_special_chars => SpecialCharReplacer,
-        :handle_leading_numbers => LeadingNumberHandler
-      }
-      
+
+      @filters = ActiveSupport::OrderedHash.new
+      @filters[:replace_umlauts]        = UmlautReplacer
+      @filters[:replace_whitespace]     = WhitespaceReplacer
+      @filters[:replace_special_chars]  = SpecialCharReplacer
+      @filters[:handle_leading_numbers] = LeadingNumberHandler
+
       def self.register(name, klass)
         @filters[name.to_sym] = klass
       end
-      
+
       def self.registered
         @filters
       end
     end
-    
+
     attr_accessor :initial_value, :value, :filters
-    
+
     def initialize(value)
       self.initial_value = value.to_s
       self.value = initial_value
     end
-    
+
     def touched?
       value != initial_value
     end
-    
+
     def run_filters!
       Filters.registered.each do |key, filter_class|
         filter_class.new.call(self, value)
       end
     end
-    
+
     def method_missing(meth, *args)
       if Filters.registered.keys.include?(meth.to_sym)
         Filters.registered[meth.to_sym].new.call(self, value)
@@ -133,13 +132,13 @@ module Iqvoc
         super
       end
     end
-    
+
     def to_s
       return value if touched?
       run_filters!
       value
     end
-  
+
     def inspect
       "#<Iqvoc::Origin:0x%08x>" % object_id
     end

data/lib/iqvoc/rankable.rb

@@ -0,0 +1,34 @@
+require 'active_support/concern'
+
+module Iqvoc
+  module Rankable
+    extend ActiveSupport::Concern
+
+    def build_rdf(document, subject)
+      super
+      if self.class.rankable?
+        predicate = "ranked#{rdf_predicate.titleize}"
+
+        subject.Schema.build_predicate(predicate) do |blank_node|
+          blank_node.Schema.relationWeight(rank)
+          blank_node.Schema.relationTarget(IqRdf.build_uri(target.origin))
+        end
+      end
+    end
+
+    module ClassMethods
+      def rankable?
+        true
+      end
+
+      def partial_name(obj)
+        'partials/concept/relation/ranked'
+      end
+
+      def edit_partial_name(obj)
+        'partials/concept/relation/edit_ranked'
+      end
+    end
+
+  end
+end

data/lib/iqvoc/version.rb

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

data/test/factories.rb

@@ -38,7 +38,7 @@ FactoryGirl.define do
           FactoryGirl.create(:pref_labeling, :target => FactoryGirl.create(:pref_label, :value => 'Some narrower relation'))
         ])
     }
-    rel.after_create { |new_relation| Factory(:stupid_broader_relation, :owner => new_relation.target, :target => new_relation.owner) }
+    rel.after_create { |new_relation| FactoryGirl.create(:stupid_broader_relation, :owner => new_relation.target, :target => new_relation.owner) }
   end
 
   factory :pref_labeling, :class => Iqvoc::Concept.pref_labeling_class do |lab|

data/test/integration/alphabetical_test.rb

@@ -24,7 +24,8 @@ class AlphabeticalConceptsTest < ActionDispatch::IntegrationTest
     ].map do |hsh|
       labelings = []
       hsh.each do |lang, val|
-        labelings << Factory(:pref_labeling, :target => Factory(:pref_label, :language => lang, :value => val))
+        labelings << FactoryGirl.create(:pref_labeling,
+            :target => FactoryGirl.create(:pref_label, :language => lang, :value => val))
       end
       FactoryGirl.create(:concept, :pref_labelings => labelings)
     end

data/test/integration/authentication_test.rb

@@ -21,7 +21,7 @@ class AuthenticationTest < ActionDispatch::IntegrationTest
   test "sign in" do
     user
     visit dashboard_path(:lang => :de)
-    assert page.has_content?("Sie müssen angemeldet sein, um diese Seite aufzurufen")
+    assert page.has_content?("Keine Berechtigung")
     visit new_user_session_path(:lang => :de)
     fill_in "E-Mail", :with => user.email
     fill_in "Passwort", :with => user.password

data/test/integration/browse_concepts_and_labels_test.rb

@@ -25,7 +25,8 @@ class BrowseConceptsAndLabelsTest < ActionDispatch::IntegrationTest
       [:de, "Baum"],
       [:de, "Forst"]
     ].map { |lang, text|
-      FactoryGirl.create(:concept, :pref_labelings => [Factory(:pref_labeling, :target => Factory(:pref_label, :language => lang, :value => text))])
+      FactoryGirl.create(:concept, :pref_labelings => [FactoryGirl.create(:pref_labeling,
+          :target => FactoryGirl.create(:pref_label, :language => lang, :value => text))])
     }
   end
 

data/test/integration/concept_scheme_test.rb

@@ -19,7 +19,7 @@ require 'integration_test_helper'
 class ConceptSchemeTest < ActionDispatch::IntegrationTest
 
   setup do
-    @concept = Factory(:concept, :broader_relations => [])
+    @concept = FactoryGirl.create(:concept, :broader_relations => [])
   end
 
   test "list top concepts in rdf scheme" do

data/test/integration/edit_concepts_test.rb

@@ -19,7 +19,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 class EditConceptsTest < ActionDispatch::IntegrationTest
 
   setup do
-    @concept = Factory(:concept)
+    @concept = FactoryGirl.create(:concept)
   end
 
   test "Create a new concept version" do

data/test/integration/instance_configuration_test.rb

@@ -24,7 +24,7 @@ class InstanceConfigurationTest < ActionDispatch::IntegrationTest
 
     # guest
     visit uri
-    assert_equal "/en/user_session/new.html", page.current_path
+    assert page.has_content?("No permission")
 
     ["reader", "editor", "publisher"].each do |role|
       login role

data/test/integration/search_test.rb

@@ -25,15 +25,16 @@ class SearchTest < ActionDispatch::IntegrationTest
 
     @concepts =  ["Tree", "Forest"].map do |english_label_value|
       FactoryGirl.create(:concept, :pref_labelings => [
-          Factory(:pref_labeling, :target => Factory(:pref_label, :language => :en, :value => english_label_value))
+          FactoryGirl.create(:pref_labeling, :target => FactoryGirl.create(:pref_label,
+              :language => :en, :value => english_label_value))
         ])
     end
 
     # create collection
     @collection = FactoryGirl.create(:collection, :concepts => @concepts,
         :labelings => [], :pref_labelings => [
-            Factory(:pref_labeling,
-                :target => Factory(:pref_label, :language => :en, :value => "Alpha"))
+            FactoryGirl.create(:pref_labeling,
+                :target => FactoryGirl.create(:pref_label, :language => :en, :value => "Alpha"))
         ])
   end
 
@@ -167,8 +168,8 @@ class SearchTest < ActionDispatch::IntegrationTest
     # create a large number of concepts
     12.times { |i|
       FactoryGirl.create(:concept,
-        :pref_labelings => [Factory(:pref_labeling,
-            :target => Factory(:pref_label, :language => :en,
+        :pref_labelings => [FactoryGirl.create(:pref_labeling,
+            :target => FactoryGirl.create(:pref_label, :language => :en,
               :value => "sample_#{sprintf("_%04d", i + 1)}"))])
     }
 

data/test/integration/tree_test.rb

@@ -19,7 +19,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../integration_test
 class TreeTest < ActionDispatch::IntegrationTest
 
   test "Browse hierarchical concepts tree" do
-    concept = Factory(:concept, :broader_relations => [])
+    concept = FactoryGirl.create(:concept, :broader_relations => [])
     narrower_concept = concept.narrower_relations.first.target
 
     visit hierarchical_concepts_path(:lang => :de, :format => :html)

data/test/integration/untranslated_test.rb

@@ -26,7 +26,8 @@ class UntranslatedConceptsTest < ActionDispatch::IntegrationTest
     ].map do |hsh|
       labelings = []
       hsh.each do |lang, val|
-        labelings << Factory(:pref_labeling, :target => Factory(:pref_label, :language => lang, :value => val))
+        labelings << FactoryGirl.create(:pref_labeling,
+            :target => FactoryGirl.create(:pref_label, :language => lang, :value => val))
       end
       FactoryGirl.create(:concept, :pref_labelings => labelings)
     end

data/test/integration_test_helper.rb

@@ -16,9 +16,6 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), 'test_helper')
 require 'capybara/rails'
-require 'test/unit/failure'
-require 'test/unit/error'
-require 'fileutils'
 
 module ActionController
   class IntegrationTest
@@ -60,29 +57,3 @@ module ActionController
 
   end
 end
-
-module Test
-  module Unit
-
-    module FailureHandler
-
-      def add_failure_with_snapshot(*args)
-        create_snapshot
-        add_failure_without_snapshot(*args)
-      end
-      alias_method_chain :add_failure, :snapshot
-
-    end
-
-    module ErrorHandler
-
-      def add_error_with_snapshot(*args)
-        create_snapshot
-        add_error_without_snapshot(*args)
-      end
-      alias_method_chain :add_error, :snapshot
-
-    end
-
-  end
-end

data/test/unit/concept_test.rb

@@ -22,11 +22,20 @@ class ConceptTest < ActiveSupport::TestCase
     @current_concept = FactoryGirl.create(:concept)
   end
 
-  test "should not create more than two versions of a concept" do
-    first_new_concept  = Concept::Base.new(@current_concept.attributes)
-    second_new_concept = Concept::Base.new(@current_concept.attributes)
-    assert first_new_concept.save
-    assert_equal second_new_concept.save, false
+  test "should not allow identical concepts" do
+    origin = "foo"
+    c1 = Concept::Base.new(:origin => origin)
+    c2 = Concept::Base.new(:origin => origin, :published_at => Time.now)
+    assert c1.save
+    assert c2.save
+
+    origin = "bar"
+    c1 = Concept::Base.new(:origin => origin)
+    c2 = Concept::Base.new(:origin => origin)
+    assert c1.save
+    assert_raise ActiveRecord::RecordInvalid do
+      c2.save!
+    end
   end
 
   test "should not save concept with empty preflabel" do
@@ -63,7 +72,9 @@ class ConceptTest < ActiveSupport::TestCase
 
   test "concepts can have multiple preferred labels" do
     concept = FactoryGirl.build(:concept)
-    concept.labelings << FactoryGirl.build(:pref_labeling, :target => Factory(:pref_label, :language => Iqvoc::Concept.pref_labeling_languages.second))
+    concept.labelings << FactoryGirl.build(:pref_labeling,
+        :target => FactoryGirl.create(:pref_label,
+            :language => Iqvoc::Concept.pref_labeling_languages.second))
     concept.save!
     concept.reload
 

data/test/unit/hygiene_test.rb

@@ -1,13 +1,23 @@
 # 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.
+
 class HygieneTest < ActiveSupport::TestCase
 
   test "trailing whitespace" do
-    begin
-      assert_no_occurrence '[[:blank:]]$', "trailing whitespace"
-    rescue Test::Unit::AssertionFailedError => exc
-      warn "[WARNING] #{exc}"
-    end
+    assert_no_occurrence '[[:blank:]]$', "trailing whitespace"
   end
 
   test "mixed whitespace" do

data/test/unit/origin_test.rb

@@ -54,7 +54,8 @@ class OriginTest < ActiveSupport::TestCase
   end
 
   def test_should_replace_brackets
-    assert_equal "--Energie-Ressource", Iqvoc::Origin.new("[Energie/Ressource]").to_s
+    assert_equal "--Energie-Ressource",
+      Iqvoc::Origin.new("[Energie/Ressource]").to_s
   end
 
   def test_should_replace_comma
@@ -62,10 +63,12 @@ class OriginTest < ActiveSupport::TestCase
   end
 
   def test_should_merge_all_together
-    assert_equal "--Energie-Ressource", Iqvoc::Origin.new("[Energie - Ressource]").to_s
-    assert_equal "--Hydrosphaere-WasserUndGewaesser", Iqvoc::Origin.new("[Hydrosphäre - Wasser und Gewässer]").to_s
+    assert_equal "--Energie-Ressource",
+      Iqvoc::Origin.new("[Energie - Ressource]").to_s
+    assert_equal "--Hydrosphaere-WasserUndGewaesser",
+      Iqvoc::Origin.new("[Hydrosphäre - Wasser und Gewässer]").to_s
   end
-  
+
   def test_register_custom_filter
     Iqvoc::Origin::Filters.register(:strip_foobars, FoobarStripper)
     assert_equal "trololo_", Iqvoc::Origin.new("trololo_foobar").strip_foobars.to_s