iqvoc 4.6.0 → 4.6.1

data/app/models/collection/base.rb

@@ -32,6 +32,8 @@ class Collection::Base < Concept::Base
   has_many :parent_collections,
       through: :parent_collection_members
 
+  include_to_deep_cloning(:members, :collection_members)
+
   after_save :regenerate_concept_members, :regenerate_collection_members
 
   validate :circular_subcollections
@@ -109,8 +111,7 @@ class Collection::Base < Concept::Base
   end
 
   def inline_member_collection_origins
-    @member_collection_origins || collections.
-        map { |m| m.origin }.uniq
+    @member_collection_origins || subcollections.map(&:origin).uniq
   end
 
   def inline_member_collections

data/app/models/concept/base.rb

@@ -128,7 +128,6 @@ class Concept::Base < ActiveRecord::Base
 
   has_many :collection_members, foreign_key: 'target_id', class_name: 'Collection::Member::Base', dependent: :destroy
   has_many :collections, through: :collection_members, class_name: Iqvoc::Collection.base_class_name
-  include_to_deep_cloning(:collection_members)
 
   has_many :notations, class_name: 'Notation::Base', foreign_key: 'concept_id', dependent: :destroy
   include_to_deep_cloning :notations

data/app/models/note/base.rb

@@ -28,8 +28,17 @@ class Note::Base < ActiveRecord::Base
   # ********** Associations
 
   belongs_to :owner, polymorphic: true
-
-  has_many :annotations, class_name: 'Note::Annotated::Base', foreign_key: :note_id, dependent: :destroy
+  belongs_to :concept,
+             class_name: Iqvoc::Concept.base_class_name,
+             foreign_key: 'owner_id'
+  belongs_to :collection,
+             class_name: Iqvoc::Collection.base_class_name,
+             foreign_key: 'owner_id'
+
+  has_many :annotations,
+           class_name: 'Note::Annotated::Base',
+           foreign_key: :note_id,
+           dependent: :destroy
 
   accepts_nested_attributes_for :annotations
 
@@ -110,7 +119,39 @@ class Note::Base < ActiveRecord::Base
   def self.single_query(params = {})
     query_str = build_query_string(params)
 
-    scope = by_query_value(query_str).by_language(params[:languages].to_a)
+    scope = by_query_value(query_str).
+            by_language(params[:languages].to_a)
+
+    case params[:for]
+    when 'concept'
+      scope = scope.where('concepts.type' => Iqvoc::Concept.base_class_name)
+                   .references(:concepts)
+      owner = :concept
+    when 'collection'
+      scope = scope.where('concepts.type' => Iqvoc::Collection.base_class_name)
+                   .references(:concepts)
+      owner = :collection
+    else
+      # no additional conditions
+      scope
+    end
+
+    if params[:collection_origin].present?
+      collection = Collection::Base.where(origin: params[:collection_origin]).last
+      if collection
+        if owner
+          scope = scope.includes(owner => :collection_members)
+        else
+          scope = scope.includes(:concept => :collection_members)
+                       .includes(:collection => :collection_members)
+        end
+        scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection.id)
+        scope = scope.references(:collection_members)
+      else
+        raise "Collection with Origin #{params[:collection_origin]} not found!"
+      end
+    end
+
     scope = yield(scope) if block_given?
     scope.map { |result| SearchResult.new(result) }
   end

data/app/views/concepts/hierarchical/index.html.erb

@@ -3,7 +3,7 @@
 <%= render 'concepts/sidebars/plural' %>
 
 <% if params[:published] == '0' %>
-  <%= render "concepts/hierarchical/treeview", concepts: @concepts, broader: false, dragabble: true %>
+  <%= treeview @concepts, false, true %>
 <% else %>
   <%= treeview @concepts %>
 <% end %>

data/app/views/search_results/sections/_languages.html.erb

@@ -1,6 +1,6 @@
 <div class="form-group">
   <%= label_tag 'ds', t('txt.views.search_results.language'), :class => 'col-sm-2 control-label' %>
-  <div class="col-sm-4">
+  <div class="language-controls col-sm-4">
     <% @available_languages.sort.each do |lang_tag, label| %>
       <label for="languages_<%= lang_tag %>" class="checkbox-inline">
         <%= check_box_tag "l[]", lang_tag, search_language_selected?(lang_tag) %><%= lang_tag %>

data/config/locales/authlogic.en.yml

@@ -17,12 +17,12 @@
 en:
   authlogic:
     error_messages:
-      login_blank: "can not be blank"
+      login_blank: "must not be empty"
       login_not_found: "is not valid"
       login_invalid: "should use only letters, numbers, spaces, and .-_@ please."
       consecutive_failed_logins_limit_exceeded: "Consecutive failed logins limit exceeded, account is disabled."
       email_invalid: "should look like an email address."
-      password_blank: "can not be blank"
+      password_blank: "must not be empty"
       password_invalid: "is not valid"
       not_active: "Your account is not active"
       not_confirmed: "Your account is not confirmed"
@@ -35,4 +35,4 @@ en:
         login: login
         email: Email
         password: Password
-        remember_me: remember me
+        remember_me: remember me

data/config/locales/en.yml

@@ -131,7 +131,7 @@ en:
        classifiers: "Environment classes"
        pending_jobs_header: "Pending jobs"
        pending_jobs_message: "There are pending jobs for this concept."
-       disabled_matches_form_message: "A concept have to be published before you can assign mapping properties."
+       disabled_matches_form_message: "A concept needs to be published before you can assign mapping properties."
        add_match: "Creation:"
        remove_match: "Deletion:"
        job_detail: "%{match_class}-Relation of concept %{subject} from remote ontology to %{target} pending."

data/db/migrate/20140730132113_add_type_to_users.rb

@@ -1,5 +1,5 @@
 class AddTypeToUsers < ActiveRecord::Migration
   def change
-    add_column :users, :type, :string
+    add_column :users, :type, :string, :default => 'User'
   end
 end

data/db/schema.rb

@@ -11,61 +11,64 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140807123413) do
+ActiveRecord::Schema.define(version: 20141204151558) do
 
   create_table "collection_members", force: true do |t|
-    t.integer "collection_id"
-    t.integer "target_id"
-    t.string  "type"
+    t.integer "collection_id", limit: 4
+    t.integer "target_id",     limit: 4
+    t.string  "type",          limit: 255
   end
 
   add_index "collection_members", ["collection_id", "target_id", "type"], name: "ix_collections_fk_type", using: :btree
+  add_index "collection_members", ["target_id"], name: "fk_rails_207ac01588", using: :btree
 
   create_table "concept_relations", force: true do |t|
-    t.string   "type"
-    t.integer  "owner_id"
-    t.integer  "target_id"
+    t.string   "type",       limit: 255
+    t.integer  "owner_id",   limit: 4
+    t.integer  "target_id",  limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "rank",       default: 100
+    t.integer  "rank",       limit: 4,   default: 100
   end
 
   add_index "concept_relations", ["owner_id", "target_id"], name: "ix_concept_relations_fk", using: :btree
+  add_index "concept_relations", ["target_id"], name: "fk_rails_59b5dcff61", using: :btree
 
   create_table "concepts", force: true do |t|
-    t.string   "type"
+    t.string   "type",                 limit: 255
     t.string   "origin",               limit: 4000
-    t.integer  "rev",                               default: 1
+    t.integer  "rev",                  limit: 4,    default: 1
     t.date     "published_at"
-    t.integer  "published_version_id"
-    t.integer  "locked_by"
+    t.integer  "published_version_id", limit: 4
+    t.integer  "locked_by",            limit: 4
     t.date     "expired_at"
     t.date     "follow_up"
-    t.boolean  "to_review"
+    t.boolean  "to_review",            limit: 1
     t.date     "rdf_updated_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "top_term",                          default: false
+    t.boolean  "top_term",             limit: 1,    default: false
   end
 
+  add_index "concepts", ["locked_by"], name: "fk_rails_9ab9124960", using: :btree
   add_index "concepts", ["origin"], name: "ix_concepts_on_origin", length: {"origin"=>255}, using: :btree
   add_index "concepts", ["published_version_id"], name: "ix_concepts_publ_version_id", using: :btree
 
   create_table "configuration_settings", force: true do |t|
-    t.string "key"
-    t.string "value"
+    t.string "key",   limit: 255
+    t.string "value", limit: 255
   end
 
   create_table "delayed_jobs", force: true do |t|
-    t.integer  "priority",   default: 0, null: false
-    t.integer  "attempts",   default: 0, null: false
-    t.text     "handler",                null: false
-    t.text     "last_error"
+    t.integer  "priority",   limit: 4,     default: 0, null: false
+    t.integer  "attempts",   limit: 4,     default: 0, null: false
+    t.text     "handler",    limit: 65535,             null: false
+    t.text     "last_error", limit: 65535
     t.datetime "run_at"
     t.datetime "locked_at"
     t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
+    t.string   "locked_by",  limit: 255
+    t.string   "queue",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -73,57 +76,58 @@ ActiveRecord::Schema.define(version: 20140807123413) do
   add_index "delayed_jobs", ["priority", "run_at"], name: "delayed_jobs_priority", using: :btree
 
   create_table "exports", force: true do |t|
-    t.integer  "user_id"
-    t.text     "output"
-    t.boolean  "success",           default: false
-    t.integer  "file_type"
-    t.string   "token"
+    t.integer  "user_id",           limit: 4
+    t.text     "output",            limit: 65535
+    t.boolean  "success",           limit: 1,     default: false
+    t.integer  "file_type",         limit: 4
+    t.string   "token",             limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "finished_at"
-    t.string   "default_namespace"
+    t.string   "default_namespace", limit: 255
   end
 
   add_index "exports", ["user_id"], name: "index_exports_on_user_id", using: :btree
 
   create_table "imports", force: true do |t|
-    t.integer  "user_id"
-    t.text     "output"
-    t.boolean  "success",           default: false
+    t.integer  "user_id",           limit: 4
+    t.text     "output",            limit: 65535
+    t.boolean  "success",           limit: 1,     default: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.datetime "finished_at"
-    t.string   "import_file"
-    t.boolean  "publish"
-    t.string   "default_namespace"
+    t.string   "import_file",       limit: 255
+    t.boolean  "publish",           limit: 1
+    t.string   "default_namespace", limit: 255
   end
 
   add_index "imports", ["user_id"], name: "index_imports_on_user_id", using: :btree
 
   create_table "job_relations", force: true do |t|
-    t.string   "type"
-    t.string   "owner_reference"
-    t.string   "job_id"
+    t.string   "type",            limit: 255
+    t.string   "owner_reference", limit: 255
+    t.string   "job_id",          limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "response_error"
+    t.string   "response_error",  limit: 255
   end
 
   create_table "labelings", force: true do |t|
-    t.string   "type"
-    t.integer  "owner_id"
-    t.integer  "target_id"
+    t.string   "type",       limit: 255
+    t.integer  "owner_id",   limit: 4
+    t.integer  "target_id",  limit: 4
     t.datetime "created_at"
     t.datetime "updated_at"
   end
 
   add_index "labelings", ["owner_id", "target_id", "type"], name: "ix_labelings_fk_type", using: :btree
+  add_index "labelings", ["target_id"], name: "fk_rails_d3560f2025", using: :btree
   add_index "labelings", ["type"], name: "ix_labelings_on_type", using: :btree
 
   create_table "labels", force: true do |t|
-    t.string   "type"
+    t.string   "type",         limit: 255
     t.string   "origin",       limit: 4000
-    t.string   "language"
+    t.string   "language",     limit: 255
     t.string   "value",        limit: 1024
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -134,9 +138,9 @@ ActiveRecord::Schema.define(version: 20140807123413) do
   add_index "labels", ["origin"], name: "ix_labels_on_origin", length: {"origin"=>255}, using: :btree
 
   create_table "matches", force: true do |t|
-    t.integer  "concept_id"
-    t.string   "type"
-    t.string   "value"
+    t.integer  "concept_id", limit: 4
+    t.string   "type",       limit: 255
+    t.string   "value",      limit: 255
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -145,7 +149,7 @@ ActiveRecord::Schema.define(version: 20140807123413) do
   add_index "matches", ["type"], name: "ix_matches_on_type", using: :btree
 
   create_table "notations", force: true do |t|
-    t.integer "concept_id"
+    t.integer "concept_id", limit: 4
     t.string  "value",      limit: 4000
     t.string  "data_type",  limit: 4000
   end
@@ -153,13 +157,13 @@ ActiveRecord::Schema.define(version: 20140807123413) do
   add_index "notations", ["concept_id"], name: "index_notations_on_concept_id", using: :btree
 
   create_table "note_annotations", force: true do |t|
-    t.integer  "note_id"
+    t.integer  "note_id",    limit: 4
     t.string   "predicate",  limit: 50
     t.string   "value",      limit: 1024
     t.datetime "created_at"
     t.datetime "updated_at"
     t.string   "namespace",  limit: 50
-    t.string   "language"
+    t.string   "language",   limit: 255
   end
 
   add_index "note_annotations", ["note_id"], name: "ix_note_annotations_fk", using: :btree
@@ -170,8 +174,8 @@ ActiveRecord::Schema.define(version: 20140807123413) do
     t.string   "type",       limit: 50
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type",              null: false
+    t.integer  "owner_id",   limit: 4
+    t.string   "owner_type", limit: 255,  null: false
   end
 
   add_index "notes", ["language"], name: "ix_notes_on_language", using: :btree
@@ -179,19 +183,32 @@ ActiveRecord::Schema.define(version: 20140807123413) do
   add_index "notes", ["type"], name: "ix_notes_on_type", using: :btree
 
   create_table "users", force: true do |t|
-    t.string   "forename"
-    t.string   "surname"
-    t.string   "email"
-    t.string   "crypted_password"
-    t.boolean  "active"
+    t.string   "forename",          limit: 255
+    t.string   "surname",           limit: 255
+    t.string   "email",             limit: 255
+    t.string   "crypted_password",  limit: 255
+    t.boolean  "active",            limit: 1
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "password_salt"
-    t.string   "persistence_token"
-    t.string   "perishable_token"
-    t.string   "role"
-    t.string   "telephone_number"
-    t.string   "type"
+    t.string   "password_salt",     limit: 255
+    t.string   "persistence_token", limit: 255
+    t.string   "perishable_token",  limit: 255
+    t.string   "role",              limit: 255
+    t.string   "telephone_number",  limit: 255
+    t.string   "type",              limit: 255
   end
 
+  add_foreign_key "collection_members", "concepts", column: "collection_id", on_update: :cascade
+  add_foreign_key "collection_members", "concepts", column: "target_id", on_update: :cascade
+  add_foreign_key "concept_relations", "concepts", column: "owner_id", on_update: :cascade
+  add_foreign_key "concept_relations", "concepts", column: "target_id", on_update: :cascade
+  add_foreign_key "concepts", "users", column: "locked_by", on_update: :cascade, on_delete: :nullify
+  add_foreign_key "exports", "users", on_update: :cascade, on_delete: :nullify
+  add_foreign_key "imports", "users", on_update: :cascade, on_delete: :nullify
+  add_foreign_key "labelings", "concepts", column: "owner_id", on_update: :cascade
+  add_foreign_key "labelings", "labels", column: "target_id", on_update: :cascade, on_delete: :cascade
+  add_foreign_key "matches", "concepts", on_update: :cascade, on_delete: :cascade
+  add_foreign_key "notations", "concepts", on_update: :cascade
+  add_foreign_key "note_annotations", "notes", on_update: :cascade, on_delete: :cascade
+  add_foreign_key "notes", "concepts", column: "owner_id", on_update: :cascade, on_delete: :cascade
 end

data/lib/iqvoc/version.rb

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

data/test/controllers/reverse_match_test.rb

@@ -93,6 +93,31 @@ class ReverseMatchTest < ActionController::TestCase
     assert_equal 2, new_concept_version.rev
   end
 
+  test 'add already existing match' do
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://google.de'
+    assert_response 200
+    body = JSON.parse response.body
+    assert_equal body['type'], 'mapping_added'
+
+    new_concept_version = Iqvoc::Concept.base_class.by_origin(@achievement_hobbies.origin).last
+    assert_equal 2, new_concept_version.rev
+
+    patch :add_match,
+          origin: @achievement_hobbies.origin,
+          match_class: 'match_skos_broadmatch',
+          uri: 'http://google.de'
+    assert_response 409
+    body = JSON.parse response.body
+    assert_equal body['type'], 'mapping_exists'
+
+    new_concept_version = Iqvoc::Concept.base_class.by_origin(@achievement_hobbies.origin).last
+    assert_equal 2, new_concept_version.rev
+  end
+
+
   test 'no referer' do
     @request.env['HTTP_REFERER'] = nil
     patch :add_match,