iqvoc 4.1.0 → 4.1.1

data/db/migrate/20101202135420_rename_collection_contents_to_collection_members.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/db/migrate/20101208103531_add_type_to_collection_contents.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/db/migrate/20101210153916_add_indexes_to_collections.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/db/migrate/20110204121244_create_collection_labels.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/db/migrate/20110208084250_change_origin_lengths.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/db/migrate/20110328124300_discard_collection_specifics.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/db/migrate/20130418093837_add_language_to_note_annotations.rb

@@ -0,0 +1,5 @@
+class AddLanguageToNoteAnnotations < ActiveRecord::Migration
+  def change
+    add_column :note_annotations, :language, :string
+  end
+end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20130315141952) do
+ActiveRecord::Schema.define(:version => 20130418093837) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -107,6 +107,7 @@ ActiveRecord::Schema.define(:version => 20130315141952) do
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "namespace",  :limit => 50
+    t.string   "language"
   end
 
   add_index "note_annotations", ["note_id"], :name => "ix_note_annotations_fk"

data/db/seeds.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/iqvoc.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'simple_form'
   s.add_dependency 'sass-rails', '~> 3.2.5'
   s.add_dependency 'iq_triplestorage'
+  s.add_dependency 'jbuilder'
 
   s.files = %w(LICENSE README.md CHANGELOG.md Gemfile Gemfile.lock Rakefile iqvoc.gemspec) +
     Dir.glob("{app,config,db,public,lib,test,vendor}/**/*")

data/lib/iqvoc.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/lib/iqvoc/configuration/core.rb

@@ -83,7 +83,8 @@ module Iqvoc
           :rdfs => "http://www.w3.org/2000/01/rdf-schema#",
           :owl  => "http://www.w3.org/2002/07/owl#",
           :skos => "http://www.w3.org/2004/02/skos/core#",
-          :dct  => "http://purl.org/dc/terms/"
+          :dct  => "http://purl.org/dc/terms/",
+          :foaf => "http://xmlns.com/foaf/spec/"
         }
 
         # The class to use for automatic generation of change notes on every save
@@ -100,7 +101,6 @@ module Iqvoc
           "languages.further_labelings.Labeling::SKOS::AltLabel" => ["en", "de"],
           "note_languages" => ["en", "de"]
         })
-        self.config.initialize_cache
       end
 
       module ClassMethods

data/lib/iqvoc/deep_cloning.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/lib/iqvoc/inline_data_helper.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/lib/iqvoc/instance_configuration.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.
@@ -39,7 +39,7 @@ module Iqvoc
 
     # convenience wrapper for `register_setting` batch operations
     # accepts a hash of key / default value pairs
-    def register_settings(settings = {})
+    def register_settings(settings)
       settings.each do |key, default_value|
         register_setting(key, default_value)
       end
@@ -69,7 +69,7 @@ module Iqvoc
 
     # retrieve individual setting, using default value as fallback
     def [](key)
-      initialize_cache if @settings.blank?
+      initialize_cache unless @initialized
       return @settings[key]
     end
 
@@ -96,16 +96,17 @@ module Iqvoc
     # (subsequent updates will happen automatically via the respective setters)
     def initialize_cache
       # cache customized settings
-      db_settings = ConfigurationSetting.all rescue [] # database table might not exist yet (pre-migration)
-      db_settings.each do |setting|
+      ConfigurationSetting.all.each do |setting|
         @records[setting.key] = JSON.load("[#{setting.value}]")[0] # temporary array wrapper ensures valid JSON text
       end
 
       # cache current settings
-      @defaults.each_with_object({}) do |(key, default_value), hsh|
+      @defaults.each do |key, default_value|
         value = @records[key]
         @settings[key] = value.nil? ? default_value : value
       end
+
+      @initialized = true
     end
 
     # checks whether value type is supported

data/lib/iqvoc/origin.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/lib/iqvoc/rdfapi.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.
@@ -34,6 +34,8 @@ module Iqvoc
       hash
     end
 
+    URI_REGEXP = /^https?:\/\/[^\s]+$/
+
     def self.devour(rdf_subject, rdf_predicate, rdf_object)
       case rdf_predicate
       when 'a', 'rdf:type'

data/lib/iqvoc/version.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.
@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = "4.1.0"
+  VERSION = "4.1.1"
 end

data/lib/iqvoc/versioning.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/lib/string.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/factories.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/functional/hierarchy_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.
@@ -22,7 +22,6 @@ class HierarchyTest < ActionController::TestCase
     @controller = HierarchyController.new
 
     # create a concept hierarchy
-
     concepts = YAML.load <<-EOS
 root:
   foo:

data/test/functional/rdf_test.rb

@@ -0,0 +1,98 @@
+# encoding: UTF-8
+
+# Copyright 2011-2013 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.
+
+require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
+
+class RDFTest < ActionController::TestCase
+
+  setup do
+    @controller = ConceptsController.new
+
+    # create a concept hierarchy
+    concepts = YAML.load <<-EOS
+root:
+  foo:
+  bar:
+    EOS
+    rel_class = Iqvoc::Concept.broader_relation_class.narrower_class
+    @concepts = create_hierarchy(concepts, rel_class, {})
+    @concepts["root"].update_attribute("top_term", true)
+  end
+
+  test "individual concept representations" do
+    params = { :lang => "en", :format => "ttl" }
+
+    get :show, params.merge(:id => "root")
+    assert_response 200
+    assert @response.body.include? ':root a skos:Concept'
+    assert @response.body.include? 'skos:narrower :foo'
+    assert @response.body.include? 'skos:narrower :bar'
+    assert @response.body.include? 'skos:prefLabel "Root"@en'
+    assert @response.body.include? ':foo skos:prefLabel "Foo"@en.'
+    assert @response.body.include? ':bar skos:prefLabel "Bar"@en.'
+
+    get :show, params.merge(:id => "foo")
+    assert_response 200
+    assert @response.body.include? ':foo a skos:Concept'
+    assert @response.body.include? 'skos:broader :root'
+    assert @response.body.include? 'skos:prefLabel "Foo"@en'
+    assert @response.body.include? ':root skos:prefLabel "Root"@en.'
+  end
+
+  test "full export" do
+    params = { :lang => "en", :format => "ttl" }
+
+    get :index, params
+    assert_response 401
+
+    # XXX: disabled because authentication fails
+    #get :index, params
+    #assert_response 200
+    #assert @response.body.include? ':foo a skos:Concept'
+    #assert @response.body.include? ':bar a skos:Concept'
+    #assert @response.body.include? 'skos:prefLabel "Foo"@en'
+    #assert @response.body.include? 'skos:prefLabel "Bar"@en'
+    # don't duplicate pref. labels
+    #assert !@response.body.include?(':foo skos:prefLabel "Foo"@en.')
+    #assert !@response.body.include?(':bar skos:prefLabel "Bar"@en.')
+  end
+
+  def create_hierarchy(hash, rel_class, memo=nil, parent=nil)
+    hash.each do |origin, children|
+      concept = create_concept(origin, origin.capitalize, "en")
+      memo[origin] = concept if memo
+      link_concepts(parent, rel_class, concept) if parent
+      create_hierarchy(children, rel_class, memo, concept) unless children.blank?
+    end
+    return memo
+  end
+
+  def link_concepts(source, rel_class, target)
+      rel_name = rel_class.name.to_relation_name
+      source.send(rel_name).create_with_reverse_relation(target)
+  end
+
+  def create_concept(origin, pref_label, label_lang, published=true)
+    concept = Iqvoc::Concept.base_class.create(:origin => origin,
+        :published_at => (published ? Time.now : nil))
+    label = Iqvoc::Label.base_class.create(:value => pref_label,
+        :language => label_lang)
+    labeling = Iqvoc::Concept.pref_labeling_class.create(:owner => concept,
+        :target => label)
+    return concept
+  end
+
+end

data/test/integration/alphabetical_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/authentication_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/browse_concepts_and_labels_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/client_augmentation_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/client_edit_concept_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/collection_circularity_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/concept_scheme_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.

data/test/integration/concept_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-# Copyright 2011 innoQ Deutschland GmbH
+# Copyright 2011-2013 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.