Merge branch 'master' into deployment

.gitignore

@@ -8,6 +8,9 @@
 .bundle
 .project
 
+# Ignore actual database.yml (copy database.example.yml)
+config/database.yml
+
 # Ignore the default SQLite database
 db/*.sqlite3*
 

.ruby-version

@@ -1 +1 @@
-ruby-2.0.0-p0
+2.0.0

.travis.yml

@@ -1,14 +1,13 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
 
 branches:
-  only:
-    - master
-    - CRUD
-    - display_of_axioms
+  except:
+    - deployment
+    - ontohub.org
+    - staging.ontohub.org
 
 services:
   - redis-server
@@ -17,17 +16,18 @@ notifications:
   email: false
 
 before_install:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"
+  - 'export DISPLAY=:99.0'
+  - 'sh -e /etc/init.d/xvfb start'
+  - 'gem install bundler'
 
 script:
   - bundle exec rake test
 
 before_script:
   - psql -c 'create database ontohub_test;' -U postgres
   - sudo apt-add-repository -y ppa:hets/hets
-  - sudo apt-add-repository -y "deb http://archive.canonical.com/ubuntu precise partner"
-  - sudo apt-add-repository -y "deb http://archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse"
+  - sudo apt-add-repository -y 'deb http://archive.canonical.com/ubuntu precise partner'
+  - sudo apt-add-repository -y 'deb http://archive.ubuntu.com/ubuntu precise-updates main restricted universe multiverse'
   - sudo apt-get update
   - sudo apt-get install ia32-libs libsane libgphoto2-2 hets-core subversion udrawgraph
   - sudo hets -update

Gemfile

@@ -1,17 +1,24 @@
 source 'https://rubygems.org'
 
 gem 'rails', '~> 3.2.13'
+gem 'rack-protection'
+gem 'secure_headers'
+
 gem 'pg'
 gem 'foreigner'
 
+gem 'rdf'
+gem 'rdf-rdfxml'
+gem 'rdf-n3'
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
   gem 'sass-rails',   '~> 3.2.3'
-  gem 'bootstrap-sass', "~> 2.3.1", git: "git://github.com/digineo/bootstrap-sass.git", branch: 'v2.3.1.0-with_javascript_fixes'
+  gem 'bootstrap-sass', "~> 2.3.2"
   gem 'coffee-rails', '~> 3.2.1'
   gem 'compass',      '~> 0.12.1'
+  gem 'font_awesome'
   gem 'jquery-rails'
   gem 'jquery-ui-rails'
   gem 'momentjs-rails'
@@ -33,7 +40,7 @@ gem 'inherited_resources', '~> 1.4.0'
 gem 'has_scope'
 
 # XML Parser
-gem 'nokogiri', '~> 1.5.0'
+gem 'nokogiri', '~> 1.6'
 
 # Authentication
 gem 'devise', '~> 2.0'
@@ -53,6 +60,9 @@ gem 'acts_as_tree'
 # Manage uploads
 gem 'carrierwave', "~> 0.8.0"
 
+# HTTP Client
+gem "rest-client"
+
 # Async jobs
 gem 'resque'
 gem 'redis-namespace'
@@ -61,10 +71,14 @@ gem 'redis-namespace'
 gem 'sunspot_rails', :git => 'git://github.com/digineo/sunspot.git'
 gem 'progress_bar'
 
-gem "faker", "~> 1.0"
+# Graph visualization
+gem 'ruby-graphviz', "~> 1.0.8"
+
+# Fake-inputs for tests and seeds
+gem "faker", "~> 1.1.2"
 
 group :test do
-  gem 'mocha'
+  gem 'mocha', require: 'mocha/setup'
   gem 'shoulda'
   gem "shoulda_routing_macros", "~> 0.1.2"
   gem "factory_girl_rails"
@@ -74,6 +88,10 @@ group :test do
   gem "capybara-webkit"
   gem 'database_cleaner'
   gem "launchy"
+
+  # Recording of HTTP Requests
+  gem "vcr"
+  gem "webmock", '~> 1.9.0'
 end
 
 group :development do