iqvoc 3.2.6 → 3.2.7

data/app/views/concepts/index.iqrdf

@@ -8,7 +8,7 @@ while true
   # fact you can't render a view from a controller multiple times we had to
   # move the logic to the view.
   
-  concepts = Iqvoc::Concept.base_class.published.order("id").limit(100).offset(offset).all
+  concepts = Iqvoc::Concept.base_class.published.order("id").limit(50).offset(offset).all
   break if concepts.size == 0
 
   # When in single query mode, AR handles ALL includes to be loaded by that

data/config/database.yml

@@ -1,13 +1,3 @@
-# MySQL.  Versions 4.1 and 5.0 are recommended.
-# 
-# Install the MYSQL driver
-#   gem install mysql2
-#
-# Ensure the MySQL gem is defined in your Gemfile
-#   gem 'mysql2'
-#
-# And be sure to use new-style password hashing:
-#   http://dev.mysql.com/doc/refman/5.0/en/old-client.html
 development:
   adapter: mysql2
   encoding: utf8
@@ -16,11 +6,8 @@ development:
   pool: 5
   username: root
   password:
-  socket: /tmp/mysql.sock
+  hostname: 127.0.0.1
 
-# Warning: The database defined as "test" will be erased and
-# re-generated from your development database when you run "rake".
-# Do not set this db to the same as development or production.
 test:
   adapter: mysql2
   encoding: utf8
@@ -29,14 +16,14 @@ test:
   pool: 5
   username: root
   password:
-  socket: /tmp/mysql.sock
+  hostname: 127.0.0.1
 
 production:
-  adapter: 
+  adapter: mysql2
   encoding: utf8
   reconnect: false
-  database: iqvoc_production
+  database: iqvoc_development
   pool: 5
   username: root
   password:
-  socket: /tmp/mysql.sock
+  hostname: 127.0.0.1

data/config/deploy.rb

@@ -0,0 +1,72 @@
+# 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.3'
+# 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'

data/config/initializers/secret_token.rb

@@ -25,6 +25,6 @@ if Iqvoc.const_defined?(:Application)
 
   # Run `rake secret` and uncomment the following line
   # Replace the secret-placeholder with your generated token
-  Iqvoc::Application.config.secret_token = 'b8d90f50515345071ea3a8fced203bfac91c734afda36bbe4a51a630cc11f1d7b99d6d6da19d6bc0aa2c636d46da87159cd53661ed6d98bbc5af30d72410e1a6'
+  Iqvoc::Application.config.secret_token = '17d06ea2c1b5aceb4274a466a83d3b063094ecb22826c82af3572740bf2d61b30f756f1aea5e6c845ad5c078265065c8748760e655da7f6425a11bbf22ec8007'
 
 end

data/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20110615134040) do
+ActiveRecord::Schema.define(:version => 20120201120736) do
 
   create_table "collection_members", :force => true do |t|
     t.integer "collection_id"
@@ -44,11 +44,17 @@ ActiveRecord::Schema.define(:version => 20110615134040) do
     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}
   add_index "concepts", ["published_version_id"], :name => "ix_concepts_publ_version_id"
 
+  create_table "configuration_settings", :force => true do |t|
+    t.string "key"
+    t.string "value"
+  end
+
   create_table "labelings", :force => true do |t|
     t.string   "type"
     t.integer  "owner_id"

data/lib/iqvoc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iqvoc
 version: !ruby/object:Gem::Version
-  version: 3.2.6
+  version: 3.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70256698528960 !ruby/object:Gem::Requirement
+  requirement: &70182803396680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -23,10 +23,10 @@ dependencies:
         version: 3.0.9
   type: :runtime
   prerelease: false
-  version_requirements: *70256698528960
+  version_requirements: *70182803396680
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70256698528380 !ruby/object:Gem::Requirement
+  requirement: &70182803396020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256698528380
+  version_requirements: *70182803396020
 - !ruby/object:Gem::Dependency
   name: kaminari
-  requirement: &70256698526920 !ruby/object:Gem::Requirement
+  requirement: &70182803394520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256698526920
+  version_requirements: *70182803394520
 - !ruby/object:Gem::Dependency
   name: authlogic
-  requirement: &70256698526060 !ruby/object:Gem::Requirement
+  requirement: &70182803391860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256698526060
+  version_requirements: *70182803391860
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &70256699937680 !ruby/object:Gem::Requirement
+  requirement: &70182803390640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256699937680
+  version_requirements: *70182803390640
 - !ruby/object:Gem::Dependency
   name: iq_rdf
-  requirement: &70256699937180 !ruby/object:Gem::Requirement
+  requirement: &70182803390040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: 0.0.14
   type: :runtime
   prerelease: false
-  version_requirements: *70256699937180
+  version_requirements: *70182803390040
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70256699936760 !ruby/object:Gem::Requirement
+  requirement: &70182803389140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,7 +89,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256699936760
+  version_requirements: *70182803389140
 description: iQvoc - a SKOS(-XL) vocabulary management system built on the Semantic
   Web
 email:
@@ -242,6 +242,7 @@ files:
 - config/database.yml
 - config/database.yml.mysql
 - config/database.yml.sqlite
+- config/deploy.rb
 - config/engine.rb
 - config/environment.rb
 - config/environments/development.rb
@@ -268,7 +269,6 @@ files:
 - config/locales/en.yml
 - config/routes.rb
 - config/warble.rb
-- db/iqvoc_test.sqlite3
 - db/migrate/20100927101502_create_schema.rb
 - db/migrate/20101125141218_add_collection_tables.rb
 - db/migrate/20101129161528_add_type_to_collections.rb