Merge branch 'dev' into openid_2

# Conflicts:
#	Gemfile.lock
#	app/controllers/users/omniauth_callbacks_controller.rb

.rubocop.yml

@@ -0,0 +1,12 @@
+inherit_from: .rubocop_todo.yml
+
+AllCops:
+  TargetRubyVersion: 2.2
+  Exclude:
+    - 'spec/**/*'
+    - 'db/**/*'
+    - 'config/**/*'
+    - 'bin/*'
+    - 'Rakefile'
+    - 'Vagrantfile'
+    - 'vendor/**/*'

.rubocop_todo.yml

@@ -0,0 +1,136 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2017-08-20 13:13:55 +0200 using RuboCop version 0.46.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Lint/IneffectiveAccessModifier:
+  Exclude:
+    - 'app/models/agreement_letter.rb'
+
+# Offense count: 2
+Lint/UselessAssignment:
+  Exclude:
+    - 'lib/pdf_generation/applications_pdf.rb'
+
+# Offense count: 41
+Metrics/AbcSize:
+  Max: 71
+
+# Offense count: 6
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 246
+
+# Offense count: 6
+Metrics/CyclomaticComplexity:
+  Max: 13
+
+# Offense count: 232
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 217
+
+# Offense count: 32
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 48
+
+# Offense count: 3
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 6
+
+# Offense count: 4
+Metrics/PerceivedComplexity:
+  Max: 13
+
+# Offense count: 5
+Style/AccessorMethodName:
+  Exclude:
+    - 'app/controllers/emails_controller.rb'
+    - 'app/models/agreement_letter.rb'
+    - 'app/models/application_letter.rb'
+    - 'app/models/event.rb'
+
+# Offense count: 2
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Exclude:
+    - 'app/controllers/users/omniauth_callbacks_controller.rb'
+    - 'app/controllers/users/registrations_controller.rb'
+
+# Offense count: 35
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+# SupportedStyles: for, each
+Style/For:
+  Exclude:
+    - 'app/models/event.rb'
+
+# Offense count: 19
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Exclude:
+    - 'app/controllers/application_controller.rb'
+    - 'app/controllers/application_letters_controller.rb'
+    - 'app/controllers/events_controller.rb'
+    - 'app/controllers/users/omniauth_callbacks_controller.rb'
+    - 'app/controllers/users_controller.rb'
+    - 'app/helpers/applicants_overview_helper.rb'
+    - 'app/models/ability.rb'
+    - 'app/models/application_letter.rb'
+    - 'app/models/date_range.rb'
+    - 'app/models/event.rb'
+    - 'app/models/profile.rb'
+    - 'app/uploaders/event_image_uploader.rb'
+    - 'lib/pdf_generation/applications_pdf.rb'
+    - 'lib/pdf_generation/participants_pdf.rb'
+
+# Offense count: 1
+Style/MultilineTernaryOperator:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+
+# Offense count: 1
+# Cop supports --auto-correct.
+Style/MutableConstant:
+  Exclude:
+    - 'app/models/participant_group.rb'
+
+# Offense count: 2
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle, SupportedStyles.
+# SupportedStyles: predicate, comparison
+Style/NumericPredicate:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/controllers/events_controller.rb'
+    - 'lib/pdf_generation/applications_pdf.rb'
+
+# Offense count: 6
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+Style/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'app/controllers/events_controller.rb'
+    - 'app/models/agreement_letter.rb'
+    - 'app/models/event.rb'
+
+# Offense count: 1
+# Configuration parameters: Methods.
+# Methods: {"reduce"=>["acc", "elem"]}, {"inject"=>["acc", "elem"]}
+Style/SingleLineBlockParams:
+  Exclude:
+    - 'app/models/event.rb'

.simplecov

@@ -0,0 +1,8 @@
+require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+SimpleCov.start do
+   # This file was generated by https://github.com/ctran/annotate_models
+   add_filter 'lib/tasks/auto_annotate_models.rake'
+end

Gemfile

@@ -35,20 +35,20 @@ gem 'jquery-ui-rails'
 # Authentication
 gem 'devise'
 # openID Authentication
-#gem 'devise_openid_authenticatable'
+# gem 'devise_openid_authenticatable'
 gem 'omniauth'
 gem 'omniauth-openid'
 
 # Use Bootstrap (app/assets/stylesheets) for app styling
 # Also provides some nifty helpers:
 # https://github.com/seyhunak/twitter-bootstrap-rails#using-helpers
-gem "therubyracer"
-#gem 'less-rails-bootstrap'
+gem 'therubyracer'
+# gem 'less-rails-bootstrap'
 # less-rails requires an older sprockets
-gem "sprockets", '3.6.3'
-gem "less-rails"
-gem 'twitter-bootstrap-rails'
+gem 'less-rails'
 gem 'ref'
+gem 'sprockets', '3.6.3'
+gem 'twitter-bootstrap-rails'
 # Boostrap-syle view for devise
 gem 'devise-bootstrap-views'
 # Integrates Bootstrap Tooltip library with Rails asset pipeline
@@ -63,10 +63,10 @@ gem 'bootstrap-datepicker-rails'
 gem 'airbrake'
 
 # to parse date parameters from ui
-gem "delocalize"
+gem 'delocalize'
 # American style month/day/year parsing for ruby 1.9
 # https://github.com/jeremyevans/ruby-american_date
-gem "american_date"
+gem 'american_date'
 
 # Authorisation library, define who is allowed what
 # See https://github.com/CanCanCommunity/cancancan
@@ -77,7 +77,7 @@ gem 'cancancan'
 gem 'has_scope'
 
 # Static code analysis
-gem 'rubocop', '~> 0.29.1'
+gem 'rubocop', '0.46'
 
 # DSL for building forms
 # See https://github.com/plataformatec/simple_form
@@ -91,23 +91,23 @@ gem 'owlcarousel-rails', github: 'acrogenesis/owlcarousel-rails', branch: 'OwlCa
 gem 'coveralls', require: false
 
 # pdf generation
+gem 'combine_pdf'
 gem 'prawn'
 gem 'prawn-table'
-gem 'combine_pdf'
 
-#zip generation
+# zip generation
 gem 'rubyzip', require: 'zip'
 
 # pdf inspection
-gem 'pdf-inspector', require: "pdf/inspector"
+gem 'pdf-inspector', require: 'pdf/inspector'
 
 # Simple, Heroku-friendly Rails app configuration using ENV and a single YAML file
 gem 'figaro'
 
 # Allow ORM functionality in plain ruby models
 gem 'active_attr'
 
-#to only display a limited number of items on an index page
+# to only display a limited number of items on an index page
 gem 'will_paginate-bootstrap'
 
 # Markdown renderer
@@ -123,11 +123,11 @@ gem 'icalendar'
 group :development, :test do
   # Call 'byebug' anywhere in the code to stop execution and get a debugger console
   gem 'byebug'
-  gem 'rspec-rails', '~> 3.6'
-  gem 'rspec-steps', '~> 2.1.1'
   gem 'capybara', '~> 2.5'
-  gem 'poltergeist'
   gem 'database_cleaner'
+  gem 'poltergeist'
+  gem 'rspec-rails', '~> 3.6'
+  gem 'rspec-steps', '~> 2.1.1'
   # gem 'database_cleaner'
   gem 'factory_girl_rails'
 end
@@ -160,18 +160,16 @@ end
 
 group :test do
   # Coverage information
+  gem 'codeclimate-test-reporter', '~> 1.0.0'
   gem 'simplecov'
-  gem "codeclimate-test-reporter", "~> 1.0.0"
   # Explicitly set parser version, to remove warnings
   # Might lead to problems with other gems that require higher parser versions
   # In that case, update to a newer Ruby version
-  gem 'parser', '~> 2.2.2.5'
+  gem 'parser', '~> 2.3.3.1'
   # Stubbing external calls by blocking traffic with WebMock.disable_net_connect! or allow:
   # gem 'webmock'
-
 end
 
-
 group :production do
   # Use Puma web server
   # https://devcenter.heroku.com/articles/deploying-rails-applications-with-the-puma-web-server