Update gems, drop old code etc.

.gitignore

@@ -1,52 +1,65 @@
-# Boring files
-# ============
-*~
-.#*
-_darcs
-DEADJOE
+# 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'
 
 # Rails
 # =====
-.bundle
-db/*.sqlite3
-log/*.log
-tmp/**/*
-.sass-cache/
-# Vendor
-vendor/cache
-vendor/bundle
+# Ignore bundler config.
+/.bundle
+
+# Ignore the default SQLite database.
+/db/*.sqlite3
+/db/*.sqlite3-journal
+
+# Ignore all logfiles and tempfiles.
+/log
+/tmp
+
+# Sensitive data.
+.env*
+
+# Ignore coverage report
+/doc/coverage
 
 # Volatile
 doc/api
 doc/app
-public/stylesheets/all.css
+
+# Coverage
+/doc/coverage
+
+# Application
+# ===========
+# Backup
+db/backup
+
+# Data Dumps
+db/data.yml
 
 # Local
 config/database.yml
-system
+data/
+
+# Gems
+# ====
+# carrierwave
+uploads/
 
-# Passenger
-# =========
-tmp/restart.txt
+# guard
+tmp/rspec_guard_result
 
-# Rails Plugins
-# =============
-# restful-authentication
-config/initializers/site_keys.rb
+# capistrano
+config/deploy/*.rb
 
-# carrier-wave
-uploads
+# simplecov
+/doc/coverage
 
-# Sphinx Freetext Search
+# thinking-sphinx
 db/sphinx
 config/*.sphinx.conf
 config/sphinx/
 
-# SwissMatch
+# swissmatch
 config/swissmatch.yml
-
-# CyDoc
-# =====
-data/
-db/backup/
-public/esr_files

.ruby-version

@@ -0,0 +1 @@
+2.1.5

CHANGELOG

@@ -1,3 +1,23 @@
+2.0.0 (unreleased)
+=====
+This is a major release of CyDoc. It has a fresh look, better Tarmed support and
+lots of small fixes.
+
+We now provide more settings in the user interface, remote printing among them.
+There is now a much better patient search and forms have been improved.
+
+We actualy rewrote most parts. Mainly porting to Rails 3, switching UI to be
+built on Twitter Bootstrap, and providing fulltext search for patients
+and more.
+
+CyDoc also uses more common code with other projects like Bookyt and Hozr
+by using factored out code.
+
+Fixes since RC8:
+* Drop currency formatting in insurance recipe as it broke on amounts > 1000.
+* Add role translations from Hozr.
+* Restrict access to bookkeeping controller actions.
+
 2.0.0.rc8
 =========
 Some gems got updated, mainly Rails. The installation instructions

Gemfile

@@ -1,136 +1,154 @@
+# Gemfile
+# =======
+# Policies:
+# * We do not add versioned dependencies unless needed
+# * If we add versioned dependencies, we document the reason
+# * We use single quotes
+# * We use titles to group related gems
+
 # Settings
 # ========
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 # Rails
 # =====
-gem 'rails'
+gem 'rails', '~> 3.2'
 
 # Unicorn
 # =======
 gem 'unicorn'
 
 # Database
-gem 'sqlite3'
+# ========
 gem 'mysql2'
+gem 'sqlite3'
 
-# Gems used only for assets and not required
-# in production environments by default.
-group :assets do
-  gem 'coffee-rails'
-  gem 'therubyracer'
-  gem 'uglifier'
-end
-
-# Development
-# ===========
-group :development do
-  # RDoc
-  gem 'rdoc'
-
-  # Deployment
-  gem 'capones_recipes'
-end
+# Asset Pipeline
+# ==============
+gem 'less-rails'
+gem 'sass-rails'
+gem 'uglifier'
+gem 'coffee-rails'
+gem 'therubyracer'
+gem 'quiet_assets'
 
-# Test
+# CRUD
 # ====
-group :test do
-  gem 'cucumber'
-end
+gem 'inherited_resources'
+gem 'has_scope'
+gem 'kaminari'
+gem 'show_for'
+gem 'i18n_rails_helpers'
 
-group :test, :development do
-  # Console
-  gem 'pry-rails'
-  gem 'pry-doc'
-  gem 'pry-debugger'
-end
+# I18n
+# ====
+gem 'routing-filter'
 
-# Standard helpers
-# ================
-gem 'haml'
-gem 'sass'
+# UI
+# ==
 gem 'jquery-rails'
-
-# Styling
-gem 'lyb_sidebar'
-gem 'less-rails'
+gem 'haml'
 gem 'twitter-bootstrap-rails'
+gem 'lyb_sidebar'
+gem 'simple-navigation'
 
-gem 'formtastic'
+# Forms
+# =====
 gem 'simple_form'
-gem 'kaminari'
-gem 'inherited_resources'
-gem 'has_scope'
-gem 'i18n_rails_helpers'
-gem 'show_for'
+gem 'select2-rails'
+gem 'in_place_editing'
 
-# Navigation
-gem 'simple-navigation'
 
-# CyDoc
-# =====
-# Authentication
+# Access Control
+# ==============
+gem 'devise', '~> 2.2' # Changed API
+gem 'devise-i18n'
+gem 'cancan', '1.6.8' # Issue with aliases
+gem 'lyb_devise_admin'
+
+# State Machine
 gem 'aasm'
 
 # Date/Time handling
 gem 'validates_timeliness'
 
+# Application Settings
+gem 'ledermann-rails-settings', '1.2.0', :require => 'rails-settings' # Changed API, 1.2.1 broken
+
 # Addresses
 gem 'unicode_utils'
-gem 'has_vcards'
+gem 'has_vcards', '~> 0.20' # Data model changes, needs synced release with CyDoc
 gem 'autocompletion'
 gem 'swissmatch'
+gem 'swissmatch-location', :require => 'swissmatch/location/autoload'
+
+# Files
+gem 'carrierwave'
 
 # Billing
-gem 'has_accounts'
-gem 'has_accounts_engine'
+gem 'has_accounts', '~> 1.1' # Changed API
+gem 'has_accounts_engine', '~> 1.1' # Changed API
 gem 'acts-as-taggable-on'
+gem 'vesr'
 
-# Import
+# Import / Export
 gem 'fastercsv'
 gem 'activerecord-sqlserver-adapter'
+gem 'csv-mapper'
 
 # Multiple Databases
 gem 'use_db'
 
-# Forms
-gem 'in_place_editing'
-gem 'select2-rails'
-
-# CRUD helpers
-gem 'inherited_resources_views'
+# PDF generation
+gem 'prawn', '1.0.0.rc2' # table support needs porting, group has been dropped
 
-# Authentication
-gem 'devise'
-gem 'cancan'
-gem 'lyb_devise_admin'
+# Printing
+gem 'cupsffi'
 
 # Search
-gem 'thinking-sphinx'
+gem 'thinking-sphinx', '~> 2.0' # Changed API
 
-# Uploads
-gem 'carrierwave'
 
-# PDF
-gem 'prawn', :git => 'https://github.com/prawnpdf/prawn.git'
-gem 'prawnto'
+# Development
+# ===========
+group :development do
+  # Debugging
+  gem 'better_errors'
+  gem 'binding_of_caller'  # Needed by binding_of_caller to enable html console
 
+  # Deployment
+  gem 'capones_recipes'
+end
 
-# Locale setting
-gem 'routing-filter'
+# Dev and Test
+# ============
+group :development, :test do
+  # Testing Framework
+  gem 'rspec-rails'
+  gem 'rspec-activemodel-mocks'
 
-# Settings
-gem 'ledermann-rails-settings', :require => 'rails-settings'
+  # Browser
+  gem 'capybara'
+  gem 'capybara-screenshot'
+  gem 'poltergeist'
+  gem 'selenium-webdriver'
 
-# ESR support
-gem 'vesr'
+  # Matchers/Helpers
+  gem 'accept_values_for'
 
-# Printing
-gem 'cupsffi'
-gem 'ffi'
+  # Debugger
+  gem 'pry-rails'
+  gem 'pry-byebug'
 
-# CSV Export
-gem 'csv-mapper'
+  # Fixtures
+  gem 'database_cleaner'
+  gem 'connection_pool'
+  gem "factory_girl_rails"
+end
 
-# XML
-gem 'nokogiri'
+# Docs
+# ====
+group :doc do
+  # Docs
+  gem 'rdoc'
+end