Update to rails 4 and cleanup

.gitignore

@@ -1,24 +1,21 @@
-# Rails
-# =====
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
+# See https://help.github.com/articles/ignoring-files for more about ignoring files.
+#
+# If you find yourself ignoring temporary files generated by your text editor
+# or operating system, you probably want to add a global ignore instead:
+#   git config --global core.excludesfile '~/.gitignore_global'
 
-# Passenger
-tmp/restart.txt
+# Ignore bundler config.
+/.bundle
 
-# Vendor
-vendor/cache
-vendor/bundle
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
 
-# Volatile
-doc/api
-doc/app
-public/stylesheets/all.css
+# Ignore all logfiles and tempfiles.
+/log/*.log
+/tmp/**/*
 
 # Local
-config/database.yml
 config/application.yml
 config/deploy/production.rb
 config/deploy/staging.rb
@@ -32,7 +29,15 @@ public/stylesheets/compiled
 db/sphinx
 config/*.sphinx.conf
 config/sphinx/
-config/initializers/mail.rb
 
 # Aspell
 db/aspell/aspell.de_CH.pws
+
+# Ignore mac ds_store files
+.DS_Store
+
+# Sensitive data.
+.env*
+
+# Ignore coverage report
+/doc/coverage

.rspec

@@ -1 +1,2 @@
 --color
+--require spec_helper

.travis.yml

@@ -9,7 +9,7 @@ before_script:
   - mysql -e 'create database katalog_test'
   - DB=mysql bundle exec rake katalog:setup
   - DB=mysql bundle exec rake db:create db:schema:load
-  - bundle exec rake katalog:ts:export_lists ts:rebuild katalog:raspell:update
+  - bundle exec rake katalog:ts:export_lists ts:rebuild katalog:aspell:update
 
 script: "bundle exec rake spec"
 

Capfile

@@ -1,7 +1,14 @@
-require 'bundler/setup'
+# Load DSL and Setup Up Stages
+require 'capistrano/setup'
 
-load 'deploy' if respond_to?(:namespace) # cap2 differentiator
-Dir['vendor/plugins/*/recipes/*.rb'].each { |plugin| load(plugin) }
-Dir['lib/recipes/*.rb'].each { |plugin| load(plugin) }
+# Includes default deployment tasks
+require 'capistrano/deploy'
 
-load 'config/deploy' # remove this line to skip loading any of the default tasks
+# Includes tasks from other gems included in your Gemfile
+require 'capistrano/rbenv'
+require 'capistrano/bundler'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+
+# Loads custom tasks from `lib/capistrano/tasks' if you have any defined.
+Dir.glob('lib/capistrano/tasks/*.rake').each { |r| import r }

Gemfile

@@ -1,128 +1,144 @@
 # Settings
 # ========
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Rails
 # =====
 gem 'rails'
-
-# Unicorn
-# =======
-gem 'unicorn'
-
 # Database
+# ========
 gem 'mysql2'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'sass-rails'
-  gem 'coffee-rails'
-  gem 'therubyracer'
-  gem 'uglifier'
-  gem 'compass-rails'
-end
+# Journaling
+# ==========
+gem 'paper_trail'
+
+# Asset Pipeline
+# ==============
+# Issue https://github.com/sstephenson/sprockets/issues/540
+gem 'sprockets', '~> 2.11.0'
+gem 'sass-rails'
+gem 'uglifier'
+gem 'coffee-rails'
+gem 'therubyracer', platforms: :ruby
+gem 'quiet_assets'
+gem 'compass-rails'
+
+# CRUD
+# ====
+gem 'inherited_resources', '~> 1.5.0' # Dependency on has_scope release candidate
+gem 'jbuilder'
+gem 'has_scope'
+gem 'show_for'
+gem 'will_paginate'
+gem 'nokogiri'
+gem 'holidays'
 
+# I18n
+# ====
+gem 'i18n_rails_helpers', github: 'huerlisi/i18n_rails_helpers'
+
+# UI
+# ==
+gem 'simple-navigation'
 gem 'jquery-rails'
 gem 'jquery-ui-rails'
+gem 'formtastic'
+gem 'cocoon'
 
-# Test
-# ===
-group :test do
-  # Matchers/Helpers
-  gem 'shoulda'
-end
+# WYSIWYG Editor
+# ==============
+gem 'ckeditor'
 
-group :test, :development do
-  # Framework
-  gem 'rspec-rails'
+# Model extensions
+# =============
+gem 'acts-as-taggable-on'
 
-  # Fixtures
-  gem 'factory_girl_rails'
-  gem 'database_cleaner'
+# Search
+# ======
+gem 'thinking-sphinx'
 
-  # Debugger
-  gem 'pry-rails'
-  gem 'pry-byebug'
-end
+# Spellchecking
+# =============
+gem 'ffi-aspell'
 
-# Development
+# PDF reports
 # ===========
-group :development do
-  # RDoc
-  gem 'rdoc'
+gem 'prawn_rails'
+gem 'prawn'
+gem 'prawn-table'
 
-  # Deployment
-  gem 'capistrano', '~> 2.15.5'
-  gem 'capistrano-rbenv', '~> 1.0'
-  gem 'capones_recipes'
+# Generate excel files
+# ====================
+gem 'spreadsheet'
 
-  gem 'quiet_assets'
+# Page fetcher
+# ============
+gem 'mechanize'
 
-  # Code quality
-  gem 'rubocop', require: false
+# Docs
+# ====
+group :doc do
+  # Docs
+  gem 'sdoc', require: false
 end
 
-# Standard helpers
-# ================
-gem 'haml-rails'
-
-gem 'formtastic'
-gem 'will_paginate', git: 'https://github.com/huerlisi/will_paginate.git', branch: 'show_always'
-gem 'inherited_resources'
-gem 'has_scope'
-gem 'i18n_rails_helpers', github: 'huerlisi/i18n_rails_helpers'
-gem 'simple-navigation'
-gem 'nokogiri'
-# Katalog
-# =======
-# Authentication
+# Access Control
+# ==============
 gem 'devise'
+gem 'cancancan'
 
-# Authorization
-gem 'cancan'
+# Deployment
+# ==========
+gem 'unicorn-rails'
 
-# Tagging
-gem 'acts-as-taggable-on'
+# Exception Notifier
+# ==================
+gem 'airbrake'
 
-# Search
-gem 'thinking-sphinx'
+# Profiling
+# =========
+gem 'rack-google-analytics'
 
-# Spellchecking
-gem 'ffi-aspell'
+# Application settings
+# ====================
+gem 'settingslogic'
 
-# Reports
-gem 'prawn_rails'
-gem 'prawn'
-gem 'prawn-table'
+group :development do
+  # Generators
+  gem 'haml-rails'
 
-# CRUD helpers
-gem 'show_for'
+  # Debugging
+  gem 'better_errors'
+  gem 'binding_of_caller'  # Needed by binding_of_caller to enable html console
 
-# WYSIWYG Editor
-gem 'ckeditor'
-
-# Change log for model data
-gem 'paper_trail'
+  # Deployment
+  gem 'capistrano', '~> 3.2.0'
+  gem 'capistrano-rails'
+  gem 'capistrano-bundler'
+  gem 'capistrano-rbenv'
+end
 
-gem 'revertible_paper_trail'
+group :development, :test do
+  # (Pre-)loading
+  gem 'spring'
+  gem 'spring-commands-rspec'
 
-# Generate excel files
-gem 'spreadsheet'
+  # Testing Framework
+  gem 'rspec-rails'
 
-# Load html content
-gem 'mechanize'
+  # Matchers/Helpers
+  gem 'shoulda'
 
-# Date handling
-gem 'holidays'
+  # QA
+  gem 'simplecov', require: false
+  gem 'rubocop', require: false
 
-# Monitoring
-# ==========
-gem 'settingslogic'
-group :staging, :production do
-  # Traffic
-  gem 'rack-google-analytics'
+  # Debugger
+  gem 'pry-rails'
+  gem 'pry-byebug'
 
-  # Exceptions
-  gem 'airbrake'
+  # Fixtures
+  gem 'factory_girl_rails'
+  gem 'database_cleaner'
 end