iqvoc 3.2.8 → 3.2.9

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

@@ -56,24 +56,29 @@ class Labeling::SKOS::Base < Labeling::Base
     if params[:collection_origin].present?
       collection = Collection::Unordered.where(:origin => params[:collection_origin]).last
       if collection
-        scope = scope.includes(:owner => :collection_members)
+        # scope = scope.includes(:owner => :collection_members)
+        scope = scope.joins("LEFT OUTER JOIN `collection_members` ON `collection_members`.`target_id` = `concepts`.`id`")
         scope = scope.where("#{Collection::Member::Base.table_name}.collection_id" => collection)
       else
         raise "Collection with Origin #{params[:collection_origin]} not found!"
       end
     end
     scope = scope.includes(:owner)
-    
+
     scope = case params[:for]
     when "concept"
       scope.where("concepts.type" => Iqvoc::Concept.base_class_name).merge(Concept::Base.published)
     when "collection"
       scope.where("concepts.type" => Iqvoc::Collection.base_class_name)
+      if collection
+        scope = scope.where("`collection_members`.`type` = 'Collection::Member::Collection'")
+      end
+      scope
     else
       # no additional conditions
       scope
     end
-    
+
     scope
   end
 
@@ -84,7 +89,7 @@ class Labeling::SKOS::Base < Labeling::Base
   def self.build_from_rdf(subject, predicate, object)
     raise "Labeling::SKOS::Base#build_from_rdf: Subject (#{subject}) must be a Concept." unless subject.is_a?(Concept::Base)
     raise "Labeling::SKOS::Base#build_from_rdf: Object (#{object}) must be a string literal" unless object =~ /^"(.+)"(@(.+))$/
-    
+
     lang = $3
     value = JSON.parse(%Q{["#{$1}"]})[0].gsub("\\n", "\n") # Trick to decode \uHHHHH chars
 

data/config/database.yml

@@ -13,7 +13,7 @@ development:
   database: iqvoc_development
   username: root
   password:
-  hostname: 127.0.0.1
+  host: 127.0.0.1
 
 test:
   adapter: mysql2
@@ -22,7 +22,7 @@ test:
   database: iqvoc_test
   username: root
   password:
-  hostname: 127.0.0.1
+  host: 127.0.0.1
 
 production:
   adapter: mysql2
@@ -31,4 +31,4 @@ production:
   database: iqvoc_development
   username: root
   password:
-  hostname: 127.0.0.1
+  host: 127.0.0.1

data/db/schema.rb

@@ -9,33 +9,33 @@
 # from scratch. The latter is a flawed and unsustainable approach (the more migrations
 # you'll amass, the slower it'll run and the greater likelihood for issues).
 #
-# It's strongly recommended to check this file into your version control system.
+# It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20120601094501) do
+ActiveRecord::Schema.define(version: 20140807123413) do
 
-  create_table "collection_members", :force => true do |t|
+  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"
+  add_index "collection_members", ["collection_id", "target_id", "type"], name: "ix_collections_fk_type", using: :btree
 
-  create_table "concept_relations", :force => true do |t|
+  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
+    t.integer  "rank",       default: 100
   end
 
-  add_index "concept_relations", ["owner_id", "target_id"], :name => "ix_concept_relations_fk"
+  add_index "concept_relations", ["owner_id", "target_id"], name: "ix_concept_relations_fk", using: :btree
 
-  create_table "concepts", :force => true do |t|
+  create_table "concepts", force: true do |t|
     t.string   "type"
-    t.string   "origin",               :limit => 4000
-    t.integer  "rev",                                  :default => 1
+    t.string   "origin",               limit: 4000
+    t.integer  "rev",                               default: 1
     t.date     "published_at"
     t.integer  "published_version_id"
     t.integer  "locked_by"
@@ -45,18 +45,71 @@ ActiveRecord::Schema.define(:version => 20120601094501) do
     t.date     "rdf_updated_at"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.boolean  "top_term",                             :default => false
+    t.boolean  "top_term",                          default: false
   end
 
-  add_index "concepts", ["origin"], :name => "ix_concepts_on_origin", :length => {"origin"=>255}
-  add_index "concepts", ["published_version_id"], :name => "ix_concepts_publ_version_id"
+  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|
+  create_table "configuration_settings", force: true do |t|
     t.string "key"
     t.string "value"
   end
 
-  create_table "labelings", :force => true do |t|
+  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"
+  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"
+  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.datetime "created_at"
+    t.datetime "updated_at"
+    t.string   "response_error"
+  end
+
+  create_table "labelings", force: true do |t|
     t.string   "type"
     t.integer  "owner_id"
     t.integer  "target_id"
@@ -64,24 +117,23 @@ ActiveRecord::Schema.define(:version => 20120601094501) do
     t.datetime "updated_at"
   end
 
-  add_index "labelings", ["owner_id", "target_id", "type"], :name => "ix_labelings_fk_type"
-  add_index "labelings", ["type"], :name => "ix_labelings_on_type"
+  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|
+  create_table "labels", force: true do |t|
     t.string   "type"
-    t.string   "origin",       :limit => 4000
+    t.string   "origin",       limit: 4000
     t.string   "language"
-    t.string   "value",        :limit => 1024
+    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"
-  add_index "labels", ["origin"], :name => "ix_labels_on_origin", :length => {"origin"=>255}
-  add_index "labels", ["value"], :name => "ix_labels_on_value", :length => {"value"=>255}
+  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|
+  create_table "matches", force: true do |t|
     t.integer  "concept_id"
     t.string   "type"
     t.string   "value"
@@ -89,44 +141,44 @@ ActiveRecord::Schema.define(:version => 20120601094501) do
     t.datetime "updated_at"
   end
 
-  add_index "matches", ["concept_id", "type"], :name => "ix_matches_fk_type"
-  add_index "matches", ["type"], :name => "ix_matches_on_type"
+  add_index "matches", ["concept_id", "type"], name: "ix_matches_fk_type", using: :btree
+  add_index "matches", ["type"], name: "ix_matches_on_type", using: :btree
 
-  create_table "note_annotations", :force => true do |t|
+  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
+
+  create_table "note_annotations", force: true do |t|
     t.integer  "note_id"
-    t.string   "predicate",  :limit => 50
-    t.string   "value",      :limit => 1024
+    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   "namespace",  limit: 50
+    t.string   "language"
   end
 
-  add_index "note_annotations", ["note_id"], :name => "ix_note_annotations_fk"
+  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
+  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
+    t.string   "owner_type",              null: false
   end
 
-  add_index "notes", ["language"], :name => "ix_notes_on_language"
-  add_index "notes", ["owner_id", "owner_type", "type"], :name => "ix_notes_fk_type"
-  add_index "notes", ["type"], :name => "ix_notes_on_type"
-
-  create_table "page_requests", :force => true do |t|
-    t.string   "path"
-    t.float    "page_duration"
-    t.float    "view_duration"
-    t.float    "db_duration"
-    t.datetime "created_at",    :null => false
-    t.datetime "updated_at",    :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|
+  create_table "users", force: true do |t|
     t.string   "forename"
     t.string   "surname"
     t.string   "email"
@@ -139,6 +191,7 @@ ActiveRecord::Schema.define(:version => 20120601094501) do
     t.string   "perishable_token"
     t.string   "role"
     t.string   "telephone_number"
+    t.string   "type"
   end
 
 end

data/lib/iqvoc/version.rb

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

data/public/javascripts/iqvoc/application.js

@@ -2,144 +2,132 @@
 /*global jQuery, IQVOC */
 
 jQuery(document).ready(function($) {
-  "use strict";
+	"use strict";
 
-  var locale = $("head meta[name=i18n-locale]").attr("content");
+	var locale = $("head meta[name=i18n-locale]").attr("content");
 
-  IQVOC.enhancedDropdown(".menu");
-  IQVOC.dynamicAuth("#auth_controls");
+	IQVOC.enhancedDropdown(".menu");
+	IQVOC.dynamicAuth("#auth_controls");
 
-  if(IQVOC.visualization) {
-    IQVOC.visualization.init("infovis", function(container) {
-      if(IQVOC.Storage.getItem("visualization") === "enlarged") {
-        container.data("widget").toggleSize(true);
-      }
-    });
-  }
+	if(IQVOC.visualization) {
+		IQVOC.visualization.init("infovis", function(container) {
+			if(IQVOC.Storage.getItem("visualization") === "enlarged") {
+				container.data("widget").toggleSize(true);
+			}
+		});
+	}
 
-  // language selection
-  var langWidget = $("ul.lang-widget")[0];
-  // primary language (converting links to radio buttons)
-  $("a", langWidget).each(function(i, node) {
-    var link = $(node),
-      el = link.closest("li"),
-      btn = $('<input type="radio" name="primary_language">');
-    if(link.hasClass("current")) {
-      btn[0].checked = true;
-    }
-    var label = $("<label />").append(btn).append(link);
-    el.append(label);
-    return label[0];
-  });
-  $("input:radio", langWidget).live("change", function(ev) {
-    window.location = $(this).closest("label").find("a").attr("href");
-  });
-  // secondary language
-  var toggleSections = function(langSelected) {
-    $(".translation[lang]").each(function(i, node) {
-      var el = $(node),
-        lang = el.attr("lang");
-      if(lang !== locale && $.inArray(lang, langSelected) === -1) {
-        el.addClass("hidden");
-      } else {
-        el.removeClass("hidden");
-      }
-    });
-  };
-  var updateNoteLangs = function(langSelected) {
-    $(".inline_note.new select").each(function(i, sel) { // NB: new notes only!
-      $(sel).find("option").each(function(i, opt) {
-        var el = $(opt),
-          lang = el.val();
-        if(lang !== locale && $.inArray(lang, langSelected) === -1) {
-          el.remove();
-        }
-      });
-    });
-  };
-  $(document).bind("lang_selected", function(ev, data) {
-    toggleSections(data.langs);
-    updateNoteLangs(data.langs);
-  });
-  var langSelector = new IQVOC.LanguageSelector(langWidget, "lang_selected");
-  if($("#concept_new, #concept_edit").length) { // edit mode
-    // disable secondary language selection to avoid excessive state complexity
-    $(":checkbox", langSelector.container).prop("disabled", true);
-  }
+	// language selection
+	var langWidget = $("ul.lang-widget")[0];
+	// primary language (converting links to radio buttons)
+	$("a", langWidget).each(function(i, node) {
+		var link = $(node),
+			el = link.closest("li"),
+			btn = $('<input type="radio" name="primary_language">');
+		if(link.hasClass("current")) {
+			btn[0].checked = true;
+		}
+		var label = $("<label />").append(btn).append(link);
+		el.append(label);
+		return label[0];
+	});
+	$("input:radio", langWidget).live("change", function(ev) {
+		window.location = $(this).closest("label").find("a").attr("href");
+	});
+	// secondary language
+	var toggleSections = function(langSelected) {
+		$(".translation[lang]").each(function(i, node) {
+			var el = $(node),
+				lang = el.attr("lang");
+			if(lang !== locale && $.inArray(lang, langSelected) === -1) {
+				el.addClass("hidden");
+			} else {
+				el.removeClass("hidden");
+			}
+		});
+	};
+	var updateNoteLangs = function(langSelected) {
+		$(".inline_note.new select").each(function(i, sel) { // NB: new notes only!
+			$(sel).find("option").each(function(i, opt) {
+				var el = $(opt),
+					lang = el.val();
+				if(lang !== locale && $.inArray(lang, langSelected) === -1) {
+					el.remove();
+				}
+			});
+		});
+	};
+	$(document).bind("lang_selected", function(ev, data) {
+		toggleSections(data.langs);
+		updateNoteLangs(data.langs);
+	});
+	var langSelector = new IQVOC.LanguageSelector(langWidget, "lang_selected");
+	if($("#concept_new, #concept_edit").length) { // edit mode
+		// disable secondary language selection to avoid excessive state complexity
+		$(":checkbox", langSelector.container).prop("disabled", true);
+	}
 
-  // entity selection (edit mode)
-  $("input.entity_select").each(function(i, node) {
-    IQVOC.EntitySelector(node);
-  });
+	// entity selection (edit mode)
+	$("input.entity_select").each(function(i, node) {
+		IQVOC.EntitySelector(node);
+	});
 
-  // Label editing (inline notes)
-  $("fieldset.note_relation ol li.inline_note.new").hide();
-  $("fieldset.note_relation input[type=button]").click(function(ev) {
-    IQVOC.createNote.apply(this, arguments);
-    langSelector.notify(); // trigger updateNoteLangs -- XXX: hacky!?
-  });
-  $("li.inline_note input:checkbox").change(function(ev) {
-    var action = this.checked ? "addClass" : "removeClass";
-    $(this).closest("li")[action]("deleted");
-  });
+	// Label editing (inline notes)
+	$("fieldset.note_relation ol li.inline_note.new").hide();
+	$("fieldset.note_relation input[type=button]").click(function(ev) {
+		IQVOC.createNote.apply(this, arguments);
+		langSelector.notify(); // trigger updateNoteLangs -- XXX: hacky!?
+	});
+	$("li.inline_note input:checkbox").change(function(ev) {
+		var action = this.checked ? "addClass" : "removeClass";
+		$(this).closest("li")[action]("deleted");
+	});
 
-  // Datepicker
-  $.datepicker.setDefaults($.datepicker.regional[locale]);
-  $("input.datepicker").datepicker({ dateFormat: "yy-mm-dd" });
+	// Datepicker
+	$.datepicker.setDefaults($.datepicker.regional[locale]);
+	$("input.datepicker").datepicker({ dateFormat: "yy-mm-dd" });
 
-  // Dashboard table row highlighting and click handling
-  $("tr.highlightable")
-    .hover(function(ev) {
-      var action = ev.type === "mouseenter" ? "addClass" : "removeClass";
-      $(this)[action]("hover");
-    })
-    .click(function(ev) {
-      window.location = $(this).attr("data-url");
-    });
+	// Dashboard table row highlighting and click handling
+	$("tr.highlightable")
+		.hover(function(ev) {
+			var action = ev.type === "mouseenter" ? "addClass" : "removeClass";
+			$(this)[action]("hover");
+		})
+		.click(function(ev) {
+			window.location = $(this).attr("data-url");
+		});
 
-  // Search
-  $("button#language_select_all").click(function() {
-    $("input[type=checkbox].lang_check").attr("checked", true);
-  });
-  $("button#language_select_none").click(function() {
-    $("input[type=checkbox].lang_check").attr("checked", false);
-  });
-  $("select.search_type").change(function() {
-    var result_type_filter = $("li.result_type_filter");
-    if($(this).val().match(/labeling/)) {
-      result_type_filter.show();
-    }
-    else {
-      result_type_filter.hide();
-    }
-  });
-  $("select.search_type").change();
+	// Search
+	$("button#language_select_all").click(function() {
+		$("input[type=checkbox].lang_check").attr("checked", true);
+	});
+	$("button#language_select_none").click(function() {
+		$("input[type=checkbox].lang_check").attr("checked", false);
+	});
+	$("select.search_type").change(function() {
+		var result_type_filter = $("li.result_type_filter");
+		if($(this).val().match(/labeling/)) {
+			result_type_filter.show();
+		}
+		else {
+			result_type_filter.hide();
+		}
+	});
+	$("select.search_type").change();
 
-  // hierarchical tree view
-  $("ul.hybrid-treeview").each(function() {
-    var url = $(this).attr("data-url"),
-      container = this;
-    $(this).treeview({
-      collapsed: true,
-      toggle: function() {
-        var el = $(this);
-        if(el.hasClass("hasChildren")) {
-          var childList = el.removeClass("hasChildren").find("ul");
-
-          var sortedItems = $(childList).children();
-          sortedItems.sort(function(a, b) {
-             var nameA = a.find("a").text(), nameB = b.find("a").text();
-             if (nameA < nameB) // sort string ascending
-              return -1
-             if (nameA > nameB)
-              return 1
-             return 0 // default return value (no sorting)
-          })
-          $(childList).empty().append(sortedItems);
-
-          $.fn.treeviewLoad({ url: url }, this.id, childList, container);
-        }
-      }
-    });
-  });
+	// hierarchical tree view
+	$("ul.hybrid-treeview").each(function() {
+		var url = $(this).attr("data-url"),
+			container = this;
+		$(this).treeview({
+			collapsed: true,
+			toggle: function() {
+				var el = $(this);
+				if(el.hasClass("hasChildren")) {
+					var childList = el.removeClass("hasChildren").find("ul");
+					$.fn.treeviewLoad({ url: url }, this.id, childList, container);
+				}
+			}
+		});
+	});
 });

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.2.8
+  version: 3.2.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2014-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70201195576640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,15 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70201195576640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 3.0.9
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70201195576240 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +39,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201195576240
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70201195575780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +55,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201195575780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70201195605560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +71,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201195605560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70201195605140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +87,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201195605140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70201195604640 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +103,15 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70201195604640
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.14
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70201195604220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +119,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70201195604220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -256,7 +291,6 @@ files:
 - config/initializers/kaminari_config.rb
 - config/initializers/language.rb
 - config/initializers/mime_types.rb
-- config/initializers/secret_token.rb
 - config/initializers/secret_token.rb.template
 - config/initializers/session_store.rb
 - config/locales/activerecord.de.yml
@@ -480,7 +514,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3
 summary: iQvoc

data/config/initializers/secret_token.rb

@@ -1,30 +0,0 @@
-# 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.
-
-# Be sure to restart your server when you modify this file.
-
-if Iqvoc.const_defined?(:Application)
-
-  # Your secret key for verifying the integrity of signed cookies.
-  # If you change this key, all old signed cookies will become invalid!
-  # Make sure the secret is at least 30 characters and all random,
-  # no regular words or you'll be exposed to dictionary attacks.
-
-  # Run `rake secret` and uncomment the following line
-  # Replace the secret-placeholder with your generated token
-  Iqvoc::Application.config.secret_token = 'ef1f801c911b45ded2944aad3121244bfabf231631d102e6e120da8639c47eb6aa4ae7df733f0d539951cbc4e399e6050f46bc279d6a85d57135688394b87c5a'
-
-end