iqvoc 3.2.5 → 3.2.6

data/README.md

@@ -1,5 +1,7 @@
 # iQvoc
 
+[![Build Status](https://secure.travis-ci.org/innoq/iqvoc.png)](http://travis-ci.org/innoq/iqvoc)
+
 iQvoc is a vocabulary management tool that combines easy-to-use human interfaces with Semantic Web interoperability.
 
 iQvoc supports vocabularies that are common to many knowledge organization systems, such as:
@@ -42,6 +44,10 @@ There are many hooks providing support for your own classes and configuration. T
 also works as a Rails Engine. The config residing in `lib/iqvoc.rb` provides a basic
 overview of the possibilities.
 
+## Documentation
+
+Documentation resources can be found in the [wiki](https://github.com/innoq/iqvoc/wiki/_pages).
+
 ## Contributing
 
 If you want to help out there are several options:
@@ -52,7 +58,7 @@ If you want to help out there are several options:
 
 If you make changes to existing code please make sure that the test suite stays green. Please include tests to your additional contributions.
 
-Tests can be run via `rake test`. We're using capybara-webkit for integration tests with JavaScript support.
+Tests can be run via `bundle exec rake test`. We're using capybara-webkit for integration tests with JavaScript support.
 
 ## Maintainer & Contributors
 

data/config/initializers/secret_token.rb

@@ -0,0 +1,30 @@
+# 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 = 'b8d90f50515345071ea3a8fced203bfac91c734afda36bbe4a51a630cc11f1d7b99d6d6da19d6bc0aa2c636d46da87159cd53661ed6d98bbc5af30d72410e1a6'
+
+end

data/lib/iqvoc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.2.5
+  version: 3.2.6
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-15 00:00:00.000000000 Z
+date: 2012-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70365076646300 !ruby/object:Gem::Requirement
+  requirement: &70256698528960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70365076646300
+  version_requirements: *70256698528960
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70365076645900 !ruby/object:Gem::Requirement
+  requirement: &70256698528380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365076645900
+  version_requirements: *70256698528380
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70365076645440 !ruby/object:Gem::Requirement
+  requirement: &70256698526920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365076645440
+  version_requirements: *70256698526920
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70365076645020 !ruby/object:Gem::Requirement
+  requirement: &70256698526060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365076645020
+  version_requirements: *70256698526060
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70365076644600 !ruby/object:Gem::Requirement
+  requirement: &70256699937680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365076644600
+  version_requirements: *70256699937680
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70365076644100 !ruby/object:Gem::Requirement
+  requirement: &70256699937180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70365076644100
+  version_requirements: *70256699937180
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70365076643680 !ruby/object:Gem::Requirement
+  requirement: &70256699936760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70365076643680
+  version_requirements: *70256699936760
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -242,12 +242,6 @@ 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
-- config/deploy/innoq.rb
-- config/deploy.rb
 - config/engine.rb
 - config/environment.rb
 - config/environments/development.rb
@@ -262,6 +256,7 @@ 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
@@ -486,7 +481,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: iQvoc

data/config/deploy/bian.rb

@@ -1,37 +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.
-
-@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

@@ -1,79 +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.
-
-desc "Runs a rake task on the remote system. Use TASK'<taskname + parameters>' to specify the task."
-task :invoke_task do
-  prefix = fetch(:invokeable_task_prefix, "")
-  if ENV['TASK'] and ENV['TASK'] =~ /^#{prefix}/
-    run("cd #{deploy_to}/current; rake --trace #{ENV['TASK']} RAILS_ENV=production")
-  else
-    run("cd #{deploy_to}/current; rake -T #{prefix} --trace RAILS_ENV=production")
-  end
-end
-
-desc "Tail production log files"
-task :tail_logs, :roles => :app do
-  run "tail -f #{shared_path}/log/production.log" do |channel, stream, data|
-    puts  # for an extra line break before the host name
-    puts "#{channel[:host]}: #{data}"
-    break if stream == :err
-  end
-end
-
-namespace :deploy do
-
-  desc "Generate a secret for the server"
-  task :generate_secret, :roles => :app do
-    require 'securerandom'
-
-    template = File.expand_path("config/initializers/secret_token.rb.template")
-    raise "File not found: #{template}" unless File.exist?(template)
-
-    path = "#{shared_path}/config/initializers"
-    file_name = "#{path}/secret_token.rb"
-
-    token = SecureRandom.hex(64)
-    txt = File.read(template)
-    txt.gsub!("S-E-C-R-E-T", token)
-
-    run "mkdir -p #{path}"
-    put txt, file_name
-  end
-
-  desc "Copy your current config/database.yml to the server"
-  task :database_config_copy, :roles => :app do
-    file_name = File.expand_path("config/database.yml")
-    raise "File not found: #{file_name}" unless File.exist?(file_name)
-    run "mkdir -p #{shared_path}/config/"
-    put File.open(file_name).read, "#{shared_path}/config/database.yml"
-  end
-
-  desc "Create default SQLite3 config/database.yml"
-  task :database_config_sqlite3, :roles => :app do
-    config = {
-      'production' => {
-        "adapter" => "sqlite3",
-        "database" => "#{shared_path}/db/production.sqlite3",
-        "pool" => 5,
-        "timeout" => 5000,
-      }
-    }
-    run "mkdir -p #{shared_path}/config/"
-    run "mkdir -p #{shared_path}/db/"
-    put config.to_yaml, "#{shared_path}/config/database.yml"
-  end
-
-end

data/config/deploy/ec2.rb

@@ -1,43 +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.
-
-@capistrano_history ||= {}
-
-# main details
-servername = Capistrano::CLI.ui.ask("Please enter the IP or Hostname of the ec2 instance to deploy to [#{@capistrano_history['last_servername']}]: ")
-servername = @capistrano_history['last_servername'] if servername == ""
-@capistrano_history['last_servername'] = servername
-role :web, servername
-role :app, servername
-role :db,  servername, :primary => true
-
-keyfile = 'doesnt_exist'
-while !File.exist?(File.expand_path(keyfile))
-  keyfile = Capistrano::CLI.ui.ask("Please enter the file holding the ssh key for user 'passenger'  [#{@capistrano_history['last_keyfile']}]: ")
-  keyfile = @capistrano_history['last_keyfile'] if keyfile == ""
-  @capistrano_history['last_keyfile'] = keyfile
-end
-ssh_options[:keys] = [File.expand_path(keyfile)]
-
-# server details
-default_run_options[:pty] = true
-ssh_options[:forward_agent] = true
-set :deploy_to, "/var/www/default"
-set :deploy_via, :remote_cache
-set :user, "passenger"
-set :use_sudo, false
-
-save_history if defined?(save_history)

data/config/deploy/history.rb

@@ -1,29 +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.
-
-# load .capistrano_history.yml to @capistrano_history
-def load_history
-  @capistrano_history = {}
-  @capistrano_history = YAML::load(File.open(".capistrano_history.yml")) if File.exist?(".capistrano_history.yml")
-end
-
-# Write history file to prevent too much typing the next time :-)
-def save_history
-  File.open(".capistrano_history.yml", 'w') do |f|
-    f.write(@capistrano_history.to_yaml)
-  end
-end
-

data/config/deploy/innoq.rb

@@ -1,37 +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.
-
-@capistrano_history ||= {}
-
-# main details
-servername = "iqvoc.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"
-set :deploy_via, :remote_cache
-set :user, username
-set :use_sudo, false
-
-save_history if defined?(save_history)

data/config/deploy.rb

@@ -1,72 +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.
-
-require "#{File.dirname(__FILE__)}/deploy/history"
-load_history
-
-load "#{File.dirname(__FILE__)}/deploy/common.rb"
-
-set :default_stage, "innoq"
-set :stages, %w(ec2 innoq bian)
-require 'capistrano/ext/multistage'
-
-# RVM bootstrap
-$:.unshift(File.expand_path('./lib', ENV['rvm_path']))
-require 'rvm/capistrano'
-set :rvm_ruby_string, '1.9.2'
-# set :rvm_type, :user
-
-# bundler bootstrap
-require 'bundler/capistrano'
-
-# main details
-set :application, "iqvoc"
-
-# repo details
-set :scm, :git
-set :git_enable_submodules, 1
-# set :scm_username, "passenger"
-set :repository, "git@github.com:innoq/iqvoc.git"
-@capistrano_history['last_branch'] = "master" if @capistrano_history['last_branch'].nil? || @capistrano_history['last_branch'] == ""
-set :branch, Capistrano::CLI.ui.ask("Please enter the branch or tag we should use [#{@capistrano_history['last_branch']}]: ")
-set :branch, @capistrano_history['last_branch'] if fetch(:branch) == ""
-@capistrano_history['last_branch'] = fetch(:branch)
-
-save_history
-
-# tasks
-namespace :deploy do
-  task :start, :roles => :app do
-    run "touch #{current_path}/tmp/restart.txt"
-  end
-
-  task :stop, :roles => :app do
-    # Do nothing.
-  end
-
-  desc "Restart Application"
-  task :restart, :roles => :app do
-    run "touch #{current_path}/tmp/restart.txt"
-  end
-
-  desc "Symlink shared resources on each release"
-  task :symlink_shared, :roles => :app do
-    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-    run "ln -nfs #{shared_path}/config/initializers/secret_token.rb #{release_path}/config/initializers/secret_token.rb"
-  end
-end
-
-after 'deploy:update_code', 'deploy:symlink_shared'