iqvoc 4.7.0 → 4.8.0

data/test/models/instance_configuration_test.rb

@@ -18,7 +18,7 @@ require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
 class InstanceConfigurationBrowsingTest < ActiveSupport::TestCase
   setup do
-    @config = Iqvoc::InstanceConfiguration.instance
+    @config = Iqvoc::Configuration::InstanceConfiguration.instance
   end
 
   teardown do
@@ -27,17 +27,19 @@ class InstanceConfigurationBrowsingTest < ActiveSupport::TestCase
   end
 
   test 'should require a setting to be registered upfront' do
-    assert_raise Iqvoc::InstanceConfiguration::UnregisteredSetting do
-      @config['foo'] = 'bar'
+    assert_raise Iqvoc::Configuration::InstanceConfiguration::UnregisteredSetting do
+      @config['new_setting_key'] = 'new_setting_value'
     end
   end
 
   test 'should register settings with defaults' do
     @config.register_setting('ho', 'yuken')
     assert_equal 'yuken', @config['ho']
+    @config.deregister_setting('ho')
 
     @config.register_settings('ha' => 'douken')
     assert_equal 'douken', @config['ha']
+    @config.deregister_setting('ha')
   end
 
   test 'should deregister settings' do
@@ -52,5 +54,7 @@ class InstanceConfigurationBrowsingTest < ActiveSupport::TestCase
     assert_raise(TypeError) { @config['foo'] = nil }
     assert_raise(TypeError) { @config.register_setting('foo', nil) }
     assert_raise(TypeError) { @config.register_setting('foo', Hash.new) }
+
+    @config.deregister_setting('foo')
   end
 end

data/test/models/origin_test.rb

@@ -16,68 +16,18 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
-class FoobarStripper < Iqvoc::Origin::Filters::GenericFilter
-  def call(obj, str)
-    str = str.gsub('foobar', '')
-    run(obj, str)
-  end
-end
-
 class OriginTest < ActiveSupport::TestCase
-  def test_should_replace_umlauts
-    assert_equal 'aauuooss', Iqvoc::Origin.new('ÄäÜüÖöß').to_s
-  end
-
-  def test_should_camelize_string
-    assert_equal 'a-weighting', Iqvoc::Origin.new("'A' Weighting").to_s
-  end
-
-  def test_should_handle_numbers_at_the_beginning
-    assert_equal '_123', Iqvoc::Origin.new('123').to_s
-  end
-
-  def test_should_handle_whitespaces_at_strange_positions
-    assert_equal 'test-12', Iqvoc::Origin.new('test 12 ').to_s
-  end
-
-  def test_should_preserve_underlines
-    assert_equal '_test', Iqvoc::Origin.new('_test').to_s
-    assert_equal 'a_test', Iqvoc::Origin.new('a_Test').to_s
-  end
-
-  def test_should_preserve_case
-    assert_equal 'test', Iqvoc::Origin.new('test').to_s
-    assert_equal 'test', Iqvoc::Origin.new('Test').to_s
-    assert_equal '_5test', Iqvoc::Origin.new('5test').to_s
-    assert_equal '_5test', Iqvoc::Origin.new('5Test').to_s
-  end
-
-  def test_should_replace_brackets
-    assert_equal 'energie-ressource',
-      Iqvoc::Origin.new('[Energie/Ressource]').to_s
+  def test_origin_generation
+    assert_match /_[0-9a-z]{8}/, Origin.new.to_s
   end
 
-  def test_should_replace_comma
-    assert_equal 'ab-cd', Iqvoc::Origin.new('ab,cd').to_s
-  end
-
-  def test_should_replace_less_and_greater_chars
-    assert_equal 'test-123', Iqvoc::Origin.new('Test<123').to_s
-    assert_equal 'test-123', Iqvoc::Origin.new('Test>123').to_s
-  end
-
-  def test_should_merge_all_together
-    assert_equal 'energie-ressource',
-      Iqvoc::Origin.new('[Energie - Ressource]').to_s
-    assert_equal 'hydrosphare-wasser-und-gewasser',
-      Iqvoc::Origin.new('[Hydrosphäre - Wasser und Gewässer]').to_s
-    assert_equal '_12-hydrosphare-wasser-und-gewasser',
-      Iqvoc::Origin.new('12[Hydrosphäre - Wasser und Gewässer]').to_s
-  end
+  def test_origin_validation
+    %w(air_sports _0997ba7fe13f13d9 _:A01).each do |origin|
+      assert Origin.new(origin).valid?
+    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
-    assert_equal 'trololo_', Iqvoc::Origin.new('trololo_foobar').to_s
+    refute Origin.new('1').valid?, 'should not start with a number'
+    refute Origin.new('fußball').valid?, 'should not contain special chars'
+    refute Origin.new('_:fußball').valid?, 'blank node should not contain special chars'
   end
 end

data/test/models/rdf_sync_test.rb

@@ -16,8 +16,6 @@
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
 
-require 'iqvoc/rdf_sync'
-
 class RDFSyncTest < ActiveSupport::TestCase
   setup do
     @rdf = 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'
@@ -34,7 +32,7 @@ class RDFSyncTest < ActiveSupport::TestCase
     end
     @view_context = FakeViewContext.new
 
-    @sync = Iqvoc::RDFSync.new(@base_url, @target_host, username: @username,
+    @sync = RDFSyncService.new(@base_url, @target_host, username: @username,
         view_context: @view_context)
 
     @concepts = 1.upto(15).map do |i|
@@ -106,7 +104,7 @@ class RDFSyncTest < ActiveSupport::TestCase
     concept_count = concepts.count
     batch_count = 3
 
-    sync = Iqvoc::RDFSync.new(@base_url, @target_host, username: @username,
+    sync = RDFSyncService.new(@base_url, @target_host, username: @username,
         batch_size: (concept_count / batch_count).ceil,
         view_context: @view_context)
 

data/test/models/rdfapi_test.rb

@@ -1,7 +1,5 @@
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/rdfapi'
 
-RDFAPI = Iqvoc::RDFAPI
 class RDFAPITest < ActiveSupport::TestCase
   test 'should instantiate known class names using strings only' do
     result = RDFAPI.devour 'foobar', 'a', 'Concept::SKOS::Base'

data/test/models/skos_collection_import_test.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/skos_importer'
 
 class SkosCollectionImportTest < ActiveSupport::TestCase
   setup do
@@ -55,7 +54,7 @@ class SkosCollectionImportTest < ActiveSupport::TestCase
 
   test 'basic importer functionality' do
     assert_difference('Collection::Base.count', 2) do
-      Iqvoc::SkosImporter.new(TEST_DATA, 'http://www.example.com/').run
+      SkosImporter.new(TEST_DATA, 'http://www.example.com/').run
     end
     concepts = {}
     ['cow', 'donkey', 'snake'].each do |origin|
@@ -80,7 +79,7 @@ class SkosCollectionImportTest < ActiveSupport::TestCase
 
   test 'subcollections importer functionality' do
     assert_difference('Collection::Base.count', 2) do
-      Iqvoc::SkosImporter.new(TEST_DATA, 'http://www.example.com/').run
+      SkosImporter.new(TEST_DATA, 'http://www.example.com/').run
     end
 
     collection_with_subcollections = Iqvoc::Collection.base_class.by_origin('land-animal').last
@@ -97,7 +96,7 @@ class SkosCollectionImportTest < ActiveSupport::TestCase
 
     assert_nothing_raised do
     assert_difference('Collection::Base.count', 1) do
-      Iqvoc::SkosImporter.new(test_data, 'http://www.example.com/').run
+      SkosImporter.new(test_data, 'http://www.example.com/').run
       end
     end
   end

data/test/models/skos_export_test.rb

@@ -15,19 +15,17 @@
 # limitations under the License.
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/skos_exporter'
-require 'iqvoc/skos_importer'
 
 class SkosExportTest < ActiveSupport::TestCase
   setup do
     @testdata = File.read(Rails.root.join('data', 'hobbies.nt')).split("\n")
     @export_file = Rails.root.join('tmp/export/skos_export_test.nt').to_s
 
-    Iqvoc::SkosImporter.new(@testdata, 'http://hobbies.com/').run
+    SkosImporter.new(@testdata, 'http://hobbies.com/').run
   end
 
   test 'basic_exporter_functionality' do
-    Iqvoc::SkosExporter.new(@export_file, 'nt', 'http://hobbies.com/').run
+    SkosExporter.new(@export_file, 'nt', 'http://hobbies.com/').run
 
     generated_export = File.read(@export_file)
 
@@ -41,7 +39,7 @@ class SkosExportTest < ActiveSupport::TestCase
 
   test 'skos exporter with an unknown export type' do
     assert_raise RuntimeError do
-      Iqvoc::SkosExporter.new(@export_file, 'txt', 'http://hobbies.com/')
+      SkosExporter.new(@export_file, 'txt', 'http://hobbies.com/')
     end
 
   end

data/test/models/skos_import_test.rb

@@ -15,7 +15,6 @@
 # limitations under the License.
 
 require File.join(File.expand_path(File.dirname(__FILE__)), '../test_helper')
-require 'iqvoc/skos_importer'
 
 class SkosImportTest < ActiveSupport::TestCase
   TEST_DATA = (<<-DATA
@@ -53,7 +52,7 @@ class SkosImportTest < ActiveSupport::TestCase
 
   test 'basic_importer_functionality' do
     assert_difference('Concept::SKOS::Base.count', 4) do
-      Iqvoc::SkosImporter.new(TEST_DATA, 'http://www.example.com/').run
+      SkosImporter.new(TEST_DATA, 'http://www.example.com/').run
     end
 
     concepts = {}
@@ -88,11 +87,14 @@ class SkosImportTest < ActiveSupport::TestCase
   end
 
   test 'incorrect origin' do
-    assert_difference('Concept::SKOS::Base.count', 1) do
-      Iqvoc::SkosImporter.new(['<http://www.example.com/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Concept>.'], 'http://www.example.com/').run
+    assert_difference('Concept::SKOS::Base.count', 0) do
+      SkosImporter.new(
+        [
+          '<http://www.example.com/1> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Concept>.',
+          '<http://www.example.com/fußball> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://www.w3.org/2008/05/skos#Concept>.'
+        ],
+        'http://www.example.com/').run
     end
-    assert_nil Iqvoc::Concept.base_class.by_origin('1').last
-    assert_not_nil Iqvoc::Concept.base_class.by_origin('_1').last
   end
 
   test 'blank nodes' do
@@ -106,11 +108,11 @@ class SkosImportTest < ActiveSupport::TestCase
     ).split("\n")
 
     assert_difference('Note::SKOS::ChangeNote.count', 1) do
-      Iqvoc::SkosImporter.new(test_data, 'http://www.example.com/').run
+      SkosImporter.new(test_data, 'http://www.example.com/').run
     end
 
     assert_difference('Note::Annotated::Base.count', 2) do
-      Iqvoc::SkosImporter.new(test_data, 'http://www.example.com/').run
+      SkosImporter.new(test_data, 'http://www.example.com/').run
     end
   end
 
@@ -123,7 +125,7 @@ class SkosImportTest < ActiveSupport::TestCase
     ).split("\n")
 
     assert_difference('Notation::Base.count', 2) do
-      Iqvoc::SkosImporter.new(test_data, 'http://www.example.com/').run
+      SkosImporter.new(test_data, 'http://www.example.com/').run
     end
   end
 
@@ -137,7 +139,7 @@ class SkosImportTest < ActiveSupport::TestCase
     ).split("\n")
 
     assert_difference('Concept::SKOS::Base.tops.count', 1) do
-      Iqvoc::SkosImporter.new(test_data, 'http://www.example.com/').run
+      SkosImporter.new(test_data, 'http://www.example.com/').run
     end
   end
 end

data/test/test_helper.rb

@@ -26,4 +26,3 @@ unless defined?(Iqvoc) && Iqvoc.const_defined?(:Engine)
 end
 
 require 'rails/test_help'
-require 'iqvoc/rdfapi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 4.7.0
+  version: 4.8.0
 platform: ruby
 authors:
 - Robert Glaser
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -173,14 +173,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
   requirement: !ruby/object:Gem::Requirement
@@ -366,6 +366,13 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- app/aides/inline_data_helper.rb
+- app/aides/maker.rb
+- app/aides/multi_logger.rb
+- app/aides/origin.rb
+- app/aides/rdfapi.rb
+- app/aides/skos_exporter.rb
+- app/aides/skos_importer.rb
 - app/assets/fonts/FiraSans-Book.eot
 - app/assets/fonts/FiraSans-Book.ttf
 - app/assets/fonts/FiraSans-Book.woff
@@ -430,9 +437,6 @@ files:
 - app/assets/stylesheets/iqvoc/settings/_fonts.scss
 - app/assets/stylesheets/iqvoc/settings/_variables.scss
 - app/assets/stylesheets/manifest.css.scss
-- app/concerns/first_level_object_validations.rb
-- app/concerns/reverse_match_errors.rb
-- app/concerns/versioning.rb
 - app/controllers/application_controller.rb
 - app/controllers/collections/versions_controller.rb
 - app/controllers/collections_controller.rb
@@ -443,7 +447,9 @@ files:
 - app/controllers/concepts/untranslated_controller.rb
 - app/controllers/concepts/versions_controller.rb
 - app/controllers/concepts_controller.rb
+- app/controllers/concerns/controller_extensions.rb
 - app/controllers/concerns/dataset_initialization.rb
+- app/controllers/concerns/reverse_match_errors.rb
 - app/controllers/dashboard_controller.rb
 - app/controllers/exports_controller.rb
 - app/controllers/frontpage_controller.rb
@@ -472,6 +478,7 @@ files:
 - app/jobs/export_job.rb
 - app/jobs/import_job.rb
 - app/jobs/reverse_match_job.rb
+- app/models/ability.rb
 - app/models/abstract_user.rb
 - app/models/bot_user.rb
 - app/models/collection/base.rb
@@ -492,6 +499,12 @@ files:
 - app/models/concept/skos/base.rb
 - app/models/concept/skos/scheme.rb
 - app/models/concept/validations.rb
+- app/models/concerns/deep_cloning.rb
+- app/models/concerns/first_level_object_scopes.rb
+- app/models/concerns/first_level_object_validations.rb
+- app/models/concerns/rankable.rb
+- app/models/concerns/search_extension.rb
+- app/models/concerns/versioning.rb
 - app/models/configuration_setting.rb
 - app/models/dataset/adaptors/iqvoc/alphabetical_search_adaptor.rb
 - app/models/dataset/adaptors/iqvoc/http_adaptor.rb
@@ -527,7 +540,6 @@ files:
 - app/models/note/skos/example.rb
 - app/models/note/skos/history_note.rb
 - app/models/note/skos/scope_note.rb
-- app/models/search_extension.rb
 - app/models/services/reverse_match_service.rb
 - app/models/user.rb
 - app/models/user_session.rb
@@ -536,6 +548,7 @@ files:
 - app/presenters/search_result.rb
 - app/presenters/search_result_collection.rb
 - app/presenters/search_result_remote.rb
+- app/services/rdf_sync_service.rb
 - app/uploaders/base.rb
 - app/uploaders/rdf_uploader.rb
 - app/view_models/concept_view.rb
@@ -591,7 +604,9 @@ files:
 - app/views/layouts/_navigation.html.erb
 - app/views/layouts/_sections.html.erb
 - app/views/layouts/application.html.erb
+- app/views/pages/components.html.erb
 - app/views/pages/help.html.erb
+- app/views/pages/version.html.erb
 - app/views/partials/collection/_edit_link_base.html.erb
 - app/views/partials/collection/_member.html.erb
 - app/views/partials/collection/_new_link_base.html.erb
@@ -647,6 +662,7 @@ files:
 - config/database.template.yml
 - config/database.yml
 - config/database.yml.mysql
+- config/database.yml.postgresql
 - config/database.yml.sqlite
 - config/engine.rb
 - config/environment.rb
@@ -682,6 +698,9 @@ files:
 - config/locales/pt.yml
 - config/routes.rb
 - config/secrets.yml
+- config/travis/database.yml.mysql
+- config/travis/database.yml.postgresql
+- config/travis/database.yml.sqlite
 - config/warble.rb
 - db/migrate/20100927101502_create_schema.rb
 - db/migrate/20101125141218_add_collection_tables.rb
@@ -720,35 +739,24 @@ files:
 - db/migrate/20140730132113_add_type_to_users.rb
 - db/migrate/20140807072457_create_job_relations.rb
 - db/migrate/20140807123413_add_response_error_to_job_relation.rb
+- db/migrate/20141204151558_add_foreign_key_constraints.rb
 - db/schema.rb
 - db/seeds.rb
 - iqvoc.gemspec
 - lib/engine_tasks/db.rake
 - lib/generators/app/template.rb
 - lib/iqvoc.rb
-- lib/iqvoc/ability.rb
 - lib/iqvoc/configuration/collection.rb
 - lib/iqvoc/configuration/concept.rb
 - lib/iqvoc/configuration/core.rb
+- lib/iqvoc/configuration/instance_configuration.rb
 - lib/iqvoc/configuration/label.rb
+- lib/iqvoc/configuration/navigation.rb
 - lib/iqvoc/configuration/sync.rb
-- lib/iqvoc/controller_extensions.rb
-- lib/iqvoc/deep_cloning.rb
 - lib/iqvoc/environments/development.rb
 - lib/iqvoc/environments/production.rb
 - lib/iqvoc/environments/test.rb
-- lib/iqvoc/inline_data_helper.rb
-- lib/iqvoc/instance_configuration.rb
-- lib/iqvoc/maker.rb
-- lib/iqvoc/navigation.rb
-- lib/iqvoc/origin.rb
-- lib/iqvoc/rankable.rb
-- lib/iqvoc/rdf_sync.rb
-- lib/iqvoc/rdfapi.rb
-- lib/iqvoc/skos_exporter.rb
-- lib/iqvoc/skos_importer.rb
 - lib/iqvoc/version.rb
-- lib/multi_logger.rb
 - lib/string.rb
 - lib/tasks/exporter.rake
 - lib/tasks/importer.rake
@@ -976,7 +984,6 @@ files:
 - test/models/skos_export_test.rb
 - test/models/skos_import_test.rb
 - test/models/testdata.nt
-- test/performance/browsing_test.rb
 - test/test_helper.rb
 - vendor/assets/images/ajax-loader.gif
 - vendor/assets/images/animated-overlay.gif
@@ -1018,9 +1025,9 @@ files:
 - vendor/assets/stylesheets/images/ui-icons_cd0a0a_256x240.png
 - vendor/assets/stylesheets/images/ui-icons_d8e7f3_256x240.png
 - vendor/assets/stylesheets/images/ui-icons_f9bd01_256x240.png
-- vendor/assets/stylesheets/jquery-ui.css.scss
-- vendor/assets/stylesheets/jquery-ui.structure.css.scss
-- vendor/assets/stylesheets/jquery-ui.theme.css.scss
+- vendor/assets/stylesheets/jquery-ui.scss
+- vendor/assets/stylesheets/jquery-ui.structure.scss
+- vendor/assets/stylesheets/jquery-ui.theme.scss
 homepage: http://github.com/innoq/iqvoc
 licenses:
 - Apache License 2.0
@@ -1085,5 +1092,4 @@ test_files:
 - test/models/skos_export_test.rb
 - test/models/skos_import_test.rb
 - test/models/testdata.nt
-- test/performance/browsing_test.rb
 - test/test_helper.rb