iqvoc 4.4.0 → 4.5.0

data/db/schema.rb

@@ -11,177 +11,177 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20140506133619) do
+ActiveRecord::Schema.define(version: 20_140_506_133_619) do
 
-  create_table "collection_members", force: true do |t|
-    t.integer "collection_id"
-    t.integer "target_id"
-    t.string  "type"
+  create_table 'collection_members', force: true do |t|
+    t.integer 'collection_id'
+    t.integer 'target_id'
+    t.string 'type'
   end
 
-  add_index "collection_members", ["collection_id", "target_id", "type"], name: "ix_collections_fk_type", using: :btree
+  add_index 'collection_members', %w(collection_id target_id type), name: 'ix_collections_fk_type', using: :btree
 
-  create_table "concept_relations", force: true do |t|
-    t.string   "type"
-    t.integer  "owner_id"
-    t.integer  "target_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "rank",       default: 100
+  create_table 'concept_relations', force: true do |t|
+    t.string 'type'
+    t.integer 'owner_id'
+    t.integer 'target_id'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.integer 'rank',       default: 100
   end
 
-  add_index "concept_relations", ["owner_id", "target_id"], name: "ix_concept_relations_fk", using: :btree
-
-  create_table "concepts", force: true do |t|
-    t.string   "type"
-    t.string   "origin",               limit: 4000
-    t.integer  "rev",                               default: 1
-    t.date     "published_at"
-    t.integer  "published_version_id"
-    t.integer  "locked_by"
-    t.date     "expired_at"
-    t.date     "follow_up"
-    t.boolean  "to_review"
-    t.date     "rdf_updated_at"
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.boolean  "top_term",                          default: false
+  add_index 'concept_relations', %w(owner_id target_id), name: 'ix_concept_relations_fk', using: :btree
+
+  create_table 'concepts', force: true do |t|
+    t.string 'type'
+    t.string 'origin',               limit: 4000
+    t.integer 'rev',                               default: 1
+    t.date 'published_at'
+    t.integer 'published_version_id'
+    t.integer 'locked_by'
+    t.date 'expired_at'
+    t.date 'follow_up'
+    t.boolean 'to_review'
+    t.date 'rdf_updated_at'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.boolean 'top_term',                          default: false
   end
 
-  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
+  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"
+  create_table 'configuration_settings', force: true do |t|
+    t.string 'key'
+    t.string 'value'
   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.datetime "run_at"
-    t.datetime "locked_at"
-    t.datetime "failed_at"
-    t.string   "locked_by"
-    t.string   "queue"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  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.datetime 'run_at'
+    t.datetime 'locked_at'
+    t.datetime 'failed_at'
+    t.string 'locked_by'
+    t.string 'queue'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
-  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.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "finished_at"
-    t.string   "default_namespace"
+  add_index 'delayed_jobs', %w(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.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.datetime 'finished_at'
+    t.string 'default_namespace'
   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.datetime "created_at"
-    t.datetime "updated_at"
-    t.datetime "finished_at"
-    t.string   "import_file"
-    t.boolean  "publish"
-    t.string   "default_namespace"
+  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.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.datetime 'finished_at'
+    t.string 'import_file'
+    t.boolean 'publish'
+    t.string 'default_namespace'
   end
 
-  add_index "imports", ["user_id"], name: "index_imports_on_user_id", using: :btree
+  add_index 'imports', ['user_id'], name: 'index_imports_on_user_id', using: :btree
 
-  create_table "labelings", force: true do |t|
-    t.string   "type"
-    t.integer  "owner_id"
-    t.integer  "target_id"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'labelings', force: true do |t|
+    t.string 'type'
+    t.integer 'owner_id'
+    t.integer 'target_id'
+    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", ["type"], name: "ix_labelings_on_type", using: :btree
-
-  create_table "labels", force: true do |t|
-    t.string   "type"
-    t.string   "origin",       limit: 4000
-    t.string   "language"
-    t.string   "value",        limit: 1024
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.date     "published_at"
+  add_index 'labelings', %w(owner_id target_id type), name: 'ix_labelings_fk_type', 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 'origin',       limit: 4000
+    t.string 'language'
+    t.string 'value',        limit: 1024
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.date 'published_at'
   end
 
-  add_index "labels", ["language"], name: "ix_labels_on_language", using: :btree
-  add_index "labels", ["origin"], name: "ix_labels_on_origin", length: {"origin"=>255}, using: :btree
+  add_index 'labels', ['language'], name: 'ix_labels_on_language', using: :btree
+  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.datetime "created_at"
-    t.datetime "updated_at"
+  create_table 'matches', force: true do |t|
+    t.integer 'concept_id'
+    t.string 'type'
+    t.string 'value'
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
   end
 
-  add_index "matches", ["concept_id", "type"], name: "ix_matches_fk_type", using: :btree
-  add_index "matches", ["type"], name: "ix_matches_on_type", using: :btree
+  add_index 'matches', %w(concept_id type), name: 'ix_matches_fk_type', using: :btree
+  add_index 'matches', ['type'], name: 'ix_matches_on_type', using: :btree
 
-  create_table "notations", force: true do |t|
-    t.integer "concept_id"
-    t.string  "value",      limit: 4000
-    t.string  "data_type",  limit: 4000
+  create_table 'notations', force: true do |t|
+    t.integer 'concept_id'
+    t.string 'value',      limit: 4000
+    t.string 'data_type',  limit: 4000
   end
 
-  add_index "notations", ["concept_id"], name: "index_notations_on_concept_id", using: :btree
+  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.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"
+  create_table 'note_annotations', force: true do |t|
+    t.integer 'note_id'
+    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'
   end
 
-  add_index "note_annotations", ["note_id"], name: "ix_note_annotations_fk", using: :btree
+  add_index 'note_annotations', ['note_id'], name: 'ix_note_annotations_fk', using: :btree
 
-  create_table "notes", force: true do |t|
-    t.string   "language",   limit: 2
-    t.string   "value",      limit: 4000
-    t.string   "type",       limit: 50
-    t.datetime "created_at"
-    t.datetime "updated_at"
-    t.integer  "owner_id"
-    t.string   "owner_type",              null: false
+  create_table 'notes', force: true do |t|
+    t.string 'language',   limit: 2
+    t.string 'value',      limit: 4000
+    t.string 'type',       limit: 50
+    t.datetime 'created_at'
+    t.datetime 'updated_at'
+    t.integer 'owner_id'
+    t.string 'owner_type',              null: false
   end
 
-  add_index "notes", ["language"], name: "ix_notes_on_language", using: :btree
-  add_index "notes", ["owner_id", "owner_type", "type"], name: "ix_notes_fk_type", using: :btree
-  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.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"
+  add_index 'notes', ['language'], name: 'ix_notes_on_language', using: :btree
+  add_index 'notes', %w(owner_id owner_type type), name: 'ix_notes_fk_type', using: :btree
+  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.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'
   end
 
 end

data/iqvoc.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = 'iqvoc'
   s.version     = Iqvoc::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ['Robert Glaser', 'Till Schulte-Coerne', 'Frederik Dohr']
-  s.email       = ['robert.glaser@innoq.com', 'till.schulte-coerne@innoq.com', 'frederik.dohr@innoq.com']
+  s.authors     = ['Robert Glaser', 'Till Schulte-Coerne', 'Frederik Dohr', 'Marc Jansing']
+  s.email       = ['robert.glaser@innoq.com', 'till.schulte-coerne@innoq.com', 'frederik.dohr@innoq.com', 'marc.jansing@innoq.com']
   s.homepage    = 'http://github.com/innoq/iqvoc'
   s.summary     = 'iQvoc'
   s.description = 'iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic Web'

data/lib/iqvoc/controller_extensions.rb

@@ -13,6 +13,7 @@ module Iqvoc
 
       rescue_from ActiveRecord::RecordNotFound, with: :handle_not_found
       rescue_from CanCan::AccessDenied, with: :handle_access_denied
+      rescue_from ActionController::ParameterMissing, with: :handle_bad_request
     end
 
     protected
@@ -51,6 +52,14 @@ module Iqvoc
       end
     end
 
+    def handle_bad_request(exception)
+      @exception = exception
+
+      respond_to do |format|
+        format.any  { head 400 }
+      end
+    end
+
     def set_locale
       if params[:lang].present? && Iqvoc::Concept.pref_labeling_languages.include?(params[:lang])
         I18n.locale = params[:lang]

data/lib/iqvoc/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module Iqvoc
-  VERSION = '4.4.0'
+  VERSION = '4.5.0'
 end