iqvoc 3.5.5 → 3.5.6

data/app/models/concept/skos/scheme.rb

@@ -24,15 +24,15 @@ require 'singleton'
 #   singleton and merely a static, virtual node
 class Concept::SKOS::Scheme
   include Singleton
-  
+
   def self.rdf_class
     :ConceptScheme
   end
-  
+
   def self.rdf_namespace
     :skos
   end
-  
+
   def origin
     :scheme
   end
@@ -42,5 +42,5 @@ class Concept::SKOS::Scheme
     raise "Namespace '#{rdf_namespace}' is not defined in IqRdf document." unless ns
     IqRdf.build_uri(origin, ns.build_uri(self.class.rdf_class), &block)
   end
-  
+
 end

data/app/models/label/base.rb

@@ -32,7 +32,7 @@ class Label::Base < ActiveRecord::Base
 
   # ********* Scopes
 
-  scope :by_language, lambda { |lang_code|
+  def self.by_language(lang_code)
     if (lang_code.is_a?(Array) && lang_code.include?(nil))
       where(arel_table[:language].eq(nil).or(arel_table[:language].in(lang_code.compact)))
     elsif lang_code.blank?
@@ -40,38 +40,40 @@ class Label::Base < ActiveRecord::Base
     else
       where(:language => lang_code)
     end
-  }
+  end
 
-  scope :begins_with, lambda { |letter|
+  def self.begins_with(letter)
     where("LOWER(SUBSTR(#{Label::Base.table_name}.value, 1, 1)) = :letter", :letter => letter.to_s.downcase)
-  }
+  end
 
-  scope :missing_translation, lambda { |lang, main_lang|
+  def self.missing_translation(lang, main_lang)
     joins(:concepts).
-      joins(sanitize_sql(["LEFT OUTER JOIN labelings pref_labelings ON
-          pref_labelings.id <> labelings.id AND
-          pref_labelings.owner_id = concepts.id AND
-          pref_labelings.type = '%s'", Iqvoc::Concept.pref_labeling_class_name])).
-      joins(sanitize_sql(["LEFT OUTER JOIN labels pref_labels ON
-          pref_labels.id = pref_labelings.target_id AND
-          pref_labels.language = '%s'", lang])).
-      where('labelings.type = :class_name', :class_name => Iqvoc::Concept.pref_labeling_class_name).
-      where('pref_labels.id IS NULL').
-      where('labels.language = :lang', :lang => main_lang).
-      includes(:pref_labeled_concepts)
-  }
-
-  scope :by_query_value, lambda { |query|
+    joins(sanitize_sql(["LEFT OUTER JOIN labelings pref_labelings ON
+        pref_labelings.id <> labelings.id AND
+        pref_labelings.owner_id = concepts.id AND
+        pref_labelings.type = '%s'", Iqvoc::Concept.pref_labeling_class_name])).
+    joins(sanitize_sql(["LEFT OUTER JOIN labels pref_labels ON
+        pref_labels.id = pref_labelings.target_id AND
+        pref_labels.language = '%s'", lang])).
+    where('labelings.type = :class_name', :class_name => Iqvoc::Concept.pref_labeling_class_name).
+    where('pref_labels.id IS NULL').
+    where('labels.language = :lang', :lang => main_lang).
+    includes(:pref_labeled_concepts)
+  end
+
+  def self.by_query_value(query)
     where(["LOWER(#{table_name}.value) LIKE ?", query.to_s.downcase])
-  }
+  end
 
   # Attention: This means that even label classes without version controll will also
-  # have to set the published_at flag to be recognized as published!!
-  scope :published, lambda {
-    where(arel_table['published_at'].not_eq(nil))
-  }
+  # have to set the published_at flag to be recognized as published!
+  def self.published
+    where(arel_table[:published_at].not_eq(nil))
+  end
 
-  scope :unpublished, lambda { where(arel_table['published_at'].eq(nil)) }
+  def self.unpublished
+    where(arel_table[:published_at].eq(nil))
+  end
 
   # ********* Methods
 

data/app/models/labeling/base.rb

@@ -29,29 +29,29 @@ class Labeling::Base < ActiveRecord::Base
 
   # ********** Scopes
 
-  scope :by_concept, lambda { |concept|
+  def self.by_concept(concept)
     where(:owner_id => concept.id)
-  }
+  end
 
-  scope :by_label, lambda { |label|
+  def self.by_label(label)
     where(:target_id => label.id)
-  }
+  end
 
-  scope :concept_published, lambda {
+  def self.concept_published
     includes(:owner).merge(Concept::Base.published)
-  }
+  end
 
-  scope :label_published, lambda {
+  def self.label_published
     includes(:target).merge(Label::Base.published)
-  }
+  end
 
-  scope :label_begins_with, lambda { |letter|
+  def self.label_begins_with(letter)
     includes(:target).merge(Label::Base.begins_with(letter))
-  }
+  end
 
-  scope :by_label_language, lambda { |lang|
+  def self.by_label_language(lang)
     includes(:target).merge(Label::Base.by_language(lang.to_s))
-  }
+  end
 
   # ********** Methods
 

data/app/models/labeling/skos/base.rb

@@ -24,9 +24,9 @@ class Labeling::SKOS::Base < Labeling::Base
 
   # ********** Scopes
 
-  scope :by_label_with_language, lambda { |label, language|
+  def self.by_label_with_language(label, language)
     includes(:target).merge(self.label_class.where(:value => label, :language => language))
-  }
+  end
 
   # ********** Methods
 

data/app/models/note/base.rb

@@ -36,27 +36,31 @@ class Note::Base < ActiveRecord::Base
 
   # ********** Scopes
 
-  scope :by_language, lambda { |lang_code|
+  def self.by_language(lang_code)
     if (lang_code.is_a?(Array) && lang_code.include?(nil))
       where(arel_table[:language].eq(nil).or(arel_table[:language].in(lang_code.compact)))
     else
       where(:language => lang_code)
     end
-  }
+  end
 
-  scope :by_query_value, lambda { |query|
-    where(["LOWER(#{table_name}.value) LIKE ?", query.to_s.downcase])
-  }
+  def self.by_query_value(query)
+     where(["LOWER(#{table_name}.value) LIKE ?", query.to_s.downcase])
+  end
 
-  scope :by_owner_type, lambda { |klass|
+  def self.by_owner_type(klass)
     where(:owner_type => klass.is_a?(ActiveRecord::Base) ? klass.name : klass)
-  }
+  end
 
-  scope :for_concepts, where(:owner_type => 'Concept::Base')
+  def self.for_concepts
+    where(:owner_type => 'Concept::Base')
+  end
 
-  scope :for_labels,   where(:owner_type => 'Label::Base')
+  def self.for_labels
+    where(:owner_type => 'Label::Base')
+  end
 
-  scope :by_owner, lambda { |owner|
+  def self.by_owner(owner)
     if owner.is_a?(Label::Base)
       for_labels.where(:owner_id => owner.id)
     elsif owner.is_a?(Concept::Base)
@@ -64,7 +68,7 @@ class Note::Base < ActiveRecord::Base
     else
       raise "Note::Base.by_owner: Unknown owner (#{owner.inspect})"
     end
-  }
+  end
 
   # ********** Methods
 

data/app/views/partials/concept/relation/_edit_base.html.erb

@@ -5,7 +5,8 @@
     concept.concept_relations_by_id(klass.name.to_relation_name),
     :id => klass.name.to_relation_name,
     :class => "entity_select",
-    :"data-query-url" => concepts_path(:format => :json, :exclude_top_terms => true),
+    :"data-query-url" => concepts_path(:format => :json,
+        :exclude_top_terms => klass != Iqvoc::Concept.broader_relation_class || nil),
     :"data-entity-uri" => concept_path("{id}"),
     :"data-singular" => klass.singular? || nil,
     :"data-entities" => Iqvoc::Concept.base_class.editor_selectable.

data/config/database.yml

@@ -3,7 +3,6 @@ development:
   encoding: utf8
   reconnect: false
   database: iqvoc_development
-  pool: 5
   username: root
   password:
   hostname: 127.0.0.1
@@ -13,7 +12,6 @@ test:
   encoding: utf8
   reconnect: false
   database: iqvoc_test
-  pool: 5
   username: root
   password:
   hostname: 127.0.0.1
@@ -22,8 +20,7 @@ production:
   adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: iqvoc_development
-  pool: 5
+  database: iqvoc_production
   username: root
   password:
   hostname: 127.0.0.1

data/config/initializers/iqvoc.rb

@@ -15,6 +15,7 @@
 # limitations under the License.
 
 require 'iqvoc'
+require 'iqvoc/origin'
 require 'iqvoc/data_helper'
 require 'iqvoc/version'
 require 'iqvoc/versioning'

data/config/initializers/secret_token.rb

@@ -25,6 +25,6 @@ if Iqvoc.const_defined?(:Application)
 
   # Run `rake secret` and uncomment the following line
   # Replace the secret-placeholder with your generated token
-  Iqvoc::Application.config.secret_token = '17d06ea2c1b5aceb4274a466a83d3b063094ecb22826c82af3572740bf2d61b30f756f1aea5e6c845ad5c078265065c8748760e655da7f6425a11bbf22ec8007'
+  Iqvoc::Application.config.secret_token = 'ef1f801c911b45ded2944aad3121244bfabf231631d102e6e120da8639c47eb6aa4ae7df733f0d539951cbc4e399e6050f46bc279d6a85d57135688394b87c5a'
 
 end

data/config/routes.rb

@@ -57,7 +57,7 @@ Rails.application.routes.draw do
 
     root :to => 'concepts/hierarchical#index', :format => nil
   end
-  
+
   match '/scheme(.:format)' => 'rdf#scheme', :as => 'scheme'
   match '/:id(.:format)' => 'rdf#show', :as => 'rdf'
 end

data/lib/iqvoc/controller_extensions.rb

@@ -34,7 +34,10 @@ module Iqvoc
 
     def handle_access_denied(exception)
       @exception = exception
-      render :template => 'errors/access_denied', :status => :access_denied
+      respond_to do |format|
+        format.html { render :template => 'errors/access_denied', :status => 403 }
+        format.any  { head 404 }
+      end
     end
 
     def handle_multiple_choices(exception)
@@ -47,8 +50,8 @@ module Iqvoc
       SearchResultsController.prepare_basic_variables(self)
 
       respond_to do |format|
-        format.html { render :template => 'errors/not_found', :status => :not_found }
-        format.any { head :not_found }
+        format.html { render :template => 'errors/not_found', :status => 404 }
+        format.any  { head 404 }
       end
     end
 

data/lib/iqvoc/environments/development.rb

@@ -1,5 +1,39 @@
 require 'iqvoc'
 
+# inject template name
+class ActionView::TemplateRenderer
+
+  def render_with_source_comment(context, options)
+    res = render_without_source_comment(context, options)
+    template = determine_template(options)
+    if template.formats.include?(:html)
+      "<!-- Template: #{template.inspect} -->\n".html_safe << res <<
+        "<!-- /Template -->\n".html_safe
+    else
+      res
+    end
+  end
+  alias_method_chain :render, :source_comment
+
+end
+
+# inject partial name
+class ActionView::PartialRenderer
+
+  def render_with_source_comment(context, options, block)
+    res = render_without_source_comment(context, options, block)
+    template = find_template
+    if template.formats.include?(:html)
+      "<!-- Partial: #{template.inspect} -->\n".html_safe << res <<
+        "<!-- /Partial -->\n".html_safe
+    else
+      res
+    end
+  end
+  alias_method_chain :render, :source_comment
+
+end
+
 module Iqvoc::Environments
 
   def self.setup_development(config)
@@ -63,4 +97,5 @@ module Iqvoc::Environments
     # mode.
     config.virtuoso_sync_threaded = false
   end
+
 end

data/lib/iqvoc/environments/production.rb

@@ -59,6 +59,26 @@ module Iqvoc::Environments
 
     # Send deprecation notices to registered listeners
     config.active_support.deprecation = :notify
+
+    # The JDBC driver URL for the connection to the virtuoso triple store.
+    # Login credentials have to be stored here too. See
+    # http://docs.openlinksw.com/virtuoso/VirtuosoDriverJDBC.html#jdbcurl4mat for
+    # more details.
+    # Example: "jdbc:virtuoso://localhost:1111/UID=dba/PWD=dba"
+    # Use nil to disable virtuoso triple synchronization
+    # Rails.application.config.virtuoso_jdbc_driver_url = "jdbc:virtuoso://virtuoso.dyndns.org:1111/UID=iqvoc/PWD=vocpass!/charset=UTF-8"
+    config.virtuoso_jdbc_driver_url = nil
+
+    # Set up the virtuoso synchronization (which is a triggered pull from the
+    # virtuoso server) to be run in a new thread.
+    # This is needed in environments where the web server only runs in a single
+    # process/thread (mostly in development environments).
+    # When a synchronization would be triggered e.g. from a running
+    # update action in the UPB, the update would trigger virtuoso to do a HTTP GET
+    # back to the UPB to fetch the RDF data. But the only process in the UPB would be
+    # blocked by the update... => Deadlock. You can avoid this by using the threaded
+    # mode.
+    config.virtuoso_sync_threaded = false
   end
 
 end

data/lib/{maker.rb → iqvoc/maker.rb}

@@ -1,5 +1,3 @@
-require 'iqvoc'
-
 module Iqvoc
   module Maker
 
@@ -118,7 +116,7 @@ module Iqvoc
 
       defaults = { # NB: must use strings, not symbols as keys due to YAML
         :value => value, # intentionally not a string; symbol takes precedence
-        "origin" => OriginMapping.merge(value),
+        "origin" => Iqvoc::Origin.new(value).to_s,
         "language" => Iqvoc::Concept.pref_labeling_languages.first,
         "published_at" => 2.days.ago
       }

data/lib/iqvoc/origin.rb

@@ -0,0 +1,148 @@
+# 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.
+
+# Provides utilities to replace special chars etc in
+# texts to generate a valid turtle compatible id (an url slug):
+# Iqvoc::Origin.new("fübar").to_s # => "fuebar"
+#
+# Note that .to_s respects eventually previously executed method chains
+# 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)
+#     str = str.gsub("foobar", "")
+#     run(obj, str)
+#   end
+# end
+# Iqvoc::Origin::Filters.register(:strip_foobars, FoobarStripper)
+# 
+module Iqvoc
+  class Origin
+    module Filters
+      class GenericFilter
+        def call(obj, str)
+          # do what has to be done with str
+          # 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
+          end
+        end
+      end
+
+      class UmlautReplacer < GenericFilter
+        def call(obj, str)
+          str = str.gsub(/Ö/, 'Oe').
+            gsub(/Ä/, 'Ae').
+            gsub(/Ü/, 'Ue').
+            gsub(/ö/, 'oe').
+            gsub(/ä/, 'ae').
+            gsub(/ü/, 'ue').
+            gsub(/ß/, 'ss')
+            
+          run(obj, str)
+        end
+      end
+
+      class WhitespaceReplacer < GenericFilter
+        def call(obj, str)
+          str = str.gsub(/\s([a-zA-Z])?/) do
+            $1.to_s.upcase
+          end
+
+          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
+      }
+      
+      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)
+      else
+        super
+      end
+    end
+    
+    def to_s
+      return value if touched?
+      run_filters!
+      value
+    end
+  
+    def inspect
+      "#<Iqvoc::Origin:0x%08x>" % object_id
+    end
+
+  end
+end