iqvoc 3.2.4 → 3.2.5

data/app/views/collections/show.html.erb

@@ -36,7 +36,7 @@
   <h3><%= Iqvoc::Concept.base_class.model_name.human(:count => 2) %></h3>
   <div class="relation-body">
     <ul>
-      <%- @collection.concepts.sort {|a, b| a.pref_label <=> b.pref_label }.each do |concept| -%>
+      <%- @collection.concepts.sort {|a, b| a.pref_label.to_s <=> b.pref_label.to_s }.each do |concept| -%>
         <%- if concept.published? || (!concept.published_version_id && can?(:update, concept)) -%>
           <li><%= render concept.class.inline_partial_name, :concept => concept %></li>
         <%- end -%>

data/config/database.yml

@@ -32,7 +32,7 @@ test:
   socket: /tmp/mysql.sock
 
 production:
-  adapter: mysql2
+  adapter: 
   encoding: utf8
   reconnect: false
   database: iqvoc_production

data/config/deploy/bian.rb

@@ -0,0 +1,37 @@
+# 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.
+
+@capistrano_history ||= {}
+
+# main details
+servername = "iqvoc-bian.innoq.com"
+role :web, servername
+role :app, servername
+role :db,  servername, :primary => true
+
+username = Capistrano::CLI.ui.ask("Please enter a ssh username for #{servername}  [#{@capistrano_history['last_user']}]: ")
+username = @capistrano_history['last_user'] if username == ""
+@capistrano_history['last_user'] = username
+
+# server details
+default_run_options[:pty] = true
+ssh_options[:forward_agent] = true
+set :deploy_to, "/var/www/iqvoc_bian"
+set :deploy_via, :remote_cache
+set :user, username
+set :use_sudo, false
+
+save_history if defined?(save_history)

data/config/deploy/common.rb

@@ -47,7 +47,7 @@ namespace :deploy do
 
     token = SecureRandom.hex(64)
     txt = File.read(template)
-    txt.gsub!(/#(Iqvoc::Application.config.secret_token) = '.*?'$/, "\\1 = '#{token}'")
+    txt.gsub!("S-E-C-R-E-T", token)
 
     run "mkdir -p #{path}"
     put txt, file_name

data/config/deploy.rb

@@ -20,7 +20,7 @@ load_history
 load "#{File.dirname(__FILE__)}/deploy/common.rb"
 
 set :default_stage, "innoq"
-set :stages, %w(ec2 innoq)
+set :stages, %w(ec2 innoq bian)
 require 'capistrano/ext/multistage'
 
 # RVM bootstrap

data/iqvoc.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   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"]
-  s.homepage    = "http://innoq.com"
+  s.email       = ["robert.glaser@innoq.com", "till.schulte-coerne@innoq.com", "frederik.dohr@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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-08 00:00:00.000000000 Z
+date: 2011-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70192944294880 !ruby/object:Gem::Requirement
+  requirement: &70365076646300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70192944294880
+  version_requirements: *70365076646300
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70192944292000 !ruby/object:Gem::Requirement
+  requirement: &70365076645900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192944292000
+  version_requirements: *70365076645900
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70192944290160 !ruby/object:Gem::Requirement
+  requirement: &70365076645440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192944290160
+  version_requirements: *70365076645440
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70192944289240 !ruby/object:Gem::Requirement
+  requirement: &70365076645020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192944289240
+  version_requirements: *70365076645020
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70192944288460 !ruby/object:Gem::Requirement
+  requirement: &70365076644600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192944288460
+  version_requirements: *70365076644600
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70192944287380 !ruby/object:Gem::Requirement
+  requirement: &70365076644100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70192944287380
+  version_requirements: *70365076644100
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70192944286540 !ruby/object:Gem::Requirement
+  requirement: &70365076643680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,12 +89,13 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70192944286540
+  version_requirements: *70365076643680
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
 - robert.glaser@innoq.com
 - till.schulte-coerne@innoq.com
+- frederik.dohr@innoq.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -241,6 +242,7 @@ files:
 - config/database.yml
 - config/database.yml.mysql
 - config/database.yml.sqlite
+- config/deploy/bian.rb
 - config/deploy/common.rb
 - config/deploy/ec2.rb
 - config/deploy/history.rb
@@ -260,7 +262,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
@@ -465,7 +466,7 @@ files:
 - test/unit/note_test.rb
 - test/unit/origin_mapping_test.rb
 - test/unit/skos_import_test.rb
-homepage: http://innoq.com
+homepage: http://github.com/innoq/iqvoc
 licenses: []
 post_install_message: 
 rdoc_options: []

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 = 'e31dccdf1caecf25fe01b7ef39e38787b2b21c5f3d5b74d9f44e56de699109141ab30206c07bc68948699618fe55c17b1338462ce7691c7559a65bfc69d929de'
-
-end