From dd3ff7cde941e91db35d629071cb715ab5b4b2f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Pi=C4=8Dman?= <karel.picman@kontron.com>
Date: Wed, 7 Nov 2018 15:43:13 +0100
Subject: [PATCH] https://github.com/rubocop-hq/rails-style-guide

---
 after_init.rb                                 |   6 +-
 .../dmsf_context_menus_controller.rb          |   6 +-
 app/controllers/dmsf_controller.rb            |  76 ++---
 app/controllers/dmsf_files_controller.rb      |  26 +-
 app/controllers/dmsf_files_copy_controller.rb |   4 +-
 .../dmsf_folder_permissions_controller.rb     |   6 +-
 .../dmsf_folders_copy_controller.rb           |  12 +-
 app/controllers/dmsf_links_controller.rb      |  16 +-
 .../dmsf_public_urls_controller.rb            |   2 +-
 app/controllers/dmsf_state_controller.rb      |   4 +-
 app/controllers/dmsf_upload_controller.rb     |   2 +-
 app/controllers/dmsf_workflows_controller.rb  |  96 +++---
 app/helpers/dmsf_helper.rb                    |  20 +-
 app/helpers/dmsf_links_helper.rb              |   4 +-
 app/helpers/dmsf_upload_helper.rb             |  24 +-
 app/helpers/dmsf_workflows_helper.rb          |  10 +-
 app/models/dmsf_file.rb                       | 198 ++++++-----
 app/models/dmsf_file_revision.rb              | 150 ++++----
 app/models/dmsf_file_revision_access.rb       |   4 +-
 app/models/dmsf_file_revision_custom_field.rb |   2 +-
 app/models/dmsf_folder.rb                     | 180 +++++-----
 app/models/dmsf_folder_permission.rb          |  12 +-
 app/models/dmsf_link.rb                       | 107 +++---
 app/models/dmsf_lock.rb                       |   4 +-
 app/models/dmsf_mailer.rb                     |   2 +-
 app/models/dmsf_upload.rb                     |   2 +-
 app/models/dmsf_workflow.rb                   | 113 +++---
 app/models/dmsf_workflow_step.rb              |  30 +-
 app/models/dmsf_workflow_step_action.rb       |  12 +-
 app/models/dmsf_workflow_step_assignment.rb   |   9 +-
 app/validators/dmsf_file_name_validator.rb    |  30 ++
 app/validators/dmsf_url_validator.rb          |  38 +++
 .../dmsf_workflow_name_validator.rb           |  49 +++
 app/views/dmsf/_custom_fields.html.erb        |   2 +-
 app/views/dmsf/_dir.html.erb                  |   7 +-
 app/views/dmsf/_dir_trash.html.erb            |   3 +-
 app/views/dmsf/_file.html.erb                 |   7 +-
 app/views/dmsf/_file_trash.html.erb           |   3 +-
 app/views/dmsf/_list_view.erb                 |   5 +-
 app/views/dmsf/_tree_view.erb                 |   5 +-
 app/views/dmsf/_url.html.erb                  |   5 +-
 app/views/dmsf/_url_trash.html.erb            |   5 +-
 app/views/dmsf/add_email.js.erb               |   6 +-
 app/views/dmsf/dmsf_rows.js.erb               |  21 +-
 app/views/dmsf/edit.html.erb                  |  14 +-
 app/views/dmsf/show.html.erb                  |   6 +-
 app/views/dmsf/trash.html.erb                 |   3 +-
 app/views/dmsf_files/_link.html.erb           |   4 +-
 app/views/dmsf_files/show.html.erb            |  44 +--
 app/views/dmsf_folder_permissions/new.js.erb  |   6 +-
 app/views/dmsf_folders_copy/_form.html.erb    |   2 +-
 .../autocomplete_for_project.js.erb           |  28 +-
 app/views/dmsf_mailer/send_documents.html.erb |   4 +-
 app/views/dmsf_mailer/send_documents.text.erb |   4 +-
 .../workflow_notification.html.erb            |  10 +-
 .../workflow_notification.text.erb            |   6 +-
 app/views/dmsf_state/_user_pref.html.erb      |   2 +-
 app/views/dmsf_upload/_form.html.erb          |   8 +-
 app/views/dmsf_workflows/_action.html.erb     |   4 +-
 .../_approval_workflow_button.html.erb        |   4 +-
 app/views/dmsf_workflows/_log.html.erb        |  26 +-
 app/views/dmsf_workflows/_main.html.erb       |   6 +-
 app/views/dmsf_workflows/_steps.html.erb      |   6 +-
 app/views/dmsf_workflows/action.js.erb        |   6 +-
 app/views/dmsf_workflows/assign.js.erb        |   6 +-
 app/views/dmsf_workflows/log.js.erb           |   6 +-
 app/views/search/_container.html.erb          |   4 +-
 app/views/settings/_dmsf_columns.html.erb     |   2 +-
 app/views/settings/_dmsf_settings.html.erb    |   8 +-
 assets/javascripts/attachments_dmsf.js        |   8 +-
 .../jquery.dataTables/locales/no.json         |   3 +-
 assets/javascripts/redmine_dmsf.js            |  10 +-
 assets/stylesheets/redmine_dmsf.css           |  16 +-
 config/locales/cs.yml                         |   9 +-
 config/locales/de.yml                         |   9 +-
 config/locales/en.yml                         |   9 +-
 config/locales/es.yml                         |   9 +-
 config/locales/fr.yml                         |   9 +-
 config/locales/hu.yml                         |   9 +-
 config/locales/it.yml                         |   9 +-
 config/locales/ja.yml                         |   9 +-
 config/locales/ko.yml                         |   9 +-
 config/locales/nl.yml                         |   9 +-
 config/locales/pl.yml                         |  10 +-
 config/locales/pt-BR.yml                      |   9 +-
 config/locales/ru.yml                         |   9 +-
 config/locales/sl.yml                         |   9 +-
 config/locales/zh-TW.yml                      |   9 +-
 config/locales/zh.yml                         |  10 +-
 db/migrate/01_create_hierarchy.rb             |  84 ++---
 db/migrate/02_dmsf_normalization.rb           |   6 +-
 db/migrate/03_dmsf_0_8_0.rb                   |  10 +-
 db/migrate/04_dmsf_0_9_0.rb                   |  17 +-
 db/migrate/05_dmsf_0_9_0_1.rb                 |  16 +-
 db/migrate/06_dmsf_1_2_0.rb                   |  11 +-
 db/migrate/07_dmsf_1_4_4.rb                   | 105 +++---
 .../20120822100401_create_dmsf_workflows.rb   |  15 +-
 ...120822100402_create_dmsf_workflow_steps.rb |  20 +-
 ...3_create_dmsf_workflow_step_assignments.rb |  18 +-
 ...00404_create_dmsf_workflow_step_actions.rb |  19 +-
 db/migrate/20130819013955_update_projects.rb  |   8 +-
 .../20131108141401_add_index_to_dmsf_files.rb |   8 +-
 ...0131108141402_add_index_to_dmsf_folders.rb |   8 +-
 ...3141401_add_index_to_dmsf_file_revision.rb |   8 +-
 .../20131113141402_add_index_to_dmsf_lock.rb  |   8 +-
 .../20131113141403_create_dmsf_links.rb       |  24 +-
 db/migrate/20140314132501_notifications_on.rb |  10 +-
 db/migrate/20140519133201_trash_bin.rb        |   8 +-
 ...1013102501_remove_project_from_revision.rb |   5 +-
 ...41015132701_remove_folder_from_revision.rb |   6 +-
 ...0141205143001_remove_uniqueness_from_wf.rb |   4 +-
 .../20150120152101_notifications_nullable.rb  |  10 +-
 db/migrate/20150130052716_add_external.rb     |   8 +-
 .../20150202010301_add_user_to_links.rb       |   8 +-
 db/migrate/20150910153701_title_not_null.rb   |   6 +-
 db/migrate/20151020141801_large_files.rb      |   5 +-
 db/migrate/20151209100001_title_format.rb     |   8 +-
 ...20160215125801_approval_workflow_status.rb |  11 +-
 db/migrate/20160217133001_status_deleted.rb   |  44 ++-
 ...0222140401_approval_workflow_std_fields.rb |  10 +-
 .../20160421150501_add_digest_to_revision.rb  |   8 +-
 .../20161223133200_create_dmsf_public_urls.rb |  18 +-
 ...64701_add_name_to_appoval_workflow_step.rb |  10 +-
 .../20170118142001_dmsf_file_container.rb     |  13 +-
 ...0170204214753_add_revision_to_dmsf_lock.rb |  10 +-
 ...dmsf_file_last_revision_id_to_dmsf_lock.rb |   4 +-
 ...d_dmsf_not_inheritable_to_custom_fields.rb |  10 +-
 .../20170323131231_dmsf_description_limit.rb  |   6 +-
 ...30131901_create_dmsf_folder_permissions.rb |  16 +-
 ...0421101901_dmsf_file_container_rollback.rb |  37 +-
 .../20170422104901_migrate_documents.rb       |  20 +-
 db/migrate/20170526144701_dmsf_attachable.rb  |   8 +-
 ...4101_change_revision_digest_limit_to_64.rb |   2 +-
 ...20171110155901_add_index_to_dmsf_folder.rb |   8 +-
 .../20180216152501_rename_title_format.rb     |   4 +-
 db/migrate/20180903132101_fast_links.rb       |   8 +-
 extra/api/link.xml                            |   4 +-
 init.rb                                       |  37 +-
 lib/dav4rack/resource.rb                      |   6 +-
 lib/dav4rack/resources/file_resource.rb       |  10 +-
 lib/dmsf_zip.rb                               |   6 +-
 lib/redmine_dmsf.rb                           |  17 +-
 .../controllers/issues_controller_hooks.rb    |   2 +-
 .../controllers/search_controller_hooks.rb    |   4 +-
 .../hooks/views/issue_view_hooks.rb           |  48 +--
 lib/redmine_dmsf/lockable.rb                  |  10 +-
 lib/redmine_dmsf/macros.rb                    |   4 +-
 .../patches/easy_crm_case_patch.rb            |  10 +-
 .../easy_crm_cases_controller_patch.rb        |   2 +-
 lib/redmine_dmsf/patches/issue_patch.rb       |  10 +-
 .../patches/projects_helper_patch.rb          |   2 +-
 lib/redmine_dmsf/patches/role_patch.rb        |   2 +-
 lib/redmine_dmsf/patches/user_patch.rb        |   4 +-
 lib/redmine_dmsf/webdav/base_resource.rb      |   6 +-
 lib/redmine_dmsf/webdav/custom_middleware.rb  |   9 +-
 lib/redmine_dmsf/webdav/dmsf_resource.rb      |  62 ++--
 lib/redmine_dmsf/webdav/index_resource.rb     |   8 +-
 lib/redmine_dmsf/webdav/project_resource.rb   |   8 +-
 lib/redmine_dmsf/webdav/resource_proxy.rb     |   8 +-
 lib/tasks/dmsf_convert_documents.rake         |   2 +-
 lib/tasks/dmsf_maintenance.rake               |   4 +-
 test/fixtures/dmsf_file_revisions.yml         |  16 +-
 test/fixtures/dmsf_workflow_step_actions.yml  |   1 -
 .../dmsf_workflow_step_assignments.yml        |  10 +-
 test/fixtures/files/2017/04/test.gif          | Bin 9982 -> 3 bytes
 test/fixtures/files/2017/04/test.pdf          | Bin 7880 -> 3 bytes
 test/fixtures/files/2017/04/test.txt          |   2 +-
 .../dmsf_context_menus_controller_test.rb     |   9 +-
 test/functional/dmsf_controller_test.rb       |  33 +-
 test/functional/dmsf_files_controller_test.rb |  23 +-
 .../dmsf_files_copy_controller_test.rb        |  33 +-
 ...dmsf_folder_permissions_controller_test.rb |  11 +-
 .../dmsf_folders_copy_controller_test.rb      |  33 +-
 test/functional/dmsf_links_controller_test.rb |  37 +-
 .../dmsf_public_urls_controller_test.rb       |  12 +-
 test/functional/dmsf_state_controller_test.rb |  11 +-
 .../dmsf_workflow_controller_test.rb          |  38 +--
 test/functional/issues_controller_test.rb     |  33 +-
 test/functional/my_controller_test.rb         |   5 +-
 .../rest_api/dmsf_file_api_test.rb            |  44 ++-
 .../rest_api/dmsf_folder_api_test.rb          |  60 ++--
 .../rest_api/dmsf_link_api_test.rb            |  34 +-
 .../dmsf_webdav_custom_middleware_test.rb     |  13 +-
 .../webdav/dmsf_webdav_delete_test.rb         |  70 ++--
 .../webdav/dmsf_webdav_get_test.rb            |  74 ++--
 .../webdav/dmsf_webdav_head_test.rb           |  67 ++--
 .../webdav/dmsf_webdav_lock_test.rb           | 166 ++++-----
 .../webdav/dmsf_webdav_mkcol_test.rb          | 100 +++---
 .../webdav/dmsf_webdav_move_test.rb           | 311 ++++++++---------
 .../webdav/dmsf_webdav_options_test.rb        |  33 +-
 .../webdav/dmsf_webdav_post_test.rb           |  12 +-
 .../webdav/dmsf_webdav_propfind_test.rb       |  91 ++---
 .../webdav/dmsf_webdav_put_test.rb            | 323 +++++++++---------
 test/unit/attachable_patch_test.rb            |   4 +-
 test/unit/dmsf_file_revision_test.rb          |  41 ++-
 test/unit/dmsf_file_test.rb                   |  83 ++---
 test/unit/dmsf_folder_permission_test.rb      |   6 +-
 test/unit/dmsf_folder_test.rb                 |  29 +-
 test/unit/dmsf_link_test.rb                   |  52 +--
 test/unit/dmsf_lock_test.rb                   |  10 +-
 test/unit/dmsf_mailer_test.rb                 |  12 +-
 test/unit/dmsf_public_url_test.rb             |  13 +-
 test/unit/dmsf_workflow_step_action_test.rb   |  16 +-
 .../dmsf_workflow_step_assignment_test.rb     |   8 +-
 test/unit/dmsf_workflow_step_test.rb          |  28 +-
 test/unit/dmsf_workflow_test.rb               | 184 +++++-----
 test/unit/issue_patch_test.rb                 |   3 +-
 test/unit/project_patch_test.rb               |  45 ++-
 test/unit/user_patch_test.rb                  |  26 +-
 209 files changed, 2582 insertions(+), 2405 deletions(-)
 create mode 100644 app/validators/dmsf_file_name_validator.rb
 create mode 100644 app/validators/dmsf_url_validator.rb
 create mode 100644 app/validators/dmsf_workflow_name_validator.rb
 mode change 100755 => 100644 test/fixtures/files/2017/04/test.gif

diff --git a/after_init.rb b/after_init.rb
index 2fee8cee..3365d537 100644
--- a/after_init.rb
+++ b/after_init.rb
@@ -64,9 +64,7 @@ def init
   end
 end
 
-unless Redmine::Plugin.installed?(:easy_extensions)
-  init
-else
+if Redmine::Plugin.installed?(:easy_extensions)
   ActiveSupport.on_load(:easyproject, yield: true) do
     init
 
@@ -76,6 +74,8 @@ else
     EpmDmsfLockedDocuments.register_to_scope(:user, :plugin => :redmine_dmsf)
     EpmDmsfOpenApprovals.register_to_scope(:user, :plugin => :redmine_dmsf)
   end
+else
+  init
 end
 
 ActionDispatch::Reloader.to_prepare do
diff --git a/app/controllers/dmsf_context_menus_controller.rb b/app/controllers/dmsf_context_menus_controller.rb
index 74021608..87f554ec 100644
--- a/app/controllers/dmsf_context_menus_controller.rb
+++ b/app/controllers/dmsf_context_menus_controller.rb
@@ -54,11 +54,11 @@ class DmsfContextMenusController < ApplicationController
       selected_files = params[:ids].select{ |x| x =~ /file-\d+/ }.map{ |x| $1.to_i if x =~ /file-(\d+)/ }
       selected_file_links = params[:ids].select{ |x| x =~ /file-link-\d+/ }.map{ |x| $1.to_i if x =~ /file-link-(\d+)/ }
       selected_file_links.each do |id|
-        link = DmsfLink.find_by_id id
-        selected_files << link.target_id if link && !selected_files.include?(link.target_id.to_s)
+        target_id = DmsfLink.find_by(id: id).pluck(:target_id).first
+        selected_files << target_id if target_id && !selected_files.include?(target_id)
       end
       if (selected_files.size == 1) && (params[:ids].size == 1)
-        @file = DmsfFile.find selected_files[0]
+        @file = DmsfFile.find_by(id: selected_files[0])
       end
     end
   end
diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index cc6dc8bd..e545bbe9 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -66,7 +66,7 @@ class DmsfController < ApplicationController
       format.csv  {
         filename = @project.name
         filename << "_#{@folder.title}" if @folder
-        filename << DateTime.now.strftime('_%Y%m%d%H%M%S.csv')
+        filename << DateTime.current.strftime('_%Y%m%d%H%M%S.csv')
         send_data(DmsfHelper.dmsf_to_csv(@folder ? @folder : @project, params[:settings][:dmsf_columns]),
                   :type => 'text/csv; header=present', :filename => filename)
       }
@@ -77,11 +77,11 @@ class DmsfController < ApplicationController
     @folder_manipulation_allowed = User.current.allowed_to? :folder_manipulation, @project
     @file_manipulation_allowed = User.current.allowed_to? :file_manipulation, @project
     @file_delete_allowed = User.current.allowed_to? :file_delete, @project
-    @subfolders = DmsfFolder.deleted.where(:project_id => @project.id)
-    @files = DmsfFile.deleted.where(:project_id => @project.id)
-    @dir_links = DmsfLink.deleted.where(:project_id => @project.id, :target_type => DmsfFolder.model_name.to_s)
-    @file_links = DmsfLink.deleted.where(:project_id => @project.id, :target_type => DmsfFile.model_name.to_s)
-    @url_links = DmsfLink.deleted.where(:project_id => @project.id, :target_type => 'DmsfUrl')
+    @subfolders = DmsfFolder.deleted.where(project_id: @project.id)
+    @files = DmsfFile.deleted.where(project_id: @project.id)
+    @dir_links = DmsfLink.deleted.where(project_id: @project.id, target_type: DmsfFolder.model_name.to_s)
+    @file_links = DmsfLink.deleted.where(project_id: @project.id, target_type: DmsfFile.model_name.to_s)
+    @url_links = DmsfLink.deleted.where(project_id: @project.id, target_type: 'DmsfUrl')
   end
 
   def download_email_entries
@@ -123,16 +123,16 @@ class DmsfController < ApplicationController
     if selected_dir_links.present? &&
       (params[:email_entries].present? || params[:download_entries].present?)
         selected_dir_links.each do |id|
-          link = DmsfLink.find_by_id id
-          selected_folders << link.target_id if link && !selected_folders.include?(link.target_id)
+          target_id = DmsfLink.find_by(id: id).pluck(:target_id).first
+          selected_folders << target_id if target_id && !selected_folders.include?(target_id)
       end
     end
 
     if selected_file_links.present? &&
       (params[:email_entries].present? || params[:download_entries].present?)
         selected_file_links.each do |id|
-          link = DmsfLink.find_by_id id
-          selected_files << link.target_id if link && !selected_files.include?(link.target_id)
+          target_id = DmsfLink.find_by(id: id).pluck(:target_id).first
+          selected_files << target_id if target_id && !selected_files.include?(target_id)
       end
     end
 
@@ -178,7 +178,7 @@ class DmsfController < ApplicationController
     if params[:email][:to].strip.blank?
       flash[:error] = l(:error_email_to_must_be_entered)
     else
-      DmsfMailer.send_documents(@project, User.current, params[:email]).deliver
+      DmsfMailer.send_documents(@project, params[:email]).deliver
       File.delete(params[:email][:zipped_content])
       flash[:notice] = l(:notice_email_sent, params[:email][:to])
     end
@@ -195,7 +195,7 @@ class DmsfController < ApplicationController
     @parent = @folder.dmsf_folder
     @pathfolder = copy_folder(@folder)
     @force_file_unlock_allowed = User.current.allowed_to?(:force_file_unlock, @project)
-    @users = Principal.active.where(:id => @folder.dmsf_folder_permissions.users.map{ |p| p.object_id })
+    @users = Principal.active.where(id: @folder.dmsf_folder_permissions.users.map{ |p| p.object_id })
   end
 
   def create
@@ -292,14 +292,14 @@ class DmsfController < ApplicationController
   end
 
   def notify_activate
-    if((@folder && @folder.notification) || (@folder.nil? && @project.dmsf_notification))
+    if (@folder && @folder.notification) || (@folder.nil? && @project.dmsf_notification)
       flash[:warning] = l(:warning_folder_notifications_already_activated)
     else
       if @folder
         @folder.notify_activate
       else
         @project.dmsf_notification = true
-        @project.save
+        @project.save!
       end
       flash[:notice] = l(:notice_folder_notifications_activated)
     end
@@ -307,14 +307,14 @@ class DmsfController < ApplicationController
   end
 
   def notify_deactivate
-    if((@folder && !@folder.notification) || (@folder.nil? && !@project.dmsf_notification))
+    if (@folder && !@folder.notification) || (@folder.nil? && !@project.dmsf_notification)
       flash[:warning] = l(:warning_folder_notifications_already_deactivated)
     else
       if @folder
         @folder.notify_deactivate
       else
         @project.dmsf_notification = nil
-        @project.save
+        @project.save!
       end
       flash[:notice] = l(:notice_folder_notifications_deactivated)
     end
@@ -354,8 +354,8 @@ class DmsfController < ApplicationController
   end
 
   def append_email
-    @principals = Principal.where(:id => params[:user_ids]).to_a
-    head 200 if @principals.blank?
+    @principals = Principal.where(id: params[:user_ids]).to_a
+    head :success if @principals.blank?
   end
 
   def autocomplete_for_user
@@ -424,7 +424,7 @@ class DmsfController < ApplicationController
       audit.save!
     end
     send_file(zip.finish,
-      :filename => filename_for_content_disposition("#{@project.name}-#{DateTime.now.strftime('%y%m%d%H%M%S')}.zip"),
+      :filename => filename_for_content_disposition("#{@project.name}-#{DateTime.current.strftime('%y%m%d%H%M%S')}.zip"),
       :type => 'application/zip',
       :disposition => 'attachment')
   rescue StandardError
@@ -434,9 +434,9 @@ class DmsfController < ApplicationController
   end
 
   def zip_entries(zip, selected_folders, selected_files)
-    member = Member.where(:user_id => User.current.id, :project_id => @project.id).first
+    member = Member.where(user_id: User.current.id, project_id: @project.id).first
     selected_folders.each do |selected_folder_id|
-      folder = DmsfFolder.visible.find_by_id selected_folder_id
+      folder = DmsfFolder.visible.find_by(id: selected_folder_id)
       if folder
         zip.add_folder(folder, member, (folder.dmsf_folder.dmsf_path_str if folder.dmsf_folder))
       else
@@ -444,7 +444,7 @@ class DmsfController < ApplicationController
       end
     end
     selected_files.each do |selected_file_id|
-      file = DmsfFile.visible.find_by_id selected_file_id
+      file = DmsfFile.visible.find_by(id: selected_file_id)
       unless file && file.last_revision && File.exist?(file.last_revision.disk_file)
         raise FileNotFound
       end
@@ -463,7 +463,7 @@ class DmsfController < ApplicationController
   def restore_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links)
     # Folders
     selected_folders.each do |id|
-      folder = DmsfFolder.find_by_id id
+      folder = DmsfFolder.find_by(id: id)
       if folder
         unless folder.restore
           flash[:error] = folder.errors.full_messages.to_sentence
@@ -474,7 +474,7 @@ class DmsfController < ApplicationController
     end
     # Files
     selected_files.each do |id|
-      file = DmsfFile.find_by_id id
+      file = DmsfFile.find_by(id: id)
       if file
         unless file.restore
           flash[:error] = file.errors.full_messages.to_sentence
@@ -485,7 +485,7 @@ class DmsfController < ApplicationController
     end
     # Links
     (selected_dir_links + selected_file_links + selected_url_links).each do |id|
-      link = DmsfLink.find_by_id id
+      link = DmsfLink.find_by(id: id)
       if link
         unless link.restore
           flash[:error] = link.errors.full_messages.to_sentence
@@ -499,7 +499,7 @@ class DmsfController < ApplicationController
   def delete_entries(selected_folders, selected_files, selected_dir_links, selected_file_links, selected_url_links, commit)
     # Folders
     selected_folders.each do |id|
-      folder = DmsfFolder.find_by_id id
+      folder = DmsfFolder.find_by(id: id)
       if folder
         unless folder.delete commit
           flash[:error] = folder.errors.full_messages.to_sentence
@@ -513,7 +513,7 @@ class DmsfController < ApplicationController
     deleted_files = []
     not_deleted_files = []
     selected_files.each do |id|
-      file = DmsfFile.find_by_id id
+      file = DmsfFile.find_by(id: id)
       if file
         if file.delete(commit)
           deleted_files << file unless commit
@@ -525,13 +525,13 @@ class DmsfController < ApplicationController
       end
     end
     # Activities
-    if !deleted_files.empty?
+    unless deleted_files.empty?
       begin
         recipients = DmsfMailer.get_notify_users(@project, deleted_files)
         recipients.each do |u|
           DmsfMailer.files_deleted(u, @project, deleted_files).deliver
         end
-        if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+        if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
           unless recipients.empty?
             to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
             to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
@@ -547,7 +547,7 @@ class DmsfController < ApplicationController
     end
     # Links
     (selected_dir_links + selected_file_links + selected_url_links).each do |id|
-      link = DmsfLink.find_by_id id
+      link = DmsfLink.find_by(id: id)
       link.delete commit if link
     end
     if flash[:error].blank? && flash[:warning].blank?
@@ -607,7 +607,7 @@ class DmsfController < ApplicationController
       if tag
         @subfolders = []
         @folder = nil
-        DmsfFolder.where(:project_id => @project.id, :system => false).visible.each do |f|
+        DmsfFolder.where(project_id: @project.id, system: false).visible.find_each do |f|
           f.custom_field_values.each do |v|
             if v.custom_field_id == params[:custom_field_id].to_i
               if v.custom_field.compare_values?(v.value, params[:custom_value])
@@ -618,7 +618,7 @@ class DmsfController < ApplicationController
           end
         end
         @files = []
-        DmsfFile.where(:project_id => @project.id).visible.each do |f|
+        DmsfFile.where(project_id: @project.id).visible.find_each do |f|
           r = f.last_revision
           if r
             r.custom_field_values.each do |v|
@@ -632,8 +632,8 @@ class DmsfController < ApplicationController
           end
         end
         @dir_links = []
-        DmsfLink.where(:project_id => @project.id, :target_type => DmsfFolder.model_name.to_s).where(
-          'target_id IS NOT NULL').visible.each do |l|
+        DmsfLink.where(project_id: @project.id, target_type: DmsfFolder.model_name.to_s).where.not(
+          target_id: nil).visible.find_each do |l|
           l.target_folder.custom_field_values.each do |v|
             if v.custom_field_id == params[:custom_field_id].to_i
               if v.custom_field.compare_values?(v.value, params[:custom_value])
@@ -644,7 +644,7 @@ class DmsfController < ApplicationController
           end
         end
         @file_links = []
-        DmsfLink.where(:project_id => @project.id, :target_type => DmsfFile.model_name.to_s).visible.each do |l|
+        DmsfLink.where(project_id: @project.id, target_type: DmsfFile.model_name.to_s).visible.find_each do |l|
           r = l.target_file.last_revision if l.target_file
           if r
             r.custom_field_values.each do |v|
@@ -692,9 +692,9 @@ class DmsfController < ApplicationController
     # Trash
     @trash_visible = @folder_manipulation_allowed && @file_manipulation_allowed &&
       @file_delete_allowed && !@locked_for_user && !@folder
-    @trash_enabled = DmsfFolder.deleted.where(:project_id => @project.id).any? ||
-      DmsfFile.deleted.where(:project_id => @project.id).any? ||
-      DmsfLink.deleted.where(:project_id => @project.id).any?
+    @trash_enabled = DmsfFolder.deleted.where(project_id: @project.id).exists? ||
+      DmsfFile.deleted.where(project_id: @project.id).exists? ||
+      DmsfLink.deleted.where(project_id: @project.id).exists?
   end
 
 end
diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index ab42b5ca..61b19bfb 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -57,7 +57,7 @@ class DmsfFilesController < ApplicationController
       access.dmsf_file_revision = @revision
       access.action = DmsfFileRevisionAccess::DownloadAction
       access.save!
-      member = Member.where(:user_id => User.current.id, :project_id => @file.project.id).first
+      member = Member.where(user_id: User.current.id, project_id: @file.project.id).first
       if member && !member.dmsf_title_format.nil? && !member.dmsf_title_format.empty?
         title_format = member.dmsf_title_format
       else
@@ -118,7 +118,15 @@ class DmsfFilesController < ApplicationController
            revision.increase_version(version)
         end
         file_upload = params[:dmsf_attachments]['1'] if params[:dmsf_attachments].present?
-        unless file_upload
+        if file_upload
+          upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, file_upload)
+          if upload
+            revision.size = upload.size
+            revision.disk_filename = revision.new_storage_filename
+            revision.mime_type = upload.mime_type
+            revision.digest = DmsfFileRevision.create_digest upload.tempfile_path
+          end
+        else
           revision.size = last_revision.size
           revision.disk_filename = last_revision.disk_filename
           revision.mime_type = last_revision.mime_type
@@ -127,14 +135,6 @@ class DmsfFilesController < ApplicationController
           else
             revision.digest = last_revision.digest
           end
-        else
-          upload = DmsfUpload.create_from_uploaded_attachment(@project, @folder, file_upload)
-          if upload
-            revision.size = upload.size
-            revision.disk_filename = revision.new_storage_filename
-            revision.mime_type = upload.mime_type
-            revision.digest = DmsfFileRevision.create_digest upload.tempfile_path
-          end
         end
 
         # Custom fields
@@ -167,7 +167,7 @@ class DmsfFilesController < ApplicationController
               recipients.each do |u|
                 DmsfMailer.files_updated(u, @project, [@file]).deliver
               end
-              if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+              if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
                 unless recipients.empty?
                   to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
                   to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
@@ -200,7 +200,7 @@ class DmsfFilesController < ApplicationController
             recipients.each do |u|
               DmsfMailer.files_deleted(u, @project, [@file]).deliver
             end
-            if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+            if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
               unless recipients.empty?
                 to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
                 to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
@@ -234,7 +234,7 @@ class DmsfFilesController < ApplicationController
       if @revision.delete(true)
         if @file.name != @file.last_revision.name
           @file.name = @file.last_revision.name
-          @file.save
+          @file.save!
         end
         flash[:notice] = l(:notice_revision_deleted)
       else
diff --git a/app/controllers/dmsf_files_copy_controller.rb b/app/controllers/dmsf_files_copy_controller.rb
index e85adef4..60f085ce 100644
--- a/app/controllers/dmsf_files_copy_controller.rb
+++ b/app/controllers/dmsf_files_copy_controller.rb
@@ -59,7 +59,7 @@ class DmsfFilesCopyController < ApplicationController
 private
 
   def find_file
-    unless DmsfFile.where(:id => params[:id]).exists?
+    unless DmsfFile.where(id: params[:id]).exists?
       render_404
       return
     end
@@ -77,7 +77,7 @@ private
     end
     if params[:target_folder_id].present?
       @target_folder = DmsfFolder.visible.find(params[:target_folder_id])
-      unless DmsfFolder.visible.where(:id => params[:target_folder_id]).exists?
+      unless DmsfFolder.visible.where(id: params[:target_folder_id]).exists?
         render_403
         return
       end
diff --git a/app/controllers/dmsf_folder_permissions_controller.rb b/app/controllers/dmsf_folder_permissions_controller.rb
index cfb9377a..c77d90b6 100644
--- a/app/controllers/dmsf_folder_permissions_controller.rb
+++ b/app/controllers/dmsf_folder_permissions_controller.rb
@@ -35,8 +35,8 @@ class DmsfFolderPermissionsController < ApplicationController
   end
 
   def append
-    @principals = Principal.where(:id => params[:user_ids]).to_a
-    head 200 if @principals.blank?
+    @principals = Principal.where(id: params[:user_ids]).to_a
+    head :success if @principals.blank?
   end
 
   def autocomplete_for_user
@@ -60,7 +60,7 @@ class DmsfFolderPermissionsController < ApplicationController
 
   def find_folder
     if params[:dmsf_folder_id]
-      @dmsf_folder = DmsfFolder.visible.find_by_id(params[:dmsf_folder_id])
+      @dmsf_folder = DmsfFolder.visible.find_by(id: params[:dmsf_folder_id])
     end
   end
 
diff --git a/app/controllers/dmsf_folders_copy_controller.rb b/app/controllers/dmsf_folders_copy_controller.rb
index 02980856..acc5f1e4 100644
--- a/app/controllers/dmsf_folders_copy_controller.rb
+++ b/app/controllers/dmsf_folders_copy_controller.rb
@@ -48,20 +48,20 @@ class DmsfFoldersCopyController < ApplicationController
   def move
     @folder.project = @target_project
     @folder.dmsf_folder = @target_folder
-    unless @folder.save
+    if @folder.save
+      flash[:notice] = l(:notice_successful_update)
+      redirect_to dmsf_folder_path(:id => @target_project, :folder_id => @folder)
+    else
       flash[:error] = @folder.errors.full_messages.join(', ')
       redirect_to :action => 'new', :id => @folder, :target_project_id => @target_project,
                   :target_folder_id => @target_folder
-    else
-      flash[:notice] = l(:notice_successful_update)
-      redirect_to dmsf_folder_path(:id => @target_project, :folder_id => @folder)
     end
   end
 
   private
 
   def find_folder
-    unless DmsfFolder.where(:id => params[:id]).exists?
+    unless DmsfFolder.where(id: params[:id]).exists?
       render_404
       return
     end
@@ -79,7 +79,7 @@ class DmsfFoldersCopyController < ApplicationController
     end
     if params[:target_folder_id].present?
       @target_folder = DmsfFolder.find(params[:target_folder_id])
-      unless DmsfFolder.visible.where(:id => params[:target_folder_id]).exists?
+      unless DmsfFolder.visible.where(id: params[:target_folder_id]).exists?
         render_403
         return
       end
diff --git a/app/controllers/dmsf_links_controller.rb b/app/controllers/dmsf_links_controller.rb
index fc12b0da..4e7e4304 100644
--- a/app/controllers/dmsf_links_controller.rb
+++ b/app/controllers/dmsf_links_controller.rb
@@ -56,11 +56,11 @@ class DmsfLinksController < ApplicationController
     @target_folder_id = params[:dmsf_folder_id].to_i if params[:dmsf_folder_id].present?
     if @type == 'link_to'
       if @dmsf_file_id
-        file = DmsfFile.find_by_id @dmsf_file_id
-        @dmsf_link.name = file.title if file
+        names = DmsfFile.where(id: @dmsf_file_id).pluck(:name)
+        @dmsf_link.name = names.first if names.any?
       else
-        folder = DmsfFolder.find_by_id @target_folder_id
-        @dmsf_link.name = folder.title if folder
+        titles = DmsfFolder.where(id: @target_folder_id).pluck(:title)
+        @dmsf_link.name = titles.first if titles.any?
       end
     end
     @container = params[:container]
@@ -96,7 +96,7 @@ class DmsfLinksController < ApplicationController
         @dmsf_link.dmsf_folder_id = nil
       end
       @dmsf_link.target_project_id = params[:dmsf_link][:target_project_id]
-      if (params[:external_link] == 'true')
+      if params[:external_link] == 'true'
         @dmsf_link.external_url = params[:dmsf_link][:external_url]
         @dmsf_link.target_type = 'DmsfUrl'
       elsif params[:dmsf_link][:target_file_id].present?
@@ -121,12 +121,12 @@ class DmsfLinksController < ApplicationController
       if params[:dmsf_link][:target_project_id].present?
         @dmsf_link.project_id = params[:dmsf_link][:target_project_id]
       else
-        target_folder = DmsfFolder.find_by(id: params[:dmsf_link][:target_folder_id])
-        unless target_folder
+        project_id = DmsfFolder.find_by(id: params[:dmsf_link][:target_folder_id]).pluck(:project_id).first
+        unless project_id
           render_404
           return
         end
-        @dmsf_link.project_id = target_folder.project_id
+        @dmsf_link.project_id = project_id
       end
       @dmsf_link.target_project_id = params[:dmsf_link][:project_id]
       if params[:dmsf_link][:dmsf_file_id].present?
diff --git a/app/controllers/dmsf_public_urls_controller.rb b/app/controllers/dmsf_public_urls_controller.rb
index 9d60781a..7b76fa2e 100644
--- a/app/controllers/dmsf_public_urls_controller.rb
+++ b/app/controllers/dmsf_public_urls_controller.rb
@@ -25,7 +25,7 @@ class DmsfPublicUrlsController < ApplicationController
   skip_before_action :check_if_login_required, :only => [:show]
 
   def show
-    dmsf_public_url = DmsfPublicUrl.where('token = ? AND expire_at >= ?', params[:token], DateTime.now).first
+    dmsf_public_url = DmsfPublicUrl.where('token = ? AND expire_at >= ?', params[:token], DateTime.current).first
     if dmsf_public_url
       revision = dmsf_public_url.dmsf_file.last_revision
       begin
diff --git a/app/controllers/dmsf_state_controller.rb b/app/controllers/dmsf_state_controller.rb
index b42cc225..d5c42cd6 100644
--- a/app/controllers/dmsf_state_controller.rb
+++ b/app/controllers/dmsf_state_controller.rb
@@ -27,7 +27,7 @@ class DmsfStateController < ApplicationController
   before_action :authorize
 
   def user_pref_save
-    member = @project.members.where(:user_id => User.current.id).first
+    member = @project.members.where(user_id: User.current.id).first
     if member
       member.dmsf_mail_notification = params[:email_notify]
       member.dmsf_title_format = params[:title_format]
@@ -51,5 +51,5 @@ class DmsfStateController < ApplicationController
   def format_valid?(format)
     format.blank? || ((format =~ /%(t|d|v|i|r)/) && format.length < 256)
   end
-    
+
 end
\ No newline at end of file
diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
index e29c2f4c..5193b6b3 100644
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@@ -114,7 +114,7 @@ class DmsfUploadController < ApplicationController
     @files = []
     attachments = params[:attachments]
     if attachments && attachments.is_a?(Hash)
-      @folder = DmsfFolder.visible.find_by_id attachments[:folder_id].to_i if attachments[:folder_id].present?
+      @folder = DmsfFolder.visible.find_by(id: attachments[:folder_id]) if attachments[:folder_id].present?
       # standard file input uploads
       uploaded_files = attachments.select { |key, value| key == 'uploaded_file'}
       uploaded_files.each_value do |uploaded_file|
diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb
index 77918b62..71d26a45 100644
--- a/app/controllers/dmsf_workflows_controller.rb
+++ b/app/controllers/dmsf_workflows_controller.rb
@@ -31,7 +31,7 @@ class DmsfWorkflowsController < ApplicationController
   layout :workflows_layout
 
   def permissions
-    revision = DmsfFileRevision.find_by_id params[:dmsf_file_revision_id] if params[:dmsf_file_revision_id].present?
+    revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id]) if params[:dmsf_file_revision_id].present?
     if revision
       render_403 unless revision.dmsf_file || DmsfFolder.permissions?(revision.dmsf_file.dmsf_folder)
     end
@@ -60,12 +60,12 @@ class DmsfWorkflowsController < ApplicationController
         :note => params[:note])
       if request.post?
         if action.save
-          revision = DmsfFileRevision.find_by_id params[:dmsf_file_revision_id]
+          revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
           if revision
             if @dmsf_workflow.try_finish revision, action, (params[:step_action].to_i / 10)
               if revision.dmsf_file
                 begin
-                  revision.dmsf_file.unlock!(true) unless Setting.plugin_redmine_dmsf['dmsf_keep_documents_locked'].present?
+                  revision.dmsf_file.unlock!(true) unless Setting.plugin_redmine_dmsf['dmsf_keep_documents_locked']
                 rescue DmsfLockError => e
                   flash[:info] = e.message
                 end
@@ -82,7 +82,7 @@ class DmsfWorkflowsController < ApplicationController
                     :text_email_finished_approved,
                     :text_email_to_see_history).deliver if user
                 end
-                if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+                if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
                   unless recipients.blank?
                     to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
                     to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
@@ -92,7 +92,7 @@ class DmsfWorkflowsController < ApplicationController
               else
                 # Just rejected
                 recipients = @dmsf_workflow.participiants
-                recipients.push User.find_by_id revision.dmsf_workflow_assigned_by
+                recipients.push User.find_by(id: revision.dmsf_workflow_assigned_by)
                 recipients.uniq!
                 recipients = recipients & DmsfMailer.get_notify_users(@project, [revision.dmsf_file], true)
                 recipients.each do |user|
@@ -105,7 +105,7 @@ class DmsfWorkflowsController < ApplicationController
                     :text_email_to_see_history,
                     action.note).deliver
                 end
-                if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+                if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
                   unless recipients.blank?
                     to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
                     to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
@@ -116,7 +116,7 @@ class DmsfWorkflowsController < ApplicationController
             else
               if action.action == DmsfWorkflowStepAction::ACTION_DELEGATE
                 # Delegation
-                delegate = User.find_by_id params[:step_action].to_i / 10
+                delegate = User.find_by(id: params[:step_action].to_i / 10)
                 if DmsfMailer.get_notify_users(@project, [revision.dmsf_file], true).include?(delegate)
                   DmsfMailer.workflow_notification(
                     delegate,
@@ -126,7 +126,7 @@ class DmsfWorkflowsController < ApplicationController
                     :text_email_finished_delegated,
                     :text_email_to_proceed,
                     action.note).deliver
-                  if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+                  if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
                     flash[:warning] = l(:warning_email_notifications, :to => delegate.name)
                   end
                 end
@@ -147,7 +147,7 @@ class DmsfWorkflowsController < ApplicationController
                           :text_email_to_proceed).deliver
                       end
                     end
-                    to = User.find_by_id revision.dmsf_workflow_assigned_by
+                    to = User.find_by(id: revision.dmsf_workflow_assigned_by)
                     if to && DmsfMailer.get_notify_users(@project, [revision.dmsf_file], true).include?(to)
                       DmsfMailer.workflow_notification(
                         to,
@@ -157,7 +157,7 @@ class DmsfWorkflowsController < ApplicationController
                         :text_email_finished_step_short,
                         :text_email_to_see_status).deliver
                     end
-                    if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+                    if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
                       recipients = assignments.collect{ |a| a.user }
                       recipients << to if to
                       recipients.uniq!
@@ -190,25 +190,29 @@ class DmsfWorkflowsController < ApplicationController
         params[:dmsf_workflow_id].present? && (params[:dmsf_workflow_id] != '-1')
       # DMS file
       if params[:dmsf_file_revision_id].present? && params[:dmsf_link_id].blank? && params[:attachment_id].blank?
-        revision = DmsfFileRevision.find_by_id params[:dmsf_file_revision_id]
-        if revision
-          revision.set_workflow(params[:dmsf_workflow_id], params[:action])
-          revision.assign_workflow(params[:dmsf_workflow_id])
-          if request.post?
-            if revision.save
-              file = DmsfFile.find_by_id revision.dmsf_file_id
-              if file
-                begin
-                  file.lock!
-                rescue DmsfLockError => e
-                  Rails.logger.warn e.message
+        revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
+        begin
+          if revision
+            revision.set_workflow(params[:dmsf_workflow_id], params[:action])
+            revision.assign_workflow(params[:dmsf_workflow_id])
+            if request.post?
+              if revision.save
+                file = DmsfFile.find_by(id: revision.dmsf_file_id)
+                if file
+                  begin
+                    file.lock!
+                  rescue DmsfLockError => e
+                    Rails.logger.warn e.message
+                  end
+                  flash[:notice] = l(:notice_successful_update)
                 end
-                flash[:notice] = l(:notice_successful_update)
+              else
+                flash[:error] = l(:error_workflow_assign)
               end
-            else
-              flash[:error] = l(:error_workflow_assign)
             end
           end
+        rescue StandardError => e
+          flash[:error] = e.message
         end
         redirect_to :back
         return
@@ -249,8 +253,8 @@ class DmsfWorkflowsController < ApplicationController
     if params[:dmsf_workflow] && params[:dmsf_workflow][:name].present?
       @dmsf_workflow.name = params[:dmsf_workflow][:name]
     elsif params[:dmsf_workflow] && params[:dmsf_workflow][:id].present?
-      wf = DmsfWorkflow.find_by_id params[:dmsf_workflow][:id]
-      @dmsf_workflow.name = wf.name if wf
+      names = DmsfWorkflow.find_by(id: params[:dmsf_workflow][:id]).pluck(:name)
+      @dmsf_workflow.name = names.first
     end
 
     render :layout => !request.xhr?
@@ -258,15 +262,15 @@ class DmsfWorkflowsController < ApplicationController
 
   def create
     if params[:dmsf_workflow]
-      if (params[:dmsf_workflow][:id].to_i > 0)
-        wf = DmsfWorkflow.find_by_id params[:dmsf_workflow][:id]
+      if params[:dmsf_workflow][:id].to_i > 0
+        wf = DmsfWorkflow.find_by(id: params[:dmsf_workflow][:id])
         @dmsf_workflow = wf.copy_to(@project, params[:dmsf_workflow][:name]) if wf
       else
         @dmsf_workflow = DmsfWorkflow.new
         @dmsf_workflow.name = params[:dmsf_workflow][:name]
         @dmsf_workflow.project_id = @project.id if @project
         @dmsf_workflow.author = User.current
-        @dmsf_workflow.save
+        @dmsf_workflow.save!
       end
     end
     if request.post? && @dmsf_workflow && @dmsf_workflow.valid?
@@ -338,13 +342,13 @@ class DmsfWorkflowsController < ApplicationController
         step = params[:step].to_i
       end
       operator = (params[:commit] == l(:dmsf_and)) ? DmsfWorkflowStep::OPERATOR_AND : DmsfWorkflowStep::OPERATOR_OR
-      users = User.where(:id => params[:user_ids]).to_a
-      if users.count > 0
-        users.each do |user|
+      user_ids = User.where(id: params[:user_ids]).ids
+      if user_ids.count > 0
+        user_ids.each do |user_id|
           ws = DmsfWorkflowStep.new
           ws.dmsf_workflow_id = @dmsf_workflow.id
           ws.step = step
-          ws.user_id = user.id
+          ws.user_id = user_id
           ws.operator = operator
           ws.name = params[:name]
           if ws.save
@@ -364,7 +368,7 @@ class DmsfWorkflowsController < ApplicationController
 
   def remove_step
     if request.delete?
-      DmsfWorkflowStep.where(:dmsf_workflow_id => @dmsf_workflow.id, :step => params[:step]).each do |ws|
+      DmsfWorkflowStep.where(dmsf_workflow_id: @dmsf_workflow.id, step: params[:step]).find_each do |ws|
         @dmsf_workflow.dmsf_workflow_steps.delete(ws)
       end
       @dmsf_workflow.dmsf_workflow_steps.each do |ws|
@@ -395,7 +399,7 @@ class DmsfWorkflowsController < ApplicationController
   end
 
   def start
-    revision = DmsfFileRevision.find_by_id(params[:dmsf_file_revision_id])
+    revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
     if revision
       revision.set_workflow(@dmsf_workflow.id, params[:action])
       if revision.save
@@ -415,21 +419,21 @@ class DmsfWorkflowsController < ApplicationController
       name =  params[:dmsf_workflow][:name]
       step = @dmsf_workflow.dmsf_workflow_steps[index]
       step.name = name
-      unless step.save
-         flash[:error] = step.errors.full_messages.to_sentence
-      else
+      if step.save
         @dmsf_workflow.dmsf_workflow_steps.each do |s|
           if s.step == step.step
             s.name = step.name
-            s.save
+            s.save!
           end
         end
+      else
+        flash[:error] = step.errors.full_messages.to_sentence
       end
     end
     # Operators/Assignees
     if params[:operator_step].present?
       params[:operator_step].each do |id, operator|
-        step = DmsfWorkflowStep.find_by_id id
+        step = DmsfWorkflowStep.find_by(id: id)
         if step
           step.operator = operator.to_i
           step.user_id = params[:assignee][id]
@@ -444,14 +448,14 @@ class DmsfWorkflowsController < ApplicationController
   end
 
   def delete_step
-    step = DmsfWorkflowStep.find_by_id params[:step]
+    step = DmsfWorkflowStep.find_by(id: params[:step])
     if step
       # Safe the name
       if step.name.present?
         @dmsf_workflow.dmsf_workflow_steps.each do |s|
           if s.step == step.step
             s.name = step.name
-            s.save
+            s.save!
           end
         end
       end
@@ -468,14 +472,14 @@ private
       if @dmsf_workflow.project # Project workflow
         @project = @dmsf_workflow.project
       else # Global workflow
-        revision = DmsfFileRevision.find_by_id params[:dmsf_file_revision_id]
+        revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
         @project = revision.dmsf_file.project if revision && revision.dmsf_file
       end
     else
       if params[:dmsf_workflow]
-        @project = Project.find_by_id params[:dmsf_workflow][:project_id]
+        @project = Project.find params[:dmsf_workflow][:project_id]
       elsif params[:project_id]
-        @project = Project.find_by_id params[:project_id]
+        @project = Project.find params[:project_id]
       else
         @project = Project.find params[:id]
       end
diff --git a/app/helpers/dmsf_helper.rb b/app/helpers/dmsf_helper.rb
index 71a0da71..0f7ec4e3 100644
--- a/app/helpers/dmsf_helper.rb
+++ b/app/helpers/dmsf_helper.rb
@@ -37,8 +37,8 @@ module DmsfHelper
 
   def self.temp_filename(filename)
     filename = sanitize_filename(filename)
-    timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
-    while self.temp_dir.join("#{timestamp}_#{filename}").exist?
+    timestamp = DateTime.current.strftime('%y%m%d%H%M%S')
+    while temp_dir.join("#{timestamp}_#{filename}").exist?
       timestamp.succ!
     end
     "#{timestamp}_#{filename}"
@@ -101,16 +101,16 @@ module DmsfHelper
       User.current.allowed_to?(:display_system_folders, project)
     folders.reject{ |folder|
       if folder.system
-        unless allowed
-          true
-        else
+        if allowed
           issue_id = folder.title.to_i
           if issue_id > 0
-            issue = Issue.find_by_id issue_id
+            issue = Issue.find_by(id: issue_id)
             issue && !issue.visible?(User.current)
           else
             false
           end
+        else
+          true
         end
       else
         false
@@ -123,11 +123,11 @@ module DmsfHelper
     nodes = visible_folders(parent.dmsf_folders.visible.to_a, parent.is_a?(Project) ? parent : parent.project) + parent.dmsf_links.visible + parent.dmsf_files.visible
     # Alphabetical and type sort
     nodes.sort! do |x, y|
-      if ((x.is_a?(DmsfFolder) || (x.is_a?(DmsfLink) && x.is_folder?)) &&
-            (y.is_a?(DmsfFile) || (y.is_a?(DmsfLink) && y.is_file?)))
+      if (x.is_a?(DmsfFolder) || (x.is_a?(DmsfLink) && x.is_folder?)) &&
+            (y.is_a?(DmsfFile) || (y.is_a?(DmsfLink) && y.is_file?))
         -1
-      elsif ((x.is_a?(DmsfFile) || (x.is_a?(DmsfLink) && x.is_file?)) &&
-            (y.is_a?(DmsfFolder) || (y.is_a?(DmsfLink) && y.is_folder?)))
+      elsif (x.is_a?(DmsfFile) || (x.is_a?(DmsfLink) && x.is_file?)) &&
+            (y.is_a?(DmsfFolder) || (y.is_a?(DmsfLink) && y.is_folder?))
         1
       else
         x.title.downcase <=> y.title.downcase
diff --git a/app/helpers/dmsf_links_helper.rb b/app/helpers/dmsf_links_helper.rb
index 1c5b5919..d4e4a9bf 100644
--- a/app/helpers/dmsf_links_helper.rb
+++ b/app/helpers/dmsf_links_helper.rb
@@ -42,10 +42,10 @@ module DmsfLinksHelper
   def files_for_select(project_id, folder_id)
     files = []
     if folder_id && (folder_id != '0')
-      folder = DmsfFolder.find_by_id folder_id
+      folder = DmsfFolder.find_by(id: folder_id)
       files = folder.dmsf_files.visible.to_a if folder
     elsif project_id
-      project = Project.find_by_id project_id
+      project = Project.find_by(id: project_id)
       files = project.dmsf_files.visible.to_a if project
     end
     files
diff --git a/app/helpers/dmsf_upload_helper.rb b/app/helpers/dmsf_upload_helper.rb
index 5ba1d7c3..4c148a7e 100644
--- a/app/helpers/dmsf_upload_helper.rb
+++ b/app/helpers/dmsf_upload_helper.rb
@@ -35,15 +35,7 @@ module DmsfUploadHelper
           file = link.target_file if link
         end
 
-        unless file
-          file = DmsfFile.new
-          file.project_id = project.id
-          file.name = name
-          file.dmsf_folder = folder
-          file.notification = Setting.plugin_redmine_dmsf['dmsf_default_notifications'].present?
-          new_revision.minor_version = 0
-          new_revision.major_version = 0
-        else
+        if file
           if file.last_revision
             last_revision = file.last_revision
             new_revision.source_revision = last_revision
@@ -53,6 +45,14 @@ module DmsfUploadHelper
             new_revision.minor_version = 0
             new_revision.major_version = 0
           end
+        else
+          file = DmsfFile.new
+          file.project_id = project.id
+          file.name = name
+          file.dmsf_folder = folder
+          file.notification = Setting.plugin_redmine_dmsf['dmsf_default_notifications'].present?
+          new_revision.minor_version = 0
+          new_revision.major_version = 0
         end
 
         if file.locked_for_user?
@@ -117,7 +117,7 @@ module DmsfUploadHelper
         end
         # Approval workflow
         if commited_file[:workflow_id].present?
-          wf = DmsfWorkflow.find_by_id commited_file[:workflow_id]
+          wf = DmsfWorkflow.find_by(id: commited_file[:workflow_id])
           if wf
             # Assign the workflow
             new_revision.set_workflow(wf.id, 'assign')
@@ -138,13 +138,13 @@ module DmsfUploadHelper
         end
       end
       # Notifications
-      if ((folder && folder.notification?) || (!folder && project.dmsf_notification?))
+      if (folder && folder.notification?) || (!folder && project.dmsf_notification?)
         begin
           recipients = DmsfMailer.get_notify_users(project, files)
           recipients.each do |u|
             DmsfMailer.files_updated(u, project, files).deliver
           end
-          if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+          if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
             unless recipients.empty?
               to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
               to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
diff --git a/app/helpers/dmsf_workflows_helper.rb b/app/helpers/dmsf_workflows_helper.rb
index a1445c84..01509f6c 100644
--- a/app/helpers/dmsf_workflows_helper.rb
+++ b/app/helpers/dmsf_workflows_helper.rb
@@ -38,9 +38,11 @@ module DmsfWorkflowsHelper
         :class => 'objects-selection')
     end
 
-    links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) {|text, parameters, options|
-      link_to text, autocomplete_for_user_dmsf_workflow_path(workflow, parameters.merge(:q => params[:q], :format => 'js')), :remote => true
-    }
+    links = pagination_links_full(principal_pages, principal_count, :per_page_links => false) do |text, parameters, options|
+      link_to text,
+              autocomplete_for_user_dmsf_workflow_path(workflow, parameters.merge(:q => params[:q], :format => 'js')),
+              remote: true
+    end
 
     s + content_tag('span', links, :class => 'pagination')
   end
@@ -72,7 +74,7 @@ module DmsfWorkflowsHelper
     options << ['', 0]
     DmsfWorkflow.active.sorted.all.each do |wf|
       if wf.project_id
-        prj = Project.find_by_id wf.project_id
+        prj = Project.find_by(id: wf.project_id)
         if User.current.allowed_to?(:manage_workflows, prj)
           # Local approval workflows
           if prj
diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 8f4b9f3c..2917abd5 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -37,7 +37,7 @@ class DmsfFile < ActiveRecord::Base
   belongs_to :dmsf_folder
   belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id'
 
-  has_many :dmsf_file_revisions, -> { order("#{DmsfFileRevision.table_name}.id DESC") },
+  has_many :dmsf_file_revisions, -> { order("#{DmsfFileRevision.table_name}.created_at DESC") },
     :dependent => :destroy
   has_many :locks, -> { where(entity_type: 0).order("#{DmsfLock.table_name}.updated_at DESC") },
     :class_name => 'DmsfLock', :foreign_key => 'entity_id', :dependent => :destroy
@@ -48,18 +48,13 @@ class DmsfFile < ActiveRecord::Base
   STATUS_DELETED = 1
   STATUS_ACTIVE = 0
 
-  scope :visible, -> { where(:deleted => STATUS_ACTIVE) }
-  scope :deleted, -> { where(:deleted => STATUS_DELETED) }
+  scope :visible, -> { where(deleted: STATUS_ACTIVE) }
+  scope :deleted, -> { where(deleted: STATUS_DELETED) }
 
-  validates_presence_of  :name, :project
-  validates_format_of :name, :with => /\A[^#{DmsfFolder::INVALID_CHARACTERS}]*\z/,
-    :message => l(:error_contains_invalid_character)
-  validate :validates_name_uniqueness
-
-  def validates_name_uniqueness
-    existing_file = DmsfFile.select(:id).findn_file_by_name(self.project_id, self.dmsf_folder, self.name)
-    errors.add(:name, l('activerecord.errors.messages.taken')) unless (existing_file.nil? || existing_file.id == self.id)
-  end
+  validates :name, presence: true, dmsf_file_name: true
+  validates :project, presence: true
+  validates_uniqueness_of :name, :scope => [:dmsf_folder_id, :project_id, :deleted],
+    conditions: -> { where(deleted: STATUS_ACTIVE) }
 
   acts_as_event :title => Proc.new { |o| o.name },
                 :description => Proc.new { |o|
@@ -85,7 +80,7 @@ class DmsfFile < ActiveRecord::Base
   before_create :default_values
 
   def default_values
-    if (Setting.plugin_redmine_dmsf['dmsf_default_notifications'] == '1') && (!self.dmsf_folder || !self.dmsf_folder.system)
+    if (Setting.plugin_redmine_dmsf['dmsf_default_notifications'] == '1') && (!dmsf_folder || !dmsf_folder.system)
       self.notification = true
     end
   end
@@ -107,19 +102,19 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def self.find_file_by_name(project, folder, name)
-    self.findn_file_by_name(project.id, folder, name)
+    findn_file_by_name(project.id, folder, name)
   end
 
   def self.findn_file_by_name(project_id, folder, name)
     where(
-      :project_id => project_id,
-      :dmsf_folder_id => folder ? folder.id : nil,
-      :name => name).visible.first
+      project_id: project_id,
+      dmsf_folder_id: folder ? folder.id : nil,
+      name: name).visible.first
   end
 
   def last_revision
     unless defined?(@last_revision)
-      @last_revision = self.deleted? ? self.dmsf_file_revisions.first : self.dmsf_file_revisions.visible.first
+      @last_revision = deleted? ? dmsf_file_revisions.first : dmsf_file_revisions.visible.first
     end
     @last_revision
   end
@@ -129,14 +124,14 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def deleted?
-    self.deleted == STATUS_DELETED
+    deleted == STATUS_DELETED
   end
 
   def delete(commit)
-    if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, self.project))
+    if locked_for_user? && (!User.current.allowed_to?(:force_file_unlock, project))
       Rails.logger.info l(:error_file_is_locked)
-      if self.lock.reverse[0].user
-        errors[:base] << l(:title_locked_by_user, :user => self.lock.reverse[0].user)
+      if lock.reverse[0].user
+        errors[:base] << l(:title_locked_by_user, :user => lock.reverse[0].user)
       else
         errors[:base] << l(:error_file_is_locked)
       end
@@ -144,12 +139,12 @@ class DmsfFile < ActiveRecord::Base
     end
     begin
       # Revisions and links of a deleted file SHOULD be deleted too
-      self.dmsf_file_revisions.each { |r| r.delete(commit, true) }
+      dmsf_file_revisions.each { |r| r.delete(commit, true) }
       if commit
-        if self.container.is_a?(Issue)
-          self.container.dmsf_file_removed(self)
+        if container.is_a?(Issue)
+          container.dmsf_file_removed(self)
         end
-        self.destroy
+        destroy
       else
         self.deleted = STATUS_DELETED
         self.deleted_by_user = User.current
@@ -163,61 +158,61 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def restore
-    if self.dmsf_folder_id && (self.dmsf_folder.nil? || self.dmsf_folder.deleted?)
+    if dmsf_folder_id && (dmsf_folder.nil? || dmsf_folder.deleted?)
       errors[:base] << l(:error_parent_folder)
       return false
     end
-    self.dmsf_file_revisions.each { |r| r.restore }
+    dmsf_file_revisions.each { |r| r.restore }
     self.deleted = STATUS_ACTIVE
     self.deleted_by_user = nil
     save
   end
 
   def title
-    self.last_revision ? self.last_revision.title : self.name
+    last_revision ? last_revision.title : name
   end
 
   def description
-    self.last_revision ? self.last_revision.description : ''
+    last_revision ? last_revision.description : ''
   end
 
   def version
-    self.last_revision ? self.last_revision.version : '0'
+    last_revision ? last_revision.version : '0'
   end
 
   def workflow
-    self.last_revision ? self.last_revision.workflow : nil
+    last_revision ? last_revision.workflow : nil
   end
 
   def size
-    self.last_revision ? self.last_revision.size : 0
+    last_revision ? last_revision.size : 0
   end
 
   def dmsf_path
-    path = self.dmsf_folder ? self.dmsf_folder.dmsf_path : []
+    path = dmsf_folder ? dmsf_folder.dmsf_path : []
     path.push(self)
     path
   end
 
   def dmsf_path_str
-    self.dmsf_path.map { |element| element.title }.join('/')
+    dmsf_path.map { |element| element.title }.join('/')
   end
 
   def notify?
-    return true if self.notification
-    return true if self.dmsf_folder && self.dmsf_folder.notify?
-    return true if !self.dmsf_folder && self.project.dmsf_notification
-    return false
+    return true if notification
+    return true if dmsf_folder && dmsf_folder.notify?
+    return true if !dmsf_folder && project.dmsf_notification
+    false
   end
 
   def notify_deactivate
     self.notification = nil
-    self.save!
+    save!
   end
 
   def notify_activate
     self.notification = true
-    self.save!
+    save!
   end
 
   # Returns an array of projects that current user can copy file to
@@ -235,26 +230,26 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def move_to(project, folder)
-    if self.locked_for_user?
+    if locked_for_user?
       errors[:base] << l(:error_file_is_locked)
       return false
     end
-    source = "#{self.project.identifier}:#{self.dmsf_path_str}"
+    source = "#{project.identifier}:#{dmsf_path_str}"
     self.project_id = project.id
     self.dmsf_folder = folder
-    new_revision = self.last_revision.clone
+    new_revision = last_revision.clone
     new_revision.dmsf_file = self
     new_revision.comment = l(:comment_moved_from, :source => source)
     new_revision.custom_values = []
-    self.last_revision.custom_values.each do |cv|
+    last_revision.custom_values.each do |cv|
       new_revision.custom_values << CustomValue.new({:custom_field => cv.custom_field, :value => cv.value})
     end
-    self.set_last_revision(new_revision)
-    self.save && new_revision.save
+    set_last_revision(new_revision)
+    save && new_revision.save
   end
 
   def copy_to(project, folder = nil)
-    copy_to_filename(project, folder, self.name)
+    copy_to_filename(project, folder, name)
   end
   
   def copy_to_filename(project, folder, filename)
@@ -263,8 +258,8 @@ class DmsfFile < ActiveRecord::Base
     file.project_id = project.id
     file.name = filename
     file.notification = Setting.plugin_redmine_dmsf['dmsf_default_notifications'].present?
-    if file.save && self.last_revision
-      new_revision = self.last_revision.clone
+    if file.save && last_revision
+      new_revision = last_revision.clone
       new_revision.dmsf_file = file
       new_revision.disk_filename = new_revision.new_storage_filename
       # Assign the same workflow if it's a global one or we are in the same project
@@ -279,23 +274,23 @@ class DmsfFile < ActiveRecord::Base
         new_revision.set_workflow(wf.id, nil)
         new_revision.assign_workflow(wf.id)
       end
-      if File.exist? self.last_revision.disk_file
-        FileUtils.cp self.last_revision.disk_file, new_revision.disk_file(false)
+      if File.exist? last_revision.disk_file
+        FileUtils.cp last_revision.disk_file, new_revision.disk_file(false)
       end
-      new_revision.comment = l(:comment_copied_from, :source => "#{project.identifier}: #{self.dmsf_path_str}")
+      new_revision.comment = l(:comment_copied_from, :source => "#{project.identifier}: #{dmsf_path_str}")
       new_revision.custom_values = []
-      self.last_revision.custom_values.each do |cv|
+      last_revision.custom_values.each do |cv|
         v = CustomValue.new
         v.custom_field = cv.custom_field
         v.value = cv.value
         new_revision.custom_values << v
       end
-      unless new_revision.save
+      if new_revision.save
+        file.set_last_revision new_revision
+      else
         Rails.logger.error new_revision.errors.full_messages.to_sentence
         file.delete(true)
         file = nil
-      else
-        file.set_last_revision new_revision
       end
     else
       Rails.logger.error file.errors.full_messages.to_sentence
@@ -330,7 +325,7 @@ class DmsfFile < ActiveRecord::Base
     project_conditions << Project.allowed_to_condition(user, :view_dmsf_files)
     project_conditions << "#{Project.table_name}.id IN (#{project_ids.join(',')})" if project_ids.present?
 
-    scope = self.visible.joins('JOIN dmsf_file_revisions ON dmsf_file_revisions.dmsf_file_id = dmsf_files.id').joins(:project)
+    scope = visible.joins('JOIN dmsf_file_revisions ON dmsf_file_revisions.dmsf_file_id = dmsf_files.id').joins(:project)
     scope = scope.limit(options[:limit]) unless options[:limit].blank?
     scope = scope.where(limit_options) unless limit_options.blank?
     scope = scope.where(project_conditions.join(' AND '))
@@ -377,7 +372,7 @@ class DmsfFile < ActiveRecord::Base
         end
 
         flags = Xapian::QueryParser::FLAG_WILDCARD
-        flags |= Xapian::QueryParser::FLAG_CJK_NGRAM if Setting.plugin_redmine_dmsf['enable_cjk_ngrams']
+        flags |= Xapian::QueryParser::FLAG_CJK_NGRAM if Setting.plugin_redmine_dmsf['dmsf_enable_cjk_ngrams']
 
         query = qp.parse_query(query_string, flags)
 
@@ -396,7 +391,7 @@ class DmsfFile < ActiveRecord::Base
               next if dmsf_attrs.length == 0 || id_attribute == 0
               next unless results.select{|f| f.id.to_s == id_attribute}.empty?
 
-              dmsf_file = DmsfFile.visible.where(limit_options).where(:id => id_attribute).first
+              dmsf_file = DmsfFile.visible.where(limit_options).where(id: id_attribute).first
 
               if dmsf_file && DmsfFolder.permissions?(dmsf_file.dmsf_folder)
                 if user.allowed_to?(:view_dmsf_files, dmsf_file.project) &&
@@ -417,12 +412,12 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def self.search_result_ranks_and_ids(tokens, user = User.current, projects = nil, options = {})
-    r = self.search(tokens, projects, options, user)[0]
+    r = search(tokens, projects, options, user)[0]
     r.map{ |f| [f.updated_at.to_i, f.id]}
   end
 
   def display_name
-    member = Member.where(:user_id => User.current.id, :project_id => self.project_id).first
+    member = Member.where(user_id: User.current.id, project_id: project_id).first
     if member && !member.dmsf_title_format.nil? && !member.dmsf_title_format.empty?
       title_format = member.dmsf_title_format
     else
@@ -436,27 +431,27 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def text?
-    self.last_revision && Redmine::MimeType.is_type?('text', self.last_revision.disk_filename)
+    last_revision && Redmine::MimeType.is_type?('text', last_revision.disk_filename)
   end
 
   def image?
-    self.last_revision && Redmine::MimeType.is_type?('image', self.last_revision.disk_filename)
+    last_revision && Redmine::MimeType.is_type?('image', last_revision.disk_filename)
   end
 
   def pdf?
-    self.last_revision && (Redmine::MimeType.of(self.last_revision.disk_filename) == 'application/pdf')
+    last_revision && (Redmine::MimeType.of(last_revision.disk_filename) == 'application/pdf')
   end
 
 
   def disposition
-    (self.image? || self.pdf?) ? 'inline' : 'attachment'
+    (image? || pdf?) ? 'inline' : 'attachment'
   end
 
   def preview(limit)
     result = 'No preview available'
-    if self.text?
+    if text?
       begin
-        f = File.new(self.last_revision.disk_file)
+        f = File.new(last_revision.disk_file)
         f.each_line do |line|
           case f.lineno
             when 1
@@ -475,10 +470,10 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def formatted_name(format)
-    if self.last_revision
-      self.last_revision.formatted_name(format)
+    if last_revision
+      last_revision.formatted_name(format)
     else
-      self.name
+      name
     end
   end
 
@@ -503,7 +498,7 @@ class DmsfFile < ActiveRecord::Base
   end
 
   def custom_value(custom_field)
-    self.last_revision.custom_field_values.each do |cv|
+    last_revision.custom_field_values.each do |cv|
       if cv.custom_field == custom_field
         if cv.value.is_a? Array
           return cv.value.reject{ |x| x.empty? }.join(',')
@@ -525,51 +520,51 @@ class DmsfFile < ActiveRecord::Base
   def to_csv(columns, level)
     csv = []
     # Project
-    csv << self.project.name if columns.include?(l(:field_project))
+    csv << project.name if columns.include?(l(:field_project))
     # Id
-    csv << self.id if columns.include?('id')
+    csv << id if columns.include?('id')
     # Title
-    csv << self.title.insert(0, '  ' * level) if columns.include?('title')
+    csv << title.insert(0, '  ' * level) if columns.include?('title')
     # Extension
-    csv << self.extension if columns.include?('extension')
+    csv << extension if columns.include?('extension')
     # Size
-    csv << number_to_human_size(self.last_revision.size) if columns.include?('size')
+    csv << number_to_human_size(last_revision.size) if columns.include?('size')
     # Modified
     if columns.include?('modified')
-      if self.last_revision
-        csv << format_time(self.last_revision.updated_at)
+      if last_revision
+        csv << format_time(last_revision.updated_at)
       else
         csv << ''
       end
     end
     # Version
     if columns.include?('version')
-      if self.last_revision
-        csv << self.last_revision.version
+      if last_revision
+        csv << last_revision.version
       else
         csv << ''
       end
     end
     # Workflow
     if columns.include?('workflow')
-      if self.last_revision
-        csv << self.last_revision.workflow_str(false)
+      if last_revision
+        csv << last_revision.workflow_str(false)
       else
         csv << ''
       end
     end
     # Author
     if columns.include?('author')
-      if self.last_revision && self.last_revision.user
-        csv << self.last_revision.user.name
+      if last_revision && last_revision.user
+        csv << last_revision.user.name
       else
         csv << ''
       end
     end
     # Last approver
     if columns.include?(l(:label_last_approver))
-      if self.last_revision && self.last_revision.dmsf_workflow
-        csv << self.last_revision.workflow_tooltip
+      if last_revision && last_revision.dmsf_workflow
+        csv << last_revision.workflow_tooltip
       else
         csv << ''
       end
@@ -577,20 +572,19 @@ class DmsfFile < ActiveRecord::Base
     # Url
     if columns.include?(l(:label_document_url))
       default_url_options[:host] = Setting.host_name
-      csv << url_for(:controller => :dmsf_files, :action => 'view', :id => self.id)
+      csv << url_for(:controller => :dmsf_files, :action => 'view', :id => id)
     end
     # Revision
     if columns.include?(l(:label_last_revision_id))
-      if self.last_revision
-        csv << self.last_revision.id
+      if last_revision
+        csv << last_revision.id
       else
         csv << ''
       end
     end
     # Custom fields
-    cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position)
-    cfs.each do |c|
-      csv << self.custom_value(c) if columns.include?(c.name)
+    CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c|
+      csv << custom_value(c) if columns.include?(c.name)
     end
     csv
   end
@@ -607,21 +601,21 @@ class DmsfFile < ActiveRecord::Base
         size = Setting.thumbnails_size.to_i
       end
       size = 100 unless size > 0
-      target = File.join(Attachment.thumbnails_storage_path, "#{self.id}_#{self.last_revision.digest}_#{size}.thumb")
+      target = File.join(Attachment.thumbnails_storage_path, "#{id}_#{last_revision.digest}_#{size}.thumb")
 
       begin
-        Redmine::Thumbnail.generate(self.last_revision.disk_file.to_s, target, size)
+        Redmine::Thumbnail.generate(last_revision.disk_file.to_s, target, size)
       rescue => e
-        Rails.logger.error "An error occured while generating thumbnail for #{self.last_revision.disk_file} to #{target}\nException was: #{e.message}"
-        return nil
+        Rails.logger.error "An error occured while generating thumbnail for #{last_revision.disk_file} to #{target}\nException was: #{e.message}"
+        nil
       end
     end
   end
 
   def get_locked_title
-    if self.locked_for_user?
-      if self.lock.reverse[0].user
-        return l(:title_locked_by_user, :user => self.lock.reverse[0].user)
+    if locked_for_user?
+      if lock.reverse[0].user
+        return l(:title_locked_by_user, :user => lock.reverse[0].user)
       else
         return l(:notice_account_unknown_email)
       end
@@ -631,8 +625,8 @@ class DmsfFile < ActiveRecord::Base
 
   def container
     unless @container
-      if self.dmsf_folder && self.dmsf_folder.system
-        @container = Issue.where(:id => self.dmsf_folder.title.to_i).first
+      if dmsf_folder && dmsf_folder.system
+        @container = Issue.find_by(id: dmsf_folder.title.to_i)
       end
     end
     @container
diff --git a/app/models/dmsf_file_revision.rb b/app/models/dmsf_file_revision.rb
index aad5c06c..b991b2e7 100644
--- a/app/models/dmsf_file_revision.rb
+++ b/app/models/dmsf_file_revision.rb
@@ -48,8 +48,8 @@ class DmsfFileRevision < ActiveRecord::Base
     'application/vnd.oasis.opendocument.presentation' => 'ms-powerpoint',
   }.freeze
 
-  scope :visible, -> { where(:deleted => STATUS_ACTIVE) }
-  scope :deleted, -> { where(:deleted => STATUS_DELETED) }
+  scope :visible, -> { where(deleted: STATUS_ACTIVE) }
+  scope :deleted, -> { where(deleted: STATUS_DELETED) }
 
   acts_as_customizable
   acts_as_event :title => Proc.new {|o| "#{l(:label_dmsf_updated)}: #{o.dmsf_file.dmsf_path_str}"},
@@ -65,17 +65,19 @@ class DmsfFileRevision < ActiveRecord::Base
     :scope => DmsfFileRevision.joins(:dmsf_file).
       joins("JOIN #{Project.table_name} ON #{Project.table_name}.id = #{DmsfFile.table_name}.project_id").visible
 
-  validates_presence_of  :title, :major_version, :minor_version, :dmsf_file
-  validates_format_of :name, :with => /\A[^#{DmsfFolder::INVALID_CHARACTERS}]*\z/,
-    :message => l(:error_contains_invalid_character)
+  validates :title, presence: true
+  validates :major_version, presence: true
+  validates :minor_version, presence: true
+  validates :dmsf_file, presence: true
+  validates :name, dmsf_file_name: true
   validates :description, length: { maximum: 1.kilobyte }
 
   def project
-    self.dmsf_file.project if self.dmsf_file
+    dmsf_file.project if dmsf_file
   end
 
   def folder
-    self.dmsf_file.dmsf_folder if self.dmsf_file
+    dmsf_file.dmsf_folder if dmsf_file
   end
 
   def self.remove_extension(filename)
@@ -87,21 +89,21 @@ class DmsfFileRevision < ActiveRecord::Base
   end
  
   def self.easy_activity_custom_project_scope(scope, options, event_type)
-    scope.where(:dmsf_files => { :project_id => options[:project_ids] })
+    scope.where(:dmsf_files => { project_id: options[:project_ids] })
   end
 
   def delete(commit = false, force = true)
-    if self.dmsf_file.locked_for_user?
+    if dmsf_file.locked_for_user?
       errors[:base] << l(:error_file_is_locked)
       return false
     end
-    if !commit && (!force && (self.dmsf_file.dmsf_file_revisions.length <= 1))
+    if !commit && (!force && (dmsf_file.dmsf_file_revisions.length <= 1))
       errors[:base] << l(:error_at_least_one_revision_must_be_present)
       return false
     end
 
     if commit
-      self.destroy
+      destroy
     else
       self.deleted = DmsfFile::STATUS_DELETED
       self.deleted_by_user = User.current
@@ -109,8 +111,8 @@ class DmsfFileRevision < ActiveRecord::Base
     end
   end
 
-  def obsolete()
-    if self.dmsf_file.locked_for_user?
+  def obsolete
+    if dmsf_file.locked_for_user?
       errors[:base] << l(:error_file_is_locked)
       return false
     end
@@ -125,14 +127,13 @@ class DmsfFileRevision < ActiveRecord::Base
   end
 
   def destroy
-    dependent = DmsfFileRevision.where(:source_dmsf_file_revision_id => self.id).all
-    dependent.each do |d|
-      d.source_revision = self.source_revision
+    DmsfFileRevision.where(source_dmsf_file_revision_id: id).find_each do |d|
+      d.source_revision = source_revision
       d.save!
     end
     if Setting.plugin_redmine_dmsf['dmsf_really_delete_files']
-      dependencies = DmsfFileRevision.where(:disk_filename => self.disk_filename).count
-      File.delete(self.disk_file) if dependencies <= 1 && File.exist?(self.disk_file)
+      dependencies = DmsfFileRevision.where(disk_filename: disk_filename).all.size
+      File.delete(disk_file) if dependencies <= 1 && File.exist?(disk_file)
     end
     super
   end
@@ -149,35 +150,34 @@ class DmsfFileRevision < ActiveRecord::Base
   #   custom SQL into a temporary object
   #
   def access_grouped
-    self.dmsf_file_revision_access.select('user_id, COUNT(*) AS count, MIN(created_at) AS first_at, MAX(created_at) AS last_at').group('user_id')
+    dmsf_file_revision_access.select('user_id, COUNT(*) AS count, MIN(created_at) AS first_at, MAX(created_at) AS last_at').group('user_id')
   end
 
   def version
-    ver = DmsfUploadHelper::gui_version(self.major_version).to_s
-    if -self.minor_version != ' '.ord
-      ver << ".#{DmsfUploadHelper::gui_version(self.minor_version)}"
+    ver = DmsfUploadHelper::gui_version(major_version).to_s
+    if -minor_version != ' '.ord
+      ver << ".#{DmsfUploadHelper::gui_version(minor_version)}"
     end
     ver
   end
   
   def storage_base_path
-    time = self.created_at || DateTime.now
+    time = created_at || DateTime.current
     DmsfFile.storage_path.join(time.strftime('%Y')).join(time.strftime('%m'))
   end
 
   def disk_file(search_if_not_exists = true)
-    path = self.storage_base_path
+    path = storage_base_path
     begin
       FileUtils.mkdir_p(path) unless File.exist?(path)
     rescue StandardError => e
       Rails.logger.error e.message
     end
-    filename = path.join(self.disk_filename)
+    filename = path.join(disk_filename)
     if search_if_not_exists
       unless File.exist?(filename)
         # Let's search for the physical file in source revisions
-        revisions = self.dmsf_file.dmsf_file_revisions.where(['id < ?', self.id]).order(:id => :desc)
-        revisions.each do |rev|
+        dmsf_file.dmsf_file_revisions.where(['id < ?', id]).order(created_at: :desc).each do |rev|
           filename = rev.disk_file
           break if File.exist?(filename)
         end
@@ -187,45 +187,45 @@ class DmsfFileRevision < ActiveRecord::Base
   end
 
   def new_storage_filename
-    raise DmsfAccessError, 'File id is not set' unless self.dmsf_file.id
-    filename = DmsfHelper.sanitize_filename(self.name)
-    timestamp = DateTime.now.strftime("%y%m%d%H%M%S")
-    while File.exist?(storage_base_path.join("#{timestamp}_#{self.dmsf_file.id}_#{filename}"))
+    raise DmsfAccessError, 'File id is not set' unless dmsf_file.id
+    filename = DmsfHelper.sanitize_filename(name)
+    timestamp = DateTime.current.strftime('%y%m%d%H%M%S')
+    while File.exist?(storage_base_path.join("#{timestamp}_#{dmsf_file.id}_#{filename}"))
       timestamp.succ!
     end
-    "#{timestamp}_#{self.dmsf_file.id}_#{filename}"
+    "#{timestamp}_#{dmsf_file.id}_#{filename}"
   end
 
   def detect_content_type
-    content_type = self.mime_type
-    content_type = Redmine::MimeType.of(self.disk_filename) if content_type.blank?
+    content_type = mime_type
+    content_type = Redmine::MimeType.of(disk_filename) if content_type.blank?
     content_type = 'application/octet-stream' if content_type.blank?
     content_type.to_s
   end
 
   def clone
     new_revision = DmsfFileRevision.new
-    new_revision.dmsf_file = self.dmsf_file
-    new_revision.disk_filename = self.disk_filename
-    new_revision.size = self.size
-    new_revision.mime_type = self.mime_type
-    new_revision.title = self.title
-    new_revision.description = self.description
-    new_revision.workflow = self.workflow
-    new_revision.major_version = self.major_version
-    new_revision.minor_version = self.minor_version
+    new_revision.dmsf_file = dmsf_file
+    new_revision.disk_filename = disk_filename
+    new_revision.size = size
+    new_revision.mime_type = mime_type
+    new_revision.title = title
+    new_revision.description = description
+    new_revision.workflow = workflow
+    new_revision.major_version = major_version
+    new_revision.minor_version = minor_version
     new_revision.source_revision = self
     new_revision.user = User.current
-    new_revision.name = self.name
-    new_revision.digest = self.digest
+    new_revision.name = name
+    new_revision.digest = digest
     new_revision
   end
 
   def workflow_str(name)
     str = ''
     if name && dmsf_workflow_id
-      wf = DmsfWorkflow.find_by_id(dmsf_workflow_id)
-      str = "#{wf.name} - " if wf
+      names = DmsfWorkflow.find_by(id: dmsf_workflow_id).pluck(:name)
+      str = "#{names.first} - " if names.any?
     end
     case workflow
       when DmsfWorkflow::STATE_WAITING_FOR_APPROVAL
@@ -248,38 +248,38 @@ class DmsfFileRevision < ActiveRecord::Base
     if commit == 'start'
       self.workflow = DmsfWorkflow::STATE_WAITING_FOR_APPROVAL
       self.dmsf_workflow_started_by = User.current.id if User.current
-      self.dmsf_workflow_started_at = DateTime.now
+      self.dmsf_workflow_started_at = DateTime.current
     else
       self.workflow = DmsfWorkflow::STATE_ASSIGNED
       self.dmsf_workflow_assigned_by = User.current.id if User.current
-      self.dmsf_workflow_assigned_at = DateTime.now
+      self.dmsf_workflow_assigned_at = DateTime.current
     end
   end
 
   def assign_workflow(dmsf_workflow_id)
-    wf = DmsfWorkflow.find_by_id(dmsf_workflow_id)
+    wf = DmsfWorkflow.find_by(id: dmsf_workflow_id)
     wf.assign(self.id) if wf && self.id
   end
 
   def increase_version(version_to_increase)
     self.minor_version = case version_to_increase
       when 1
-        DmsfUploadHelper.increase_version(self.minor_version, 1)
+        DmsfUploadHelper.increase_version(minor_version, 1)
       when 2
-        (self.major_version < 0) ? -(' '.ord) : 0
+        (major_version < 0) ? -(' '.ord) : 0
       else
-        self.minor_version
+        minor_version
     end
     self.major_version = case version_to_increase
       when 2
-        DmsfUploadHelper::increase_version(self.major_version, 1)
+        DmsfUploadHelper::increase_version(major_version, 1)
       else
         major_version
     end
   end
 
   def copy_file_content(open_file)
-    File.open(self.disk_file(false), 'wb') do |f|
+    File.open(disk_file(false), 'wb') do |f|
       while (buffer = open_file.read(8192))
         f.write(buffer)
       end
@@ -292,25 +292,25 @@ class DmsfFileRevision < ActiveRecord::Base
   end
 
   def iversion
-    parts = self.version.split '.'
+    parts = version.split '.'
     parts.size == 2 ? parts[0].to_i * 1000 + parts[1].to_i : 0
   end
 
   def formatted_name(format)
-    return self.name if format.blank?
-    if self.name =~ /(.*)(\..*)$/
+    return name if format.blank?
+    if name =~ /(.*)(\..*)$/
       filename = $1
       ext = $2
     else
-      filename = self.name
+      filename = name
     end
     format2 = format.dup
-    format2.sub!('%t', self.title)
+    format2.sub!('%t', title)
     format2.sub!('%f', filename)
-    format2.sub!('%d', self.updated_at.strftime('%Y%m%d%H%M%S'))
-    format2.sub!('%v', self.version)
-    format2.sub!('%i', self.dmsf_file.id.to_s)
-    format2.sub!('%r', self.id.to_s)
+    format2.sub!('%d', updated_at.strftime('%Y%m%d%H%M%S'))
+    format2.sub!('%v', version)
+    format2.sub!('%i', dmsf_file.id.to_s)
+    format2.sub!('%r', id.to_s)
     format2 += ext if ext
     format2
   end
@@ -325,33 +325,33 @@ class DmsfFileRevision < ActiveRecord::Base
   end
 
   def create_digest
-    self.digest = DmsfFileRevision.create_digest(self.disk_file)
+    self.digest = DmsfFileRevision.create_digest(disk_file)
   end
 
   # Returns either MD5 or SHA256 depending on the way self.digest was computed
   def digest_type
-    self.digest.size < 64 ? 'MD5' : 'SHA256' if digest.present?
+    digest.size < 64 ? 'MD5' : 'SHA256' if digest.present?
   end
 
   def tooltip
-    if self.description.present?
-      text = self.description
+    if description.present?
+      text = description
     else
       text = ''
     end
-    if self.comment.present?
+    if comment.present?
       text += ' / ' if text.present?
-      text += self.comment
+      text += comment
     end
     ActionView::Base.full_sanitizer.sanitize(text)
   end
 
   def workflow_tooltip
     tooltip = ''
-    if self.dmsf_workflow
+    if dmsf_workflow
       case workflow
         when DmsfWorkflow::STATE_WAITING_FOR_APPROVAL, DmsfWorkflow::STATE_ASSIGNED
-          assignments = self.dmsf_workflow.next_assignments(self.id)
+          assignments = dmsf_workflow.next_assignments(id)
           if assignments
             assignments.each_with_index do |assignment, index|
               tooltip << ', ' if index > 0
@@ -360,8 +360,8 @@ class DmsfFileRevision < ActiveRecord::Base
           end
         when DmsfWorkflow::STATE_APPROVED, DmsfWorkflow::STATE_REJECTED
           action = DmsfWorkflowStepAction.joins(:dmsf_workflow_step_assignment).where(
-            :dmsf_workflow_step_assignments => { :dmsf_file_revision_id => self.id }).order(
-            'dmsf_workflow_step_actions.id').last
+            :dmsf_workflow_step_assignments => { :dmsf_file_revision_id => id }).order(
+            'dmsf_workflow_step_actions.created_at').last
           tooltip << action.author.name if action
       end
     end
@@ -370,7 +370,7 @@ class DmsfFileRevision < ActiveRecord::Base
 
   def protocol
     unless @protocol
-      @protocol = PROTOCOLS[self.mime_type]
+      @protocol = PROTOCOLS[mime_type]
     end
     @protocol
   end
diff --git a/app/models/dmsf_file_revision_access.rb b/app/models/dmsf_file_revision_access.rb
index 928a1a26..eca301b8 100644
--- a/app/models/dmsf_file_revision_access.rb
+++ b/app/models/dmsf_file_revision_access.rb
@@ -26,7 +26,7 @@ class DmsfFileRevisionAccess < ActiveRecord::Base
   delegate :dmsf_file, :to => :dmsf_file_revision, :allow_nil => false
   delegate :project, :to => :dmsf_file, :allow_nil => false
 
-  validates_presence_of :dmsf_file_revision
+  validates :dmsf_file_revision, presence: true
 
   DownloadAction = 0
   EmailAction = 1
@@ -44,5 +44,5 @@ class DmsfFileRevisionAccess < ActiveRecord::Base
     :scope => DmsfFileRevisionAccess.
       joins(:dmsf_file_revision).joins("JOIN #{DmsfFile.table_name} ON dmsf_files.id = dmsf_file_revisions.dmsf_file_id").
       joins("JOIN #{Project.table_name} on dmsf_files.project_id = projects.id").
-      where(:dmsf_files => { :deleted => DmsfFile::STATUS_ACTIVE })
+      where(:dmsf_files => { deleted: DmsfFile::STATUS_ACTIVE })
 end
diff --git a/app/models/dmsf_file_revision_custom_field.rb b/app/models/dmsf_file_revision_custom_field.rb
index 2185d4a2..f25f0873 100644
--- a/app/models/dmsf_file_revision_custom_field.rb
+++ b/app/models/dmsf_file_revision_custom_field.rb
@@ -35,7 +35,7 @@ class DmsfFileRevisionCustomField < CustomField
           return true
         end
       end
-      return false
+      false
     else
       x == y
     end
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 65af4554..ad281cf0 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -30,14 +30,14 @@ class DmsfFolder < ActiveRecord::Base
 
   has_many :dmsf_folders, -> { order :title }, :dependent => :destroy
   has_many :dmsf_files, :dependent => :destroy
-  has_many :folder_links, -> { where(:target_type => 'DmsfFolder').order(:name) },
+  has_many :folder_links, -> { where(target_type: 'DmsfFolder').order(:name) },
     :class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy
-  has_many :file_links, -> { where :target_type => 'DmsfFile' },
+  has_many :file_links, -> { where(target_type: 'DmsfFile') },
     :class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy
-  has_many :url_links, -> { where :target_type => 'DmsfUrl' },
+  has_many :url_links, -> { where(target_type: 'DmsfUrl') },
     :class_name => 'DmsfLink', :foreign_key => 'dmsf_folder_id', :dependent => :destroy
   has_many :dmsf_links, :dependent => :destroy
-  has_many :referenced_links, -> { where :target_type => 'DmsfFolder' },
+  has_many :referenced_links, -> { where(target_type: 'DmsfFolder') },
     :class_name => 'DmsfLink', :foreign_key => 'target_id', :dependent => :destroy
   has_many :locks, -> { where(entity_type:  1).order("#{DmsfLock.table_name}.updated_at DESC") },
     :class_name => 'DmsfLock', :foreign_key => 'entity_id', :dependent => :destroy
@@ -67,18 +67,18 @@ class DmsfFolder < ActiveRecord::Base
 
   scope :visible, -> (system=true) { joins(:project).joins(
     "LEFT JOIN #{DmsfFolderPermission.table_name} ON #{DmsfFolder.table_name}.id = #{DmsfFolderPermission.table_name}.dmsf_folder_id").where(
-    :deleted => STATUS_ACTIVE).where(DmsfFolder.visible_condition(system)).distinct
+    deleted: STATUS_ACTIVE).where(DmsfFolder.visible_condition(system)).distinct
   }
   scope :deleted, -> { joins(:project).joins(
     "LEFT JOIN #{DmsfFolderPermission.table_name} ON #{DmsfFolder.table_name}.id = #{DmsfFolderPermission.table_name}.dmsf_folder_id").where(
-    :deleted => STATUS_DELETED).where(DmsfFolder.visible_condition).distinct
+    deleted: STATUS_DELETED).where(DmsfFolder.visible_condition).distinct
   }
-  scope :system, -> { where(:system => true) }
-  scope :notsystem, -> { where(:system => false) }
+  scope :system, -> { where(system: true) }
+  scope :notsystem, -> { where(system: false) }
 
   acts_as_customizable
 
-  acts_as_searchable :columns => ["#{self.table_name}.title", "#{self.table_name}.description"],
+  acts_as_searchable :columns => ["#{table_name}.title", "#{table_name}.description"],
         :project_key => 'project_id',
         :date_column => 'updated_at',
         :permission => :view_dmsf_files,
@@ -90,13 +90,11 @@ class DmsfFolder < ActiveRecord::Base
           :datetime => Proc.new {|o| o.updated_at },
           :author => Proc.new {|o| o.user }
 
-  validates_presence_of  :title, :project
+  validates :title, presence: true, dmsf_file_name: true
+  validates :project, presence: true
   validates_uniqueness_of :title, :scope => [:dmsf_folder_id, :project_id, :deleted],
-    conditions: -> { where(:deleted => STATUS_ACTIVE) }
-  validates_format_of :title, :with => /\A[^#{INVALID_CHARACTERS}]*\z/,
-    :message => l(:error_contains_invalid_character)
-  validate :check_cycle
-  validates_length_of :description, :maximum => 65535
+    conditions: -> { where(deleted: STATUS_ACTIVE) }
+  validates :description, length: { maximum: 65535 }
 
   before_create :default_values
 
@@ -105,7 +103,7 @@ class DmsfFolder < ActiveRecord::Base
     return true if (User.current.admin? || folder.nil?)
     # System folder?
     if folder && folder.system
-      return false if !(allow_system || User.current.allowed_to?(:display_system_folders, folder.project))
+      return false unless allow_system || User.current.allowed_to?(:display_system_folders, folder.project)
       return false if folder.issue && !folder.issue.visible?(User.current)
     end
     # Permissions?
@@ -125,61 +123,48 @@ class DmsfFolder < ActiveRecord::Base
   end
 
   def default_values
-    if Setting.plugin_redmine_dmsf['dmsf_default_notifications'] == '1' && !self.system
+    if Setting.plugin_redmine_dmsf['dmsf_default_notifications'] == '1' && !system
       self.notification = true
     end
   end
 
-  def check_cycle
-    folders = []
-    self.dmsf_folders.each {|f| folders.push(f)}
-    self.dmsf_folders.each do |folder|
-      if folder == self.dmsf_folder
-        errors.add(:folder, l(:error_create_cycle_in_folder_dependency))
-        return false
-      end
-      folder.dmsf_folders.each {|f| folders.push(f)}
-    end
-    return true
-  end
-
   def self.find_by_title(project, folder, title)
     if folder
-      visible.where(:project_id => project.id, :dmsf_folder_id => nil, :title => title).first
+      visible.where(project_id: project.id, dmsf_folder_id: nil, title: title).first
     else
-      visible.where(:project_id => project.id, :dmsf_folder_id => folder.id, :title => title).first
+      visible.where(project_id: project.id, dmsf_folder_id: folder.id, title: title).first
     end
   end
 
   def delete(commit)
-    if self.locked?
+    if locked?
       errors[:base] << l(:error_folder_is_locked)
       return false
-    elsif !self.dmsf_folders.visible.empty? || !self.dmsf_files.visible.empty? || !self.dmsf_links.visible.empty?
+    elsif !dmsf_folders.visible.empty? || !dmsf_files.visible.empty? || !dmsf_links.visible.empty?
       errors[:base] << l(:error_folder_is_not_empty)
       return false
     end
     if commit
-      self.destroy
+      destroy
     else
       self.deleted = STATUS_DELETED
       self.deleted_by_user = User.current
-      self.save
+      save!
     end
   end
 
   def deleted?
-    self.deleted == STATUS_DELETED
+    deleted == STATUS_DELETED
   end
 
   def restore
-    if self.dmsf_folder_id && (self.dmsf_folder.nil? || self.dmsf_folder.deleted?)
+    if dmsf_folder_id && (nil? || dmsf_folder.deleted?)
       errors[:base] << l(:error_parent_folder)
       return false
     end
     self.deleted = STATUS_ACTIVE
     self.deleted_by_user = nil
-    self.save
+    save!
   end
 
   def dmsf_path
@@ -193,34 +178,31 @@ class DmsfFolder < ActiveRecord::Base
   end
 
   def dmsf_path_str
-    path = self.dmsf_path
+    path = dmsf_path
     string_path = path.map { |element| element.title }
     string_path.join('/')
   end
 
   def notify?
-    return true if self.notification
-    return true if self.dmsf_folder && self.dmsf_folder.notify?
-    return true if !self.dmsf_folder && self.project.dmsf_notification
-    return false
+    return true if notification
+    return true if dmsf_folder && dmsf_folder.notify?
+    return true if !dmsf_folder && project.dmsf_notification
+    false
   end
 
   def notify_deactivate
     self.notification = nil
-    self.save!
+    save!
   end
 
   def notify_activate
     self.notification = true
-    self.save!
+    save!
   end
 
   def self.directory_tree(project, current_folder = nil)
-    unless project.is_a? Project
-      project = Project.find_by_id project
-    end
     tree = [[l(:link_documents), nil]]
-    folders = DmsfFolder.where(:project_id => project.id).visible(false).to_a
+    folders = DmsfFolder.where(project_id: project.id).visible(false).to_a
     folders.delete(current_folder)
     folders = folders.delete_if{ |f| f.locked_for_user? }
     folders.each do |folder|
@@ -231,9 +213,9 @@ class DmsfFolder < ActiveRecord::Base
   end
 
   def folder_tree
-    tree = [[self.title, self.id]]
+    tree = [[title, id]]
     DmsfFolder.directory_subtree(tree, self, 1, nil)
-    return tree
+    tree
   end
 
   def self.file_list(files)
@@ -246,21 +228,21 @@ class DmsfFolder < ActiveRecord::Base
   end
 
   def deep_file_count
-    file_count = self.dmsf_files.visible.count
-    self.dmsf_folders.visible.each { |subfolder| file_count += subfolder.deep_file_count }
-    file_count + self.file_links.visible.count + self.url_links.visible.count
+    file_count = dmsf_files.visible.all.size
+    dmsf_folders.visible.each { |subfolder| file_count += subfolder.deep_file_count }
+    file_count + file_links.visible.all.size + url_links.visible.all.size
   end
 
   def deep_folder_count
-    folder_count = self.dmsf_folders.visible.count
-    self.dmsf_folders.visible.each { |subfolder| folder_count += subfolder.deep_folder_count }
-    folder_count + self.folder_links.visible.count
+    folder_count = dmsf_folders.visible.all.size
+    dmsf_folders.visible.each { |subfolder| folder_count += subfolder.deep_folder_count }
+    folder_count + folder_links.visible.all.size
   end
 
   def deep_size
     size = 0
-    self.dmsf_files.visible.each {|file| size += file.size}
-    self.dmsf_folders.visible.each {|subfolder| size += subfolder.deep_size}
+    dmsf_files.visible.each {|file| size += file.size}
+    dmsf_folders.visible.each {|subfolder| size += subfolder.deep_size}
     size
   end
 
@@ -282,42 +264,42 @@ class DmsfFolder < ActiveRecord::Base
     new_folder = DmsfFolder.new
     new_folder.dmsf_folder = folder ? folder : nil
     new_folder.project = folder ? folder.project : project
-    new_folder.title = self.title
-    new_folder.description = self.description
+    new_folder.title = title
+    new_folder.description = description
     new_folder.user = User.current
 
     new_folder.custom_values = []
-    self.custom_values.each do |cv|
+    custom_values.each do |cv|
       new_folder.custom_values << CustomValue.new({:custom_field => cv.custom_field, :value => cv.value})
     end
 
     return new_folder unless new_folder.save
 
-    self.dmsf_files.visible.each do |f|
+    dmsf_files.visible.each do |f|
       f.copy_to project, new_folder
     end
 
-    self.dmsf_folders.visible.each do |s|
+    dmsf_folders.visible.each do |s|
       s.copy_to project, new_folder
     end
 
-    self.folder_links.visible.each do |l|
+    folder_links.visible.each do |l|
       l.copy_to project, new_folder
     end
 
-    self.file_links.visible.each do |l|
+    file_links.visible.each do |l|
       l.copy_to project, new_folder
     end
 
-    self.url_links.visible.each do |l|
+    url_links.visible.each do |l|
       l.copy_to project, new_folder
     end
 
-    self.dmsf_folder_permissions.each do |p|
+    dmsf_folder_permissions.each do |p|
       p.copy_to new_folder
     end
 
-    return new_folder
+    new_folder
   end
 
   # Overrides Redmine::Acts::Customizable::InstanceMethods#available_custom_fields
@@ -329,24 +311,24 @@ class DmsfFolder < ActiveRecord::Base
     last_update = updated_at
     time = DmsfFolder.where(
       ['project_id = ? AND dmsf_folder_id = ? AND updated_at > ?',
-       self.project_id, self.id, last_update]).maximum(:updated_at)
+       project_id, id, last_update]).maximum(:updated_at)
     last_update = time if time
     time = DmsfFile.where(
       ['project_id = ? AND dmsf_folder_id = ? AND updated_at > ?',
-       self.project_id, self.id, last_update]).maximum(:updated_at)
+       project_id, id, last_update]).maximum(:updated_at)
     last_update = time if time
     time = DmsfLink.where(
       ['project_id = ? AND dmsf_folder_id = ? AND updated_at > ?',
-       self.project_id, self.id, last_update]).maximum(:updated_at)
+       project_id, id, last_update]).maximum(:updated_at)
     last_update = time if time
     last_update
   end
 
   # Number of items in the folder
   def items
-    dmsf_folders.visible.where(:project_id => self.project_id).count +
-    dmsf_files.visible.where(:project_id => self.project_id).count +
-    dmsf_links.visible.where(:project_id => self.project_id).count
+    dmsf_folders.visible.where(project_id: project_id).all.size +
+    dmsf_files.visible.where(project_id: project_id).all.size +
+    dmsf_links.visible.where(project_id: project_id).all.size
   end
   
   def self.is_column_on?(column)
@@ -356,7 +338,7 @@ class DmsfFolder < ActiveRecord::Base
   end
 
   def custom_value(custom_field)
-    self.custom_field_values.each do |cv|
+    custom_field_values.each do |cv|
       return cv.value if cv.custom_field == custom_field
     end
     nil
@@ -424,8 +406,7 @@ class DmsfFolder < ActiveRecord::Base
       return nil if column == 'author'
     end
     # 9 - custom fields
-    cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField')
-    cfs.each do |c|
+    CustomField.where(type: 'DmsfFileRevisionCustomField').each do |c|
       if DmsfFolder.is_column_on?(c.name)
         pos += 1
       end
@@ -457,44 +438,43 @@ class DmsfFolder < ActiveRecord::Base
   def to_csv(columns, level)
     csv = []
     # Project
-    csv << self.project.name if columns.include?(l(:field_project))
+    csv << project.name if columns.include?(l(:field_project))
     # Id
-    csv << self.id if columns.include?('id')
+    csv << id if columns.include?('id')
     # Title
-    csv << self.title.insert(0, '  ' * level) if columns.include?('title')
+    csv << title.insert(0, '  ' * level) if columns.include?('title')
     # Extension
     csv << '' if columns.include?('extension')
     # Size
     csv << '' if columns.include?('size')
     # Modified
-    csv << format_time(self.updated_at) if columns.include?('modified')
+    csv << format_time(updated_at) if columns.include?('modified')
     # Version
     csv << '' if columns.include?('version')
     # Workflow
     csv << '' if columns.include?('workflow')
     # Author
-    csv << self.user.name if columns.include?('author')
+    csv << user.name if columns.include?('author')
     # Last approver
     csv << '' if columns.include?(l(:label_last_approver))
     # Url
     if columns.include?(l(:label_document_url))
       default_url_options[:host] = Setting.host_name
-      csv << url_for(:controller => :dmsf, :action => 'show', :id => self.project_id, :folder_id => self.id)
+      csv << url_for(:controller => :dmsf, :action => 'show', :id => project_id, :folder_id => id)
     end
     # Revision
     csv << '' if columns.include?(l(:label_last_revision_id))
     # Custom fields
-    cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position)
-    cfs.each do |c|
-      csv << self.custom_value(c) if columns.include?(c.name)
+    CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c|
+      csv << custom_value(c) if columns.include?(c.name)
     end
     csv
   end
 
   def get_locked_title
-    if self.locked_for_user?
-      if self.lock.reverse[0].user
-        return l(:title_locked_by_user, :user => self.lock.reverse[0].user)
+    if locked_for_user?
+      if lock.reverse[0].user
+        return l(:title_locked_by_user, :user => lock.reverse[0].user)
       else
         return l(:notice_account_unknown_email)
       end
@@ -504,9 +484,9 @@ class DmsfFolder < ActiveRecord::Base
 
   def issue
     unless @issue
-      if self.system
-        issue_id = self.title.to_i
-        @issue = Issue.find_by_id(issue_id) if issue_id > 0
+      if system
+        issue_id = title.to_i
+        @issue = Issue.find_by(id: issue_id) if issue_id > 0
       end
     end
     @issue
@@ -520,18 +500,18 @@ class DmsfFolder < ActiveRecord::Base
     # Custom fields
     if params[:dmsf_folder][:custom_field_values].present?
       params[:dmsf_folder][:custom_field_values].each_with_index do |v, i|
-        self.custom_field_values[i].value = v[1]
+        custom_field_values[i].value = v[1]
       end
     end
     # Permissions
-    self.dmsf_folder_permissions.delete_all
+    dmsf_folder_permissions.delete_all
     if params[:permissions]
       if params[:permissions][:role_ids]
         params[:permissions][:role_ids].each do |role_id|
           permission = DmsfFolderPermission.new
           permission.object_id = role_id
           permission.object_type = Role.model_name.to_s
-          self.dmsf_folder_permissions << permission
+          dmsf_folder_permissions << permission
         end
       end
       if params[:permissions][:user_ids]
@@ -539,12 +519,12 @@ class DmsfFolder < ActiveRecord::Base
           permission = DmsfFolderPermission.new
           permission.object_id = user_id
           permission.object_type = User.model_name.to_s
-          self.dmsf_folder_permissions << permission
+          dmsf_folder_permissions << permission
         end
       end
     end
     # Save
-    self.save
+    save!
   end
 
   def self.get_valid_title(title)
@@ -557,7 +537,7 @@ class DmsfFolder < ActiveRecord::Base
   private
 
   def self.directory_subtree(tree, folder, level, current_folder)
-    folders = DmsfFolder.where(:project_id => folder.project_id, :dmsf_folder_id => folder.id).notsystem.visible(false).to_a
+    folders = DmsfFolder.where(project_id: folder.project_id, dmsf_folder_id: folder.id).notsystem.visible(false).to_a
     folders.delete(current_folder)
     folders.delete_if { |f| f.locked_for_user? }
     folders.each do |subfolder|
diff --git a/app/models/dmsf_folder_permission.rb b/app/models/dmsf_folder_permission.rb
index cfda5cf0..84475d75 100644
--- a/app/models/dmsf_folder_permission.rb
+++ b/app/models/dmsf_folder_permission.rb
@@ -22,17 +22,17 @@ class DmsfFolderPermission < ActiveRecord::Base
 
   belongs_to :dmsf_folder
 
-  validates_presence_of :dmsf_folder
+  validates :dmsf_folder, presence: true
 
-  scope :users, -> { where(:object_type => User.model_name.to_s) }
-  scope :roles, -> { where(:object_type => Role.model_name.to_s) }
+  scope :users, -> { where(object_type: User.model_name.to_s) }
+  scope :roles, -> { where(object_type: Role.model_name.to_s) }
 
   def copy_to(folder)
     permission = DmsfFolderPermission.new
     permission.dmsf_folder_id = folder.id
-    permission.object_id = self.object_id
-    permission.object_type = self.object_type
-    permission.save
+    permission.object_id = object_id
+    permission.object_type = object_type
+    permission.save!
     permission
   end
 
diff --git a/app/models/dmsf_link.rb b/app/models/dmsf_link.rb
index a23f80ba..3e4331df 100644
--- a/app/models/dmsf_link.rb
+++ b/app/models/dmsf_link.rb
@@ -1,4 +1,4 @@
-# encode: utf-8
+ # encode: utf-8
 #
 # Redmine plugin for Document Management System "Features"
 #
@@ -27,57 +27,43 @@ class DmsfLink < ActiveRecord::Base
   belongs_to :deleted_by_user, :class_name => 'User', :foreign_key => 'deleted_by_user_id'
   belongs_to :user
 
-  validates_presence_of :name, :project
-  validates_length_of :name, :maximum => 255
-  validates_length_of :external_url, :maximum => 255
-  validate :validate_url
-
-  def validate_url
-    if self.target_type == 'DmsfUrl'
-      begin
-        if self.external_url.present?
-          URI.parse self.external_url
-        else
-          errors.add :external_url, :invalid
-        end
-      rescue URI::InvalidURIError
-        errors.add :external_url, :invalid
-      end
-    end
-  end
+  validates :name, presence: true, length: { maximum: 255 }
+  validates :project, presence: true
+  validates :external_url, length: { maximum: 255 }
+  validates :external_url, dmsf_url: true
 
   STATUS_DELETED = 1
   STATUS_ACTIVE = 0
 
-  scope :visible, -> { where(:deleted => STATUS_ACTIVE) }
-  scope :deleted, -> { where(:deleted => STATUS_DELETED) }
+  scope :visible, -> { where(deleted: STATUS_ACTIVE) }
+  scope :deleted, -> { where(deleted: STATUS_DELETED) }
 
   def target_folder_id
-    if self.target_type == DmsfFolder.model_name.to_s
-      self.target_id
+    if target_type == DmsfFolder.model_name.to_s
+      target_id
     else
-      f = DmsfFile.find_by_id self.target_id
-      f.dmsf_folder_id if f
+      dmsf_folder_ids = DmsfFile.where(id: target_id).pluck(:dmsf_folder_id)
+      dmsf_folder_ids.first
     end
   end
 
   def target_folder
     unless @target_folder
-      if self.target_folder_id
-        @target_folder = DmsfFolder.find_by_id self.target_folder_id
+      if target_folder_id
+        @target_folder = DmsfFolder.find_by(id: target_folder_id)
       end
     end
     @target_folder
   end
 
   def target_file_id
-    self.target_id if self.target_type == DmsfFile.model_name.to_s
+    target_id if target_type == DmsfFile.model_name.to_s
   end
 
   def target_file
     unless @target_file
-      if self.target_file_id
-        @target_file = DmsfFile.find_by_id self.target_file_id
+      if target_file_id
+        @target_file = DmsfFile.find_by(id: target_file_id)
       end
     end
     @target_file
@@ -85,22 +71,20 @@ class DmsfLink < ActiveRecord::Base
 
   def target_project
     unless @target_project
-      @target_project = Project.find_by_id self.target_project_id
+      @target_project = Project.find_by(id: target_project_id)
     end
     @target_project
   end
 
   def folder
-    unless @folder
-      if self.dmsf_folder_id
-        @folder = DmsfFolder.find_by_id self.dmsf_folder_id
-      end
+    if !@folder && dmsf_folder_id
+      @folder = DmsfFolder.find_by(id: dmsf_folder_id)
     end
     @folder
   end
 
   def title
-    self.name
+    name
   end
 
   def self.find_link_by_file_name(project, folder, filename)
@@ -115,12 +99,12 @@ class DmsfLink < ActiveRecord::Base
   end
 
   def path
-    if self.target_type == DmsfFile.model_name.to_s
-      path = self.target_file.dmsf_path.map { |element| element.is_a?(DmsfFile) ? element.display_name : element.title }.join('/') if self.target_file
+    if target_type == DmsfFile.model_name.to_s
+      path = target_file.dmsf_path.map { |element| element.is_a?(DmsfFile) ? element.display_name : element.title }.join('/') if target_file
     else
-      path = self.target_folder ? self.target_folder.dmsf_path_str : ''
+      path = target_folder ? target_folder.dmsf_path_str : ''
     end
-    path.insert(0, "#{self.target_project.name}:") if self.project_id != self.target_project_id
+    path.insert(0, "#{target_project.name}:") if project_id != target_project_id
     if path && path.length > 50
       return "#{path[0, 25]}...#{path[-25, 25]}"
     end
@@ -129,29 +113,29 @@ class DmsfLink < ActiveRecord::Base
 
   def copy_to(project, folder)
     link = DmsfLink.new
-    link.target_project_id = self.target_project_id
-    link.target_id = self.target_id
-    link.target_type = self.target_type
-    link.name = self.name
-    link.external_url = self.external_url
+    link.target_project_id = target_project_id
+    link.target_id = target_id
+    link.target_type = target_type
+    link.name = name
+    link.external_url = external_url
     link.project_id = project.id
     link.dmsf_folder_id = folder ? folder.id : nil
-    link.save
+    link.save!
     link
   end
 
   def container
-    if self.folder && self.folder.system
-      Issue.where(:id => self.folder.title.to_i).first
+    if folder && folder.system
+      Issue.find_by(id: folder.title)
     end
   end
 
   def delete(commit = false)
     if commit
-      if self.container.is_a?(Issue)
-        self.container.dmsf_file_removed(self.target_file)
+      if container.is_a?(Issue)
+        container.dmsf_file_removed(target_file)
       end
-      self.destroy
+      destroy
     else
       self.deleted = STATUS_DELETED
       self.deleted_by_user = User.current
@@ -160,7 +144,7 @@ class DmsfLink < ActiveRecord::Base
   end
 
   def restore
-    if self.dmsf_folder_id && (self.dmsf_folder.nil? || self.dmsf_folder.deleted?)
+    if dmsf_folder_id && (dmsf_folder.nil? || dmsf_folder.deleted?)
       errors[:base] << l(:error_parent_folder)
       return false
     end
@@ -170,7 +154,7 @@ class DmsfLink < ActiveRecord::Base
   end
 
   def is_folder?
-    self.target_type == 'DmsfFolder'
+    target_type == 'DmsfFolder'
   end
 
   def is_file?
@@ -179,34 +163,33 @@ class DmsfLink < ActiveRecord::Base
 
   def to_csv(columns, level)
     csv = []
-    if self.target_type == 'DmsfUrl'
+    if target_type == 'DmsfUrl'
       # Project
-      csv << self.project.name if columns.include?(l(:field_project))
+      csv << project.name if columns.include?(l(:field_project))
       # Id
-      csv << self.id if columns.include?('id')
+      csv << id if columns.include?('id')
       # Title
-      csv << self.title.insert(0, ' ' * level) if columns.include?('title')
+      csv << title.insert(0, ' ' * level) if columns.include?('title')
       # Extension
       csv << '' if columns.include?('extension')
       # Size
       csv << '' if columns.include?('size')
       # Modified
-      csv << format_time(self.updated_at) if columns.include?('modified')
+      csv << format_time(updated_at) if columns.include?('modified')
       # Version
       csv << '' if columns.include?('version')
       # Workflow
       csv << '' if columns.include?('workflow')
       # Author
-      csv << self.user.name if columns.include?('author')
+      csv << user.name if columns.include?('author')
       # Last approver
       csv << '' if columns.include?(l(:label_last_approver))
       # Url
-      csv << self.external_url if columns.include?(l(:label_document_url))
+      csv << external_url if columns.include?(l(:label_document_url))
       # Revision
       csv << '' if columns.include?(l(:label_last_revision_id))
       # Custom fields
-      cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position)
-      cfs.each do |c|
+      CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c|
         csv << '' if columns.include?(c.name)
       end
     end
diff --git a/app/models/dmsf_lock.rb b/app/models/dmsf_lock.rb
index abc5dcd0..04c29cb7 100644
--- a/app/models/dmsf_lock.rb
+++ b/app/models/dmsf_lock.rb
@@ -46,7 +46,7 @@ class DmsfLock < ActiveRecord::Base
   end
 
   def expired?
-    return expires_at && (expires_at <= Time.now)
+    expires_at && (expires_at <= Time.current)
   end
 
   def generate_uuid
@@ -65,7 +65,7 @@ class DmsfLock < ActiveRecord::Base
   end
 
   def self.find_by_param(*args)
-    self.find(*args)
+    find(*args)
   end
 
 end
\ No newline at end of file
diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb
index f3ce186a..eee3ebdc 100644
--- a/app/models/dmsf_mailer.rb
+++ b/app/models/dmsf_mailer.rb
@@ -50,7 +50,7 @@ class DmsfMailer < Mailer
     end
   end
 
-  def send_documents(project, user, email_params)
+  def send_documents(project, email_params)
     redmine_headers 'Project' => project.identifier if project
     @body = email_params[:body]
     @links_only = email_params[:links_only] == '1'
diff --git a/app/models/dmsf_upload.rb b/app/models/dmsf_upload.rb
index 758fd86e..5fe6a233 100644
--- a/app/models/dmsf_upload.rb
+++ b/app/models/dmsf_upload.rb
@@ -36,7 +36,7 @@ class DmsfUpload
   attr_accessor :tempfile_path
 
   def disk_file
-    DmsfHelper.temp_dir.join(self.disk_filename).to_s
+    DmsfHelper.temp_dir.join(disk_filename).to_s
   end
 
   def self.create_from_uploaded_attachment(project, folder, uploaded_file)
diff --git a/app/models/dmsf_workflow.rb b/app/models/dmsf_workflow.rb
index b8406063..12b66748 100644
--- a/app/models/dmsf_workflow.rb
+++ b/app/models/dmsf_workflow.rb
@@ -23,39 +23,11 @@ class DmsfWorkflow < ActiveRecord::Base
   belongs_to :author, :class_name => 'User'
 
   scope :sorted, lambda { order(:name => :asc) }
-  scope :global, lambda { where(:project_id => nil) }
-  scope :active, lambda { where(:status => STATUS_ACTIVE) }
+  scope :global, lambda { where(project_id: nil) }
+  scope :active, lambda { where(status: STATUS_ACTIVE) }
   scope :status, lambda { |arg| where(arg.blank? ? nil : {:status => arg.to_i}) }
 
-  validate :name_validation
-  validates_presence_of :name
-  validates_length_of :name, :maximum => 255
-
-  def name_validation
-    if self.project_id
-      if self.id
-        if (DmsfWorkflow.where(['(project_id IS NULL OR (project_id = ? AND id != ?)) AND name = ?',
-            self.project_id, self.id, self.name]).exists?)
-          errors.add(:name, l('activerecord.errors.messages.taken'))
-        end
-      else
-        if (DmsfWorkflow.where(['(project_id IS NULL OR project_id = ?) AND name = ?',
-            self.project_id, self.name]).exists?)
-          errors.add(:name, l('activerecord.errors.messages.taken'))
-        end
-      end
-    else
-      if self.id
-        if DmsfWorkflow.where(['name = ? AND id != ?', self.name, self.id]).exists?
-          errors.add(:name, l('activerecord.errors.messages.taken'))
-        end
-      else
-        if DmsfWorkflow.where(:name => self.name).exists?
-          errors.add(:name, l('activerecord.errors.messages.taken'))
-        end
-      end
-    end
-  end
+  validates :name, presence: true, length: { maximum: 255 }, dmsf_workflow_name: true
 
   STATE_ASSIGNED = 3
   STATE_WAITING_FOR_APPROVAL = 1
@@ -68,18 +40,18 @@ class DmsfWorkflow < ActiveRecord::Base
 
   def participiants
     users = Array.new
-    self.dmsf_workflow_steps.each do |step|
+    dmsf_workflow_steps.each do |step|
       users << step.user unless users.include? step.user
     end
     users
   end
 
   def self.workflows(project)
-    project ? where(:project_id => project) : where('project_id IS NULL')
+    where(project_id: project)
   end
 
   def project
-    Project.find_by_id(project_id) if project_id
+    Project.find_by(id: project_id) if project_id
   end
 
   def to_s
@@ -100,7 +72,7 @@ class DmsfWorkflow < ActiveRecord::Base
           end
         end
       end
-    return true
+    true
   end
 
   def delegates(q, dmsf_workflow_step_assignment_id, dmsf_file_revision_id)
@@ -123,32 +95,30 @@ class DmsfWorkflow < ActiveRecord::Base
 
   def next_assignments(dmsf_file_revision_id)
     results = Array.new
-    nsteps = self.dmsf_workflow_steps.collect{|s| s.step}.uniq
+    nsteps = dmsf_workflow_steps.collect{ |s| s.step }.uniq
     nsteps.each do |i|
       step_is_finished = false
-      steps = self.dmsf_workflow_steps.collect{|s| s.step == i ? s : nil}.compact
+      steps = dmsf_workflow_steps.collect{ |s| s.step == i ? s : nil }.compact
       steps.each do |step|
-        step.dmsf_workflow_step_assignments.each do |assignment|
-          if assignment.dmsf_file_revision_id == dmsf_file_revision_id
-            assignment.dmsf_workflow_step_actions.each do |action|
-              case action.action
-              when DmsfWorkflowStepAction::ACTION_APPROVE
-                step_is_finished = true
-                # Try to find another unfinished AND step
-                exists = false
-                stps = self.dmsf_workflow_steps.collect{|s| (s.step == i && s.operator == DmsfWorkflowStep::OPERATOR_AND) ? s : nil}.compact
-                stps.each do |s|
-                  s.dmsf_workflow_step_assignments.each do |a|
-                    exists = a.add?(dmsf_file_revision_id)
-                    break if exists
-                  end
+        step.dmsf_workflow_step_assignments.where(dmsf_file_revision_id: dmsf_file_revision_id).find_each do |assignment|
+          assignment.dmsf_workflow_step_actions.find_each do |action|
+            case action.action
+            when DmsfWorkflowStepAction::ACTION_APPROVE
+              step_is_finished = true
+              # Try to find another unfinished AND step
+              exists = false
+              stps = dmsf_workflow_steps.collect{ |s| (s.step == i && s.operator == DmsfWorkflowStep::OPERATOR_AND) ? s : nil }.compact
+              stps.each do |s|
+                s.dmsf_workflow_step_assignments.where(dmsf_file_revision_id: dmsf_file_revision_id).find_each do |a|
+                  exists = a.add?(dmsf_file_revision_id)
                   break if exists
                 end
-                step_is_finished = false if exists
-                break
-              when DmsfWorkflowStepAction::ACTION_REJECT
-                return Array.new
+                break if exists
               end
+              step_is_finished = false if exists
+              break
+            when DmsfWorkflowStepAction::ACTION_REJECT
+              return Array.new
             end
           end
           break if step_is_finished
@@ -157,7 +127,7 @@ class DmsfWorkflow < ActiveRecord::Base
       end
       unless step_is_finished
         steps.each do |step|
-          step.dmsf_workflow_step_assignments.each do |assignment|
+          step.dmsf_workflow_step_assignments.find_each do |assignment|
             results << assignment if assignment.add?(dmsf_file_revision_id)
           end
         end
@@ -175,50 +145,53 @@ class DmsfWorkflow < ActiveRecord::Base
 
   def try_finish(revision, action, user_id)
     case action.action
-      when DmsfWorkflowStepAction::ACTION_APPROVE
-        assignments = self.next_assignments revision.id
+    when DmsfWorkflowStepAction::ACTION_APPROVE
+        assignments = next_assignments(revision.id)
         return false unless assignments.empty?
-        revision.update_attribute(:workflow, DmsfWorkflow::STATE_APPROVED)
+        revision.workflow = DmsfWorkflow::STATE_APPROVED
+        revision.save!
         return true
       when DmsfWorkflowStepAction::ACTION_REJECT
-        revision.update_attribute(:workflow, DmsfWorkflow::STATE_REJECTED)
+        revision.workflow = DmsfWorkflow::STATE_REJECTED
+        revision.save!
         return true
       when DmsfWorkflowStepAction::ACTION_DELEGATE
-        self.dmsf_workflow_steps.each do |step|
+        dmsf_workflow_steps.each do |step|
           step.dmsf_workflow_step_assignments.each do |assignment|
             if assignment.id == action.dmsf_workflow_step_assignment_id
-              assignment.update_attribute(:user_id, user_id)
+              assignment.user_id = user_id
+              assignment.save!
               return false
             end
           end
         end
     end
-    return false
+    false
   end
 
   def copy_to(project, name = nil)
-    new_wf = self.dup
+    new_wf = dup
     new_wf.name = name if name
     new_wf.project_id = project ? project.id : nil
     new_wf.author = User.current
     if new_wf.save
-      self.dmsf_workflow_steps.each do |step|
+      dmsf_workflow_steps.each do |step|
         step.copy_to(new_wf)
       end
     end
-    return new_wf
+    new_wf
   end
 
   def locked?
-    self.status == STATUS_LOCKED
+    status == STATUS_LOCKED
   end
 
   def active?
-    self.status == STATUS_ACTIVE
+    status == STATUS_ACTIVE
   end
 
   def notify_users(project, revision, controller)
-    assignments = self.next_assignments revision.id
+    assignments = next_assignments(revision.id)
     recipients = assignments.collect{ |a| a.user }
     recipients.uniq!
     recipients = recipients & DmsfMailer.get_notify_users(project, [revision.dmsf_file], true)
@@ -231,7 +204,7 @@ class DmsfWorkflow < ActiveRecord::Base
         :text_email_started,
         :text_email_to_proceed).deliver
     end
-    if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients'] == '1'
+    if Setting.plugin_redmine_dmsf['dmsf_display_notified_recipients']
       unless recipients.blank?
         to = recipients.collect{ |r| r.name }.first(DMSF_MAX_NOTIFICATION_RECEIVERS_INFO).join(', ')
         to << ((recipients.count > DMSF_MAX_NOTIFICATION_RECEIVERS_INFO) ? ',...' : '.')
diff --git a/app/models/dmsf_workflow_step.rb b/app/models/dmsf_workflow_step.rb
index a96d94ac..86ebf8a1 100644
--- a/app/models/dmsf_workflow_step.rb
+++ b/app/models/dmsf_workflow_step.rb
@@ -24,15 +24,18 @@ class DmsfWorkflowStep < ActiveRecord::Base
 
   has_many :dmsf_workflow_step_assignments, :dependent => :destroy
 
-  validates_presence_of :dmsf_workflow, :step, :user, :operator
-  validates_uniqueness_of :user_id, :scope => [:dmsf_workflow_id, :step]
-  validates_length_of :name, :maximum => 30
+  validates :dmsf_workflow, presence: true
+  validates :step, presence: true
+  validates :user, presence: true
+  validates :operator, presence: true
+  validates_uniqueness_of :user_id, scope: [:dmsf_workflow_id, :step]
+  validates :name, length: { maximum: 30 }
 
   OPERATOR_OR  = 0
   OPERATOR_AND = 1
 
   def soperator
-    DmsfWorkflowStep.soperator(self.operator)
+    DmsfWorkflowStep.soperator(operator)
   end
 
   def self.soperator(operator)
@@ -40,15 +43,15 @@ class DmsfWorkflowStep < ActiveRecord::Base
   end
 
   def assign(dmsf_file_revision_id)
-    step_assignment = DmsfWorkflowStepAssignment.new(
-      :dmsf_workflow_step_id => id,
-      :user_id => user_id,
-      :dmsf_file_revision_id => dmsf_file_revision_id)
-    step_assignment.save
+    step_assignment = DmsfWorkflowStepAssignment.new
+    step_assignment.dmsf_workflow_step_id = id
+    step_assignment.user_id = user_id
+    step_assignment.dmsf_file_revision_id = dmsf_file_revision_id
+    step_assignment.save!
   end
 
   def is_finished?(dmsf_file_revision_id)
-    self.dmsf_workflow_step_assignments.each do |assignment|
+    dmsf_workflow_step_assignments.each do |assignment|
       if assignment.dmsf_file_revision_id == dmsf_file_revision_id
         if assignment.dmsf_workflow_step_actions.empty?
           return false
@@ -61,9 +64,10 @@ class DmsfWorkflowStep < ActiveRecord::Base
   end
 
   def copy_to(workflow)
-    new_step = self.dup
+    new_step = dup
     new_step.dmsf_workflow_id = workflow.id
-    new_step.save
-    return new_step
+    new_step.save!
+    new_step
   end
+
 end
\ No newline at end of file
diff --git a/app/models/dmsf_workflow_step_action.rb b/app/models/dmsf_workflow_step_action.rb
index 6bc7f332..ca2d7e7d 100644
--- a/app/models/dmsf_workflow_step_action.rb
+++ b/app/models/dmsf_workflow_step_action.rb
@@ -23,10 +23,12 @@ class DmsfWorkflowStepAction < ActiveRecord::Base
   belongs_to :dmsf_workflow_step_assignment
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
 
-  validates_presence_of :dmsf_workflow_step_assignment, :action, :author_id
-  validates_presence_of :note, :unless => lambda { self.action == DmsfWorkflowStepAction::ACTION_APPROVE }
-  validates_uniqueness_of :dmsf_workflow_step_assignment_id, :scope => [:action],
-                          :unless => lambda {self.action == DmsfWorkflowStepAction::ACTION_DELEGATE}
+  validates :dmsf_workflow_step_assignment, presence: true
+  validates :action, presence: true
+  validates :author_id, presence: true
+  validates :note, presence: true, :unless => lambda { action == DmsfWorkflowStepAction::ACTION_APPROVE }
+  validates_uniqueness_of :dmsf_workflow_step_assignment_id, scope: [:action],
+                          unless: lambda { action == DmsfWorkflowStepAction::ACTION_DELEGATE }
 
   ACTION_APPROVE = 1
   ACTION_REJECT = 2
@@ -45,7 +47,7 @@ class DmsfWorkflowStepAction < ActiveRecord::Base
   end
 
   def is_finished?
-    DmsfWorkflowStepAction.is_finished? self.action
+    DmsfWorkflowStepAction.is_finished? action
   end
 
   def self.action_str(action)
diff --git a/app/models/dmsf_workflow_step_assignment.rb b/app/models/dmsf_workflow_step_assignment.rb
index b5500470..340725b5 100644
--- a/app/models/dmsf_workflow_step_assignment.rb
+++ b/app/models/dmsf_workflow_step_assignment.rb
@@ -25,13 +25,14 @@ class DmsfWorkflowStepAssignment < ActiveRecord::Base
 
   has_many :dmsf_workflow_step_actions, :dependent => :destroy
 
-  validates_presence_of :dmsf_workflow_step, :dmsf_file_revision
-  validates_uniqueness_of :dmsf_workflow_step_id, :scope => [:dmsf_file_revision_id]
+  validates :dmsf_workflow_step, presence: true
+  validates :dmsf_file_revision, presence: true
+  validates_uniqueness_of :dmsf_workflow_step_id, scope: [:dmsf_file_revision_id]
 
   def add?(dmsf_file_revision_id)
-    if self.dmsf_file_revision_id == dmsf_file_revision_id
+    if dmsf_file_revision_id == dmsf_file_revision_id
       add = true
-      self.dmsf_workflow_step_actions.each do |action|
+      dmsf_workflow_step_actions.each do |action|
         if action.is_finished?
           add = false
           break
diff --git a/app/validators/dmsf_file_name_validator.rb b/app/validators/dmsf_file_name_validator.rb
new file mode 100644
index 00000000..5996dbc7
--- /dev/null
+++ b/app/validators/dmsf_file_name_validator.rb
@@ -0,0 +1,30 @@
+# encoding: utf-8
+#
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright © 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class DmsfFileNameValidator  < ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    unless value =~ /\A[^#{DmsfFolder::INVALID_CHARACTERS}]*\z/
+      record.errors.add attribute, :error_contains_invalid_character
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/validators/dmsf_url_validator.rb b/app/validators/dmsf_url_validator.rb
new file mode 100644
index 00000000..c1494cb2
--- /dev/null
+++ b/app/validators/dmsf_url_validator.rb
@@ -0,0 +1,38 @@
+# encoding: utf-8
+#
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright © 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class DmsfUrlValidator  < ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    if record.target_type == 'DmsfUrl'
+      begin
+        if value.present?
+          URI.parse value
+        else
+          record.errors.add attribute, :invalid
+        end
+      rescue URI::InvalidURIError
+        record.errors.add attribute, :invalid
+      end
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/validators/dmsf_workflow_name_validator.rb b/app/validators/dmsf_workflow_name_validator.rb
new file mode 100644
index 00000000..7f0cf40c
--- /dev/null
+++ b/app/validators/dmsf_workflow_name_validator.rb
@@ -0,0 +1,49 @@
+# encoding: utf-8
+#
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright © 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+class DmsfWorkflowNameValidator  < ActiveModel::EachValidator
+
+  def validate_each(record, attribute, value)
+    if record.project_id
+      if record.id
+        if DmsfWorkflow.where(['(project_id IS NULL OR (project_id = ? AND id != ?)) AND name = ?',
+                                record.project_id, record.id, value]).exists?
+          record.errors.add attribute, :taken
+        end
+      else
+        if DmsfWorkflow.where(['(project_id IS NULL OR project_id = ?) AND name = ?', record.project_id, value]).exists?
+          record.errors.add attribute, :taken
+        end
+      end
+    else
+      if record.id
+        if DmsfWorkflow.where(['name = ? AND id != ?', value, record.id]).exists?
+          record.errors.add attribute, :taken
+        end
+      else
+        if DmsfWorkflow.where(name: value).exists?
+          record.errors.add attribute, :taken
+        end
+      end
+    end
+  end
+
+end
\ No newline at end of file
diff --git a/app/views/dmsf/_custom_fields.html.erb b/app/views/dmsf/_custom_fields.html.erb
index c1a6fb82..becebba1 100644
--- a/app/views/dmsf/_custom_fields.html.erb
+++ b/app/views/dmsf/_custom_fields.html.erb
@@ -25,7 +25,7 @@
 <% if object %>
   <div>
     <% object.custom_field_values.each do |custom_value| %>
-      <% if !custom_value.value.blank? %>
+      <% unless custom_value.value.blank? %>
         <div class="status attribute">
           <%= content_tag :div, h(custom_value.custom_field.name), :class => 'label' %>
           <div class="value">
diff --git a/app/views/dmsf/_dir.html.erb b/app/views/dmsf/_dir.html.erb
index a3b3ee42..405d6cc7 100644
--- a/app/views/dmsf/_dir.html.erb
+++ b/app/views/dmsf/_dir.html.erb
@@ -21,7 +21,7 @@
 %>
 
 <td class="dmsf_checkbox">
-  <% unless (subfolder && subfolder.system) %>
+  <% unless subfolder && subfolder.system %>
     <%= check_box_tag('ids[]', "#{name}-#{id}", false, :id => "subfolder_#{id}") %>
   <% end %>
 </td>
@@ -55,7 +55,7 @@
   </td>
 <% end %>
 <% if DmsfFolder.is_column_on?('extension') %>
-    <td class="dmsf_extension"></td>
+  <td class="dmsf_extension"></td>
 <% end %>
 <% if DmsfFolder.is_column_on?('size') %>
   <td class="dmsf_size"></td>
@@ -72,8 +72,7 @@
 <% if DmsfFolder.is_column_on?('author') %>
   <td class="dmsf_author"><%= h(subfolder.user) if subfolder %></td>
 <% end %>
-<% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-<% cfs.each do |c| %>
+<% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
     <% if DmsfFolder.is_column_on?(c.name) %>
         <td class="dmsf_cf">
           <%= subfolder.custom_value(c) if subfolder %>
diff --git a/app/views/dmsf/_dir_trash.html.erb b/app/views/dmsf/_dir_trash.html.erb
index 26dd2c1e..9e49423a 100644
--- a/app/views/dmsf/_dir_trash.html.erb
+++ b/app/views/dmsf/_dir_trash.html.erb
@@ -56,8 +56,7 @@
 <% if DmsfFolder.is_column_on?('author') %>
   <td class="dmsf_author"><%= h(subfolder.user) if subfolder %></td>
 <% end %>
-<% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-<% cfs.each do |c| %>
+<% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
     <% if DmsfFolder.is_column_on?(c.name) %>
         <td class="dmsf_cf">
           <%= subfolder.custom_value(c) if subfolder %>
diff --git a/app/views/dmsf/_file.html.erb b/app/views/dmsf/_file.html.erb
index e4b8f490..72d0c4fc 100644
--- a/app/views/dmsf/_file.html.erb
+++ b/app/views/dmsf/_file.html.erb
@@ -20,7 +20,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% wf = DmsfWorkflow.find_by_id(file.last_revision.dmsf_workflow_id) if file.last_revision.dmsf_workflow_id %>
+<% wf = DmsfWorkflow.find_by(id: file.last_revision.dmsf_workflow_id) if file.last_revision.dmsf_workflow_id %>
 
 <td class="dmsf_checkbox"><%= check_box_tag('ids[]', "#{name}-#{id}", false, :id => "file_#{id}") %></td>
 <% if DmsfFolder.is_column_on?('id') %>
@@ -76,8 +76,7 @@
 <% if DmsfFolder.is_column_on?('author') %>
   <td class="dmsf_author"><%= h(file.last_revision.user) %></td>
 <% end %>
-<% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-<% cfs.each do |c| %>
+<% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
     <% if DmsfFolder.is_column_on?(c.name) %>
         <td class="dmsf_cf">
           <%= file.custom_value(c) %>
@@ -100,7 +99,7 @@
     <% else %>
       <span class="icon-only icon-unlock" title="<%= file.get_locked_title %>"></span>
     <% end %>
-    <% unless file.locked? %>
+    <% if !file.locked? %>
       <% if file.notification %>
         <%= link_to('', notify_deactivate_dmsf_files_path(:id => file),
           :title => l(:title_notifications_active_deactivate),
diff --git a/app/views/dmsf/_file_trash.html.erb b/app/views/dmsf/_file_trash.html.erb
index 332478ab..0f120fe7 100644
--- a/app/views/dmsf/_file_trash.html.erb
+++ b/app/views/dmsf/_file_trash.html.erb
@@ -56,8 +56,7 @@
 <% if DmsfFolder.is_column_on?('author') %>
   <td class="dmsf_author"><%= h(file.last_revision.user) %></td>
 <% end %>
-<% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-<% cfs.each do |c| %>
+<% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
     <% if DmsfFolder.is_column_on?(c.name) %>
         <td class="dmsf_cf">
           <%= file.custom_value(c) %>
diff --git a/app/views/dmsf/_list_view.erb b/app/views/dmsf/_list_view.erb
index d2f781bd..b0599fd9 100644
--- a/app/views/dmsf/_list_view.erb
+++ b/app/views/dmsf/_list_view.erb
@@ -24,7 +24,7 @@
   <thead>
     <tr>
       <th class="dmsf_checkbox dmsf_th">
-        <% if !@system_folder %>
+        <% unless @system_folder %>
           <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
                             :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         <% end %>
@@ -53,8 +53,7 @@
       <% if DmsfFolder.is_column_on?('author') %>
         <th class="dmsf_th"><%= l(:link_author) %></th>
       <% end %>
-      <% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-      <% cfs.each do |c| %>
+      <% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
         <% if DmsfFolder.is_column_on?(c.name) %>
           <th class="dmsf_th"><%= h(c.name) %></th>
         <% end %>
diff --git a/app/views/dmsf/_tree_view.erb b/app/views/dmsf/_tree_view.erb
index 43333269..19740b08 100644
--- a/app/views/dmsf/_tree_view.erb
+++ b/app/views/dmsf/_tree_view.erb
@@ -24,7 +24,7 @@
   <thead>
     <tr>
       <th class="dmsf_checkbox dmsf_th">
-        <% if !@system_folder %>
+        <% unless @system_folder %>
           <%= check_box_tag 'check_all', '', false, :class => 'toggle-selection',
                           :title => "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
         <% end %>
@@ -53,8 +53,7 @@
       <% if DmsfFolder.is_column_on?('author') %>
         <th class ="dmsf_th"><%= l(:link_author) %></th>
       <% end %>
-      <% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-      <% cfs.each do |c| %>
+      <% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
           <% if DmsfFolder.is_column_on?(c.name) %>
               <th class="dmsf_th"><%= c.name %></th>
           <% end %>
diff --git a/app/views/dmsf/_url.html.erb b/app/views/dmsf/_url.html.erb
index ef2b0ea7..5b9a7a98 100644
--- a/app/views/dmsf/_url.html.erb
+++ b/app/views/dmsf/_url.html.erb
@@ -40,7 +40,7 @@
   </td>
 <% end %>
 <% if DmsfFolder.is_column_on?('extension') %>
-    <td class="dmsf_extension"></td>
+  <td class="dmsf_extension"></td>
 <% end %>
 <% if DmsfFolder.is_column_on?('size') %>
   <td class="dmsf_size"></td>
@@ -57,8 +57,7 @@
 <% if DmsfFolder.is_column_on?('author') %>
   <td class="dmsf_author"><%= h(link.user) %></td>
 <% end %>
-<% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-<% cfs.each do |c| %>
+<% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
     <% if DmsfFolder.is_column_on?(c.name) %>
         <td class="dmsf_cf"></td>
     <% end %>
diff --git a/app/views/dmsf/_url_trash.html.erb b/app/views/dmsf/_url_trash.html.erb
index d149ded5..1fe04cf8 100644
--- a/app/views/dmsf/_url_trash.html.erb
+++ b/app/views/dmsf/_url_trash.html.erb
@@ -22,7 +22,7 @@
 
 <td class="dmsf_checkbox"><%= check_box_tag('ids[]', "#{name}-#{id}", false) %></td>
 <% if DmsfFolder.is_column_on?('id') %>
-    <td class="id"></td>
+  <td class="id"></td>
 <% end %>
 <% if DmsfFolder.is_column_on?('title') %>
   <td class="dmsf_title">
@@ -51,8 +51,7 @@
 <% if DmsfFolder.is_column_on?('author') %>
   <td class="dmsf_author"><%= h(link.user) %></td>
 <% end %>
-<% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-<% cfs.each do |c| %>
+<% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
   <% if DmsfFolder.is_column_on?(c.name) %>
     <td class="dmsf_cf"></td>
   <% end %>
diff --git a/app/views/dmsf/add_email.js.erb b/app/views/dmsf/add_email.js.erb
index 1a8b5882..93e05385 100644
--- a/app/views/dmsf/add_email.js.erb
+++ b/app/views/dmsf/add_email.js.erb
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#ajax-modal').html("<%= escape_javascript(render :partial => 'dmsf/add_email') %>");
+var modal = $('#ajax-modal');
+
+modal.html("<%= escape_javascript(render :partial => 'dmsf/add_email') %>");
 showModal('ajax-modal', '400px');
-$('#ajax-modal').addClass('new-user');
+modal.addClass('new-user');
diff --git a/app/views/dmsf/dmsf_rows.js.erb b/app/views/dmsf/dmsf_rows.js.erb
index a39ce030..287c76f2 100644
--- a/app/views/dmsf/dmsf_rows.js.erb
+++ b/app/views/dmsf/dmsf_rows.js.erb
@@ -1,15 +1,17 @@
 // Store DMSF controls
 var dmsfButtons = $('#dmsf_buttons')[0].outerHTML;
 var browserInfo = $('#browser_info').text();
+var tag = $('#dmsf_tag');
 var dmsfTag;
+var browser = $("#browser");
 
-if(($('#dmsf_tag') != null) && $('#dmsf_tag')[0] != null) {
+if((tag != null) && tag[0] != null) {
 
-    dmsfTag = $('#dmsf_tag')[0].outerHTML
+    dmsfTag = tag[0].outerHTML
 }
 
 // Destroy the original dataTable
-$("#browser").dataTable().fnDestroy();
+browser.dataTable().fnDestroy();
 
 // Add rows
 $('#<%= params[:row_id] %>').after('<%= escape_javascript(render(:partial => 'dmsf/dmsf_rows')) %>');
@@ -27,7 +29,7 @@ hideOnLoad();
 <% size = DmsfFolder.get_column_position('size') %>
 <% modified = DmsfFolder.get_column_position('modified') %>
 
-$('#browser').dataTable({
+browser.dataTable({
   orderClasses: false,
   responsive: {
       details: false
@@ -55,10 +57,11 @@ $('#browser').dataTable({
       <% end %>
   ],
   "fnInitComplete": function() {
-    $(dmsfButtons).prependTo($("#browser_wrapper div.fg-toolbar")[0]);
-    if($(dmsfTag) != null) {
-        $(dmsfTag).prependTo($("#browser_wrapper div.fg-toolbar")[0]);
-    }
+      var wrapper = $("#browser_wrapper div.fg-toolbar")[0];
+      $(dmsfButtons).prependTo(wrapper);
+      if($(dmsfTag) != null) {
+        $(dmsfTag).prependTo(wrapper);
+      }
   },
   "fnInfoCallback": function( oSettings, iStart, iEnd, iMax, iTotal, sPre ) {
     return browserInfo;
@@ -66,4 +69,4 @@ $('#browser').dataTable({
 });
 
 // Hot fix
-$('#browser').attr('style', 'width: 100%');
+browser.attr('style', 'width: 100%');
diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index 6202847d..023b8e58 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -26,13 +26,13 @@
 
 <div class="contextual">
   <% if !@folder.new_record? && User.current.allowed_to?(:folder_manipulation, @project) && !@folder.system %>
-    <% unless @folder.locked? %>
-      <%= link_to(l(:button_lock), lock_dmsf_path(:id => @project, :folder_id => @folder),
-        :title => l(:title_lock_file), :class => 'icon icon-lock') %>
-    <% else %>
+    <% if @folder.locked? %>
       <%= link_to_if(@folder.unlockable? && (!@folder.locked_for_user? || @force_file_unlock_allowed), l(:button_unlock),
         unlock_dmsf_path(:id => @project, :folder_id => @folder),
-        :title => l(:title_unlock_file), :class => 'icon icon-unlock')%>
+      :title => l(:title_unlock_file), :class => 'icon icon-unlock') %>
+    <% else %>
+      <%= link_to(l(:button_lock), lock_dmsf_path(:id => @project, :folder_id => @folder),
+      :title => l(:title_lock_file), :class => 'icon icon-lock') %>
     <% end %>
     <% unless @folder.locked? %>
       <% if @folder.notification %>
@@ -77,7 +77,7 @@
     <p>
       <%= label_tag '', l(:label_permissions) %>
       <% User.current.managed_roles(@project).each do |role| %>
-          <% checked = @folder.dmsf_folder_permissions.roles.exists?(:object_id => role.id) %>
+          <% checked = @folder.dmsf_folder_permissions.roles.exists?(object_id: role.id) %>
           <label class="inline"><%= check_box_tag 'permissions[role_ids][]', role.id, checked, :id => nil %> <%= role %></label>
       <% end %>
       <span id="user_permissions">
@@ -95,7 +95,7 @@
           :method => 'get' %>
       </span>
     </p>
-    <% values = @folder ? @folder.custom_field_values : @parent ? @parent.custom_field_values : DmsfFolder.new.custom_field_values %>
+    <% values = @folder ? @folder.custom_field_values : (@parent ? @parent.custom_field_values : DmsfFolder.new.custom_field_values) %>
     <% values.each do |value| %>
       <p><%= custom_field_tag_with_label(:dmsf_folder, value) %></p>
     <% end %>    
diff --git a/app/views/dmsf/show.html.erb b/app/views/dmsf/show.html.erb
index 094eee2f..9c10ea1f 100644
--- a/app/views/dmsf/show.html.erb
+++ b/app/views/dmsf/show.html.erb
@@ -86,7 +86,7 @@
 <%= form_tag(entries_operations_dmsf_path(:id => @project, :folder_id => @folder), :method => :post,
              :class => 'dmsf_entries', :id => 'entries_form', :data => {:cm_url => dmsf_context_menu_path}) do %>
     <%= hidden_field_tag('action') %>
-    <% if !@system_folder %>
+    <% unless @system_folder %>
       <div id="dmsf_buttons" class="dmsf_controls" style="float: left">
         <%= submit_tag(l(:button_download), :title => l(:title_download_checked), :name => 'download_entries',
           :class => 'toggle-selection') if @file_view_allowed %>
@@ -183,7 +183,7 @@
                 <% if @folder %>
                   return "<%= "#{l(:label_number_of_folders)}: #{@folder.deep_folder_count} #{l(:label_number_of_documents)}: #{@folder.deep_file_count}" %>";
                 <% else %>
-                  return "<%= "#{l(:label_number_of_folders)}: #{DmsfFolder.visible.where(:project_id => @project.id).count + DmsfLink.visible.where(:project_id => @project.id, :target_type => 'DmsfFolder').count}, #{l(:label_number_of_documents)}: #{DmsfFile.visible.where(:project_id => @project.id).count + DmsfLink.visible.where(:project_id => @project.id, :target_type => ['DmsfFile', 'DmsfUrl']).count}" %>";
+                  return "<%= "#{l(:label_number_of_folders)}: #{DmsfFolder.visible.where(:project_id => @project.id).count + DmsfLink.visible.where(:project_id => @project.id, :target_type => 'DmsfFolder').count}, #{l(:label_number_of_documents)}: #{DmsfFile.visible.where(:project_id => @project.id).count + DmsfLink.visible.where(:project_id => @project.id, :target_type => %w(DmsfFile DmsfUrl)).count}" %>";
                 <% end %>
               <% else %>
                 return "<%= "#{l(:label_number_of_folders)}: #{@subfolders.count + @dir_links.count}, #{l(:label_number_of_documents)}: #{@files.count + @file_links.count + @url_links.count}" %>";
@@ -215,7 +215,7 @@
     <% end %>
 <% end %>
 
-<% if (@file_manipulation_allowed && !@locked_for_user && !@system_folder) %>
+<% if @file_manipulation_allowed && !@locked_for_user && !@system_folder %>
     <%= render(:partial => 'dmsf_upload/multi_upload', :local => { :lbl => true }) %>
 <% end %>
 
diff --git a/app/views/dmsf/trash.html.erb b/app/views/dmsf/trash.html.erb
index d2e44b14..84f2ffac 100644
--- a/app/views/dmsf/trash.html.erb
+++ b/app/views/dmsf/trash.html.erb
@@ -76,8 +76,7 @@
         <% if DmsfFolder.is_column_on?('author') %>
           <th class="dmsf_th"><%= l(:link_author) %></th>
         <% end %>
-        <% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
-        <% cfs.each do |c| %>
+        <% CustomField.where(type: 'DmsfFileRevisionCustomField').order(:position).each do |c| %>
             <% if DmsfFolder.is_column_on?(c.name) %>
                 <th class="dmsf_th"><%= h(c.name) %></th>
             <% end %>
diff --git a/app/views/dmsf_files/_link.html.erb b/app/views/dmsf_files/_link.html.erb
index b216c454..c0472ce8 100644
--- a/app/views/dmsf_files/_link.html.erb
+++ b/app/views/dmsf_files/_link.html.erb
@@ -66,7 +66,7 @@
     <% else %>
       <span class="icon-only icon-unlock" title="<%= dmsf_file.get_locked_title %>"></span>
     <% end %>
-    <% unless dmsf_file.locked? %>
+    <% if !dmsf_file.locked? %>
       <% # Notifications %>
       <% if dmsf_file.notification %>
         <%= link_to('', notify_deactivate_dmsf_files_path(:id => dmsf_file),
@@ -91,7 +91,7 @@
       <span class="icon-only"></span>
     <% end %>
     <% # Approval workflow %>
-    <% wf = DmsfWorkflow.find_by_id(dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id %>
+    <% wf = DmsfWorkflow.find_by(id: dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id %>
     <%= render(:partial => 'dmsf_workflows/approval_workflow_button',
       :locals => {:file => dmsf_file,
          :file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_file.project),
diff --git a/app/views/dmsf_files/show.html.erb b/app/views/dmsf_files/show.html.erb
index a65cae75..ccfc3d19 100644
--- a/app/views/dmsf_files/show.html.erb
+++ b/app/views/dmsf_files/show.html.erb
@@ -26,37 +26,37 @@
 
 <div class="contextual">
   <% if @file_manipulation_allowed %>
-    <% unless @file.locked_for_user? %>
-      <% unless @file.locked? %>
-        <%= link_to(l(:button_lock), lock_dmsf_files_path(:id => @file),
-          :title => l(:title_lock_file), :class => 'icon icon-lock') %>
-      <% else %>
+    <% if @file.locked_for_user? %>
+      <% if User.current.allowed_to?(:force_file_unlock, @project) %>
         <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(:id => @file),
-          :title => l(:title_unlock_file), :class => 'icon icon-unlock') %>
+                       :title => l(:title_unlock_file), :class => 'icon icon-unlock')%>
+      <% end %>
+    <% else %>
+      <% if @file.locked? %>
+        <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(:id => @file),
+                       :title => l(:title_unlock_file), :class => 'icon icon-unlock') %>
+      <% else %>
+        <%= link_to(l(:button_lock), lock_dmsf_files_path(:id => @file),
+                    :title => l(:title_lock_file), :class => 'icon icon-lock') %>
       <% end %>
       <% if @file.notification %>
         <%= link_to(l(:label_notifications_off),
-          notify_deactivate_dmsf_files_path(:id => @file),
-          :title => l(:title_notifications_active_deactivate),
-          :class => 'icon icon-email') %>
+                    notify_deactivate_dmsf_files_path(:id => @file),
+                    :title => l(:title_notifications_active_deactivate),
+                    :class => 'icon icon-email') %>
       <% else %>
         <%= link_to(l(:label_notifications_on),
-          notify_activate_dmsf_files_path(:id => @file),
-          :title => l(:title_notifications_not_active_activate),
-          :class => 'icon icon-email-add') %>
+                    notify_activate_dmsf_files_path(:id => @file),
+                    :title => l(:title_notifications_not_active_activate),
+                    :class => 'icon icon-email-add') %>
       <% end %>
       <%= link_to(l(:label_link_to),
-        new_dmsf_link_path(:project_id => @project.id, :dmsf_folder_id => @file.dmsf_folder ? @file.dmsf_folder.id : nil, :dmsf_file_id => @file.id, :type => 'link_to'),
-        :title => l(:title_create_link),
-        :class => 'icon icon-link') %>
+                  new_dmsf_link_path(:project_id => @project.id, :dmsf_folder_id => @file.dmsf_folder ? @file.dmsf_folder.id : nil, :dmsf_file_id => @file.id, :type => 'link_to'),
+                  :title => l(:title_create_link),
+                  :class => 'icon icon-link') %>
       <%= link_to("#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(:id => @file),
-        :title => l(:title_copy), :class => 'icon icon-copy') %>
+                  :title => l(:title_copy), :class => 'icon icon-copy') %>
       <%= delete_link(dmsf_file_path(:id => @file, :details => true)) if @file_delete_allowed %>
-    <% else %>
-      <% if User.current.allowed_to?(:force_file_unlock, @project) %>
-        <%= link_to_if(@file.unlockable?, l(:button_unlock), unlock_dmsf_files_path(:id => @file),
-          :title => l(:title_unlock_file), :class => 'icon icon-unlock')%>
-      <% end %>
     <% end %>
   <% end %>
 </div>
@@ -127,7 +127,7 @@
             <%= content_tag :div, l(:label_size), :class => 'label' %>
             <%= content_tag :div, number_to_human_size(revision.size), :class => 'value' %>
           </div>
-          <% wf = DmsfWorkflow.find_by_id(revision.dmsf_workflow_id) %>
+          <% wf = DmsfWorkflow.find_by(id: revision.dmsf_workflow_id) %>
           <% if wf %>
             <div class="status attribute">
               <%= content_tag :div, l(:label_workflow), :class => 'label' %>
diff --git a/app/views/dmsf_folder_permissions/new.js.erb b/app/views/dmsf_folder_permissions/new.js.erb
index f35b6b51..5c302c70 100644
--- a/app/views/dmsf_folder_permissions/new.js.erb
+++ b/app/views/dmsf_folder_permissions/new.js.erb
@@ -20,7 +20,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
+var modal = $('#ajax-modal');
+
 $('#users_for_watcher').html('<%= escape_javascript(render_principals_for_new_folder_permissions(@principals)) %>');
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'dmsf_folder_permissions/new') %>');
+modal.html('<%= escape_javascript(render :partial => 'dmsf_folder_permissions/new') %>');
 showModal('ajax-modal', '400px');
-$('#ajax-modal').addClass('new-user');
+modal.addClass('new-user');
diff --git a/app/views/dmsf_folders_copy/_form.html.erb b/app/views/dmsf_folders_copy/_form.html.erb
index 9eab0973..806782c4 100644
--- a/app/views/dmsf_folders_copy/_form.html.erb
+++ b/app/views/dmsf_folders_copy/_form.html.erb
@@ -21,7 +21,7 @@
 %>
 
 <% if projects.present? %>
-  <%= form_tag({:action => 'copy', :id => file_or_folder}, :id => 'copyForm') do |f| %>
+  <%= form_tag({:action => 'copy', :id => file_or_folder}, :id => 'copyForm') do %>
     <div class="box tabular">
       <p>
         <%= label_tag('target_project_id', l(:field_target_project)) %>
diff --git a/app/views/dmsf_links/autocomplete_for_project.js.erb b/app/views/dmsf_links/autocomplete_for_project.js.erb
index eda8eb4b..2e527478 100644
--- a/app/views/dmsf_links/autocomplete_for_project.js.erb
+++ b/app/views/dmsf_links/autocomplete_for_project.js.erb
@@ -1,4 +1,28 @@
-$('#dmsf_link_target_folder_id').html('<%= escape_javascript(
+<%
+# encoding: utf-8
+#
+# Redmine plugin for Document Management System "Features"
+#
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+%>
+
+var link = $('#dmsf_link_target_folder_id');
+
+link.html('<%= escape_javascript(
   select_tag('dmsf_link[target_folder_id]',
          folder_tree_options_for_select(DmsfFolder.directory_tree(params[:dmsf_link][:target_project_id])))) %>');
-$('#dmsf_link_target_folder_id').change();
+link.change();
diff --git a/app/views/dmsf_mailer/send_documents.html.erb b/app/views/dmsf_mailer/send_documents.html.erb
index a9f8e672..83c380cc 100644
--- a/app/views/dmsf_mailer/send_documents.html.erb
+++ b/app/views/dmsf_mailer/send_documents.html.erb
@@ -28,10 +28,10 @@
   <% files = [] %>
   <% if @folders.present? %>
     <% JSON.parse(@folders).each do |id| %>
-      <% folder = DmsfFolder.find_by_id id %>
+      <% folder = DmsfFolder.find_by(id: id) %>
       <% if folder %>
         <% folder.folder_tree.each do |name, i| %>
-          <% dir = DmsfFolder.find_by_id i %>
+          <% dir = DmsfFolder.find_by(id: i) %>
           <% if dir && !folders.include?(dir) %>
             <br/>
             <%= link_to(h(dir.dmsf_path_str), dmsf_folder_path(:id => dir.project_id, :folder_id => dir.id, :only_path => false)) %>
diff --git a/app/views/dmsf_mailer/send_documents.text.erb b/app/views/dmsf_mailer/send_documents.text.erb
index 07a299fe..89ee5cc8 100644
--- a/app/views/dmsf_mailer/send_documents.text.erb
+++ b/app/views/dmsf_mailer/send_documents.text.erb
@@ -28,10 +28,10 @@
   <% files = [] %>
   <% if @folders.present? %>
     <% JSON.parse(@folders).each do |id| %>
-      <% folder = DmsfFolder.find_by_id id %>
+      <% folder = DmsfFolder.find_by(id: id) %>
       <% if folder && !folders.include?(folder) %>
         <% folder.folder_tree.each do |name, i| %>
-          <% dir = DmsfFolder.find_by_id i %>
+          <% dir = DmsfFolder.find_by(id: i) %>
           <% if dir %>
             <%= dir.dmsf_path_str %>
             <% dir.dmsf_files.each do |file| %>
diff --git a/app/views/dmsf_mailer/workflow_notification.html.erb b/app/views/dmsf_mailer/workflow_notification.html.erb
index 4ca553de..baea1ee3 100644
--- a/app/views/dmsf_mailer/workflow_notification.html.erb
+++ b/app/views/dmsf_mailer/workflow_notification.html.erb
@@ -22,11 +22,11 @@
 </p>
 <p>
   <%= @text2 %>
-  <%  unless @revision.dmsf_file.dmsf_folder %>
-    <%= link_to l(:link_documents),
-      dmsf_folder_url(:id => @revision.dmsf_file.project) %>
-  <% else %>
-    <%=  link_to @revision.dmsf_file.dmsf_folder.title,
+  <% if @revision.dmsf_file.dmsf_folder %>
+  <%=   link_to @revision.dmsf_file.dmsf_folder.title,
       dmsf_folder_url(:id => @revision.dmsf_file.project, :folder_id => @revision.dmsf_file.dmsf_folder) %>
+  <% else %>
+  <%=  link_to l(:link_documents),
+      dmsf_folder_url(:id => @revision.dmsf_file.project) %>
   <% end %>.
 </p>
\ No newline at end of file
diff --git a/app/views/dmsf_mailer/workflow_notification.text.erb b/app/views/dmsf_mailer/workflow_notification.text.erb
index fb071730..a4500d07 100644
--- a/app/views/dmsf_mailer/workflow_notification.text.erb
+++ b/app/views/dmsf_mailer/workflow_notification.text.erb
@@ -21,8 +21,8 @@
 
 <%= @user.name %>,
 <%= @text1 %>
-<% unless @revision.dmsf_file.dmsf_folder %>
-  <%= @text2 %> <%= dmsf_folder_url(:id => @revision.dmsf_file.project) %>.
+<% if @revision.dmsf_file.dmsf_folder %>
+<%=  @text2  %> <%=  dmsf_folder_url(:id => @revision.dmsf_file.project, :folder_id => @revision.dmsf_file.dmsf_folder) %>.
 <% else %>
-  <%= @text2 %> <%= dmsf_folder_url(:id => @revision.dmsf_file.project, :folder_id => @revision.dmsf_file.dmsf_folder) %>.
+<%=  @text2  %> <%=  dmsf_folder_url(:id => @revision.dmsf_file.project) %>.
 <% end %>
\ No newline at end of file
diff --git a/app/views/dmsf_state/_user_pref.html.erb b/app/views/dmsf_state/_user_pref.html.erb
index b8db6728..6955f48f 100644
--- a/app/views/dmsf_state/_user_pref.html.erb
+++ b/app/views/dmsf_state/_user_pref.html.erb
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
 
-<% member = Member.find_by_project_id_and_user_id(@project.id, User.current.id) %>
+<% member = Member.find_by(project_id: @project.id, user_id: User.current.id) %>
 <% if member %>
   <% mail_notification = member.dmsf_mail_notification %>
   <% title_format = member.dmsf_title_format %>
diff --git a/app/views/dmsf_upload/_form.html.erb b/app/views/dmsf_upload/_form.html.erb
index 020dd1ed..1ec76a2f 100644
--- a/app/views/dmsf_upload/_form.html.erb
+++ b/app/views/dmsf_upload/_form.html.erb
@@ -23,7 +23,7 @@
 <span id="dmsf_attachments_fields">
   <% if defined?(container) && container && container.saved_dmsf_attachments.present? %>
     <% container.saved_dmsf_attachments.each_with_index do |attachment, i| %>
-      <span id="dmsf_attachments_p<%= i %>", class="attachment">
+      <span id="dmsf_attachments_p<%= i %>" class="attachment">
           <%= hidden_field_tag "dmsf_attachments[p#{i}][token]", "#{attachment.token}" %>
           <%= text_field_tag("dmsf_attachments[p#{i}][filename]", attachment.filename, :class => 'filename') %>
           <%= text_field_tag("dmsf_attachments[p#{i}][description]", attachment.description, :maxlength => 255,
@@ -32,7 +32,7 @@
                 :method => 'delete', :remote => true, :class => 'remove-upload icon-only icon-del') %>
           <% wf = container.saved_dmsf_attachments_wfs[attachment.id] %>
           <% if wf %>
-              <a href="javascript:void(0);" title="<%= l(:title_assigned) %>" class="icon-only icon-wf-assigned"></a>
+          <a href="javascript:void(0);" title="<%= l(:title_assigned) %>" class="icon-only icon-wf-assigned"></a>
               <%= hidden_field_tag("dmsf_attachments_wfs[p#{i}]", wf.id) if wf %>
           <% else %>
               <%= link_to('',  assign_dmsf_workflow_path(:id => container.project.id, :project_id => container.project.id,
@@ -47,14 +47,14 @@
 <span id="dmsf_links_attachments_fields">
 <% if defined?(container) && container && container.saved_dmsf_links.present? %>
     <% container.saved_dmsf_links.each_with_index do |dmsf_link, index| %>
-        <span id="dmsf_links_attachments_<%= index %>", class="attachment">
+        <span id="dmsf_links_attachments_<%= index %>" class="attachment">
           <input name="dmsf_links[<%= index %>]" value="<%= dmsf_link.id %>" type="hidden">
           <input type="text" class='filename readonly' value="<%= dmsf_link.name %>">
            <%= link_to('', dmsf_link_attachment_path(dmsf_link, :link_id => "#{index}", :format => 'js'),
                       :method => 'delete', :remote => true, :class => 'remove-upload icon-only icon-del') %>
             <% wf = container.saved_dmsf_links_wfs[dmsf_link.id] %>
             <% if wf %>
-              <a href="javascript:void(0);" title="<%= l(:title_assigned) %>" class="modify-upload icon-only icon-wf-assigned"></a>
+            <a href="javascript:void(0);" title="<%= l(:title_assigned) %>" class="modify-upload icon-only icon-wf-assigned"></a>
                 <%= hidden_field_tag("dmsf_links_wfs[#{dmsf_link.id}]", wf.id) if wf %>
             <% else %>
               <%= render(:partial => 'dmsf_workflows/approval_workflow_button',
diff --git a/app/views/dmsf_workflows/_action.html.erb b/app/views/dmsf_workflows/_action.html.erb
index 9dc5bb52..9129f3fa 100644
--- a/app/views/dmsf_workflows/_action.html.erb
+++ b/app/views/dmsf_workflows/_action.html.erb
@@ -41,7 +41,7 @@
     <%= text_area_tag :note, '', :placeholder => l(:message_dmsf_wokflow_note), :style => 'width: 90%' %>
   </p>
 
-  <p>
+  <div>
     <%= label_tag 'delegate', l(:label_dmsf_wokflow_action_delegate) %><br/>
     <%= text_field_tag 'user_search', nil %>    
     <%= late_javascript_tag "observeSearchfield('user_search', null, '#{ escape_javascript autocomplete_for_user_dmsf_workflow_path(@dmsf_workflow, :dmsf_workflow_step_assignment_id => params[:dmsf_workflow_step_assignment_id], :dmsf_file_revision_id => params[:dmsf_file_revision_id]) }')" %>
@@ -49,7 +49,7 @@
       <%= render_principals_for_new_dmsf_workflow_users(
         @dmsf_workflow, params[:dmsf_workflow_step_assignment_id], params[:dmsf_file_revision_id]) %>
     </div>
-  </p>
+  </div>
   
   <p class="buttons">
     <%= submit_tag l(:button_submit), :name => 'commit', :onclick => 'hideModal(this);' %>
diff --git a/app/views/dmsf_workflows/_approval_workflow_button.html.erb b/app/views/dmsf_workflows/_approval_workflow_button.html.erb
index 968cbb84..e886465e 100644
--- a/app/views/dmsf_workflows/_approval_workflow_button.html.erb
+++ b/app/views/dmsf_workflows/_approval_workflow_button.html.erb
@@ -26,7 +26,7 @@
         <% if wf %>
             <% assignments = wf.next_assignments(file.last_revision.id) %>
             <% index = assignments.find_index{|assignment| assignment.user_id == User.current.id} if assignments %>
-            <% if index %>
+            <% if assignments && index %>
                 <%= link_to('',
                             action_dmsf_workflow_path(
                                 :project_id => project.id,
@@ -37,7 +37,7 @@
                             :remote => true,
                             :class => "icon-only icon-wf-waiting") %>
             <% else %>
-                <span class="icon-only"></span>
+              <span class="icon-only"></span>
             <% end %>
         <% else %>
             <span class="icon-only"></span>
diff --git a/app/views/dmsf_workflows/_log.html.erb b/app/views/dmsf_workflows/_log.html.erb
index 87d8f8ef..6c292a12 100644
--- a/app/views/dmsf_workflows/_log.html.erb
+++ b/app/views/dmsf_workflows/_log.html.erb
@@ -23,7 +23,7 @@
 <h3 class="title"><%= l(:title_dmsf_workflow_log) %></h3>
 <p>
   <% if params[:dmsf_file_revision_id].present? %>
-    <% revision = DmsfFileRevision.find_by_id(params[:dmsf_file_revision_id]) %>
+    <% revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id]) %>
       <% if revision %>
         <div class="dmsf_log_header_box">                    
           <div class="dmsf_log_header_left">
@@ -44,7 +44,7 @@
             <thead><tr>
               <th></th>
               <th><%= l(:label_dmsf_workflow_step) %></th>
-              <th><%= l(:label_user) %> </th>
+              <th><%= l(:label_user) %></th>
               <th><%= l(:label_action) %></th>
               <th><%= l(:link_workflow) %></th>
               <th><%= l(:label_note) %></th>
@@ -52,18 +52,18 @@
             </tr></thead>
             <tbody>
             <tr id="step-0" class="even">
-                <td class="id"/>
-                <td/>
-                <td/>
-                <td/>
+              <td class="id"></td>
+                <td></td>
+                <td></td>
+                <td></td>
                 <td><%= DmsfWorkflowStepAction.workflow_str(0) %></td>
                 <td class="dmsf_note"></td>
-                <td/>
+                <td></td>
               </tr>
               <tr id="step-1" class="odd">
                 <td class="id"></td>
-                <td/>
-                <td><%= link_to_user User.find_by_id(revision.dmsf_workflow_assigned_by) if revision.dmsf_workflow_assigned_by %></td>
+                <td></td>
+                <td><%= link_to_user User.find_by(id: revision.dmsf_workflow_assigned_by) if revision.dmsf_workflow_assigned_by %></td>
                 <td><%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %></td>
                 <td><%= DmsfWorkflowStepAction.workflow_str(DmsfWorkflowStepAction::ACTION_ASSIGN) %></td>
                 <td class="dmsf_note"></td>
@@ -71,8 +71,8 @@
               </tr>  
               <tr id="step-2" class="even">
                 <td class="id"></td>
-                <td/>
-                <td><%= link_to_user User.find_by_id(revision.dmsf_workflow_started_by) if revision.dmsf_workflow_started_by %></td>
+                <td></td>
+                <td><%= link_to_user User.find_by(id: revision.dmsf_workflow_started_by) if revision.dmsf_workflow_started_by %></td>
                 <td><%= DmsfWorkflowStepAction.action_str(DmsfWorkflowStepAction::ACTION_START) %></td>
                 <td><%= DmsfWorkflowStepAction.workflow_str(DmsfWorkflowStepAction::ACTION_START) if revision.dmsf_workflow_started_by %></td>
                 <td class="dmsf_note"></td>
@@ -86,10 +86,10 @@
                   <td class="id"><%= row['step'] unless row['step'] == last_step %></td>
                   <% last_step = row['step'] %>
                   <td class="name"><%= row['name'] %></td>
-                  <td><%= link_to_user User.find_by_id(row['author_id'].present? ? row['author_id'] : row['user_id']) %></td>
+                  <td><%= link_to_user User.find_by(id: row['author_id'].present? ? row['author_id'] : row['user_id']) %></td>
                   <td><%= DmsfWorkflowStepAction.action_str(row['action']) %></td>
                   <td>                    
-                    <% if((row['step'].to_i == @dmsf_workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row['action'] != DmsfWorkflowStepAction::ACTION_DELEGATE)) %>
+                    <% if (row['step'].to_i == @dmsf_workflow.dmsf_workflow_steps.last.step) && (revision.workflow == DmsfWorkflow::STATE_APPROVED) && (row['action'] != DmsfWorkflowStepAction::ACTION_DELEGATE) %>
                       <%= l(:title_approved) %>
                     <% else %>
                       <%= DmsfWorkflowStepAction.workflow_str(row['action']) %>
diff --git a/app/views/dmsf_workflows/_main.html.erb b/app/views/dmsf_workflows/_main.html.erb
index 7cb75a3f..640228af 100644
--- a/app/views/dmsf_workflows/_main.html.erb
+++ b/app/views/dmsf_workflows/_main.html.erb
@@ -43,12 +43,12 @@
   <table class="list">
     <thead><tr>
       <th><%=l(:field_name)%></th>    
-      <th></th>
+      <th/>
     </tr></thead>
     <tbody>
-      <% for workflow in @workflows %>
+      <% @workflows.each do |workflow| %>
         <tr id="workflow-<%= workflow.id %>" class="dmsf_workflows <%= workflow.active? ? 'active' : 'locked' %>">
-          <td class="name"><%= link_to(h(workflow.name), dmsf_workflow_path(workflow)) %></td>          
+          <td class="name"><%= link_to(h(workflow.name), dmsf_workflow_path(workflow)) %></td>
           <td class="buttons">
             <%= change_status_link(workflow) unless @project %>
             <%= delete_link dmsf_workflow_path(workflow) %>
diff --git a/app/views/dmsf_workflows/_steps.html.erb b/app/views/dmsf_workflows/_steps.html.erb
index b924be18..507f5fe4 100644
--- a/app/views/dmsf_workflows/_steps.html.erb
+++ b/app/views/dmsf_workflows/_steps.html.erb
@@ -47,7 +47,7 @@
         <th></th>
         <th><%= l(:label_dmsf_workflow_step) %></th>
         <th><%= l(:label_dmsf_workflow_approval_plural) %></th>
-        <th></th>
+        <th>/th>
       </tr></thead>
       <tbody>
       <% steps.each do |i|%>
@@ -74,9 +74,9 @@
                 <%= link_to_user step.user %>
               <% end %>
             </span>
-            <div id="<%= "step-index-#{index}-approvers-form" %>", class="hol">
+            <div id="<%= "step-index-#{index}-approvers-form" %>" class="hol">
                 <div class="dmsf_parent_container">
-                  <% stps.each_with_index do |step, j| %>
+                  <% stps.each do |step| %>
                       <div class="dmsf_child_container">
                         <label>
                           <%= radio_button_tag "operator_step[#{step.id}]", DmsfWorkflowStep::OPERATOR_AND,
diff --git a/app/views/dmsf_workflows/action.js.erb b/app/views/dmsf_workflows/action.js.erb
index 122cabff..e92331fa 100644
--- a/app/views/dmsf_workflows/action.js.erb
+++ b/app/views/dmsf_workflows/action.js.erb
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'action', :locals => {:workflow => @dmsf_workflow}) %>');
+var modal = $('#ajax-modal');
+
+modal.html('<%= escape_javascript(render :partial => 'action', :locals => {:workflow => @dmsf_workflow}) %>');
 showModal('ajax-modal', '35%');
-$('#ajax-modal').addClass('new-action');
\ No newline at end of file
+modal.addClass('new-action');
\ No newline at end of file
diff --git a/app/views/dmsf_workflows/assign.js.erb b/app/views/dmsf_workflows/assign.js.erb
index 112f7d61..dba9611c 100644
--- a/app/views/dmsf_workflows/assign.js.erb
+++ b/app/views/dmsf_workflows/assign.js.erb
@@ -20,6 +20,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'assign') %>');
+var modal = $('#ajax-modal');
+
+modal.html('<%= escape_javascript(render :partial => 'assign') %>');
 showModal('ajax-modal', '30%');
-$('#ajax-modal').addClass('assignment');
\ No newline at end of file
+modal.addClass('assignment');
\ No newline at end of file
diff --git a/app/views/dmsf_workflows/log.js.erb b/app/views/dmsf_workflows/log.js.erb
index ac2955fc..358c86ed 100644
--- a/app/views/dmsf_workflows/log.js.erb
+++ b/app/views/dmsf_workflows/log.js.erb
@@ -19,6 +19,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
 
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'log', :locals => {:workflow => @dmsf_workflow}) %>');
+var modal = $('#ajax-modal');
+
+modal.html('<%= escape_javascript(render :partial => 'log', :locals => {:workflow => @dmsf_workflow}) %>');
 showModal('ajax-modal', '90%');
-$('#ajax-modal').addClass('workflow-log');
\ No newline at end of file
+modal.addClass('workflow-log');
diff --git a/app/views/search/_container.html.erb b/app/views/search/_container.html.erb
index 8aa3534a..40a35513 100644
--- a/app/views/search/_container.html.erb
+++ b/app/views/search/_container.html.erb
@@ -22,8 +22,8 @@
 
 <% dmsf_file_or_folder = object %>
 <% if dmsf_file_or_folder.dmsf_folder_id %>
-  <% dmsf_folder = DmsfFolder.find_by_id dmsf_file_or_folder.dmsf_folder_id %>
-  <% title = dmsf_folder.title if dmsf_folder %>
+  <% titles = DmsfFolder.where(id: dmsf_file_or_folder.dmsf_folder_id).pluck(:title) %>
+  <% title = titles.first %>
 <% else %>
   <% title = dmsf_file_or_folder.project.name %>
 <% end %>
diff --git a/app/views/settings/_dmsf_columns.html.erb b/app/views/settings/_dmsf_columns.html.erb
index bb926ed1..76ffbfd8 100644
--- a/app/views/settings/_dmsf_columns.html.erb
+++ b/app/views/settings/_dmsf_columns.html.erb
@@ -32,7 +32,7 @@
   <% cfs = CustomField.where(:type => 'DmsfFileRevisionCustomField').order(:position) %>
   <% columns.concat(cfs.map{ |c| c.name }) %>
   <% selected_columns = DmsfFolder::DEFAULT_COLUMNS if selected_columns.blank? %>
-  <% columns.each_with_index do |column, i| %>
+  <% columns.each do |column| %>
     <%= check_box_tag('settings[dmsf_columns][]', column, selected_columns.include?(column)) %>
     <%= h column.capitalize %>
     <br/>
diff --git a/app/views/settings/_dmsf_settings.html.erb b/app/views/settings/_dmsf_settings.html.erb
index 9e8e987e..7b12f713 100644
--- a/app/views/settings/_dmsf_settings.html.erb
+++ b/app/views/settings/_dmsf_settings.html.erb
@@ -79,8 +79,7 @@
 <% testfilename = DmsfFile.storage_path.join('test.test') %>
 <% if File.exist?(storage_dir) %>
   <%	begin %>
-    <% File.open(testfilename, 'wb') do |file| %>
-    <% end %>
+    <% File.open(testfilename, 'wb') %>
   <% rescue %>
     <p class="warning"><%= l(:error_file_can_not_be_created) %></p>
   <%	ensure %>
@@ -110,8 +109,7 @@
 <% testfilename = path.join('test.test') %>
 <% if File.exist?(tmpdir) %>
   <%	begin %>
-    <% File.open(testfilename, 'wb') do |file| %>
-    <% end %>
+    <% File.open(testfilename, 'wb') %>
   <% rescue %>
     <p class="warning"><%= l(:error_tmpfile_can_not_be_created) %></p>
   <%	ensure %>
@@ -316,7 +314,7 @@
 
 <p>
   <%= content_tag(:label, l(:label_enable_cjk_ngrams)) %>
-  <%= check_box_tag 'settings[enable_cjk_ngrams]', true, @settings['enable_cjk_ngrams'] == 'true' %>
+  <%= check_box_tag 'settings[enable_cjk_ngrams]', true, @settings['dmsf_enable_cjk_ngrams'] %>
   <em class="info">
     <%= l(:text_enable_cjk_ngrams) %>
   </em>
diff --git a/assets/javascripts/attachments_dmsf.js b/assets/javascripts/attachments_dmsf.js
index 09bb49a0..dae3741a 100644
--- a/assets/javascripts/attachments_dmsf.js
+++ b/assets/javascripts/attachments_dmsf.js
@@ -49,7 +49,9 @@ dmsfAddLink.nextLinkId = 1000;
 
 function dmsfAddFile(inputEl, file, eagerUpload) {
 
-    if ($('#dmsf_attachments_fields').children().length < 10) {
+    var attachments = $('#dmsf_attachments_fields');
+
+    if (attachments.children().length < 10) {
 
         var attachmentId = dmsfAddFile.nextAttachmentId++;
         var fileSpan = $('<span>', { id: 'dmsf_attachments_' + attachmentId, 'class': 'attachment' });
@@ -82,11 +84,11 @@ function dmsfAddFile(inputEl, file, eagerUpload) {
                 fileSpan.append(iconWf);
             }
 
-            $('#dmsf_attachments_fields').append(fileSpan);
+            attachments.append(fileSpan);
         }
         else{
             fileSpan.append(fileName);
-            $('#dmsf_attachments_fields').append(fileSpan);
+            attachments.append(fileSpan);
             $('#dmsf_file_revision_name').val(file.name);
         }
 
diff --git a/assets/javascripts/jquery.dataTables/locales/no.json b/assets/javascripts/jquery.dataTables/locales/no.json
index e4835c01..3181b781 100644
--- a/assets/javascripts/jquery.dataTables/locales/no.json
+++ b/assets/javascripts/jquery.dataTables/locales/no.json
@@ -10,7 +10,6 @@
     "sInfoThousands": " ",
     "sLoadingRecords": "Lastar...",
     "sLengthMenu": "Syn _MENU_ linjer",
-    "sLoadingRecords": "Lastar...",
     "sProcessing": "Lastar...",
     "sSearch": "S&oslash;k:",
     "sUrl": "",
@@ -20,7 +19,7 @@
         "sPrevious": "Forrige",
         "sNext": "Neste",
         "sLast": "Siste"
-    }
+    },
     "oAria": {
         "sSortAscending": ": aktiver for å sortere kolonna stigande",
         "sSortDescending": ": aktiver for å sortere kolonna synkande"
diff --git a/assets/javascripts/redmine_dmsf.js b/assets/javascripts/redmine_dmsf.js
index 781f0cda..2c37e25b 100644
--- a/assets/javascripts/redmine_dmsf.js
+++ b/assets/javascripts/redmine_dmsf.js
@@ -41,7 +41,7 @@ function dmsfToggle(EL, PM, url)
     dmsfExpandRows(EL, selectedRow, url);
   }
 
-  for(i = 0; i < elsLen; i++)
+  for(var i = 0; i < elsLen; i++)
   {
     if(cpattern.test(els[i].id))
     {
@@ -65,7 +65,7 @@ function dmsfToggle(EL, PM, url)
 
     if(pattern.test(els[i].className))
     {
-      var cnames = els[i].className;
+      let cnames = els[i].className;
 
       cnames = cnames.replace(/dmsf_hidden/g,'');
 
@@ -89,7 +89,7 @@ function dmsfToggle(EL, PM, url)
 
     if(!(hide.test(els[i].className)))
     {
-      var cnames = els[i].className;
+      let cnames = els[i].className;
 
       cnames = cnames.replace(/odd/g,'');
       cnames = cnames.replace(/even/g,'');
@@ -110,14 +110,14 @@ function dmsfToggle(EL, PM, url)
 
   if (collapse.test(selectedRow.className))
   {
-    var cnames = selectedRow.className;
+    let cnames = selectedRow.className;
 
     cnames = cnames.replace(/dmsf_collapsed/,'dmsf_expanded');
     selectedRow.className = cnames;
   }
   else
   {
-    var cnames = selectedRow.className;
+    let cnames = selectedRow.className;
 
     cnames = cnames.replace(/dmsf_expanded/,'dmsf_collapsed');
     selectedRow.className = cnames;
diff --git a/assets/stylesheets/redmine_dmsf.css b/assets/stylesheets/redmine_dmsf.css
index e7d890c8..dee60b89 100644
--- a/assets/stylesheets/redmine_dmsf.css
+++ b/assets/stylesheets/redmine_dmsf.css
@@ -37,7 +37,7 @@
 
 #dmsf_tag .check_box_group {
     background: inherit;
-    border: 0px;
+    border: 0;
 }
 
 .list .dmsf_modified {
@@ -68,7 +68,7 @@
 }
 
 .list .dmsf_checkbox input {
-    padding:0px;
+    padding: 0;
 }
 
 .list .dmsf_checkbox .DataTables_sort_wrapper {
@@ -152,7 +152,7 @@ table.display thead th div.DataTables_sort_wrapper span {
 
 /* DMSF revision box */
 .dmsf_revision_box {
-  padding: 0px 0px 0px 0px;
+  padding: 0 0 0 0;
   margin-bottom: 10px;
   background-color:#f6f6f6;
   color:#505050;
@@ -201,7 +201,7 @@ div.dmsf_revision_inner_box .attribute .label {
 
 .dmsf_log_header_box label{
   font-weight: bold;
-  margin-left: 0px;
+  margin-left: 0;
   margin-right: 3px;
   padding: 3px 0 3px 0;
 }
@@ -349,13 +349,13 @@ div.dmsf_revision_inner_box .attribute .label {
 
 #dmsf_attachments_fields input.description {margin-left:4px; width:340px;}
 #dmsf_attachments_fields span {display:block; white-space:nowrap;}
-#dmsf_attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../../../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
-#dmsf_attachments_fields .ajax-waiting input.filename {background:url(../../../images/hourglass.png) no-repeat 0px 50%;}
-#dmsf_attachments_fields .ajax-loading input.filename {background:url(../../../images/loading.gif) no-repeat 0px 50%;}
+#dmsf_attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../../../images/attachment.png) no-repeat 1px 50%; padding-left: 18px;}
+#dmsf_attachments_fields .ajax-waiting input.filename {background:url(../../../images/hourglass.png) no-repeat 0 50%;}
+#dmsf_attachments_fields .ajax-loading input.filename {background:url(../../../images/loading.gif) no-repeat 0 50%;}
 #dmsf_attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
 
 #dmsf_links_attachments_fields span {display:block; white-space:nowrap;}
-#dmsf_links_attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../../../images/link.png) no-repeat 1px 50%; padding-left:18px;}
+#dmsf_links_attachments_fields input.filename {border:0; height:1.8em; width:250px; color:#555; background-color:inherit; background:url(../../../images/link.png) no-repeat 1px 50%; padding-left: 18px;}
 
 /* New link form*/
 #dmsf_link_target_file_id, #dmsf_link_target_folder_id, #dmsf_link_target_project_id, #dmsf_link_name{
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bdfc004d..c9a29d44 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -168,8 +168,6 @@ cs:
   permission_email_documents: Email documents
   label_file: Soubor
   field_folder: Složka
-  error_create_cycle_in_folder_dependency: vytvořit smyčku v závislostech složky
-  error_contains_invalid_character: obsahuje neplatné znaky
   error_file_commit_require_uploaded_file: Potvrzení vyžaduje nahraný soubor
 
   warning_some_files_were_not_commited: "Některé soubory nebyly potvrzené z důvodu chyb při validaci: %{files}"
@@ -417,4 +415,9 @@ cs:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: obsahuje neplatné znaky
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 9a792550..91e9daab 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -168,8 +168,6 @@ de:
   permission_email_documents: Email documents
   label_file: Datei
   field_folder: Ordner
-  error_create_cycle_in_folder_dependency: Zirkelabhängigkeit in der Ordnerstruktur erstellt
-  error_contains_invalid_character: enthält ungültige Zeichen
   error_file_commit_require_uploaded_file: Der Commit erfordet eine hochladene Datei
 
   warning_some_files_were_not_commited: "Einige Dateien wurden wegen Validierungsfehlern nicht commitet: %{files}"
@@ -417,4 +415,9 @@ de:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: enthält ungültige Zeichen
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 09c78b5b..6b556592 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -168,8 +168,6 @@ en:
   permission_email_documents: Email documents
   label_file: File
   field_folder: Folder
-  error_create_cycle_in_folder_dependency: create cycle in folder dependency
-  error_contains_invalid_character: contains invalid character(s)
   error_file_commit_require_uploaded_file: File commit require uploaded file
 
   warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}"
@@ -417,4 +415,9 @@ en:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: contains invalid character(s)
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index d20b005d..744ed5fc 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -168,8 +168,6 @@ es:
   permission_email_documents: Email documents
   label_file: Archivo
   field_folder: Directorio
-  error_create_cycle_in_folder_dependency: crear ciclo en dependencia de directorio
-  error_contains_invalid_character: contiene caracter(es) inválido(s)
   error_file_commit_require_uploaded_file: El commit requiere archivos subidos
 
   warning_some_files_were_not_commited: "Algunos archivos no fueron registrados por un error de validación: %{files}"
@@ -417,4 +415,9 @@ es:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: contiene caracter(es) inválido(s)
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 59792dd5..ad0d3ef8 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -168,8 +168,6 @@ fr:
   permission_email_documents: Email documents
   label_file: Fichier
   field_folder: Dossier
-  error_create_cycle_in_folder_dependency: Crée une dépendance cyclique du dossier
-  error_contains_invalid_character: Contient un(des) caractère(s) invalide(s)
   error_file_commit_require_uploaded_file: "Transmission des fichiers nécessaire avant l'enregistrement"
 
   warning_some_files_were_not_commited: "Erreur d'enregsitrement de certains fichiers %{files}"
@@ -417,4 +415,9 @@ fr:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: contient un(des) caractère(s) invalide(s)
\ No newline at end of file
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 5d7573c6..76ea4a73 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -168,8 +168,6 @@ hu:
   permission_email_documents: Email documents
   label_file: Fájl
   field_folder: Mappa
-  error_create_cycle_in_folder_dependency: hurok létrehozása a könyvtárstruktúrában
-  error_contains_invalid_character: érvénytelen karaktereket tartalmaz
   error_file_commit_require_uploaded_file: Fájl beíratáshoz szükséges a feltöltött fájl
 
   warning_some_files_were_not_commited: "Néhány fájl nem került beíratásra validálási locked_documents: Zárolt
@@ -417,4 +415,9 @@ hu:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: érvénytelen karaktereket tartalmaz
\ No newline at end of file
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 75479cbd..aa68189b 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -168,8 +168,6 @@ it: # Italian strings thx 2 Matteo Arceci!
   permission_email_documents: Email documents
   label_file: Documento
   field_folder: Cartella
-  error_create_cycle_in_folder_dependency: crea un ciclo nella dipendenza della cartella
-  error_contains_invalid_character: contiene carattere(i) non validi
   error_file_commit_require_uploaded_file: L'aggiornamento del documento richiede un documento già caricato in
     precedenza
   warning_some_files_were_not_commited: "Alcuni documenti non sono stati aggiornati a causa di errori di validazione:
@@ -417,4 +415,9 @@ it: # Italian strings thx 2 Matteo Arceci!
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: contiene carattere(i) non validi
\ No newline at end of file
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index aa4fc6e8..3c960522 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -168,8 +168,6 @@ ja:
   permission_email_documents: Email documents
   label_file: ファイル
   field_folder: フォルダ
-  error_create_cycle_in_folder_dependency: フォルダの依存関係が循環しています
-  error_contains_invalid_character: 無効な文字を含んでいます
   error_file_commit_require_uploaded_file: コミットするには、まずファイルをアップロードしてください
 
   warning_some_files_were_not_commited: "いくつかのファイルは、バリデーションエラーのためにコミットされませんでした: %{files}"
@@ -417,4 +415,9 @@ ja:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: 無効な文字を含んでいます
\ No newline at end of file
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index e95f8131..964c650a 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -168,8 +168,6 @@ ko:
   permission_email_documents: Email documents
   label_file: 파일
   field_folder: 폴더
-  error_create_cycle_in_folder_dependency: 폴더 종속에 규칙 생성
-  error_contains_invalid_character: 사용이 불가능한 문자(들) 포함
   error_file_commit_require_uploaded_file: 파일은 업로드 파일이 필요합니다
 
   warning_some_files_were_not_commited: "다음 오류로 인하여 파일을 실행할 수 없습니다: %{files}"
@@ -417,4 +415,9 @@ ko:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: 사용이 불가능한 문자(들) 포함
\ No newline at end of file
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f369494f..3f371347 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -168,8 +168,6 @@ nl:
   permission_email_documents: Email documents
   label_file: Bestand
   field_folder: Map
-  error_create_cycle_in_folder_dependency: maak cyclus in de map afhankelijkheid
-  error_contains_invalid_character: bevat ongeldige teken(s)
   error_file_commit_require_uploaded_file: Bestand indienen vereist geüpload bestand
 
   warning_some_files_were_not_commited: Sommige bestanden zijn niet ingediend door
@@ -417,4 +415,9 @@ nl:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: bevat ongeldige teken(s)
\ No newline at end of file
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 11007f68..4b805690 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -168,8 +168,7 @@ pl:
   permission_email_documents: Email documents
   label_file: Plik
   field_folder: Folder
-  error_create_cycle_in_folder_dependency: utworzono pętlę zależności pomiędzy folderami
-  error_contains_invalid_character: zawiera nieprawidłowe znaki
+
   error_file_commit_require_uploaded_file: Commit pliku wymaga jego uprzedniego przesłania
 
   warning_some_files_were_not_commited: "Niektóre pliki nie zostały zacommitowane ze względu na błędy walidacji:
@@ -417,4 +416,9 @@ pl:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: zawiera nieprawidłowe znaki
\ No newline at end of file
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index aefeaec8..ac08ca6e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -168,8 +168,6 @@ pt-BR:
   permission_email_documents: Email documents
   label_file: Arquivo
   field_folder: Pasta
-  error_create_cycle_in_folder_dependency: Dependência entre pastas
-  error_contains_invalid_character: Contém caracteres inválidos
   error_file_commit_require_uploaded_file: É necessário carregar um arquivo
 
   warning_some_files_were_not_commited: "O(s) arquivo(s) não foram salvos: %{files}"
@@ -417,4 +415,9 @@ pt-BR:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: Contém caracteres inválidos
\ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 7d60bc57..c76574ea 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -168,8 +168,6 @@ ru:
   permission_email_documents: Email documents
   label_file: Файл
   field_folder: Папка
-  error_create_cycle_in_folder_dependency: создать циклическую зависимость в папке
-  error_contains_invalid_character: содержит недопустимые символы
   error_file_commit_require_uploaded_file: Чтобы зафиксировать файл нужно для начала его загрузить
 
   warning_some_files_were_not_commited: "Некоторые файлы не были зафиксированы через ошибки валидации: %{files}"
@@ -417,4 +415,9 @@ ru:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: содержит недопустимые символы
\ No newline at end of file
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 5e4f930e..78004bb9 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -168,8 +168,6 @@ sl:
   permission_email_documents: Email documents
   label_file: Datoteka
   field_folder: Pod mapo
-  error_create_cycle_in_folder_dependency: naredi ciklično odvisnost med mapami
-  error_contains_invalid_character: vsebuje nedovoljene znake
   error_file_commit_require_uploaded_file: Ukaz zahteva naloženo datoteko
 
   warning_some_files_were_not_commited: "Nekatere datoteke niso shranje zaradi napak v validaciji: %{files}"
@@ -417,4 +415,9 @@ sl:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: vsebuje nedovoljene znake
\ No newline at end of file
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index d0d99bdb..ddc9b062 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -168,8 +168,6 @@ zh-TW:
   permission_email_documents: Email documents
   label_file: 檔案
   field_folder: 資料夾
-  error_create_cycle_in_folder_dependency: 資料夾之間的關係，不得為一個cycle循環。
-  error_contains_invalid_character: 內有非法字元
   error_file_commit_require_uploaded_file: 檔案提交，需要上傳檔案。
 
   warning_some_files_were_not_commited: "部份檔案因為驗証失敗無法提交: %{files}"
@@ -417,4 +415,9 @@ zh-TW:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: 內有非法字元
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3e3dac48..5b422dd5 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -43,7 +43,7 @@ zh:
   error_folder_is_not_empty: 非空文件夹
   error_folder_title_is_already_used: 标题已经被使用
   notice_folder_details_were_saved: 文件夹详细信息已保存
-  error_file_is_locked: Folder is locked
+  error_folder_is_locked: 資料夾己經鎖定
   error_file_is_locked: 文件被锁定
   notice_file_deleted: 文件已删除
   error_at_least_one_revision_must_be_present: 至少一个修订版本必须存在
@@ -168,7 +168,6 @@ zh:
   permission_email_documents: Email documents
   label_file: 文件
   field_folder: 件夹
-  error_create_cycle_in_folder_dependency: create cycle in folder dependency
   error_contains_invalid_character: 含有无效字符
   error_file_commit_require_uploaded_file: 文件提交要求上传文件
 
@@ -417,4 +416,9 @@ zh:
       dmsf_locked_documents: My locked documents
       dmsf_open_approvals: My open approvals
     module_category:
-      easy_dms: Easy DMS
\ No newline at end of file
+      easy_dms: Easy DMS
+
+  activerecord:
+    errors:
+      messages:
+        error_contains_invalid_character: 含有无效字符
\ No newline at end of file
diff --git a/db/migrate/01_create_hierarchy.rb b/db/migrate/01_create_hierarchy.rb
index 01d7fa3e..a6317979 100644
--- a/db/migrate/01_create_hierarchy.rb
+++ b/db/migrate/01_create_hierarchy.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
-# Copyright © 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011    Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,83 +18,58 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateHierarchy < ActiveRecord::Migration
-  def self.up
+
+  def change
     create_table :dmsf_folders do |t|
-      t.references :project, :null => false
+      t.references :project, null: false
       t.references :dmsf_folder
-      
-      t.string :name, :null => false
+      t.string :name, null: false
       t.text :description
-      
-      t.boolean :notification, :default => false, :null => false
-      
-      t.references :user, :null => false
-      t.timestamps :null => false
+      t.boolean :notification, default: false, null: false
+      t.references :user, null: false
+      t.timestamps null: false
     end
-    
     create_table :dmsf_files do |t|
-      t.references :project, :null => false
-      
+      t.references :project, null: false
       # This two fileds are copy from last revision due to simpler search
       t.references :dmsf_folder
-      t.string :name, :null => false
-
-      t.boolean :notification, :default => false, :null => false
-      
-      t.boolean :deleted, :default => false, :null => false
+      t.string :name, null: false
+      t.boolean :notification, default: false, null: false
+      t.boolean :deleted, default: false, null: false
       t.integer :deleted_by_user_id
-      
-      t.timestamps  :null => false
+      t.timestamps  null: false
     end
-    
     create_table :dmsf_file_revisions do |t|
-      t.references :dmsf_file, :null => false
+      t.references :dmsf_file, null: false
       t.integer :source_dmsf_file_revision_id
-      
-      t.string :name, :null => false
+      t.string :name, null: false
       t.references :dmsf_folder
-      
-      t.string :disk_filename, :null => false
+      t.string :disk_filename, null: false
       t.integer :size
       t.string :mime_type
-      
       t.string :title
       t.text :description
       t.integer :workflow
-      t.integer :major_version, :null => false
-      t.integer :minor_version, :null => false
+      t.integer :major_version, null: false
+      t.integer :minor_version, null: false
       t.text :comment
-      
-      t.boolean :deleted, :default => false, :null => false
+      t.boolean :deleted, default: false, null: false
       t.integer :deleted_by_user_id
-      
-      t.references :user, :null => false
-      t.timestamps  :null => false
+      t.references :user, null: false
+      t.timestamps  null: false
     end
-    
     create_table :dmsf_file_locks do |t|
-      t.references :dmsf_file, :null => false
-      t.boolean :locked, :default => false, :null => false
-      t.references :user, :null => false
-      t.timestamps  :null => false
+      t.references :dmsf_file, null: false
+      t.boolean :locked, default: false, null: false
+      t.references :user, null: false
+      t.timestamps  null: false
     end
-    
     create_table :dmsf_user_prefs do |t|
-      t.references :project, :null => false
-      t.references :user, :null => false
-      
+      t.references :project, null: false
+      t.references :user, null: false
       t.boolean :email_notify
-      
-      t.timestamps  :null => false
+      t.timestamps null: false
     end
-    
   end
 
-  def self.down
-    drop_table :dmsf_file_revisions
-    drop_table :dmsf_files
-    drop_table :dmsf_folders
-    drop_table :dmsf_file_locks
-    drop_table :dmsf_user_prefs
-  end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/02_dmsf_normalization.rb b/db/migrate/02_dmsf_normalization.rb
index a337ce27..0fe7ae59 100644
--- a/db/migrate/02_dmsf_normalization.rb
+++ b/db/migrate/02_dmsf_normalization.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright © 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,11 +18,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DmsfNormalization < ActiveRecord::Migration
-  def self.up
+
+  def up
     rename_column :dmsf_folders, :name, :title
   end
 
-  def self.down
+  def down
     rename_column :dmsf_folders, :title, :name 
   end
 
diff --git a/db/migrate/03_dmsf_0_8_0.rb b/db/migrate/03_dmsf_0_8_0.rb
index 168d6a96..f9f9dfe2 100644
--- a/db/migrate/03_dmsf_0_8_0.rb
+++ b/db/migrate/03_dmsf_0_8_0.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright © 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,12 +18,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Dmsf080 < ActiveRecord::Migration
-  def self.up
+
+  def change
     add_column :projects, :dmsf_description, :text
   end
 
-  def self.down
-    remove_column :projects, :dmsf_description 
-  end
-
-end
+end
\ No newline at end of file
diff --git a/db/migrate/04_dmsf_0_9_0.rb b/db/migrate/04_dmsf_0_9_0.rb
index 8dfab326..872b75ec 100644
--- a/db/migrate/04_dmsf_0_9_0.rb
+++ b/db/migrate/04_dmsf_0_9_0.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright © 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,22 +18,20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Dmsf090 < ActiveRecord::Migration
-  def self.up
+
+  def up
     add_column :members, :dmsf_mail_notification, :boolean
     drop_table :dmsf_user_prefs
   end
 
-  def self.down
+  def own
     remove_column :members, :dmsf_mail_notification
-    
     create_table :dmsf_user_prefs do |t|
-      t.references :project, :null => false
-      t.references :user, :null => false
-      
+      t.references :project, null: false
+      t.references :user, null: false
       t.boolean :email_notify
-      
-      t.timestamps  :null => false
+      t.timestamps  null: false
     end
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/migrate/05_dmsf_0_9_0_1.rb b/db/migrate/05_dmsf_0_9_0_1.rb
index aad64d1b..1f9e5595 100644
--- a/db/migrate/05_dmsf_0_9_0_1.rb
+++ b/db/migrate/05_dmsf_0_9_0_1.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright © 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -17,17 +18,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class Dmsf0901 < ActiveRecord::Migration
-  def self.up
+
+  def change
     create_table :dmsf_file_revision_accesses do |t|
-      t.references :dmsf_file_revision, :null => false
-      t.integer :action, :default => 0, :null => false  # 0 ... download, 1 ... email
-      t.references :user, :null => false
-      t.timestamps  :null => false
+      t.references :dmsf_file_revision, null: false
+      t.integer :action, :default => 0, null: false  # 0 ... download, 1 ... email
+      t.references :user, null: false
+      t.timestamps  null: false
     end
   end
 
-  def self.down
-    drop_table :dmsf_file_revision_accesses
-  end
-
 end
diff --git a/db/migrate/06_dmsf_1_2_0.rb b/db/migrate/06_dmsf_1_2_0.rb
index c248e884..bd7b8afe 100644
--- a/db/migrate/06_dmsf_1_2_0.rb
+++ b/db/migrate/06_dmsf_1_2_0.rb
@@ -21,20 +21,19 @@
 
 class Dmsf120 < ActiveRecord::Migration
 
-  def self.up
-    add_column :dmsf_file_revisions, :project_id, :integer, :null => true
+  def up
+    add_column :dmsf_file_revisions, :project_id, :integer, null: true
     DmsfFileRevision.reset_column_information
     DmsfFileRevision.find_each do |revision|
       if revision.dmsf_file
         revision.project_id = revision.dmsf_file.project.id
-        revision.save
+        revision.save!
       end
     end
-
-    change_column :dmsf_file_revisions, :project_id, :integer, :null => false
+    change_column :dmsf_file_revisions, :project_id, :integer, null: false
   end
 
-  def self.down
+  def down
     remove_column :dmsf_file_revisions, :project_id
   end
 
diff --git a/db/migrate/07_dmsf_1_4_4.rb b/db/migrate/07_dmsf_1_4_4.rb
index 2791c498..6c5ad4b0 100644
--- a/db/migrate/07_dmsf_1_4_4.rb
+++ b/db/migrate/07_dmsf_1_4_4.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright © 2012 Daniel Munn <dan.munn@munnster.co.uk>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -21,24 +22,20 @@ require 'uuidtools'
 
 class Dmsf144 < ActiveRecord::Migration
 
-
   class DmsfFileLock < ActiveRecord::Base
-    belongs_to :file, :class_name => 'DmsfFile', :foreign_key => 'dmsf_file_id'
+    belongs_to :file, class_name: 'DmsfFile', foreign_key: 'dmsf_file_id'
     belongs_to :user
   end  
 
-  def self.up
-    #Add our entity_type column (used with our entity type)
-    add_column :dmsf_file_locks, :entity_type, :integer, :null => true
-
-    #Add our lock relevent columns (ENUM) - null (till we upgrade data)
-    add_column :dmsf_file_locks, :lock_type_cd, :integer, :null => true
-    add_column :dmsf_file_locks, :lock_scope_cd, :integer, :null => true
-    add_column :dmsf_file_locks, :uuid, :string, :null => true, :limit => 36
-
-    #Add our expires_at column
-    add_column :dmsf_file_locks, :expires_at, :datetime, :null => true
-
+  def up
+    #A dd our entity_type column (used with our entity type)
+    add_column :dmsf_file_locks, :entity_type, :integer, null: true
+    # Add our lock relevent columns (ENUM) - null (till we upgrade data)
+    add_column :dmsf_file_locks, :lock_type_cd, :integer, null: true
+    add_column :dmsf_file_locks, :lock_scope_cd, :integer, null: true
+    add_column :dmsf_file_locks, :uuid, :string, null: true, limit: 36
+    # Add our expires_at column
+    add_column :dmsf_file_locks, :expires_at, :datetime, null: true
     do_not_delete = []
     # - 2012-07-12: Better compatibility for postgres - query used 3 columns however
     #               only on appearing in group, find_each imposes a limit and incorrect
@@ -46,48 +43,37 @@ class Dmsf144 < ActiveRecord::Migration
     #               data into it, which should enable us to run checks we need, not as
     #               efficient, however compatible across the board.
     DmsfFileLock.reset_column_information
-    DmsfFileLock.select('MAX(id), id').
-      order('MAX(id) DESC').
-      group(:dmsf_file_id, :id).
-      each do |lock|
+    DmsfFileLock.select('MAX(id), id').order('MAX(id) DESC').group(:dmsf_file_id, :id).find do |lock|
       lock.reload 
-      if (lock.locked)
+      if lock.locked
         do_not_delete << lock.id
       end
     end
-
-    #Generate new lock Id's for whats being persisted
-    do_not_delete.each {|l|
-      #Find the lock
+    # Generate new lock Id's for whats being persisted
+    do_not_delete.each do |l|
+      # Find the lock
       next unless lock = DmsfFileLock.find(l)
       lock.uuid = UUIDTools::UUID.random_create.to_s
       lock.save!
-    }
-
+    end
     say "Preserving #{do_not_delete.count} file lock(s) found in old schema"
-
-    DmsfFileLock.where(['id NOT IN (?)', do_not_delete]).delete_all
-
-    #We need to force our newly found
-
+    DmsfFileLock.where.not(id: do_not_delete).delete_all
+    # We need to force our newly found
     say 'Applying default lock scope / type - Exclusive / Write'
-    DmsfFileLock.update_all ['entity_type = ?, lock_type_cd = ?, lock_scope_cd = ?', 0, 0, 0]
-
-    #These are not null-allowed columns
-    change_column :dmsf_file_locks, :entity_type, :integer, :null => false
-    change_column :dmsf_file_locks, :lock_type_cd, :integer, :null => false
-    change_column :dmsf_file_locks, :lock_scope_cd, :integer, :null => false
-
-    #Data cleanup
+    DmsfFileLock.update_all(entity_type: 0, lock_type_cd: 0, lock_scope_cd: 0)
+    # These are not null-allowed columns
+    change_column :dmsf_file_locks, :entity_type, :integer, null: false
+    change_column :dmsf_file_locks, :lock_type_cd, :integer, null: false
+    change_column :dmsf_file_locks, :lock_scope_cd, :integer, null: false
+    # Data cleanup
     rename_column :dmsf_file_locks, :dmsf_file_id, :entity_id
     remove_column :dmsf_file_locks, :locked
     rename_table :dmsf_file_locks, :dmsf_locks
-
-    #Not sure if this is the right place to do this, as its file manipulation, not database (strictly)
-    say "Completing one-time file migration ..."
+    # Not sure if this is the right place to do this, as its file manipulation, not database (strictly)
+    say 'Completing one-time file migration ...'
     begin
-      DmsfFileRevision.visible.each {|rev|
-        next if rev.project.nil?
+      DmsfFileRevision.visible.find_each do |rev|
+        next unless rev.project
         existing = DmsfFile.storage_path.join rev.disk_filename
         new_path = rev.disk_file(false)
         begin
@@ -97,7 +83,7 @@ class Dmsf144 < ActiveRecord::Migration
               new_path = rev.disk_file(false)
               rev.save!
             end
-            #Ensure the project path exists
+            # Ensure the project path exists
             project_directory = File.dirname(new_path)
             Dir.mkdir(project_directory) unless File.directory? project_directory
             FileUtils.mv(existing, new_path)
@@ -106,42 +92,37 @@ class Dmsf144 < ActiveRecord::Migration
         rescue #Here we wrap around IO in the loop to prevent one failure ruining complete run.
           say "Migration: #{existing} -> #{new_path} failed"
         end
-      }
+      end
       say 'Action was successful'
     rescue Exception => e
       say 'Action was not successful'
       puts e.message
-      puts e.backtrace.inspect #See issue 86
-      #Nothing here, we just dont want a migration to break
+      puts e.backtrace.inspect # See issue #86
+      # Nothing here, we just dont want a migration to break
     end
   end
 
   def self.down
     rename_table :dmsf_locks, :dmsf_file_locks
-    add_column :dmsf_file_locks, :locked, :boolean, :default => false, :null => false
-
-    #Data cleanup - delete all expired locks, or any folder locks
+    add_column :dmsf_file_locks, :locked, :boolean, default: false, null: false
+    # Data cleanup - delete all expired locks, or any folder locks
     DmsfFileLock.reset_column_information
     say 'Removing all expired and/or folder locks'
-    DmsfFileLock.where(['expires_at < ? OR entity_type = 1', Time.now]).delete_all
-
+    DmsfFileLock.where(['expires_at < ? OR entity_type = 1', Time.current]).delete_all
     say 'Changing all records to be locked'
-    DmsfFileLock.update_all ['locked = ?', true]
-
+    DmsfFileLock.update_all(locked: true)
     rename_column :dmsf_file_locks, :entity_id, :dmsf_file_id
-
     remove_column :dmsf_file_locks, :entity_type
     remove_column :dmsf_file_locks, :lock_type_cd
     remove_column :dmsf_file_locks, :lock_scope_cd
     remove_column :dmsf_file_locks, :expires_at
     remove_column :dmsf_file_locks, :uuid
-
-    #Not sure if this is the right place to do this, as its file manipulation, not database (stricly)
+    # Not sure if this is the right place to do this, as its file manipulation, not database (stricly)
     begin
       say 'restoring old file-structure'
-      DmsfFileRevision.visible.each {|rev|
-        next if rev.project.nil?
-        project = rev.project.identifier.gsub(/[^\w\.\-]/,'_')
+      DmsfFileRevision.visible.find_each do |rev|
+        next unless rev.project
+        project = rev.project.identifier.gsub(/[^\w\.\-]/, '_')
         existing = DmsfFile.storage_path.join("p_#{project}/#{rev.disk_filename}")
         new_path = DmsfFile.storage_path.join(rev.disk_filename)
         if File.exist?(existing)
@@ -152,9 +133,9 @@ class Dmsf144 < ActiveRecord::Migration
           end
           FileUtils.mv(existing, new_path)
         end
-      }
+      end
     rescue
-      #Nothing here, we just dont want a migration to break
+      # Nothing here, we just dont want a migration to break
     end
   end
 
diff --git a/db/migrate/20120822100401_create_dmsf_workflows.rb b/db/migrate/20120822100401_create_dmsf_workflows.rb
index 2642ffd7..76aa6001 100644
--- a/db/migrate/20120822100401_create_dmsf_workflows.rb
+++ b/db/migrate/20120822100401_create_dmsf_workflows.rb
@@ -3,6 +3,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
+# Copyright © 2011-18 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,12 +20,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfWorkflows < ActiveRecord::Migration
-  def self.up
+
+  def up
     create_table :dmsf_workflows do |t|
-      t.string :name, :null => false
+      t.string :name, null: false
       t.references :project    
     end
-    add_index :dmsf_workflows, [:name], :unique => true
+    add_index :dmsf_workflows, [:name], unique: true, name: :index_dmsf_workflows_on_name
         
     change_table :dmsf_file_revisions do |t|
       t.references :dmsf_workflow
@@ -35,12 +37,13 @@ class CreateDmsfWorkflows < ActiveRecord::Migration
     end
   end
   
-  def self.down
+  def down
     remove_column :dmsf_file_revisions, :dmsf_workflow_id
     remove_column :dmsf_file_revisions, :dmsf_workflow_assigned_by
     remove_column :dmsf_file_revisions, :dmsf_workflow_assigned_at
     remove_column :dmsf_file_revisions, :dmsf_workflow_started_by
     remove_column :dmsf_file_revisions, :dmsf_workflow_started_at
     drop_table :dmsf_workflows
-  end    
-end
+  end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20120822100402_create_dmsf_workflow_steps.rb b/db/migrate/20120822100402_create_dmsf_workflow_steps.rb
index c3ccff9e..0716f1ad 100644
--- a/db/migrate/20120822100402_create_dmsf_workflow_steps.rb
+++ b/db/migrate/20120822100402_create_dmsf_workflow_steps.rb
@@ -19,17 +19,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfWorkflowSteps < ActiveRecord::Migration
-  def self.up
+
+  def change
     create_table :dmsf_workflow_steps do |t|
-      t.references :dmsf_workflow, :null => false
-      t.integer :step, :null => false
-      t.references :user, :null => false
-      t.integer :operator, :null => false
+      t.references :dmsf_workflow, null: false
+      t.integer :step, null: false
+      t.references :user, null: false
+      t.integer :operator, null: false
     end
-    add_index :dmsf_workflow_steps, :dmsf_workflow_id    
+    add_index :dmsf_workflow_steps, :dmsf_workflow_id, name: :index_dmsf_workflow_steps_on_dmsf_workflow_id
   end
-  
-  def self.down
-    drop_table :dmsf_workflow_steps
-  end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb b/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb
index 53b41586..435b8a5c 100644
--- a/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb
+++ b/db/migrate/20120822100403_create_dmsf_workflow_step_assignments.rb
@@ -19,20 +19,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfWorkflowStepAssignments < ActiveRecord::Migration
-  def self.up
+
+  def change
     create_table :dmsf_workflow_step_assignments do |t|
-      t.references :dmsf_workflow_step, :null => false
-      t.references :user, :null => false
-      t.references :dmsf_file_revision, :null => false
+      t.references :dmsf_workflow_step, null: false
+      t.references :user, null: false
+      t.references :dmsf_file_revision, null: false
     end   
     add_index :dmsf_workflow_step_assignments, 
       [:dmsf_workflow_step_id, :dmsf_file_revision_id],
       # The default index name exceeds the index name limit
-      :name => 'index_dmsf_wrkfl_step_assigns_on_wrkfl_step_id_and_frev_id',
-      :unique => true
-  end
-  
-  def self.down
-    drop_table :dmsf_workflow_step_assignments
+      name: :index_dmsf_wrkfl_step_assigns_on_wrkfl_step_id_and_frev_id,
+      unique: true
   end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20120822100404_create_dmsf_workflow_step_actions.rb b/db/migrate/20120822100404_create_dmsf_workflow_step_actions.rb
index 06d20294..69b6b510 100644
--- a/db/migrate/20120822100404_create_dmsf_workflow_step_actions.rb
+++ b/db/migrate/20120822100404_create_dmsf_workflow_step_actions.rb
@@ -19,20 +19,19 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfWorkflowStepActions < ActiveRecord::Migration
-  def self.up
+
+  def change
     create_table :dmsf_workflow_step_actions do |t|
-      t.references :dmsf_workflow_step_assignment, :null => false
-      t.integer :action, :null => false
+      t.references :dmsf_workflow_step_assignment, null: false
+      t.integer :action, null: false
       t.text :note      
-      t.timestamp :created_at, :null => false
-      t.integer :author_id, :null => false
+      t.timestamp :created_at, null: false
+      t.integer :author_id, null: false
     end
     add_index :dmsf_workflow_step_actions, 
       :dmsf_workflow_step_assignment_id,
       # The default index name exceeds the index name limit
-      {:name => 'idx_dmsf_wfstepact_on_wfstepassign_id'}
+      name: :idx_dmsf_wfstepact_on_wfstepassign_id
   end
-  def self.down
-    drop_table :dmsf_workflow_step_actions
-  end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20130819013955_update_projects.rb b/db/migrate/20130819013955_update_projects.rb
index 64baba3d..f93f3fc1 100644
--- a/db/migrate/20130819013955_update_projects.rb
+++ b/db/migrate/20130819013955_update_projects.rb
@@ -19,12 +19,10 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class UpdateProjects < ActiveRecord::Migration
-  def self.up
+
+  def change
     # DMSF - project's root folder notification
     add_column :projects, :dmsf_notification, :boolean
   end
-  
-  def self.down
-    remove_column :projects, :dmsf_notification
-  end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20131108141401_add_index_to_dmsf_files.rb b/db/migrate/20131108141401_add_index_to_dmsf_files.rb
index b8858f59..79f70a7d 100644
--- a/db/migrate/20131108141401_add_index_to_dmsf_files.rb
+++ b/db/migrate/20131108141401_add_index_to_dmsf_files.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddIndexToDmsfFiles < ActiveRecord::Migration
-  def self.up    
-    add_index :dmsf_files, :project_id
+
+  def chnage
+    add_index :dmsf_files, :project_id, name: :index_dmsf_files_on_project_id
   end
 
-  def self.down    
-    remove_index :dmsf_files, :project_id
-  end
 end
\ No newline at end of file
diff --git a/db/migrate/20131108141402_add_index_to_dmsf_folders.rb b/db/migrate/20131108141402_add_index_to_dmsf_folders.rb
index 9adad03f..9bf09bcd 100644
--- a/db/migrate/20131108141402_add_index_to_dmsf_folders.rb
+++ b/db/migrate/20131108141402_add_index_to_dmsf_folders.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddIndexToDmsfFolders < ActiveRecord::Migration
-  def self.up    
-    add_index :dmsf_folders, :project_id
+
+  def change
+    add_index :dmsf_folders, :project_id, name: :index_dmsf_folders_on_project_id
   end
 
-  def self.down    
-    remove_index :dmsf_folders, :project_id
-  end
 end
\ No newline at end of file
diff --git a/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb b/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb
index 694914ef..591f242c 100644
--- a/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb
+++ b/db/migrate/20131113141401_add_index_to_dmsf_file_revision.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddIndexToDmsfFileRevision < ActiveRecord::Migration
-  def self.up    
-    add_index :dmsf_file_revisions, :dmsf_file_id
+
+  def change
+    add_index :dmsf_file_revisions, :dmsf_file_id, name: :index_dmsf_file_revisions_on_dmsf_file_id
   end
 
-  def self.down    
-    remove_index :dmsf_file_revisions, :dmsf_file_id
-  end
 end
\ No newline at end of file
diff --git a/db/migrate/20131113141402_add_index_to_dmsf_lock.rb b/db/migrate/20131113141402_add_index_to_dmsf_lock.rb
index 039b588c..b3a75919 100644
--- a/db/migrate/20131113141402_add_index_to_dmsf_lock.rb
+++ b/db/migrate/20131113141402_add_index_to_dmsf_lock.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddIndexToDmsfLock < ActiveRecord::Migration
-  def self.up    
-    add_index :dmsf_locks, :entity_id
+
+  def change
+    add_index :dmsf_locks, :entity_id, name: :index_dmsf_locks_on_entity_id
   end
 
-  def self.down    
-    remove_index :dmsf_locks, :entity_id
-  end
 end
\ No newline at end of file
diff --git a/db/migrate/20131113141403_create_dmsf_links.rb b/db/migrate/20131113141403_create_dmsf_links.rb
index 61f67517..fd0abf08 100644
--- a/db/migrate/20131113141403_create_dmsf_links.rb
+++ b/db/migrate/20131113141403_create_dmsf_links.rb
@@ -19,22 +19,20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfLinks < ActiveRecord::Migration
+
   def change
     create_table :dmsf_links do |t|
-      t.integer :target_project_id, :null => false
-      t.integer :target_id, :null => false
-      t.string :target_type, :limit => 10, :null => false
-      t.string :name, :null => false
-      t.references :project, :null => false
+      t.integer :target_project_id, null: false
+      t.integer :target_id, null: false
+      t.string :target_type, limit: 10, null: false
+      t.string :name, null: false
+      t.references :project, null: false
       t.references :dmsf_folder
-      t.boolean :deleted, :default => false, :null => false
+      t.boolean :deleted, default: false, null: false
       t.integer :deleted_by_user_id
-      t.timestamps :null => false
+      t.timestamps null: false
     end
-    add_index :dmsf_links, :project_id   
+    add_index :dmsf_links, :project_id, name: :index_dmsf_links_on_project_id
   end
-  
-  def self.down
-    drop_table :dmsf_links
-  end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20140314132501_notifications_on.rb b/db/migrate/20140314132501_notifications_on.rb
index d635b722..91973556 100644
--- a/db/migrate/20140314132501_notifications_on.rb
+++ b/db/migrate/20140314132501_notifications_on.rb
@@ -19,14 +19,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class NotificationsOn < ActiveRecord::Migration
+
   def up  
     # Switch on the default notifications for new projects and folders
-    change_column :projects, :dmsf_notification, :boolean, :default => true, :null => true
-    change_column :dmsf_folders, :notification, :boolean, :default => true, :null => false
+    change_column :projects, :dmsf_notification, :boolean, default: true, null: true
+    change_column :dmsf_folders, :notification, :boolean, default: true, null: false
   end
   
   def down
-    change_column :projects, :dmsf_notification, :boolean, :default => false, :null => true
-    change_column :dmsf_folders, :notification, :boolean, :default => false
+    change_column :projects, :dmsf_notification, :boolean, default: false, null: true
+    change_column :dmsf_folders, :notification, :boolean, default: false
   end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20140519133201_trash_bin.rb b/db/migrate/20140519133201_trash_bin.rb
index 7b862801..0ceb8ea2 100644
--- a/db/migrate/20140519133201_trash_bin.rb
+++ b/db/migrate/20140519133201_trash_bin.rb
@@ -19,16 +19,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TrashBin < ActiveRecord::Migration
+
   def up  
     # DMSF - project's root folder notification
-    add_column :dmsf_folders, :deleted, :boolean, :default => false, :null => false
+    add_column :dmsf_folders, :deleted, :boolean, default: false, null: false
     add_column :dmsf_folders, :deleted_by_user_id, :integer
     DmsfFolder.reset_column_information
-    DmsfFolder.update_all(:deleted => false)
+    DmsfFolder.update_all(deleted: false)
   end
   
   def down
     remove_column :dmsf_folders, :deleted
     remove_column :dmsf_folders, :deleted_by_user_id
   end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20141013102501_remove_project_from_revision.rb b/db/migrate/20141013102501_remove_project_from_revision.rb
index 2812531b..7a154bf9 100644
--- a/db/migrate/20141013102501_remove_project_from_revision.rb
+++ b/db/migrate/20141013102501_remove_project_from_revision.rb
@@ -19,17 +19,18 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class RemoveProjectFromRevision < ActiveRecord::Migration
+
   def up
     remove_column :dmsf_file_revisions, :project_id
   end
 
   def down
-    add_column :dmsf_file_revisions, :project_id, :integer, :null => true
+    add_column :dmsf_file_revisions, :project_id, :integer, null: true
     DmsfFileRevision.reset_column_information
     DmsfFileRevision.find_each do |revision|
       if revision.dmsf_file
         revision.project_id = revision.dmsf_file.project.id
-        revision.save
+        revision.save!
       end
     end
   end
diff --git a/db/migrate/20141015132701_remove_folder_from_revision.rb b/db/migrate/20141015132701_remove_folder_from_revision.rb
index 343c8858..17d1df67 100644
--- a/db/migrate/20141015132701_remove_folder_from_revision.rb
+++ b/db/migrate/20141015132701_remove_folder_from_revision.rb
@@ -19,18 +19,20 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class RemoveFolderFromRevision < ActiveRecord::Migration
+
   def up      
     remove_column :dmsf_file_revisions, :dmsf_folder_id
   end
   
   def down
-    add_column :dmsf_file_revisions, :dmsf_folder_id, :integer, :null => true
+    add_column :dmsf_file_revisions, :dmsf_folder_id, :integer, null: true
     DmsfFileRevision.reset_column_information
     DmsfFileRevision.find_each do |revision|
       if revision.dmsf_file
         revision.dmsf_folder_id = revision.dmsf_file.dmsf_folder_id
-        revision.save
+        revision.save!
       end
     end        
   end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20141205143001_remove_uniqueness_from_wf.rb b/db/migrate/20141205143001_remove_uniqueness_from_wf.rb
index 4356a94d..878d5c22 100644
--- a/db/migrate/20141205143001_remove_uniqueness_from_wf.rb
+++ b/db/migrate/20141205143001_remove_uniqueness_from_wf.rb
@@ -19,7 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class RemoveUniquenessFromWf < ActiveRecord::Migration
+
   def up      
     remove_index(:dmsf_workflows, :name) if index_exists?(:dmsf_workflows, :name)
-  end  
+  end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20150120152101_notifications_nullable.rb b/db/migrate/20150120152101_notifications_nullable.rb
index 60360ee0..c58efbe7 100644
--- a/db/migrate/20150120152101_notifications_nullable.rb
+++ b/db/migrate/20150120152101_notifications_nullable.rb
@@ -19,9 +19,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class NotificationsNullable < ActiveRecord::Migration
+
   def up      
-    change_column :projects, :dmsf_notification, :boolean, :default => false, :null => true
-    change_column :dmsf_folders, :notification, :boolean, :default => false, :null => true
-    change_column :dmsf_files, :notification, :boolean, :default => false, :null => true
-  end    
+    change_column :projects, :dmsf_notification, :boolean, default: false, null: true
+    change_column :dmsf_folders, :notification, :boolean, default: false, null: true
+    change_column :dmsf_files, :notification, :boolean, default: false, null: true
+  end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20150130052716_add_external.rb b/db/migrate/20150130052716_add_external.rb
index fc237b12..c736f0a3 100644
--- a/db/migrate/20150130052716_add_external.rb
+++ b/db/migrate/20150130052716_add_external.rb
@@ -19,12 +19,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddExternal < ActiveRecord::Migration
+
   def up
-    change_column :dmsf_links, :target_id, :integer, :null => true
-    add_column :dmsf_links, :external_url, :string, :null => true    
+    change_column :dmsf_links, :target_id, :integer, null: true
+    add_column :dmsf_links, :external_url, :string, null: true
   end
 
   def down    
     remove_column :dmsf_links, :external_url    
   end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20150202010301_add_user_to_links.rb b/db/migrate/20150202010301_add_user_to_links.rb
index 73fae474..ed1dc111 100644
--- a/db/migrate/20150202010301_add_user_to_links.rb
+++ b/db/migrate/20150202010301_add_user_to_links.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddUserToLinks < ActiveRecord::Migration
-  def up
+
+  def change
     add_column :dmsf_links, :user_id, :integer
   end
 
-  def down
-    remove_column :dmsf_links, :user_id
-  end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20150910153701_title_not_null.rb b/db/migrate/20150910153701_title_not_null.rb
index aadf2590..80577366 100644
--- a/db/migrate/20150910153701_title_not_null.rb
+++ b/db/migrate/20150910153701_title_not_null.rb
@@ -19,11 +19,13 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TitleNotNull < ActiveRecord::Migration
+
   def up
-    change_column :dmsf_file_revisions, :title, :string, :null => false
+    change_column :dmsf_file_revisions, :title, :string, null: false
   end
 
   def down
-    change_column :dmsf_file_revisions, :title, :string, :null => true
+    change_column :dmsf_file_revisions, :title, :string, null: true
   end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20151020141801_large_files.rb b/db/migrate/20151020141801_large_files.rb
index d182d545..fd4b0203 100644
--- a/db/migrate/20151020141801_large_files.rb
+++ b/db/migrate/20151020141801_large_files.rb
@@ -19,11 +19,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class LargeFiles < ActiveRecord::Migration
+
   def up    
-    change_column :dmsf_file_revisions, :size, :bigint, :null => true
+    change_column :dmsf_file_revisions, :size, :bigint, null: true
   end
 
   def down
-    change_column :dmsf_file_revisions, :size, :int, :null => true
+    change_column :dmsf_file_revisions, :size, :int, null: true
   end
 end
\ No newline at end of file
diff --git a/db/migrate/20151209100001_title_format.rb b/db/migrate/20151209100001_title_format.rb
index 81b41d56..6fd80d30 100644
--- a/db/migrate/20151209100001_title_format.rb
+++ b/db/migrate/20151209100001_title_format.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class TitleFormat < ActiveRecord::Migration
-  def self.up
-    add_column :members, :title_format, :text, :null => true, :limit => 100
+
+  def change
+    add_column :members, :title_format, :text, null: true, limit: 100
   end
 
-  def self.down
-    remove_column :members, :title_format        
-  end
 end
\ No newline at end of file
diff --git a/db/migrate/20160215125801_approval_workflow_status.rb b/db/migrate/20160215125801_approval_workflow_status.rb
index ef70ad33..37877d4d 100644
--- a/db/migrate/20160215125801_approval_workflow_status.rb
+++ b/db/migrate/20160215125801_approval_workflow_status.rb
@@ -19,13 +19,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ApprovalWorkflowStatus < ActiveRecord::Migration
-  def self.up
-    add_column :dmsf_workflows, :status, :integer, :null => false, :default => DmsfWorkflow::STATUS_ACTIVE
+
+  def up
+    add_column :dmsf_workflows, :status, :integer, null: false,
+               default: DmsfWorkflow::STATUS_ACTIVE
     DmsfWorkflow.reset_column_information
-    DmsfWorkflow.all.each {|wf| wf.update_attribute(:status, DmsfWorkflow::STATUS_ACTIVE)}
+    DmsfWorkflow.all.each { |wf| wf.update_attribute(:status, DmsfWorkflow::STATUS_ACTIVE) }
   end
 
-  def self.down
+  def down
     remove_column :dmsf_workflows, :status        
   end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20160217133001_status_deleted.rb b/db/migrate/20160217133001_status_deleted.rb
index 76afca11..34cda511 100644
--- a/db/migrate/20160217133001_status_deleted.rb
+++ b/db/migrate/20160217133001_status_deleted.rb
@@ -20,41 +20,49 @@
 
 class StatusDeleted < ActiveRecord::Migration
 
-  def self.up
+  def up
     case ActiveRecord::Base.connection.adapter_name.downcase
       when /postgresql/
         execute 'ALTER TABLE dmsf_folders ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_folders, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfFolder::STATUS_ACTIVE
+        change_column :dmsf_folders, :deleted,
+                      'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', null: false, default: DmsfFolder::STATUS_ACTIVE
         execute 'ALTER TABLE dmsf_files ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_files, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfFile::STATUS_ACTIVE
+        change_column :dmsf_files, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END',
+                      null: false, default: DmsfFile::STATUS_ACTIVE
         execute 'ALTER TABLE dmsf_file_revisions ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_file_revisions, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfFileRevision::STATUS_ACTIVE
+        change_column :dmsf_file_revisions, :deleted,
+                      'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', null: false, default: DmsfFileRevision::STATUS_ACTIVE
         execute 'ALTER TABLE dmsf_links ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_links, :deleted, 'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', :null => false, :default => DmsfLink::STATUS_ACTIVE
+        change_column :dmsf_links, :deleted,
+                      'INTEGER USING CASE WHEN TRUE THEN 1 ELSE 0 END', null: false, default: DmsfLink::STATUS_ACTIVE
       else
-        change_column :dmsf_folders, :deleted, :integer, :default => DmsfFolder::STATUS_ACTIVE
-        change_column :dmsf_files, :deleted, :integer, :default => DmsfFile::STATUS_ACTIVE
-        change_column :dmsf_file_revisions, :deleted, :integer, :default => DmsfFile::STATUS_ACTIVE
-        change_column :dmsf_links, :deleted, :integer, :default => DmsfFile::STATUS_ACTIVE
+        change_column :dmsf_folders, :deleted, :integer, default: DmsfFolder::STATUS_ACTIVE
+        change_column :dmsf_files, :deleted, :integer, default: DmsfFile::STATUS_ACTIVE
+        change_column :dmsf_file_revisions, :deleted, :integer, default: DmsfFile::STATUS_ACTIVE
+        change_column :dmsf_links, :deleted, :integer, default: DmsfFile::STATUS_ACTIVE
     end
   end
 
-  def self.down
+  def down
     case ActiveRecord::Base.connection.adapter_name.downcase
       when /postgresql/
         execute 'ALTER TABLE dmsf_folders ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_folders, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
+        change_column :dmsf_folders, :deleted,
+                      'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', null: false, default: false
         execute 'ALTER TABLE dmsf_files ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_files, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
+        change_column :dmsf_files, :deleted,
+                      'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', null: false, default: false
         execute 'ALTER TABLE dmsf_file_revisions ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_file_revisions, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
+        change_column :dmsf_file_revisions, :deleted,
+                      'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', null: false, default: false
         execute 'ALTER TABLE dmsf_links ALTER deleted DROP DEFAULT;'
-        change_column :dmsf_links, :deleted, 'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', :null => false, :default => false
+        change_column :dmsf_links, :deleted,
+                      'BOOLEAN USING CASE WHEN deleted=1 THEN TRUE ELSE FALSE END', null: false, default: false
       else
-        change_column :dmsf_folders, :deleted, :boolean, :null => false, :default => false
-        change_column :dmsf_files, :deleted, :boolean, :null => false, :default => false
-        change_column :dmsf_file_revisions, :deleted,:boolean, :null => false, :default => false
-        change_column :dmsf_links, :deleted, :boolean, :null => false, :default => false
+        change_column :dmsf_folders, :deleted, :boolean, null: false, default: false
+        change_column :dmsf_files, :deleted, :boolean, null: false, default: false
+        change_column :dmsf_file_revisions, :deleted,:boolean, null: false, default: false
+        change_column :dmsf_links, :deleted, :boolean, null: false, default: false
     end
   end
 
diff --git a/db/migrate/20160222140401_approval_workflow_std_fields.rb b/db/migrate/20160222140401_approval_workflow_std_fields.rb
index 70ab4954..5fd06159 100644
--- a/db/migrate/20160222140401_approval_workflow_std_fields.rb
+++ b/db/migrate/20160222140401_approval_workflow_std_fields.rb
@@ -19,7 +19,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class ApprovalWorkflowStdFields < ActiveRecord::Migration
-  def self.up
+
+  def up
     add_column :dmsf_workflows, :updated_on, :timestamp
     add_column :dmsf_workflows, :created_on, :datetime
     add_column :dmsf_workflows, :author_id, :integer
@@ -27,13 +28,14 @@ class ApprovalWorkflowStdFields < ActiveRecord::Migration
     # Set updated_on
     DmsfWorkflow.all.each(&:touch)
     # Set created_on and author_id
-    admin = User.active.where(admin: true).first
-    DmsfWorkflow.update_all "created_on = updated_on, author_id = #{admin.id}" if admin
+    admin_ids = User.active.where(admin: true).limit(1).ids
+    DmsfWorkflow.update_all(created_on: :updated_on, author_id: admin_ids.first)
   end
 
-  def self.down
+  def down
     remove_column :dmsf_workflows, :updated_on
     remove_column :dmsf_workflows, :created_on
     remove_column :dmsf_workflows, :author_id
   end
+
 end
diff --git a/db/migrate/20160421150501_add_digest_to_revision.rb b/db/migrate/20160421150501_add_digest_to_revision.rb
index e802347a..6500f8be 100644
--- a/db/migrate/20160421150501_add_digest_to_revision.rb
+++ b/db/migrate/20160421150501_add_digest_to_revision.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddDigestToRevision < ActiveRecord::Migration
+
   def up
-    add_column :dmsf_file_revisions, :digest, :string, :limit => 40, :default => '', :null => false
+    add_column :dmsf_file_revisions, :digest, :string, limit: 40, default: '', null: false
   end
 
-  def down
-    remove_column :dmsf_file_revisions, :digest
-  end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20161223133200_create_dmsf_public_urls.rb b/db/migrate/20161223133200_create_dmsf_public_urls.rb
index 34064a7f..2fe50ebe 100644
--- a/db/migrate/20161223133200_create_dmsf_public_urls.rb
+++ b/db/migrate/20161223133200_create_dmsf_public_urls.rb
@@ -19,18 +19,16 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfPublicUrls < ActiveRecord::Migration
+
   def change
     create_table :dmsf_public_urls do |t|
-      t.string :token, :null => false, :limit => 32
-      t.references :dmsf_file, :null => false
-      t.references :user, :null => false
-      t.datetime :expire_at, :null => false
+      t.string :token, null: false, limit: 32
+      t.references :dmsf_file, null: false
+      t.references :user, null: false
+      t.datetime :expire_at, null: false
       t.timestamps
     end
-    add_index :dmsf_public_urls, :token
+    add_index :dmsf_public_urls, :token, name: :index_dmsf_public_urls_on_token
   end
-  
-  def self.down
-    drop_table :dmsf_public_urls
-  end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20170103164701_add_name_to_appoval_workflow_step.rb b/db/migrate/20170103164701_add_name_to_appoval_workflow_step.rb
index de6e58fc..ece8afdf 100644
--- a/db/migrate/20170103164701_add_name_to_appoval_workflow_step.rb
+++ b/db/migrate/20170103164701_add_name_to_appoval_workflow_step.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddNameToAppovalWorkflowStep < ActiveRecord::Migration
-  def up
-    add_column :dmsf_workflow_steps, :name, :string, :limit => 30, :null => true
+
+  def change
+    add_column :dmsf_workflow_steps, :name, :string, limit: 30, null: true
   end
 
-  def down
-    remove_column :dmsf_workflow_steps, :name
-  end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20170118142001_dmsf_file_container.rb b/db/migrate/20170118142001_dmsf_file_container.rb
index 2e89c6ff..1dbda708 100644
--- a/db/migrate/20170118142001_dmsf_file_container.rb
+++ b/db/migrate/20170118142001_dmsf_file_container.rb
@@ -19,18 +19,21 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DmsfFileContainer < ActiveRecord::Migration
+
   def up
     remove_index :dmsf_files, :project_id
     rename_column :dmsf_files, :project_id, :container_id
-    add_column :dmsf_files, :container_type, :string, :limit => 30, :null => false, :default => 'Project'
-    DmsfFile.update_all(:container_type => 'Project')
-    add_index :dmsf_files, [:container_id, :container_type]
+    add_column :dmsf_files, :container_type, :string, limit: 30, null: false,
+               default: 'Project'
+    DmsfFile.update_all container_type: 'Project'
+    add_index :dmsf_files, [:container_id, :container_type], name: :index_dmsf_files_on_container_id_container_type
   end
 
   def down
     remove_index :dmsf_files, [:container_id, :container_type]
     remove_column :dmsf_files, :container_type
     rename_column :dmsf_files, :container_id, :project_id
-    add_index :dmsf_files, :project_id
+    add_index :dmsf_files, :project_id, name: :index_dmsf_files_on_project_id
   end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20170204214753_add_revision_to_dmsf_lock.rb b/db/migrate/20170204214753_add_revision_to_dmsf_lock.rb
index e4b740fc..58a2ce2e 100644
--- a/db/migrate/20170204214753_add_revision_to_dmsf_lock.rb
+++ b/db/migrate/20170204214753_add_revision_to_dmsf_lock.rb
@@ -20,11 +20,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddRevisionToDmsfLock < ActiveRecord::Migration
-  def up
-    add_column :dmsf_locks, :revision, :integer, :null => true
+
+  def change
+    add_column :dmsf_locks, :revision, :integer, null: true
   end
 
-  def down
-    remove_column :dmsf_locks, :revision
-  end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20170214153223_add_dmsf_file_last_revision_id_to_dmsf_lock.rb b/db/migrate/20170214153223_add_dmsf_file_last_revision_id_to_dmsf_lock.rb
index e60593ae..1e962b73 100644
--- a/db/migrate/20170214153223_add_dmsf_file_last_revision_id_to_dmsf_lock.rb
+++ b/db/migrate/20170214153223_add_dmsf_file_last_revision_id_to_dmsf_lock.rb
@@ -20,6 +20,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddDmsfFileLastRevisionIdToDmsfLock < ActiveRecord::Migration
+
   def up
     rename_column :dmsf_locks, :revision, :dmsf_file_last_revision_id
   end
@@ -27,4 +28,5 @@ class AddDmsfFileLastRevisionIdToDmsfLock < ActiveRecord::Migration
   def down
     rename_column :dmsf_locks, :dmsf_file_last_revision_id, :revision
   end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb b/db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb
index 2a275869..d40ff6a9 100644
--- a/db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb
+++ b/db/migrate/20170217141601_add_dmsf_not_inheritable_to_custom_fields.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddDmsfNotInheritableToCustomFields < ActiveRecord::Migration
-  def up
-    add_column :custom_fields, :dmsf_not_inheritable, :boolean, :null => true
+
+  def change
+    add_column :custom_fields, :dmsf_not_inheritable, :boolean, null: true
   end
 
-  def down
-    remove_column :custom_fields, :dmsf_not_inheritable
-  end
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20170323131231_dmsf_description_limit.rb b/db/migrate/20170323131231_dmsf_description_limit.rb
index f14b6ad5..a6e2ffc9 100644
--- a/db/migrate/20170323131231_dmsf_description_limit.rb
+++ b/db/migrate/20170323131231_dmsf_description_limit.rb
@@ -19,13 +19,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DmsfDescriptionLimit < ActiveRecord::Migration
+
   def up
-    change_column :projects, :dmsf_description, :text, :null => true, :limit => 65535
-    change_column :dmsf_folders, :description, :text,:null => true, :limit => 65535
+    change_column :projects, :dmsf_description, :text, null: true, limit: 65535
+    change_column :dmsf_folders, :description, :text, null: true, limit: 65535
   end
 
   def down
     change_column :projects, :dmsf_description, :text
     change_column :dmsf_folders, :description, :text
   end
+
 end
diff --git a/db/migrate/20170330131901_create_dmsf_folder_permissions.rb b/db/migrate/20170330131901_create_dmsf_folder_permissions.rb
index 4f61255f..13d65938 100644
--- a/db/migrate/20170330131901_create_dmsf_folder_permissions.rb
+++ b/db/migrate/20170330131901_create_dmsf_folder_permissions.rb
@@ -19,16 +19,14 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class CreateDmsfFolderPermissions < ActiveRecord::Migration
-  def up
+
+  def change
     create_table :dmsf_folder_permissions do |t|
       t.references :dmsf_folder
-      t.integer :object_id, :null => false
-      t.string :object_type, :limit => 30, :null => false
+      t.integer :object_id, null: false
+      t.string :object_type, limit: 30, null: false
     end
-    add_index :dmsf_folder_permissions, :dmsf_folder_id
+    add_index :dmsf_folder_permissions, :dmsf_folder_id, name: :index_dmsf_folder_permissions_on_dmsf_folder_id
   end
-  
-  def self.down
-    drop_table :dmsf_folder_permissions
-  end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20170421101901_dmsf_file_container_rollback.rb b/db/migrate/20170421101901_dmsf_file_container_rollback.rb
index f3da26c7..2bcaf440 100644
--- a/db/migrate/20170421101901_dmsf_file_container_rollback.rb
+++ b/db/migrate/20170421101901_dmsf_file_container_rollback.rb
@@ -19,27 +19,28 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DmsfFileContainerRollback < ActiveRecord::Migration
+
   def up
     # Add system folder_flag to dmsf_folders
-    add_column :dmsf_folders, :system, :boolean, :null => false, :default => false
+    add_column :dmsf_folders, :system, :boolean, null: false, default: false
     # Create necessary folders
     new_folder_ids = []
     description = 'Documents assigned to issues'
-    DmsfFile.where(:container_type => 'Issue').each do |file|
-      issue = Issue.find_by_id file.container_id
+    DmsfFile.where(container_type: 'Issue').find_each do |file|
+      issue = Issue.find_by(id: file.container_id)
       unless issue
         Rails.logger.error "Issue ##{file.container_id} not found"
         next
       end
       # Parent folder
-      parent = DmsfFolder.where(:project_id => issue.project.id, :title => '.Issues', :description => description).first
+      parent = DmsfFolder.where(project_id: issue.project.id, title: '.Issues', description: description).first
       unless parent
         parent = DmsfFolder.new
         parent.project_id = issue.project.id
         parent.title = '.Issues'
         parent.description = description
         parent.user_id = User.anonymous.id
-        parent.save
+        parent.save!
         new_folder_ids << parent.id
       end
       # Issue folder
@@ -48,7 +49,7 @@ class DmsfFileContainerRollback < ActiveRecord::Migration
       folder.dmsf_folder_id = parent.id
       folder.title = "#{issue.id} - #{issue.subject}"
       folder.user_id = User.anonymous.id
-      folder.save
+      folder.save!
       new_folder_ids << folder.id
       # Move the file into the new folder
       file.dmsf_folder_id = folder.id
@@ -62,31 +63,35 @@ class DmsfFileContainerRollback < ActiveRecord::Migration
     remove_index :dmsf_files, [:container_id, :container_type]
     remove_column :dmsf_files, :container_type
     rename_column :dmsf_files, :container_id, :project_id
-    add_index :dmsf_files, :project_id
+    add_index :dmsf_files, :project_id, name: :index_dmsf_files_on_project_id
     # Initialize system folder_flag to dmsf_folders
-    DmsfFolder.where(:id => new_folder_ids).update_all(:system => true)
+    DmsfFolder.where(id: new_folder_ids).update_all(system: true)
   end
 
   def down
     # dmsf_files
-    file_folder_ids = DmsfFile.joins(:dmsf_folder).where(:dmsf_folders => { :system => true }).pluck('dmsf_files.id, cast(dmsf_folders.title as decimal)')
+    file_folder_ids = DmsfFile.joins(:dmsf_folder).where(dmsf_folders: { system: true }).pluck(
+        'dmsf_files.id, cast(dmsf_folders.title as decimal)')
     remove_index :dmsf_files, :project_id
     rename_column :dmsf_files, :project_id, :container_id
-    add_column :dmsf_files, :project_id, :int, :null => true # temporarily added for the save method
-    add_column :dmsf_files, :container_type, :string, :limit => 30, :null => false, :default => 'Project'
+    # Temporarily added for the save method
+    add_column :dmsf_files, :project_id, :int, null: true
+    add_column :dmsf_files, :container_type, :string, limit: 30, null: false,
+               default: 'Project'
     DmsfFile.update_all(:container_type => 'Project')
     file_folder_ids.each do |id, container_id|
-      file = DmsfFile.find_by_id(id)
+      file = DmsfFile.find_by(id: id)
       if file
         file.container_id = container_id
         file.container_type = 'Issue'
-        file.save
+        file.save!
       end
     end
     remove_column :dmsf_files, :project_id # temporarily added for the save method
-    add_index :dmsf_files, [:container_id, :container_type]
+    add_index :dmsf_files, [:container_id, :container_type], name: :index_dmsf_files_on_container_id_container_type
     # dmsf_folders
-    DmsfFolder.where(:system => true).delete_all
+    DmsfFolder.where(system: true).delete_all
     remove_column :dmsf_folders, :system
   end
-end
+
+end
\ No newline at end of file
diff --git a/db/migrate/20170422104901_migrate_documents.rb b/db/migrate/20170422104901_migrate_documents.rb
index 0d0e071d..027a32c6 100644
--- a/db/migrate/20170422104901_migrate_documents.rb
+++ b/db/migrate/20170422104901_migrate_documents.rb
@@ -25,15 +25,15 @@ class MigrateDocuments < ActiveRecord::Migration
     DmsfFileRevision.find_each do |dmsf_file_revision|
       if dmsf_file_revision.dmsf_file
         if dmsf_file_revision.dmsf_file.project
-          origin = self.disk_file(dmsf_file_revision)
+          origin = disk_file(dmsf_file_revision)
           if origin
             if File.exist?(origin)
               target = dmsf_file_revision.disk_file(false)
               if target
-                unless File.exist?(target)
+                if !File.exist?(target)
                   begin
                     FileUtils.mv origin, target, :verbose => true
-                    folder = self.storage_base_path(dmsf_file_revision)
+                    folder = storage_base_path(dmsf_file_revision)
                     Dir.rmdir(folder) if (folder && (Dir.entries(folder).size == 2))
                   rescue Exception => e
                     msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: #{e.message}"
@@ -81,9 +81,13 @@ class MigrateDocuments < ActiveRecord::Migration
           origin = dmsf_file_revision.disk_file(false)
           if origin
             if File.exist?(origin)
-              target = self.disk_file(dmsf_file_revision)
+              target = disk_file(dmsf_file_revision)
               if target
-                unless File.exist?(target)
+                if File.exist?(target)
+                  msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: Target '#{target}' exists"
+                  say msg
+                  Rails.logger.error msg
+                else
                   begin
                     FileUtils.mv origin, target, :verbose => true
                     folder = dmsf_file_revision.storage_base_path
@@ -93,10 +97,6 @@ class MigrateDocuments < ActiveRecord::Migration
                     say msg
                     Rails.logger.error msg
                   end
-                else
-                  msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: Target '#{target}' exists"
-                  say msg
-                  Rails.logger.error msg
                 end
               else
                 msg = "DmsfFileRevisions ID #{dmsf_file_revision.id}: target = nil"
@@ -145,4 +145,4 @@ class MigrateDocuments < ActiveRecord::Migration
     nil
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20170526144701_dmsf_attachable.rb b/db/migrate/20170526144701_dmsf_attachable.rb
index ca4143ad..f1b390d1 100644
--- a/db/migrate/20170526144701_dmsf_attachable.rb
+++ b/db/migrate/20170526144701_dmsf_attachable.rb
@@ -19,13 +19,15 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class DmsfAttachable < ActiveRecord::Migration
-  def self.up
+
+  def up
     # DMSF - project's root folder notification
-    add_column :projects, :dmsf_act_as_attachable, :integer, :default => 1, :null => false
+    add_column :projects, :dmsf_act_as_attachable, :integer, default: 1, null: false
     Project.update_all dmsf_act_as_attachable: 1
   end
   
-  def self.down
+  def down
     remove_column :projects, :dmsf_act_as_attachable
   end
+
 end
\ No newline at end of file
diff --git a/db/migrate/20171027124101_change_revision_digest_limit_to_64.rb b/db/migrate/20171027124101_change_revision_digest_limit_to_64.rb
index e269c1f6..ca94c18c 100644
--- a/db/migrate/20171027124101_change_revision_digest_limit_to_64.rb
+++ b/db/migrate/20171027124101_change_revision_digest_limit_to_64.rb
@@ -30,4 +30,4 @@ class ChangeRevisionDigestLimitTo64 < ActiveRecord::Migration
     #change_column :dmsf_file_revisions, :digest, :string, limit: 40
   end
 
-end
+end
\ No newline at end of file
diff --git a/db/migrate/20171110155901_add_index_to_dmsf_folder.rb b/db/migrate/20171110155901_add_index_to_dmsf_folder.rb
index c5708828..d7f86254 100644
--- a/db/migrate/20171110155901_add_index_to_dmsf_folder.rb
+++ b/db/migrate/20171110155901_add_index_to_dmsf_folder.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class AddIndexToDmsfFolder < ActiveRecord::Migration
-  def self.up    
-    add_index :dmsf_folders, :dmsf_folder_id
+
+  def change
+    add_index :dmsf_folders, :dmsf_folder_id, name: :index_dmsf_folders_on_dmsf_folder_id
   end
 
-  def self.down
-    remove_index :dmsf_folders, :dmsf_folder_id
-  end
 end
\ No newline at end of file
diff --git a/db/migrate/20180216152501_rename_title_format.rb b/db/migrate/20180216152501_rename_title_format.rb
index 19a75866..458b7337 100644
--- a/db/migrate/20180216152501_rename_title_format.rb
+++ b/db/migrate/20180216152501_rename_title_format.rb
@@ -20,11 +20,11 @@
 
 class RenameTitleFormat < ActiveRecord::Migration
 
-  def self.up
+  def up
     rename_column :members, :title_format, :dmsf_title_format
   end
 
-  def self.down
+  def down
     rename_column :members, :dmsf_title_format, :title_format
   end
 
diff --git a/db/migrate/20180903132101_fast_links.rb b/db/migrate/20180903132101_fast_links.rb
index 0733fcfa..81c3467c 100644
--- a/db/migrate/20180903132101_fast_links.rb
+++ b/db/migrate/20180903132101_fast_links.rb
@@ -19,11 +19,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class FastLinks < ActiveRecord::Migration
-  def self.up
-    add_column :members, :dmsf_fast_links, :boolean, :default => false, :null => false
+
+  def change
+    add_column :members, :dmsf_fast_links, :boolean, default: false, null: false
   end
 
-  def self.down
-    remove_column :members, :dmsf_fast_links
-  end
 end
\ No newline at end of file
diff --git a/extra/api/link.xml b/extra/api/link.xml
index 4373519c..2d0d192e 100644
--- a/extra/api/link.xml
+++ b/extra/api/link.xml
@@ -2,10 +2,10 @@
 <dmsf_link>
   <project_id>2387</project_id>
   <type>link_from</type>
-  <dmsf_file_id></dmsf_file_id>
+  <dmsf_file_id/>
   <target_project_id>2387</target_project_id>
   <target_folder_id>Documents</target_folder_id>
   <target_file_id>196119</target_file_id>
-  <external_url></external_url>
+  <external_url/>
   <name>test</name>
 </dmsf_link>
\ No newline at end of file
diff --git a/init.rb b/init.rb
index 7197da97..62759b3c 100644
--- a/init.rb
+++ b/init.rb
@@ -21,46 +21,45 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 Redmine::Plugin.register :redmine_dmsf do
-  unless Redmine::Plugin.installed?(:easy_extensions)
-    name 'DMSF'
-    url 'http://www.redmine.org/plugins/dmsf'
-    author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors'
-  else
+  if Redmine::Plugin.installed?(:easy_extensions)
     name 'Easy DMS'
     url 'https://www.easyredmine.com'
     author_url 'https://www.easyredmine.com'
+  else
+    name 'DMSF'
+    url 'http://www.redmine.org/plugins/dmsf'
+    author_url 'https://github.com/danmunn/redmine_dmsf/graphs/contributors'
   end
   author 'Vít Jonáš / Daniel Munn / Karel Pičman'
   description 'Document Management System Features'
   version '1.6.2 devel'
 
-  requires_redmine :version_or_higher => '3.4.0'
+  requires_redmine version_or_higher: '3.4.0'
 
-  settings  :partial => 'settings/dmsf_settings',
-            :default => {
-              'dmsf_max_file_upload' => '0',
-              'dmsf_max_file_download' => '0',
-              'dmsf_max_email_filesize' => '0',
-              'dmsf_max_ajax_upload_filesize' => '100',
+  settings partial: 'settings/dmsf_settings',
+            default: {
+              'dmsf_max_file_upload' => 0,
+              'dmsf_max_file_download' => 0,
+              'dmsf_max_email_filesize' => 0,
+              'dmsf_max_ajax_upload_filesize' => 100,
               'dmsf_storage_directory' => 'files/dmsf',
               'dmsf_index_database' => File.expand_path('dmsf_index', Rails.root),
               'dmsf_stemming_lang' => 'english',
               'dmsf_stemming_strategy' => 'STEM_NONE',
               'dmsf_webdav' => '1',
-              'dmsf_display_notified_recipients' => 0,
+              'dmsf_display_notified_recipients' => nil,
               'dmsf_global_title_format' => '',
               'dmsf_columns' => %w(title size modified version workflow author),
               'dmsf_webdav_ignore' => '^(\._|\.DS_Store$|Thumbs.db$)',
               'dmsf_webdav_disable_versioning' => '^\~\$|\.tmp$',
-              'dmsf_keep_documents_locked' => false,
-              'dmsf_act_as_attachable' => false,
-              'dmsf_show_system_folders' => false,
-              'dmsf_webdav_caching_enabled' => false,
+              'dmsf_keep_documents_locked' => nil,
+              'dmsf_act_as_attachable' => nil,
               'dmsf_tmpdir' => Dir.tmpdir,
               'dmsf_documents_email_from' => '',
               'dmsf_documents_email_reply_to' => '',
-              'dmsf_documents_email_links_only' => false,
-              'enable_cjk_ngrams' => true
+              'dmsf_documents_email_links_only' => nil,
+              'dmsf_enable_cjk_ngrams' => nil,
+              'dmsf_webdav_use_project_names' => nil
             }
 
   # Uncomment to remove the original Documents from searching (replaced with DMSF)
diff --git a/lib/dav4rack/resource.rb b/lib/dav4rack/resource.rb
index d6f2c609..2981e852 100644
--- a/lib/dav4rack/resource.rb
+++ b/lib/dav4rack/resource.rb
@@ -79,11 +79,11 @@ module DAV4Rack
       @namespaces = (options[:namespaces] || {}).merge({DAV_NAMESPACE => DAV_NAMESPACE_NAME})
       @request = request
       @response = response
-      unless(options.has_key?(:lock_class))
-        @lock_class = LockStore
-      else
+      if (options.has_key?(:lock_class))
         @lock_class = options[:lock_class]
         raise NameError.new("Unknown lock type constant provided: #{@lock_class}") unless @lock_class.nil? || defined?(@lock_class)
+      else
+        @lock_class = LockStore
       end
       @options = options
       @max_timeout = options[:max_timeout] || 86400
diff --git a/lib/dav4rack/resources/file_resource.rb b/lib/dav4rack/resources/file_resource.rb
index c48a26c8..093e7703 100644
--- a/lib/dav4rack/resources/file_resource.rb
+++ b/lib/dav4rack/resources/file_resource.rb
@@ -227,19 +227,17 @@ module DAV4Rack
     end
 
     def lock(args)
-      unless(parent_exists?)
-        Conflict
-      else
+      if (parent_exists?)
         lock_check(args[:type])
         lock = FileResourceLock.explicit_locks(@path, root, :scope => args[:scope], :kind => args[:type], :user => @user)
-        unless(lock)
+        unless (lock)
           token = UUIDTools::UUID.random_create.to_s
           lock = FileResourceLock.generate(@path, @user, token, root)
           lock.scope = args[:scope]
           lock.kind = args[:type]
           lock.owner = args[:owner]
           lock.depth = args[:depth]
-          if(args[:timeout])
+          if (args[:timeout])
             lock.timeout = args[:timeout] <= @max_timeout && args[:timeout] > 0 ? args[:timeout] : @max_timeout
           else
             lock.timeout = @default_timeout
@@ -255,6 +253,8 @@ module DAV4Rack
           status
         end
         [lock.remaining_timeout, lock.token]
+      else
+        Conflict
       end
     end
 
diff --git a/lib/dmsf_zip.rb b/lib/dmsf_zip.rb
index 73d1a967..0fe1a2d9 100644
--- a/lib/dmsf_zip.rb
+++ b/lib/dmsf_zip.rb
@@ -25,7 +25,7 @@ class DmsfZip
 
   attr_reader :files
 
-  def initialize()
+  def initialize
     @zip_path = DmsfHelper.temp_dir.join(DmsfHelper.temp_filename('dmsf_zip.zip'))
     @zip_file = Zip::OutputStream.new(@zip_path)
     @files = []
@@ -73,8 +73,8 @@ class DmsfZip
                                    ::Zip::DOSTime.at(folder.modified))
       @zip_file.put_next_entry(zip_entry)
       @folders << folder
-      folder.dmsf_folders.visible.each { |subfolder| self.add_folder(subfolder, member, root_path) }
-      folder.dmsf_files.visible.each { |file| self.add_file(file, member, root_path) }
+      folder.dmsf_folders.visible.each { |subfolder| add_folder(subfolder, member, root_path) }
+      folder.dmsf_files.visible.each { |file| add_file(file, member, root_path) }
     end
   end
 
diff --git a/lib/redmine_dmsf.rb b/lib/redmine_dmsf.rb
index 70846f5c..65890cc6 100644
--- a/lib/redmine_dmsf.rb
+++ b/lib/redmine_dmsf.rb
@@ -24,6 +24,11 @@ DMSF_MAX_NOTIFICATION_RECEIVERS_INFO = 10
 
 # DMSF libraries
 
+# Validators
+require_dependency '../validators/dmsf_file_name_validator'
+require_dependency '../validators/dmsf_workflow_name_validator'
+require_dependency '../validators/dmsf_url_validator'
+
 # Plugin's patches
 require 'redmine_dmsf/patches/projects_helper_patch'
 require 'redmine_dmsf/patches/project_patch'
@@ -48,12 +53,12 @@ require 'redmine_dmsf/webdav/project_resource'
 require 'redmine_dmsf/webdav/resource_proxy'
 
 # Exceptions
-require 'redmine_dmsf/errors/dmsf_access_error.rb'
-require 'redmine_dmsf/errors/dmsf_content_error.rb'
-require 'redmine_dmsf/errors/dmsf_email_max_file_error.rb'
-require 'redmine_dmsf/errors/dmsf_file_not_found_error.rb'
-require 'redmine_dmsf/errors/dmsf_lock_error.rb'
-require 'redmine_dmsf/errors/dmsf_zip_max_file_error.rb'
+require 'redmine_dmsf/errors/dmsf_access_error'
+require 'redmine_dmsf/errors/dmsf_content_error'
+require 'redmine_dmsf/errors/dmsf_email_max_file_error'
+require 'redmine_dmsf/errors/dmsf_file_not_found_error'
+require 'redmine_dmsf/errors/dmsf_lock_error'
+require 'redmine_dmsf/errors/dmsf_zip_max_file_error'
 
 # Hooks
 require 'redmine_dmsf/hooks/controllers/search_controller_hooks'
diff --git a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb
index 31052def..78ae7081 100644
--- a/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb
+++ b/lib/redmine_dmsf/hooks/controllers/issues_controller_hooks.rb
@@ -34,7 +34,7 @@ module RedmineDmsf
         if context.is_a?(Hash)
           issue = context[:issue]
           params = context[:params]
-          copied_from = Issue.find_by_id(params[:copy_from]) if params[:copy_from].present?
+          copied_from = Issue.find_by(id: params[:copy_from]) if params[:copy_from].present?
           # Save documents
           if copied_from
             copied_from.dmsf_files.each do |dmsf_file|
diff --git a/lib/redmine_dmsf/hooks/controllers/search_controller_hooks.rb b/lib/redmine_dmsf/hooks/controllers/search_controller_hooks.rb
index 0504bb1e..28af2fa0 100644
--- a/lib/redmine_dmsf/hooks/controllers/search_controller_hooks.rb
+++ b/lib/redmine_dmsf/hooks/controllers/search_controller_hooks.rb
@@ -28,8 +28,8 @@ module RedmineDmsf
         if context.is_a?(Hash) 
           question = context[:question]
           if question.present?
-            if question.match(/^D(\d+)$/) && DmsfFile.visible.find_by_id($1.to_i)
-              return { :controller => 'dmsf_files', :action => 'show', :id => $1.to_i }
+            if question.match(/^D(\d+)$/) && DmsfFile.visible.find_by(id: $1).exists?
+              return dmsf_file_path(:id => $1)
             end
           end
         end        
diff --git a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
index 94b0586c..f8b6dcf3 100644
--- a/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
+++ b/lib/redmine_dmsf/hooks/views/issue_view_hooks.rb
@@ -111,12 +111,12 @@ module RedmineDmsf
         if defined?(container.dmsf_files) && User.current.allowed_to?(:view_dmsf_files, container.project) &&
           Setting.plugin_redmine_dmsf['dmsf_act_as_attachable'] &&
           (container.project.dmsf_act_as_attachable == Project::ATTACHABLE_DMS_AND_ATTACHMENTS)
-          for dmsf_file in container.dmsf_files
+          container.dmsf_files.each do |dmsf_file|
             if dmsf_file.last_revision
               links << [dmsf_file, nil, dmsf_file.created_at]
             end
           end
-          for dmsf_link in container.dmsf_links
+          container.dmsf_links.each do |dmsf_link|
             dmsf_file = dmsf_link.target_file
             if dmsf_file && dmsf_file.last_revision
               links << [dmsf_file, dmsf_link, dmsf_link.created_at]
@@ -165,11 +165,11 @@ module RedmineDmsf
         # Add list of attached documents
         links = get_links(container)
         if links.present?
-          unless defined?(EasyExtensions)
-            controller.send(:render_to_string, {:partial => 'dmsf_files/links',
-              :locals => { :links => links, :thumbnails => Setting.thumbnails_enabled? }})
-          else
+          if defined?(EasyExtensions)
             attachment_rows(links, container, controller, attachments)
+          else
+            controller.send(:render_to_string, {:partial => 'dmsf_files/links',
+                                                :locals => {:links => links, :thumbnails => Setting.thumbnails_enabled?}})
           end
         end
       end
@@ -237,27 +237,27 @@ module RedmineDmsf
           else
             html << "<span class=\"icon icon-unlock\" title=\"#{dmsf_file.get_locked_title}\"></span>"
           end
-          unless dmsf_file.locked?
-            # Notifications
-            if dmsf_file.notification
-              html << link_to('',notify_deactivate_dmsf_files_path(:id => dmsf_file),
-                :title => l(:title_notifications_active_deactivate), :class => 'icon icon-email')
-            else
-              html << link_to('',notify_activate_dmsf_files_path(:id => dmsf_file),
-                :title => l(:title_notifications_not_active_activate), :class => 'icon icon-email-add')
-            end
-            # Delete
-            if issue.attributes_editable?  && User.current.allowed_to?(:file_delete, dmsf_file.project)
-              html << link_to('',
-                link ? dmsf_link_path(link, :commit => 'yes') : dmsf_file_path(:id => dmsf_file, :commit => 'yes'),
-                :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:title_delete),
-                :class => 'icon icon-del')
-            end
+        if dmsf_file.locked?
+          html << '<span class="icon"></span>' * 2
+        else
+          # Notifications
+          if dmsf_file.notification
+            html << link_to('', notify_deactivate_dmsf_files_path(:id => dmsf_file),
+                            :title => l(:title_notifications_active_deactivate), :class => 'icon icon-email')
           else
-            html << '<span class="icon"></span>' * 2
+            html << link_to('', notify_activate_dmsf_files_path(:id => dmsf_file),
+                            :title => l(:title_notifications_not_active_activate), :class => 'icon icon-email-add')
           end
+          # Delete
+          if issue.attributes_editable? && User.current.allowed_to?(:file_delete, dmsf_file.project)
+            html << link_to('',
+                            link ? dmsf_link_path(link, :commit => 'yes') : dmsf_file_path(:id => dmsf_file, :commit => 'yes'),
+                            :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, :title => l(:title_delete),
+                            :class => 'icon icon-del')
+          end
+        end
           # Approval workflow
-          wf = DmsfWorkflow.find_by_id(dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id
+          wf = DmsfWorkflow.find_by(id: dmsf_file.last_revision.dmsf_workflow_id) if dmsf_file.last_revision.dmsf_workflow_id
           html << controller.send(:render_to_string, {:partial => 'dmsf_workflows/approval_workflow_button',
             :locals => {:file => dmsf_file,
               :file_approval_allowed => User.current.allowed_to?(:file_approval, dmsf_file.project),
diff --git a/lib/redmine_dmsf/lockable.rb b/lib/redmine_dmsf/lockable.rb
index e3551e01..146a950f 100644
--- a/lib/redmine_dmsf/lockable.rb
+++ b/lib/redmine_dmsf/lockable.rb
@@ -40,7 +40,7 @@ module RedmineDmsf
       if tree
         ret = ret | (self.dmsf_folder.locks.empty? ? self.dmsf_folder.lock : self.dmsf_folder.locks) if dmsf_folder
       end
-      return ret
+      ret
     end
 
     def lock!(scope = :scope_exclusive, type = :type_write, expire = nil)
@@ -73,7 +73,7 @@ module RedmineDmsf
       l.save!
       reload
       locks.reload
-      return l
+      l
     end
 
     def unlockable?
@@ -93,7 +93,7 @@ module RedmineDmsf
         next if locks.empty?
         locks.each do |lock|
           next if lock.expired? # In case we're in between updates
-          if (lock.lock_scope == :scope_exclusive && b_shared.nil?)
+          if lock.lock_scope == :scope_exclusive && b_shared.nil?
             return true if (!lock.user) || (lock.user.id != User.current.id)
           else
             b_shared = true if b_shared.nil?
@@ -117,7 +117,7 @@ module RedmineDmsf
           self.locked_for_user? && !User.current.allowed_to?(:force_file_unlock, self.project) && !force_file_unlock_allowed)
 
         # Now we need to determine lock type and do the needful
-        if (existing.count == 1 && existing[0].lock_scope == :exclusive)
+        if (existing.count == 1) && (existing[0].lock_scope == :exclusive)
           existing[0].destroy
         else
           b_destroyed = false
@@ -131,7 +131,7 @@ module RedmineDmsf
           # At first it was going to be allowed for someone with force_file_unlock to delete all shared by default
           # Instead, they by default remove themselves from shared lock, and everyone from shared lock if they're not
           # on said lock
-          if (!b_destroyed && (User.current.allowed_to?(:force_file_unlock, self.project) || force_file_unlock_allowed))
+          if !b_destroyed && (User.current.allowed_to?(:force_file_unlock, self.project) || force_file_unlock_allowed)
             locks.delete_all
           end
         end
diff --git a/lib/redmine_dmsf/macros.rb b/lib/redmine_dmsf/macros.rb
index 5505c83c..36f658b5 100644
--- a/lib/redmine_dmsf/macros.rb
+++ b/lib/redmine_dmsf/macros.rb
@@ -157,7 +157,7 @@ Redmine::WikiFormatting::Macros.register do
     size = options[:size]
     width = options[:width]
     height = options[:height]
-    if file = DmsfFile.find_by_id(file_id)
+    if file = DmsfFile.find_by(id: file_id)
       unless User.current && User.current.allowed_to?(:view_dmsf_files, file.project)
         raise l(:notice_not_authorized)
       end
@@ -191,7 +191,7 @@ Redmine::WikiFormatting::Macros.register do
     size = options[:size]
     width = options[:width]
     height = options[:height]
-    if file = DmsfFile.find_by_id(file_id)
+    if file = DmsfFile.find_by(id: file_id)
       unless User.current && User.current.allowed_to?(:view_dmsf_files, file.project)
         raise l(:notice_not_authorized)
       end
diff --git a/lib/redmine_dmsf/patches/easy_crm_case_patch.rb b/lib/redmine_dmsf/patches/easy_crm_case_patch.rb
index c20a1d25..bd269b18 100644
--- a/lib/redmine_dmsf/patches/easy_crm_case_patch.rb
+++ b/lib/redmine_dmsf/patches/easy_crm_case_patch.rb
@@ -27,7 +27,7 @@ module RedmineDmsf
 
       def self.included(base)
         base.class_eval do
-          before_destroy :delete_system_folder
+          before_destroy :delete_system_folder, prepend: true
         end
       end
 
@@ -55,7 +55,7 @@ module RedmineDmsf
         if dmsf_links
           ids = dmsf_links.map(&:last)
           ids.each do |id|
-            l = DmsfLink.find_by_id(id)
+            l = DmsfLink.find_by(id: id)
             @saved_dmsf_links << l if l
           end
         end
@@ -72,7 +72,7 @@ module RedmineDmsf
             attachment = dmsf_attachments[attachment_id]
             if attachment
               a = Attachment.find_by_token(attachment[:token])
-              wf = DmsfWorkflow.find_by_id approval_workflow_id
+              wf = DmsfWorkflow.find_by(id: approval_workflow_id)
               @dmsf_attachments_wfs[a.id] = wf if wf && a
             end
           end
@@ -87,7 +87,7 @@ module RedmineDmsf
         if dmsf_links_wfs
           @saved_dmsf_links_wfs = {}
           dmsf_links_wfs.each do |dmsf_link_id, approval_workflow_id|
-            wf = DmsfWorkflow.find_by_id approval_workflow_id
+            wf = DmsfWorkflow.find_by(id: approval_workflow_id)
             @saved_dmsf_links_wfs[dmsf_link_id.to_i] = wf if wf
           end
         end
@@ -98,7 +98,7 @@ module RedmineDmsf
       end
 
       def system_folder(create = false)
-        parent = DmsfFolder.system.where(:project_id => self.project_id, :title => '.CRM cases').first
+        parent = DmsfFolder.system.where(project_id: self.project_id, title: '.CRM cases').first
         if create && !parent
           parent = DmsfFolder.new
           parent.project_id = self.project_id
diff --git a/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb b/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb
index 8bd4ee3f..19669d58 100644
--- a/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb
+++ b/lib/redmine_dmsf/patches/easy_crm_cases_controller_patch.rb
@@ -82,7 +82,7 @@ module RedmineDmsf
               end
             end
           end
-          copied_from = EasyCrmCase.find_by_id(params[:copy_from]) if params[:copy_from].present?
+          copied_from = EasyCrmCase.find_by(id: params[:copy_from]) if params[:copy_from].present?
           # Save documents
           if copied_from
             copied_from.dmsf_files.each do |dmsf_file|
diff --git a/lib/redmine_dmsf/patches/issue_patch.rb b/lib/redmine_dmsf/patches/issue_patch.rb
index 4a38af0e..72ebfb82 100644
--- a/lib/redmine_dmsf/patches/issue_patch.rb
+++ b/lib/redmine_dmsf/patches/issue_patch.rb
@@ -27,7 +27,7 @@ module RedmineDmsf
 
       def self.included(base)
         base.class_eval do
-          before_destroy :delete_system_folder
+          before_destroy :delete_system_folder, prepend: true
         end
       end
 
@@ -49,7 +49,7 @@ module RedmineDmsf
         @saved_dmsf_links = []
         if dmsf_links
           dmsf_links.each do |_, id|
-            l = DmsfLink.find_by_id(id)
+            l = DmsfLink.find_by(id: id)
             @saved_dmsf_links << l if l
           end
         end
@@ -66,7 +66,7 @@ module RedmineDmsf
             attachment = dmsf_attachments[attachment_id]
             if attachment
               a = Attachment.find_by_token(attachment[:token])
-              wf = DmsfWorkflow.find_by_id approval_workflow_id
+              wf = DmsfWorkflow.find_by(id: approval_workflow_id)
               @dmsf_attachments_wfs[a.id] = wf if wf && a
             end
           end
@@ -81,7 +81,7 @@ module RedmineDmsf
         if dmsf_links_wfs
           @saved_dmsf_links_wfs = {}
           dmsf_links_wfs.each do |dmsf_link_id, approval_workflow_id|
-            wf = DmsfWorkflow.find_by_id approval_workflow_id
+            wf = DmsfWorkflow.find_by(id: approval_workflow_id)
             @saved_dmsf_links_wfs[dmsf_link_id.to_i] = wf if wf
           end
         end
@@ -93,7 +93,7 @@ module RedmineDmsf
 
       def main_system_folder(create = false, prj_id = nil)
         prj_id ||= self.project_id
-        parent = DmsfFolder.system.where(:project_id => prj_id, :title => '.Issues').first
+        parent = DmsfFolder.system.find_by(project_id: prj_id, title: '.Issues')
         if create && !parent
           parent = DmsfFolder.new
           parent.project_id = prj_id
diff --git a/lib/redmine_dmsf/patches/projects_helper_patch.rb b/lib/redmine_dmsf/patches/projects_helper_patch.rb
index 747f6ac7..4c30557b 100644
--- a/lib/redmine_dmsf/patches/projects_helper_patch.rb
+++ b/lib/redmine_dmsf/patches/projects_helper_patch.rb
@@ -34,7 +34,7 @@ module RedmineDmsf
            :partial => 'dmsf_workflows/main', :label => :label_dmsf_workflow_plural}
         ]
         tabs.concat(dmsf_tabs.select {|dmsf_tab| User.current.allowed_to?(dmsf_tab[:action], @project)})
-        return tabs
+        tabs
       end
 
     end
diff --git a/lib/redmine_dmsf/patches/role_patch.rb b/lib/redmine_dmsf/patches/role_patch.rb
index 386b1997..cd0ab8b4 100644
--- a/lib/redmine_dmsf/patches/role_patch.rb
+++ b/lib/redmine_dmsf/patches/role_patch.rb
@@ -27,7 +27,7 @@ module RedmineDmsf
 
       def self.included(base)
         base.class_eval do
-          before_destroy :remove_dmsf_references
+          before_destroy :remove_dmsf_references, prepend: true
         end
       end
 
diff --git a/lib/redmine_dmsf/patches/user_patch.rb b/lib/redmine_dmsf/patches/user_patch.rb
index adf11ea2..666c0cd4 100644
--- a/lib/redmine_dmsf/patches/user_patch.rb
+++ b/lib/redmine_dmsf/patches/user_patch.rb
@@ -25,9 +25,9 @@ module RedmineDmsf
       ##################################################################################################################
       # New methods
 
-      def self.included(base) # :nodoc:
+      def self.included(base)
         base.class_eval do
-          before_destroy :remove_dmsf_references
+          before_destroy :remove_dmsf_references, prepend: true
         end
       end
 
diff --git a/lib/redmine_dmsf/webdav/base_resource.rb b/lib/redmine_dmsf/webdav/base_resource.rb
index 0fc7ec09..0bd8f1df 100644
--- a/lib/redmine_dmsf/webdav/base_resource.rb
+++ b/lib/redmine_dmsf/webdav/base_resource.rb
@@ -93,8 +93,8 @@ module RedmineDmsf
 
       def parent
         p = @__proxy.parent
-        return nil if p.nil? 
-        return p.resource.nil? ? p : p.resource
+        return nil unless p
+        p.resource.nil? ? p : p.resource
       end
 
       def options(request, response)
@@ -118,7 +118,7 @@ module RedmineDmsf
           if pinfo.length > 0
             if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
               if pinfo.first =~ /(\d+)$/
-                @project = Project.find_by_id($1)
+                @project = Project.find_by(id: $1)
                 Rails.logger.error("No project found on path '#{@path}'") unless @project
               end
             else
diff --git a/lib/redmine_dmsf/webdav/custom_middleware.rb b/lib/redmine_dmsf/webdav/custom_middleware.rb
index 692927d3..938986cd 100644
--- a/lib/redmine_dmsf/webdav/custom_middleware.rb
+++ b/lib/redmine_dmsf/webdav/custom_middleware.rb
@@ -54,12 +54,15 @@ module RedmineDmsf
         end
         # If the URL map generated by Rack::Builder did not find a matching path,
         # it will return a 404 along with the X-Cascade header set to 'pass'.
-        if status == 404 and headers['X-Cascade'] == 'pass'
+        if (status == 404) && (headers['X-Cascade'] == 'pass')
           # The MS web redirector webdav client likes to go up a level and try
           # OPTIONS there. We catch that here and respond telling it that just
           # plain HTTP is going on.
-          if 'OPTIONS'.casecmp(env['REQUEST_METHOD'].to_s) == 0
-            [ '200', { 'Allow' => 'OPTIONS,HEAD,GET,PUT,POST,DELETE' }, [''] ]
+          if (env['REQUEST_METHOD'].present? && ('OPTIONS'.casecmp(env['REQUEST_METHOD']) == 0)) &&
+              (env['PATH_INFO'].present? && env['PATH_INFO'].start_with?('/dmsf')) # *
+            [ '200', { :Allow => 'OPTIONS,HEAD,GET,PUT,POST,DELETE' }, [''] ]
+            # * This's a new condition in order to not process WebDAV request which doesn't belong to DMS. But, it might
+            # case problems when acessing /dmsf and consequently /
           else
             # let Rails handle the request
             @rails_app.call env
diff --git a/lib/redmine_dmsf/webdav/dmsf_resource.rb b/lib/redmine_dmsf/webdav/dmsf_resource.rb
index 8499864b..331bf72a 100644
--- a/lib/redmine_dmsf/webdav/dmsf_resource.rb
+++ b/lib/redmine_dmsf/webdav/dmsf_resource.rb
@@ -46,11 +46,11 @@ module RedmineDmsf
         unless @children
           @children = []
           if collection?
-            folder.dmsf_folders.select(:title).visible.map do |p|
-              @children.push child(p.title)
+            folder.dmsf_folders.visible.pluck(:title).each do |title|
+              @children.push child(title)
             end
-            folder.dmsf_files.select(:name).visible.map do |p|
-              @children.push child(p.name)
+            folder.dmsf_files.visible.pluck(:name).each do |name|
+              @children.push child(name)
             end
           end
         end
@@ -60,12 +60,12 @@ module RedmineDmsf
       # Does the object exist?
       # If it is either a folder or a file, then it exists
       def exist?
-        self.project && self.project.module_enabled?('dmsf') && (self.folder || self.file) &&
-          (User.current.admin? || User.current.allowed_to?(:view_dmsf_folders, self.project))
+        project && project.module_enabled?('dmsf') && (folder || file) &&
+          (User.current.admin? || User.current.allowed_to?(:view_dmsf_folders, project))
       end
 
       def really_exist?
-        return project && project.module_enabled?('dmsf') && (folder || file)        
+        project && project.module_enabled?('dmsf') && (folder || file)
       end
 
       # Is this entity a folder?
@@ -125,8 +125,8 @@ module RedmineDmsf
       end
 
       def etag
-        filesize = file ? file.size : 4096;
-        fileino = (file && file.last_revision && File.exist?(file.last_revision.disk_file)) ? File.stat(file.last_revision.disk_file).ino : 2;
+        filesize = file ? file.size : 4096
+        fileino = (file && file.last_revision && File.exist?(file.last_revision.disk_file)) ? File.stat(file.last_revision.disk_file).ino : 2
         sprintf('%x-%x-%x', fileino, filesize, last_modified.to_i)
       end
 
@@ -165,7 +165,7 @@ module RedmineDmsf
           raise Forbidden unless (!parent.exist? || !parent.folder || DmsfFolder.permissions?(parent.folder, false))
           return MethodNotAllowed if exist? # If we already exist, why waste the time trying to save?
           parent_folder = nil
-          if (parent.projectless_path != '/')
+          if parent.projectless_path != '/'
             return Conflict unless parent.folder
             parent_folder = parent.folder.id
           end
@@ -189,7 +189,7 @@ module RedmineDmsf
           raise Forbidden unless User.current.admin? || User.current.allowed_to?(:file_delete, project)
           raise Forbidden unless (!parent.exist? || !parent.folder || DmsfFolder.permissions?(parent.folder, false))
           pattern = Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning']
-          if !pattern.blank? && basename.match(pattern)
+          if pattern.present? && basename.match(pattern)
             # Files that are not versioned should be destroyed
             destroy = true
           elsif file.last_revision.size == 0
@@ -247,7 +247,7 @@ module RedmineDmsf
           if dest.exist?
             return overwrite ? NotImplemented : PreconditionFailed
           else
-            if(parent.projectless_path == '/') #Project root
+            if parent.projectless_path == '/' # Project root
               folder.dmsf_folder_id = nil
             else
               return PreconditionFailed unless parent.exist? && parent.folder
@@ -296,7 +296,7 @@ module RedmineDmsf
               NotImplemented
             end
           else
-            if(parent.projectless_path == '/') #Project root
+            if parent.projectless_path == '/' # Project root
               f = nil
             else
               return PreconditionFailed unless parent.exist? && parent.folder
@@ -386,7 +386,7 @@ module RedmineDmsf
               User.current.allowed_to?(:view_dmsf_files, resource.project) &&
               User.current.allowed_to?(:view_dmsf_files, project))
 
-          if(parent.projectless_path == '/') #Project root
+          if parent.projectless_path == '/' # Project root
             f = nil
           else
             return PreconditionFailed unless parent.exist? && parent.folder
@@ -419,12 +419,12 @@ module RedmineDmsf
 
       # Lock
       def lock(args)
-        unless (parent.projectless_path == '/' || parent_exists?)
+        unless (parent.projectless_path == '/') || parent_exists?
           e = DAV4Rack::LockFailure.new
           e.add_failure @path, Conflict
           raise e
         end
-        unless self.exist?
+        unless exist?
           e = DAV4Rack::LockFailure.new
           e.add_failure @path, NotFound
           raise e
@@ -432,29 +432,29 @@ module RedmineDmsf
         lock_check(args[:scope])
         entity = file ? file : folder
         begin
-          if (entity.locked? && entity.locked_for_user?)
+          if entity.locked? && entity.locked_for_user?
             raise DAV4Rack::LockFailure.new("Failed to lock: #{@path}")
           else
             # If scope and type are not defined, the only thing we can
             # logically assume is that the lock is being refreshed (office loves
             # to do this for example, so we do a few checks, try to find the lock
             # and ultimately extend it, otherwise we return Conflict for any failure
-            if (!args[:scope] && !args[:type]) #Perhaps a lock refresh
+            if (!args[:scope]) && (!args[:type]) # Perhaps a lock refresh
               http_if = request.env['HTTP_IF']
-              if http_if.nil?
+              if http_if.blank?
                 e = DAV4Rack::LockFailure.new
                 e.add_failure @path, Conflict
                 raise e
               end
               if http_if =~ /([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12})/
-                l = DmsfLock.find($1)
+                l = DmsfLock.find_by(uuid: $1)
               end
               unless l
                 e = DAV4Rack::LockFailure.new
                 e.add_failure @path, Conflict
                 raise e
               end
-              l.expires_at = Time.now + 1.week
+              l.expires_at = Time.current + 1.week
               l.save!
               @response['Lock-Token'] = l.uuid
               return [1.weeks.to_i, l.uuid]
@@ -464,7 +464,7 @@ module RedmineDmsf
             type = "type_#{(args[:type] || 'write')}".to_sym
 
             #l should be the instance of the lock we've just created
-            l = entity.lock!(scope, type, Time.now + 1.weeks)
+            l = entity.lock!(scope, type, Time.current + 1.weeks)
             @response['Lock-Token'] = l.uuid
             [1.week.to_i, l.uuid]
           end
@@ -480,7 +480,7 @@ module RedmineDmsf
       # ownership of token before permitting unlock
       def unlock(token)
         return NotFound unless exist?
-        if (token.nil? || token.empty? || token == "<(null)>" || User.current.anonymous?)
+        if token.nil? || token.empty? || (token == '<(null)>') || User.current.anonymous?
           BadRequest
         else
           if token =~ /([a-f0-9]{8}-[a-f0-9]{4}-4[a-f0-9]{3}-[89aAbB][a-f0-9]{3}-[a-f0-9]{12})/
@@ -496,7 +496,7 @@ module RedmineDmsf
             # This should throw forbidden as only the lock at level initiated should be unlocked
             return NoContent unless entity.locked?
             l_entity = l.file || l.folder
-            if (entity.locked_for_user? || l_entity != entity)
+            if entity.locked_for_user? || (l_entity != entity)
               Forbidden
             else
               entity.unlock!
@@ -536,9 +536,9 @@ module RedmineDmsf
           
           # Disable versioning for file name patterns given in the plugin settings.
           pattern = Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning']
-          if !pattern.blank? && basename.match(pattern)
-              Rails.logger.info "Versioning disabled for #{basename}"
-              reuse_revision = true
+          if pattern.present? && basename.match(pattern)
+            Rails.logger.info "Versioning disabled for #{basename}"
+            reuse_revision = true
           end
           
           if reuse_version_for_locked_file(file)
@@ -611,7 +611,7 @@ module RedmineDmsf
       end
 
       def project_id
-        self.project.id if self.project
+        project.id if project
       end
 
       # array of lock info hashes
@@ -648,14 +648,14 @@ module RedmineDmsf
                 if lock.expires_at.nil?
                   doc.timeout 'Infinite'
                 else
-                  doc.timeout "Second-#{(lock.expires_at.to_i - Time.now.to_i)}"
+                  doc.timeout "Second-#{(lock.expires_at.to_i - Time.current.to_i)}"
                 end
                 lock_entity = lock.folder || lock.file
                 lock_path = "#{request.scheme}://#{request.host}:#{request.port}#{path_prefix}#{Addressable::URI.escape(lock_entity.project.identifier)}/"
                 lock_path << lock_entity.dmsf_path.map { |e| Addressable::URI.escape(e.respond_to?('name') ? e.name : e.title) }.join('/')
                 lock_path << '/' if lock_entity.is_a?(DmsfFolder) && lock_path[-1,1] != '/'
                 doc.lockroot { doc.href lock_path }
-                if ((lock.user.id == User.current.id) || User.current.allowed_to?(:force_file_unlock, self.project))
+                if (lock.user.id == User.current.id) || User.current.allowed_to?(:force_file_unlock, project)
                   doc.locktoken { doc.href lock.uuid }
                 end
               }
@@ -699,7 +699,7 @@ private
             return true
           end
         end
-        return false
+        false
       end
       
     end
diff --git a/lib/redmine_dmsf/webdav/index_resource.rb b/lib/redmine_dmsf/webdav/index_resource.rb
index 572dfc70..3de6e450 100644
--- a/lib/redmine_dmsf/webdav/index_resource.rb
+++ b/lib/redmine_dmsf/webdav/index_resource.rb
@@ -33,7 +33,7 @@ module RedmineDmsf
           @projects = []
           Project.select(:id, :identifier, :name).has_module(:dmsf).where(
             Project.allowed_to_condition(
-              User.current, :view_dmsf_folders)).order('lft').each do |p|
+              User.current, :view_dmsf_folders)).order('lft').find_each do |p|
             @projects << child_project(p)
           end
         end
@@ -45,11 +45,11 @@ module RedmineDmsf
       end
 
       def creation_date
-        Time.now
+        Time.current
       end
 
       def last_modified
-        Time.now
+        Time.current
       end
 
       # Index resource ALWAYS exists
@@ -63,7 +63,7 @@ module RedmineDmsf
       end
 
       def etag
-        sprintf('%x-%x-%x', children.count, 4096, Time.now.to_i)
+        sprintf('%x-%x-%x', children.count, 4096, Time.current.to_i)
       end
 
       def content_type
diff --git a/lib/redmine_dmsf/webdav/project_resource.rb b/lib/redmine_dmsf/webdav/project_resource.rb
index 011dfeee..384df927 100644
--- a/lib/redmine_dmsf/webdav/project_resource.rb
+++ b/lib/redmine_dmsf/webdav/project_resource.rb
@@ -33,11 +33,11 @@ module RedmineDmsf
         unless @children          
           @children = []
           if project
-            project.dmsf_folders.select(:title).visible.map do |p|
-              @children.push child(p.title)
+            project.dmsf_folders.visible.pluck(:title).each do |title|
+              @children.push child(title)
             end
-            project.dmsf_files.select(:name).visible.map do |p|
-              @children.push child(p.name)              
+            project.dmsf_files.visible.pluck(:name).each do |name|
+              @children.push child(name)
             end
           end
         end
diff --git a/lib/redmine_dmsf/webdav/resource_proxy.rb b/lib/redmine_dmsf/webdav/resource_proxy.rb
index ba53e3a8..71ec0d14 100644
--- a/lib/redmine_dmsf/webdav/resource_proxy.rb
+++ b/lib/redmine_dmsf/webdav/resource_proxy.rb
@@ -35,12 +35,12 @@ module RedmineDmsf
 
       def initialize(*args)
         # Return 404 - NotFound if WebDAV is not enabled
-        raise NotFound unless Setting.plugin_redmine_dmsf['dmsf_webdav'].present?
+        raise NotFound unless Setting.plugin_redmine_dmsf['dmsf_webdav']
         super(*args)
         pinfo = path.split('/').drop(1)
-        if (pinfo.length == 0) # If this is the base_path, we're at root
+        if pinfo.length == 0 # If this is the base_path, we're at root
           @resource_c = IndexResource.new(*args)
-        elsif (pinfo.length == 1) # This is the first level, and as such, project path
+        elsif pinfo.length == 1 # This is the first level, and as such, project path
           @resource_c = ProjectResource.new(*args)
         else # We made it all the way to DMSF Data
           @resource_c = DmsfResource.new(*args)
@@ -51,7 +51,7 @@ module RedmineDmsf
 
       def authenticate(username, password)
         User.current = User.try_to_login(username, password)
-        return User.current && !User.current.anonymous?
+        User.current && !User.current.anonymous?
       end
 
       def options(request, response)
diff --git a/lib/tasks/dmsf_convert_documents.rake b/lib/tasks/dmsf_convert_documents.rake
index 722aca5e..f9f6b206 100644
--- a/lib/tasks/dmsf_convert_documents.rake
+++ b/lib/tasks/dmsf_convert_documents.rake
@@ -105,7 +105,7 @@ class DmsfConvertDocuments
             end
           end
 
-          folders << folder;
+          folders << folder
 
           files = []          
           document.attachments.each do |attachment|
diff --git a/lib/tasks/dmsf_maintenance.rake b/lib/tasks/dmsf_maintenance.rake
index 81666922..73654654 100644
--- a/lib/tasks/dmsf_maintenance.rake
+++ b/lib/tasks/dmsf_maintenance.rake
@@ -74,12 +74,10 @@ class DmsfMaintenance
   end
 
   def documents
-    DmsfFile.all.each do |f|
+    DmsfFile.find_each do |f|
       r = f.last_revision
       if r.nil? || (!File.exist?(r.disk_file))
         @documents_to_delete << f
-        folder = f.dmsf_folder ? f.dmsf_folder.dmsf_path_str : ''
-        project = f.project ? f.project.name : '<nil>'
         puts "\t#{r.disk_file}\n" if r
       end
     end
diff --git a/test/fixtures/dmsf_file_revisions.yml b/test/fixtures/dmsf_file_revisions.yml
index 62eb569c..80ff3d62 100644
--- a/test/fixtures/dmsf_file_revisions.yml
+++ b/test/fixtures/dmsf_file_revisions.yml
@@ -9,7 +9,7 @@ dmsf_file_revisions_001:
   mime_type:                     text/plain
   title:                         "Test File"
   description:                   'Some file :-)'
-  workflow:                      NULL
+  workflow:                      1 # DmsfWorkflow::STATE_WAITING_FOR_APPROVAL
   minor_version:                 0
   major_version:                 1
   comment:                       NULL
@@ -26,8 +26,8 @@ dmsf_file_revisions_002:
   id:                            2
   dmsf_file_id:                  2
   source_dmsf_file_revision_id:  NULL
-  name:                          "test.txt"  
-  disk_filename:                 "test.txt"
+  name:                          "test2.txt"
+  disk_filename:                 "test2.txt"
   size:                          4
   mime_type:                     text/plain
   title:                         "Test File"
@@ -69,8 +69,8 @@ dmsf_file_revisions_004:
   id:                           4
   dmsf_file_id:                 4
   source_dmsf_file_revision_id: NULL
-  name:                         'test.txt'  
-  disk_filename:                'test.txt'
+  name:                         'test4.txt'
+  disk_filename:                'test4.txt'
   size:                         4
   mime_type:                    text/plain
   title:                        'Test File'
@@ -90,8 +90,8 @@ dmsf_file_revisions_005:
   id:                            5
   dmsf_file_id:                  1
   source_dmsf_file_revision_id:  NULL
-  name:                          "test.txt"  
-  disk_filename:                 "test.txt"
+  name:                          "test5.txt"
+  disk_filename:                 "test5.txt"
   size:                          4
   mime_type:                     text/plain
   title:                         "Test File"
@@ -154,7 +154,7 @@ dmsf_file_revisions_008:
   dmsf_file_id:                  9
   source_dmsf_file_revision_id:  NULL
   name:                          "myfile.txt"  
-  disk_filename:                 "myfile.txt"
+  disk_filename:                 "myfile.txt" # The file is not physicaly present
   size:                          0
   mime_type:                     text/plain
   title:                         "My File"
diff --git a/test/fixtures/dmsf_workflow_step_actions.yml b/test/fixtures/dmsf_workflow_step_actions.yml
index f006b8ee..4f43948a 100644
--- a/test/fixtures/dmsf_workflow_step_actions.yml
+++ b/test/fixtures/dmsf_workflow_step_actions.yml
@@ -1,4 +1,3 @@
-
 ---
 wfsac1:
   id: 1
diff --git a/test/fixtures/dmsf_workflow_step_assignments.yml b/test/fixtures/dmsf_workflow_step_assignments.yml
index a231c65c..c8e0760b 100644
--- a/test/fixtures/dmsf_workflow_step_assignments.yml
+++ b/test/fixtures/dmsf_workflow_step_assignments.yml
@@ -38,11 +38,17 @@ wfsa6:
 wfsa7:
   id: 7
   dmsf_workflow_step_id: 2
-  user_id: 1
+  user_id: 2
   dmsf_file_revision_id: 1 
   
 wfsa8:
   id: 8
   dmsf_workflow_step_id: 3  
+  user_id: 1
+  dmsf_file_revision_id: 1
+
+wfsa9:
+  id: 9
+  dmsf_workflow_step_id: 5
   user_id: 2
-  dmsf_file_revision_id: 1 
\ No newline at end of file
+  dmsf_file_revision_id: 1
\ No newline at end of file
diff --git a/test/fixtures/files/2017/04/test.gif b/test/fixtures/files/2017/04/test.gif
old mode 100755
new mode 100644
index 0329e659baf657fe9b0564f0d61fd97d58fbf8f5..d800886d9c86731ae5c4a62b0b77c437015e00d2
GIT binary patch
literal 3
KcmXpsG6nzvEdZAQ

literal 9982
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

diff --git a/test/fixtures/files/2017/04/test.pdf b/test/fixtures/files/2017/04/test.pdf
index 4d26b29754f9094881a72a161bdb1de5cb1e65bc..d800886d9c86731ae5c4a62b0b77c437015e00d2 100644
GIT binary patch
literal 3
KcmXpsG6nzvEdZAQ

literal 7880
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
b29?i1h{M}s@xN0lDK0Gu;Nw%#MFIW?3bVHn

diff --git a/test/fixtures/files/2017/04/test.txt b/test/fixtures/files/2017/04/test.txt
index 274c0052..d800886d 100644
--- a/test/fixtures/files/2017/04/test.txt
+++ b/test/fixtures/files/2017/04/test.txt
@@ -1 +1 @@
-1234
\ No newline at end of file
+123
\ No newline at end of file
diff --git a/test/functional/dmsf_context_menus_controller_test.rb b/test/functional/dmsf_context_menus_controller_test.rb
index 288fbe0e..f6791c21 100644
--- a/test/functional/dmsf_context_menus_controller_test.rb
+++ b/test/functional/dmsf_context_menus_controller_test.rb
@@ -27,12 +27,11 @@ class DmsfContextMenusControllerTest < RedmineDmsf::Test::TestCase
            :dmsf_files, :dmsf_file_revisions
 
   def setup
-    @user_member = User.find_by_id 2 # John Smith - manager
-    @project1 = Project.find_by_id 1
-    assert_not_nil @project1
+    @user_member = User.find 2 # John Smith - manager
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
-    @file1 = DmsfFile.find_by_id 1
-    @folder1 = DmsfFolder.find_by_id 1
+    @file1 = DmsfFile.find 1
+    @folder1 = DmsfFolder.find 1
     User.current = nil
     @request.session[:user_id] = @user_member.id
   end
diff --git a/test/functional/dmsf_controller_test.rb b/test/functional/dmsf_controller_test.rb
index 8fa49a48..873ce4d8 100644
--- a/test/functional/dmsf_controller_test.rb
+++ b/test/functional/dmsf_controller_test.rb
@@ -28,20 +28,19 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
     :dmsf_files, :dmsf_file_revisions, :dmsf_folder_permissions, :dmsf_locks
 
   def setup
-    @project = Project.find_by_id 1
-    assert_not_nil @project
+    @project = Project.find 1
     @project.enable_module! :dmsf
-    @folder1 = DmsfFolder.find_by_id 1
-    @folder2 = DmsfFolder.find_by_id 2
-    @folder4 = DmsfFolder.find_by_id 4
-    @file1 = DmsfFile.find_by_id 1
-    @file_link2 = DmsfLink.find_by_id 4
-    @folder_link1 = DmsfLink.find_by_id 1
-    @role = Role.find_by_id 1
-    @custom_field = CustomField.find_by_id 21
-    @custom_value = CustomValue.find_by_id 21
-    @folder7 = DmsfFolder.find_by_id 7
-    @manager = User.find_by_id 2 #1
+    @folder1 = DmsfFolder.find 1
+    @folder2 = DmsfFolder.find 2
+    @folder4 = DmsfFolder.find 4
+    @file1 = DmsfFile.find 1
+    @file_link2 = DmsfLink.find 4
+    @folder_link1 = DmsfLink.find 1
+    @role = Role.find 1
+    @custom_field = CustomField.find 21
+    @custom_value = CustomValue.find 21
+    @folder7 = DmsfFolder.find 7
+    @manager = User.find 2 #1
     User.current = nil
     @request.session[:user_id] = @manager.id
   end
@@ -204,7 +203,7 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
   def test_show_csv
     @role.add_permission! :view_dmsf_files
     @role.add_permission! :view_dmsf_folders
-    get :show, :id => @project.id, :format => 'csv', :settings => {:dmsf_columns => ['id', 'title']}
+    get :show, id: @project.id, format: 'csv', :settings => { dmsf_columns: %w(id title) }
     assert_response :success
     assert_equal 'text/csv; header=present', @response.content_type
   end
@@ -215,7 +214,7 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
     assert_response :forbidden
   end
 
-  def test_new_forbidden
+  def test_new
     @role.add_permission! :folder_manipulation
     get :new, :id => @project, :parent_id => nil
     assert_response :success
@@ -240,7 +239,7 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
   end
 
   def test_email_entries_links_only
-    Setting.plugin_redmine_dmsf['dmsf_documents_email_links_only'] = '1'
+    Setting.plugin_redmine_dmsf['dmsf_documents_email_links_only'] = true
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
     @role.add_permission! :view_dmsf_files
     get :entries_operation, :id => @project, :email_entries => 'Email', :ids => ["file-#{@file1.id}"]
@@ -264,7 +263,7 @@ class DmsfControllerTest < RedmineDmsf::Test::TestCase
     assert_response :forbidden
   end
 
-  def test_append_email_forbidden
+  def test_append_email
     @role.add_permission! :view_dmsf_files
     post :append_email, :id => @project, :user_ids => @project.members.collect{ |m| m.user.id }, :format => 'js'
     assert_response :success
diff --git a/test/functional/dmsf_files_controller_test.rb b/test/functional/dmsf_files_controller_test.rb
index 95ebfc3e..1847f645 100644
--- a/test/functional/dmsf_files_controller_test.rb
+++ b/test/functional/dmsf_files_controller_test.rb
@@ -27,15 +27,26 @@ class DmsfFilesControllerTest < RedmineDmsf::Test::TestCase
     :enabled_modules, :dmsf_file_revisions
 
   def setup
-    @project = Project.find_by_id 1
-    assert_not_nil @project
+    @project = Project.find 1
     @project.enable_module! :dmsf    
-    @file = DmsfFile.find_by_id 1    
-    @role = Role.find_by_id 1
+    @file = DmsfFile.find 1
+    @role = Role.find 1
     User.current = nil
     @request.session[:user_id] = 2
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
-  end 
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+  end
+
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
   
   def test_truth
     assert_kind_of Project, @project
diff --git a/test/functional/dmsf_files_copy_controller_test.rb b/test/functional/dmsf_files_copy_controller_test.rb
index d7653088..88c7aabe 100644
--- a/test/functional/dmsf_files_copy_controller_test.rb
+++ b/test/functional/dmsf_files_copy_controller_test.rb
@@ -28,25 +28,36 @@ class DmsfFilesCopyControllerTest < RedmineDmsf::Test::TestCase
     :enabled_modules, :dmsf_file_revisions, :dmsf_folders
 
   def setup
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @project5 = Project.find_by_id 5
-    assert_not_nil @project1
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @project5 = Project.find 5
     @project1.enable_module! :dmsf
-    @file1 = DmsfFile.find_by_id 1
-    @folder1 = DmsfFolder.find_by_id 1
-    @user_admin = User.find_by_id 1
-    @user_member = User.find_by_id 2
-    @user_non_member = User.find_by_id 3
-    @role_manager = Role.where(:name => 'Manager').first
+    @file1 = DmsfFile.find 1
+    @folder1 = DmsfFolder.find 1
+    @user_admin = User.find 1
+    @user_member = User.find 2
+    @user_non_member = User.find 3
+    @role_manager = Role.find_by(name: 'Manager')
     User.current = nil
     @request.session[:user_id] = 2  # John Smith - manager
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     @project1.enable_module!(:dmsf)
     @role_manager.add_permission! :file_manipulation
     @role_manager.add_permission! :view_dmsf_folders
   end
 
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
+
   def test_truth
     assert_kind_of Project, @project1
     assert_kind_of Project, @project2
diff --git a/test/functional/dmsf_folder_permissions_controller_test.rb b/test/functional/dmsf_folder_permissions_controller_test.rb
index 289f5542..46eba14a 100644
--- a/test/functional/dmsf_folder_permissions_controller_test.rb
+++ b/test/functional/dmsf_folder_permissions_controller_test.rb
@@ -25,13 +25,12 @@ class DmsfFolderPermissionsControllerTest < RedmineDmsf::Test::TestCase
            :email_addresses
 
   def setup
-    @project1 = Project.find_by_id 1
-    assert_not_nil @project1
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
-    @folder7 = DmsfFolder.find_by_id 7
-    @manager = User.find_by_id 2
-    @developer = User.find_by_id 3
-    @manager_role = Role.find_by_id 1
+    @folder7 = DmsfFolder.find 7
+    @manager = User.find 2
+    @developer = User.find 3
+    @manager_role = Role.find 1
     User.current = nil
     @request.session[:user_id] = @manager.id
     @manager_role.add_permission! :view_dmsf_folders
diff --git a/test/functional/dmsf_folders_copy_controller_test.rb b/test/functional/dmsf_folders_copy_controller_test.rb
index dad67dd0..ccdd09a4 100644
--- a/test/functional/dmsf_folders_copy_controller_test.rb
+++ b/test/functional/dmsf_folders_copy_controller_test.rb
@@ -27,26 +27,37 @@ class DmsfFoldersCopyControllerTest < RedmineDmsf::Test::TestCase
            :email_addresses
 
   def setup
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @project5 = Project.find_by_id 5
-    assert_not_nil @project1
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @project5 = Project.find 5
     @project1.enable_module! :dmsf
-    @folder1 = DmsfFolder.find_by_id 1
-    @folder2 = DmsfFolder.find_by_id 2
-    @folder6 = DmsfFolder.find_by_id 6
-    @user_admin = User.find_by_id 1
-    @user_member = User.find_by_id 2
-    @user_non_member = User.find_by_id 3
+    @folder1 = DmsfFolder.find 1
+    @folder2 = DmsfFolder.find 2
+    @folder6 = DmsfFolder.find 6
+    @user_admin = User.find 1
+    @user_member = User.find 2
+    @user_non_member = User.find 3
     @role_manager = Role.where(:name => 'Manager').first
     User.current = nil
     @request.session[:user_id] = @user_member.id  # John Smith - manager
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     @project1.enable_module!(:dmsf)
     @role_manager.add_permission! :folder_manipulation
     @role_manager.add_permission! :view_dmsf_folders
   end
 
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
+
   def test_truth
     assert_kind_of Project, @project1
     assert_kind_of Project, @project2
diff --git a/test/functional/dmsf_links_controller_test.rb b/test/functional/dmsf_links_controller_test.rb
index bec88392..648408b7 100644
--- a/test/functional/dmsf_links_controller_test.rb
+++ b/test/functional/dmsf_links_controller_test.rb
@@ -27,33 +27,28 @@ class DmsfLinksControllerTest < RedmineDmsf::Test::TestCase
     :dmsf_file_revisions, :dmsf_folders, :dmsf_links, :roles, :member_roles
   
   def setup
-    @user_admin = User.find_by_id 1
-    assert_not_nil @user_admin
-    @user_member = User.find_by_id 2
-    assert_not_nil @user_member
-    @user_non_member = User.find_by_id 3
-    assert_not_nil @user_non_member
-    @role_manager = Role.where(:name => 'Manager').first
+    @user_admin = User.find 1
+    @user_member = User.find 2
+    @user_non_member = User.find 3
+    @role_manager = Role.find_by(name: 'Manager')
     assert_not_nil @role_manager
     @role_manager.add_permission! :file_manipulation
-    @role_developer = Role.where(:name => 'Developer').first
+    @role_developer = Role.find_by(name: 'Developer')
     assert_not_nil @role_developer
     @role_developer.add_permission! :file_manipulation
-    @project1 = Project.find_by_id 1
-    assert_not_nil @project1
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
-    @project2 = Project.find_by_id 2
-    assert_not_nil @project2
+    @project2 = Project.find 2
     @project2.enable_module! :dmsf    
-    @folder1 = DmsfFolder.find_by_id 1 # project1/folder1
-    @folder2 = DmsfFolder.find_by_id 2 # project1/folder1/folder2
-    @folder3 = DmsfFolder.find_by_id 3 # project2/folder3
-    @file1 = DmsfFile.find_by_id 1 # project1/file1
-    @file2 = DmsfFile.find_by_id 2 # project2/file2
-    @file4 = DmsfFile.find_by_id 4 # project1/folder2/file4
-    @file6 = DmsfFile.find_by_id 6 # project2/folder3/file6    
-    @file_link = DmsfLink.find_by_id 1
-    @request.env['HTTP_REFERER'] = dmsf_folder_path(:id => @project1.id, :folder_id => @folder1.id)
+    @folder1 = DmsfFolder.find 1 # project1/folder1
+    @folder2 = DmsfFolder.find 2 # project1/folder1/folder2
+    @folder3 = DmsfFolder.find 3 # project2/folder3
+    @file1 = DmsfFile.find 1 # project1/file1
+    @file2 = DmsfFile.find 2 # project2/file2
+    @file4 = DmsfFile.find 4 # project1/folder2/file4
+    @file6 = DmsfFile.find 6 # project2/folder3/file6
+    @file_link = DmsfLink.find 1
+    @request.env['HTTP_REFERER'] = dmsf_folder_path(id: @project1.id, folder_id: @folder1.id)
     @request.session[:user_id] = @user_member.id
     User.current = nil
   end
diff --git a/test/functional/dmsf_public_urls_controller_test.rb b/test/functional/dmsf_public_urls_controller_test.rb
index e6064fa7..07338d28 100644
--- a/test/functional/dmsf_public_urls_controller_test.rb
+++ b/test/functional/dmsf_public_urls_controller_test.rb
@@ -25,7 +25,13 @@ class DmsfPublicUrlsControllerTest < RedmineDmsf::Test::TestCase
   fixtures :dmsf_files, :dmsf_file_revisions, :dmsf_public_urls
   
   def setup
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+  end
+
+  def teardown
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
   end
 
   def test_show_valid_url
@@ -35,12 +41,12 @@ class DmsfPublicUrlsControllerTest < RedmineDmsf::Test::TestCase
 
   def test_show_url_width_invalid_token
     get :show, :token => 'f8d33e21914a433b280fdc94450ee212'
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_show_url_that_has_expired
     get :show, :token => 'e8d33e21914a433b280fdc94450ee212'
-    assert_response :missing
+    assert_response :not_found
   end
 
 end
diff --git a/test/functional/dmsf_state_controller_test.rb b/test/functional/dmsf_state_controller_test.rb
index 986870d8..021aeaab 100644
--- a/test/functional/dmsf_state_controller_test.rb
+++ b/test/functional/dmsf_state_controller_test.rb
@@ -26,13 +26,12 @@ class DmsfStateControllerTest < RedmineDmsf::Test::TestCase
   fixtures :users, :email_addresses, :projects, :members, :roles, :member_roles
 
   def setup
-    @user_admin = User.find_by_id 1 # Redmine admin
-    @user_member = User.find_by_id 2 # John Smith - manager
-    @user_non_member = User.find_by_id 3 # Dave Lopper    
-    @project = Project.find_by_id 1
-    assert_not_nil @project
+    @user_admin = User.find 1 # Redmine admin
+    @user_member = User.find 2 # John Smith - manager
+    @user_non_member = User.find 3 # Dave Lopper
+    @project = Project.find 1
     @project.enable_module! :dmsf
-    @role_manager = Role.find_by_name('Manager')    
+    @role_manager = Role.find_by(name: 'Manager')
     User.current = nil
   end
   
diff --git a/test/functional/dmsf_workflow_controller_test.rb b/test/functional/dmsf_workflow_controller_test.rb
index cda46cff..77f11cd5 100644
--- a/test/functional/dmsf_workflow_controller_test.rb
+++ b/test/functional/dmsf_workflow_controller_test.rb
@@ -28,28 +28,27 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
     :dmsf_file_revisions, :dmsf_files
 
   def setup
-    @user_admin = User.find_by_id 1 # Redmine admin
-    @user_member = User.find_by_id 2 # John Smith - manager
-    @user_non_member = User.find_by_id 3 # Dave Lopper
-    @role_manager = Role.find_by_name('Manager')
+    @user_admin = User.find 1 # Redmine admin
+    @user_member = User.find 2 # John Smith - manager
+    @user_non_member = User.find 3 # Dave Lopper
+    @role_manager = Role.find_by(name: 'Manager')
     @role_manager.add_permission! :file_manipulation
     @role_manager.add_permission! :manage_workflows
     @role_manager.add_permission! :file_approval
-    @wfs1 = DmsfWorkflowStep.find_by_id 1 # step 1
-    @wfs2 = DmsfWorkflowStep.find_by_id 2 # step 2
-    @wfs3 = DmsfWorkflowStep.find_by_id 3 # step 1
-    @wfs4 = DmsfWorkflowStep.find_by_id 4 # step 2
-    @wfs5 = DmsfWorkflowStep.find_by_id 5 # step 3
-    @project1 = Project.find_by_id 1
+    @wfs1 = DmsfWorkflowStep.find 1 # step 1
+    @wfs2 = DmsfWorkflowStep.find 2 # step 2
+    @wfs3 = DmsfWorkflowStep.find 3 # step 1
+    @wfs4 = DmsfWorkflowStep.find 4 # step 2
+    @wfs5 = DmsfWorkflowStep.find 5 # step 3
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
-    @wf1 = DmsfWorkflow.find_by_id 1
-    @wf3 = DmsfWorkflow.find_by_id 3
-    @wfsa2 = DmsfWorkflowStepAssignment.find_by_id 2
-    @revision1 = DmsfFileRevision.find_by_id 1
-    @revision2 = DmsfFileRevision.find_by_id 2
-    @revision3 = DmsfFileRevision.find_by_id 3
-    @file1 = DmsfFile.find_by_id 1
-    @file2 = DmsfFile.find_by_id 2
+    @wf1 = DmsfWorkflow.find 1
+    @wf3 = DmsfWorkflow.find 3
+    @wfsa2 = DmsfWorkflowStepAssignment.find 2
+    @revision1 = DmsfFileRevision.find 1
+    @revision2 = DmsfFileRevision.find 2
+    @file1 = DmsfFile.find 1
+    @file2 = DmsfFile.find 2
     @request.env['HTTP_REFERER'] = dmsf_folder_path(:id => @project1.id)
     User.current = nil
     @request.session[:user_id] = @user_member.id
@@ -71,7 +70,6 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
     assert_kind_of DmsfWorkflowStepAssignment, @wfsa2
     assert_kind_of DmsfFileRevision, @revision1
     assert_kind_of DmsfFileRevision, @revision2
-    assert_kind_of DmsfFileRevision, @revision3
     assert_kind_of DmsfFile, @file1
     assert_kind_of DmsfFile, @file2
   end
@@ -200,7 +198,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
            :user_ids => [@user_non_member.id]
     end
     assert_response :success
-    ws = DmsfWorkflowStep.order(:id => :desc).first
+    ws = DmsfWorkflowStep.order(id: :desc).first
     assert_equal @wf1.id, ws.dmsf_workflow_id
     assert_equal 1, ws.step
     assert_equal '1st step', ws.name
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 940ee7d3..9333fba3 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -27,21 +27,30 @@ class IssuesControllerTest < RedmineDmsf::Test::TestCase
            :enabled_modules, :enumerations, :issue_statuses
 
   def setup
-    @user_manager = User.find_by_id 2
-    assert_not_nil @user_manager
-    @project1 = Project.find_by_id 1
-    assert_not_nil @project1
+    @user_manager = User.find 2
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
     @project1.enable_module! :issue_tracking
-    @project2 = Project.find_by_id 2
-    assert_not_nil @project2
+    @project2 = Project.find 2
     @project2.enable_module! :dmsf
     @project2.enable_module! :issue_tracking
-    @issue1 = Issue.find_by_id 1
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
+    @issue1 = Issue.find 1
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     User.current = nil
     @request.session[:user_id] = @user_manager.id
-  end 
+  end
+
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
   
   def test_truth
     assert_kind_of Project, @project1
@@ -58,9 +67,9 @@ class IssuesControllerTest < RedmineDmsf::Test::TestCase
     main_system_folder = @issue1.main_system_folder
     assert main_system_folder
     assert_equal @project1.id, main_system_folder.project_id
-    put :update, :id => @issue1.id, :issue => { :project_id => @project2.id, :tracker_id => '1', :priority_id => '6',
-        :category_id => '3' }
-    assert_redirected_to :action => 'show', :id => @issue1.id
+    put :update, id: @issue1.id, issue: { project_id: @project2.id, tracker_id: '1', priority_id: '6',
+        category_id: '3' }
+    assert_redirected_to action: 'show', id: @issue1.id
     @issue1.reload
     assert_equal @project2.id, @issue1.project.id
     system_folder = @issue1.system_folder
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index ce70b425..550b62f9 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -28,8 +28,7 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
     :dmsf_file_revisions, :dmsf_folders, :dmsf_files, :dmsf_locks
 
   def setup
-    @user_member = User.find_by_id 2
-    assert_not_nil @user_member
+    @user_member = User.find 2
     User.current = nil
     @request.session[:user_id] = @user_member.id    
   end 
@@ -45,7 +44,7 @@ class MyControllerTest < RedmineDmsf::Test::TestCase
     assert_response :success
     unless defined?(EasyExtensions)
       assert_select 'div#list-top' do
-        assert_select 'h3', { :text => "#{l(:open_approvals)} (0)" }
+        assert_select 'h3', { :text => "#{l(:open_approvals)} (3)" }
       end
     end
   end
diff --git a/test/integration/rest_api/dmsf_file_api_test.rb b/test/integration/rest_api/dmsf_file_api_test.rb
index dd4cd11c..dcd94053 100644
--- a/test/integration/rest_api/dmsf_file_api_test.rb
+++ b/test/integration/rest_api/dmsf_file_api_test.rb
@@ -26,12 +26,12 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
   fixtures :projects, :users, :dmsf_files, :dmsf_file_revisions, :members, :roles, :member_roles
 
   def setup
-    @admin = User.find_by_id 1
-    @jsmith = User.find_by_id 2
-    @file1 = DmsfFile.find_by_id 1
+    @admin = User.find 1
+    @jsmith = User.find 2
+    @file1 = DmsfFile.find 1
     Setting.rest_api_enabled = '1'
-    @role = Role.find_by_id 1
-    @project1 = Project.find_by_id 1
+    @role = Role.find_by(name: 'Manager')
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
   end
 
@@ -75,11 +75,11 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../../fixtures/files', __FILE__
     get "/dmsf/files/#{@file1.id}/download.xml?key=#{token.value}"
     assert_response :success
-    assert_equal '1234', @response.body
+    assert_equal '123', @response.body
   end
 
   def test_upload_document
-    timestamp = DateTime.now.strftime('%y%m%d%H%M')
+    timestamp = DateTime.current.strftime('%y%m%d%H%M')
     Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = DmsfHelper.temp_dir.join("dmsf_test-#{timestamp}").to_s
     FileUtils.mkdir_p(Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     @role.add_permission! :file_manipulation
@@ -97,20 +97,18 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
     ftoken = xml['upload']['token']
     assert_not_nil ftoken
     #curl -v -H "Content-Type: application/xml" -X POST --data "@file.xml" -u ${1}:${2} http://localhost:3000/projects/12/dmsf/commit.xml
-    payload = %{
-      <?xml version="1.0" encoding="utf-8" ?>
-      <attachments>
-       <folder_id/>
-       <uploaded_file>
-         <name>test.txt</name>
-         <title>test.txt</title>
-         <description>REST API</description>
-         <comment>From API</comment>
-         <version/>
-         <token>#{ftoken}</token>
-       </uploaded_file>
-      </attachments>
-    }
+    payload = %{<?xml version="1.0" encoding="utf-8" ?>
+                <attachments>
+                 <folder_id/>
+                 <uploaded_file>
+                   <name>test.txt</name>
+                   <title>test.txt</title>
+                   <description>REST API</description>
+                   <comment>From API</comment>
+                   <version/>
+                   <token>#{ftoken}</token>
+                 </uploaded_file>
+                </attachments>}
     assert_difference 'DmsfFileRevision.count', +1 do
       post "/projects/#{@project1.id}/dmsf/commit.xml?key=#{token.value}", payload, {"CONTENT_TYPE" => 'application/xml'}
     end
@@ -123,7 +121,7 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
     # </dmsf_files> #
     assert_select 'dmsf_files > file > name', :text => 'test.txt'
     assert_response :success
-    revision = DmsfFileRevision.order(:id).last
+    revision = DmsfFileRevision.order(:created_at).last
     assert revision && revision.size > 0
     begin
       FileUtils.rm_rf Setting.plugin_redmine_dmsf['dmsf_storage_directory']
@@ -156,7 +154,7 @@ class DmsfFileApiTest < RedmineDmsf::Test::IntegrationTest
     # curl -v -H "Content-Type: application/xml" -X DELETE -u ${1}:${2} http://localhost:3000/dmsf/files/196118.xml&commit=yes
     delete "/dmsf/files/#{@file1.id}.xml?key=#{token.value}&commit=yes", {'CONTENT_TYPE' => 'application/xml'}
     assert_response :success
-    assert_nil DmsfFile.find_by_id(@file1.id)
+    assert_nil DmsfFile.find_by(id: @file1.id)
   end
 
   def test_delete_file_locked
diff --git a/test/integration/rest_api/dmsf_folder_api_test.rb b/test/integration/rest_api/dmsf_folder_api_test.rb
index 82701c6a..d59b0655 100644
--- a/test/integration/rest_api/dmsf_folder_api_test.rb
+++ b/test/integration/rest_api/dmsf_folder_api_test.rb
@@ -27,18 +27,30 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
            :member_roles
 
   def setup
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../../fixtures/files', __FILE__
-    @admin = User.find_by_id 1
-    @jsmith = User.find_by_id 2
-    @file1 = DmsfFile.find_by_id 1
-    @folder1 = DmsfFolder.find_by_id 1
-    @folder7 = DmsfFolder.find_by_id 7
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+    @admin = User.find 1
+    @jsmith = User.find 2
+    @file1 = DmsfFile.find 1
+    @folder1 = DmsfFolder.find 1
+    @folder7 = DmsfFolder.find 7
     Setting.rest_api_enabled = '1'
-    @role = Role.find_by_id 1
-    @project1 = Project.find_by_id 1
+    @role = Role.find_by(name: 'Manager')
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
   end
 
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
+
   def test_truth
     assert_kind_of User, @admin
     assert_kind_of User, @jsmith
@@ -133,14 +145,12 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :folder_manipulation
     token = Token.create!(:user => @jsmith, :action => 'api')
     #curl -v -H "Content-Type: application/xml" -X POST --data "@folder.xml" -u ${1}:${2} http://localhost:3000/projects/12/dmsf/create.xml
-    payload = %{
-      <?xml version="1.0" encoding="utf-8" ?>
-      <dmsf_folder>
-        <title>rest_api</title>
-        <description>A folder created via REST API</description>
-        <dmsf_folder_id/>
-      </dmsf_folder>
-    }
+    payload = %{<?xml version="1.0" encoding="utf-8" ?>
+                <dmsf_folder>
+                  <title>rest_api</title>
+                  <description>A folder created via REST API</description>
+                  <dmsf_folder_id/>
+                </dmsf_folder>}
     post "/projects/#{@project1.id}/dmsf/create.xml?key=#{token.value}", payload, {'CONTENT_TYPE' => 'application/xml'}
     assert_response :success
     # <?xml version="1.0" encoding="UTF-8"?>
@@ -184,7 +194,7 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     token = Token.create!(:user => @jsmith, :action => 'api')
     # curl -v -H "Content-Type: application/json" -X GET -H "X-Redmine-API-Key: USERS_API_KEY" http://localhost:3000/projects/1/dmsf.json?folder_title=Updated%20title
     get "/projects/#{@project1.id}/dmsf.xml?key=#{token.value}&folder_title=xxx"
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_find_folder_by_id
@@ -220,20 +230,18 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     token = Token.create!(:user => @jsmith, :action => 'api')
     # curl -v -H "Content-Type: application/json" -X GET -H "X-Redmine-API-Key: USERS_API_KE" http://localhost:3000/projects/1/dmsf.json?folder_id=3
     get "/projects/#{@project1.id}/dmsf.xml?key=#{token.value}&folder_id=99999999999"
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_update_folder
     @role.add_permission! :folder_manipulation
     token = Token.create!(:user => @jsmith, :action => 'api')
     #curl -v -H "Content-Type: application/json" -X POST --data "@update-folder-payload.json" -H "X-Redmine-API-Key: USERS_API_KEY" http://localhost:3000//projects/#{project_id}/dmsf/save.json
-    payload = %{
-      <?xml version="1.0" encoding="utf-8" ?>
-        <dmsf_folder>
-          <title>rest_api</title>
-          <description>A folder updated via REST API</description>
-        </dmsf_folder>
-    }
+    payload = %{<?xml version="1.0" encoding="utf-8" ?>
+                <dmsf_folder>
+                  <title>rest_api</title>
+                  <description>A folder updated via REST API</description>
+                </dmsf_folder>}
     post "/projects/#{@project1.id}/dmsf/save.xml?folder_id=1&key=#{token.value}", payload, {'CONTENT_TYPE' => 'application/xml'}
     assert_response :success
     # <?xml version="1.0" encoding="UTF-8"?>
@@ -272,7 +280,7 @@ class DmsfFolderApiTest < RedmineDmsf::Test::IntegrationTest
     delete "/projects/#{@project1.id}/dmsf/delete.xml?key=#{token.value}&folder_id=#{@folder1.id}&commit=yes",
            {'CONTENT_TYPE' => 'application/xml'}
     assert_response :success
-    assert_nil DmsfFolder.find_by_id(@folder1.id)
+    assert_nil DmsfFolder.find_by(id: @folder1.id)
   end
 
   def test_delete_folder_locked
diff --git a/test/integration/rest_api/dmsf_link_api_test.rb b/test/integration/rest_api/dmsf_link_api_test.rb
index 41202b22..21e4e499 100644
--- a/test/integration/rest_api/dmsf_link_api_test.rb
+++ b/test/integration/rest_api/dmsf_link_api_test.rb
@@ -26,12 +26,12 @@ class DmsfLinkApiTest < RedmineDmsf::Test::IntegrationTest
   fixtures :projects, :users, :dmsf_files, :dmsf_file_revisions, :members, :roles, :member_roles
 
   def setup
-    @admin = User.find_by_id 1
-    @jsmith = User.find_by_id 2
-    @file1 = DmsfFile.find_by_id 1
+    @admin = User.find 1
+    @jsmith = User.find 2
+    @file1 = DmsfFile.find 1
     Setting.rest_api_enabled = '1'
-    @role = Role.find_by_id 1
-    @project1 = Project.find_by_id 1
+    @role = Role.find 1
+    @project1 = Project.find 1
     @project1.enable_module! :dmsf
   end
 
@@ -48,19 +48,17 @@ class DmsfLinkApiTest < RedmineDmsf::Test::IntegrationTest
     token = Token.create!(:user => @jsmith, :action => 'api')
     name = 'REST API link test'
     # curl -v -H "Content-Type: application/xml" -X POST --data "@link.xml" -H "X-Redmine-API-Key: USERS_API_KEY" http://localhost:3000/dmsf_links.xml
-    payload = %{
-      <?xml version="1.0" encoding="utf-8" ?>
-      <dmsf_link>
-        <project_id>#{@project1.id}</project_id>
-        <type>link_from</type>
-        <dmsf_file_id></dmsf_file_id>
-        <target_project_id>#{@project1.id}</target_project_id>
-        <target_folder_id>Documents</target_folder_id>
-        <target_file_id>#{@file1.id}</target_file_id>
-        <external_url></external_url>
-        <name>#{name}</name>
-      </dmsf_link>
-    }
+    payload = %{<?xml version="1.0" encoding="utf-8" ?>
+                <dmsf_link>
+                  <project_id>#{@project1.id}</project_id>
+                  <type>link_from</type>
+                  <dmsf_file_id></dmsf_file_id>
+                  <target_project_id>#{@project1.id}</target_project_id>
+                  <target_folder_id>Documents</target_folder_id>
+                  <target_file_id>#{@file1.id}</target_file_id>
+                  <external_url></external_url>
+                  <name>#{name}</name>
+                </dmsf_link>}
     post "/dmsf_links.xml?key=#{token.value}", payload, {'CONTENT_TYPE' => 'application/xml'}
     assert_response :success
     # <?xml version="1.0" encoding="UTF-8"?>
diff --git a/test/integration/webdav/dmsf_webdav_custom_middleware_test.rb b/test/integration/webdav/dmsf_webdav_custom_middleware_test.rb
index fbf2c500..3f5c7730 100644
--- a/test/integration/webdav/dmsf_webdav_custom_middleware_test.rb
+++ b/test/integration/webdav/dmsf_webdav_custom_middleware_test.rb
@@ -23,12 +23,17 @@ require File.expand_path('../../../test_helper', __FILE__)
 class DmsfWebdavCustomMiddlewareTest < RedmineDmsf::Test::IntegrationTest
 
   def setup
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+  end
+
+  def teardown
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
   end
 
   def test_options_for_root_path
     xml_http_request  :options, '/'
-    assert_response :success
+    assert_response :not_found
   end
 
   def test_options_for_dmsf_root_path
@@ -39,7 +44,7 @@ class DmsfWebdavCustomMiddlewareTest < RedmineDmsf::Test::IntegrationTest
   def test_webdav_not_enabled
     Setting.plugin_redmine_dmsf['dmsf_webdav'] = nil
     xml_http_request  :options, '/dmsf/webdav'
-    assert_response 404
+    assert_response :not_found
   end
 
-end
+end
\ No newline at end of file
diff --git a/test/integration/webdav/dmsf_webdav_delete_test.rb b/test/integration/webdav/dmsf_webdav_delete_test.rb
index d1be1163..4763835b 100644
--- a/test/integration/webdav/dmsf_webdav_delete_test.rb
+++ b/test/integration/webdav/dmsf_webdav_delete_test.rb
@@ -29,22 +29,39 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     :dmsf_locks
    
   def setup
-    DmsfLock.delete_all
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @role = Role.find_by_id 1 # Manager
-    @folder1 = DmsfFolder.find_by_id 1    
-    @folder6 = DmsfFolder.find_by_id 6
-    @file1 = DmsfFile.find_by_id 1    
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @role = Role.find_by(name: 'Manager')
+    @folder1 = DmsfFolder.find 1
+    @folder6 = DmsfFolder.find 6
+    @file1 = DmsfFile.find 1
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     @project1.enable_module! :dmsf # Flag module enabled
     User.current = nil    
   end
+
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
   
   def test_truth
     assert_kind_of Project, @project1
@@ -57,27 +74,27 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
 
   def test_not_authenticated
     delete '/dmsf/webdav'
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_not_authenticated_project
     delete "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_failed_authentication_global
     delete '/dmsf/webdav', nil, credentials('admin', 'badpassword')
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_failed_authentication
     delete "/dmsf/webdav/#{@project1.identifier}", nil, credentials('admin', 'badpassword')
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_root_folder
     delete '/dmsf/webdav', nil, @admin
-    assert_response :error # 501
+    assert_response :not_implemented
   end
 
   def test_delete_not_empty_folder
@@ -87,31 +104,31 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
 
   def test_not_existed_project
     delete '/dmsf/webdav/not_a_project/file.txt', nil, @admin
-    assert_response :missing # Item does not exist.
+    assert_response :not_found
   end
 
   def test_dmsf_not_enabled
     @project1.disable_module! :dmsf
     delete "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @jsmith
-    assert_response :missing # Item does not exist, as project is not enabled.
+    assert_response :not_found # Item does not exist, as project is not enabled.
   end
 
   def test_delete_when_ro
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_ONLY'
     delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @admin
-    assert_response :error # 502 - Item does not exist, as project is not enabled.
+    assert_response :bad_gateway # Item does not exist, as project is not enabled.
   end
 
   def test_unlocked_file
     delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @admin
-    assert_response :success # If its in the 20x range it's acceptable, should be 204.
+    assert_response :no_content
     @file1.reload
     assert @file1.deleted?, "File #{@file1.name} hasn't been deleted"
   end
 
   def test_unathorized_user
     delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @jsmith
-    assert_response :missing # Without folder_view permission, he will not even be aware of its existence.
+    assert_response :not_found # Without folder_view permission, he will not even be aware of its existence.
     @file1.reload
     assert !@file1.deleted?, "File #{@file1.name} is expected to exist"
   end
@@ -127,7 +144,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
   def test_view_folder_not_allowed
     @role.add_permission! :file_manipulation
     delete "/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}", nil, @jsmith
-    assert_response :missing # Without folder_view permission, he will not even be aware of its existence.
+    assert_response :not_found # Without folder_view permission, he will not even be aware of its existence.
     @folder1.reload
     assert !@folder1.deleted?, "Folder #{@folder1.title} is expected to exist"
   end
@@ -161,7 +178,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :folder_manipulation
     delete "/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}", nil, @jsmith
-    assert_response 404
+    assert_response :not_found
     p1name_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
     delete "/dmsf/webdav/#{p1name_uri}/#{@folder6.title}", nil, @jsmith
     assert_response :success
@@ -190,7 +207,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :file_delete
     delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @jsmith
-    assert_response 404
+    assert_response :not_found
     p1name_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
     delete "/dmsf/webdav/#{p1name_uri}/#{@file1.name}", nil, @jsmith
     assert_response :success
@@ -202,7 +219,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :folder_manipulation
     delete "/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}/#frament=HTTP/1.1", nil, @jsmith
-    assert_response 400 # BadRequest
+    assert_response :bad_request
   end
 
   def test_locked_folder
@@ -210,7 +227,7 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :folder_manipulation
     @folder6.lock!
     delete "/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}", nil, @jsmith
-    assert_response 423 # Locked
+    assert_response :locked
     @folder6.reload
     assert !@folder6.deleted?, "Folder #{@folder6.title} is expected to exist"
   end
@@ -220,19 +237,18 @@ class DmsfWebdavDeleteTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :file_delete
     @file1.lock!
     delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @jsmith
-    assert_response 423 # Locked
+    assert_response :locked
     @file1.reload
     assert !@file1.deleted?, "File #{@file1.name} is expected to exist"
   end
 
   def test_non_versioned_file
-    Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning'] = '\.tmp$'
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :file_delete
     delete "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil, @jsmith
     assert_response :success
     # The file should be destroyed
-    assert_nil DmsfFile.visible.find_by_id @file1.id
+    assert_nil DmsfFile.visible.find_by(id: @file1.id)
   end
 
 end
\ No newline at end of file
diff --git a/test/integration/webdav/dmsf_webdav_get_test.rb b/test/integration/webdav/dmsf_webdav_get_test.rb
index 144d6db2..c2578b50 100644
--- a/test/integration/webdav/dmsf_webdav_get_test.rb
+++ b/test/integration/webdav/dmsf_webdav_get_test.rb
@@ -29,16 +29,34 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @role = Role.find_by_id 1 # Manager
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @role = Role.find_by(name: 'Manager')
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     User.current = nil
   end
 
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
+
   def test_truth
     assert_kind_of Project, @project1
     assert_kind_of Project, @project2
@@ -47,12 +65,12 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
 
   def test_should_deny_anonymous
     get '/dmsf/webdav'
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_should_deny_failed_authentication
     get '/dmsf/webdav', nil, credentials('admin', 'badpassword')
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_should_permit_authenticated_user
@@ -64,15 +82,12 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
     get '/dmsf/webdav', nil, @admin
     assert_response :success
     assert !response.body.match(@project1.identifier).nil?, "Expected to find project #{@project1.identifier} in return data"
-    
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
-      get '/dmsf/webdav', nil, @admin
-      assert_response :success
-      assert_no_match @project1.identifier, response.body
-      assert_match project1_uri, response.body
-    end
+    project1_uri = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
+    get '/dmsf/webdav', nil, @admin
+    assert_response :success
+    assert_no_match @project1.identifier, response.body
+    assert_match project1_uri, response.body
   end
 
   def test_should_not_list_non_dmsf_enabled_project
@@ -84,50 +99,47 @@ class DmsfWebdavGetTest < RedmineDmsf::Test::IntegrationTest
   def test_should_return_status_404_when_project_does_not_exist
     @project1.enable_module! :dmsf # Flag module enabled
     get '/dmsf/webdav/project_does_not_exist', nil, @jsmith
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_should_return_status_404_when_dmsf_not_enabled
     get "/dmsf/webdav/#{@project2.identifier}", nil, @jsmith
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_download_file_from_dmsf_enabled_project
     get "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
     assert_response :success
-    
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
-      get "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
-      assert_response 404
-      get "/dmsf/webdav/#{project1_uri}/test.txt", nil, @admin
-      assert_response :success
-    end
+    project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
+    get "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
+    assert_response :not_found
+    get "/dmsf/webdav/#{project1_uri}/test.txt", nil, @admin
+    assert_response :success
   end
 
   def test_should_list_dmsf_contents_within_project
     get "/dmsf/webdav/#{@project1.identifier}", nil, @admin
     assert_response :success
-    folder = DmsfFolder.find_by_id 1
-    assert folder
+    folder = DmsfFolder.find_by(id: 1)
+    assert_not_nil folder
     assert response.body.match(folder.title),
       "Expected to find #{folder.title} in return data"
-    file = DmsfFile.find_by_id 1
-    assert file
+    file = DmsfFile.find_by(id: 1)
+    assert_not_nil file
     assert response.body.match(file.name),
       "Expected to find #{file.name} in return data"
   end
 
   def test_user_assigned_to_project_dmsf_module_not_enabled
     get "/dmsf/webdav/#{@project1.identifier}", nil, @jsmith
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_user_assigned_to_project_folder_forbidden
     @project2.enable_module! :dmsf # Flag module enabled
     get "/dmsf/webdav/#{@project1.identifier}", nil, @jsmith
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_user_assigned_to_project_folder_ok
diff --git a/test/integration/webdav/dmsf_webdav_head_test.rb b/test/integration/webdav/dmsf_webdav_head_test.rb
index 4c9ecfc4..86301048 100644
--- a/test/integration/webdav/dmsf_webdav_head_test.rb
+++ b/test/integration/webdav/dmsf_webdav_head_test.rb
@@ -29,18 +29,35 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
   def setup  
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
+    @project1 = Project.find 1
     @project1.enable_module!('dmsf')
-    @project2 = Project.find_by_id 2
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @project2 = Project.find 2
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
-    # Temporarily enable project names
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     @project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     User.current = nil    
   end
+
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
   
   def test_truth
     assert_kind_of Project, @project1
@@ -49,7 +66,7 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
 
   def test_head_requires_authentication
     head "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401
+    assert_response :unauthorized
     check_headers_dont_exist
   end
 
@@ -57,14 +74,11 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
     head "/dmsf/webdav/#{@project1.identifier}", nil, @admin
     assert_response :success
     check_headers_exist
-
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      head "/dmsf/webdav/#{@project1.identifier}", nil, @admin
-      assert_response 404
-      head "/dmsf/webdav/#{@project1_uri}", nil, @admin
-      assert_response :success
-    end
+    head "/dmsf/webdav/#{@project1.identifier}", nil, @admin
+    assert_response :not_found
+    head "/dmsf/webdav/#{@project1_uri}", nil, @admin
+    assert_response :success
   end
 
   # Note:
@@ -76,49 +90,46 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
     head "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
     assert_response :success
     check_headers_exist # Note it'll allow 1 out of the 3 expected to fail
-
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      head "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
-      assert_response 404
-      head "/dmsf/webdav/#{@project1_uri}/test.txt", nil, @admin
-      assert_response :success
-    end
+    head "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, @admin
+    assert_response :not_found
+    head "/dmsf/webdav/#{@project1_uri}/test.txt", nil, @admin
+    assert_response :success
   end
 
   def test_head_responds_to_file_anonymous_other_user_agent
     head "/dmsf/webdav/#{@project1.identifier}/test.txt", nil, {:HTTP_USER_AGENT => 'Other'}
-    assert_response 401
+    assert_response :unauthorized
     check_headers_dont_exist
   end
 
   def test_head_fails_when_file_not_found
     head "/dmsf/webdav/#{@project1.identifier}/not_here.txt", nil, @admin
-    assert_response :missing
+    assert_response :not_found
     check_headers_dont_exist
   end
 
   def test_head_fails_when_file_not_found_anonymous_other_user_agent
     head "/dmsf/webdav/#{@project1.identifier}/not_here.txt", nil, {:HTTP_USER_AGENT => 'Other'}
-    assert_response 401
+    assert_response :unauthorized
     check_headers_dont_exist
   end
 
   def test_head_fails_when_folder_not_found
     head '/dmsf/webdav/folder_not_here', nil, @admin
-    assert_response :missing
+    assert_response :not_found
     check_headers_dont_exist
   end
 
   def test_head_fails_when_folder_not_found_anonymous_other_user_agent
     head '/dmsf/webdav/folder_not_here', nil, {:HTTP_USER_AGENT => 'Other'}
-    assert_response 401
+    assert_response :unauthorized
     check_headers_dont_exist
   end
 
   def test_head_fails_when_project_is_not_enabled_for_dmsf
     head "/dmsf/webdav/#{@project2.identifier}/test.txt", nil, @jsmith
-    assert_response :missing
+    assert_response :not_found
     check_headers_dont_exist
   end
 
@@ -134,7 +145,7 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
     single_optional = false
     values.each do |key,val|
       if val.is_a?(Hash)
-        if (val[:optional].nil? || !val[:optional])
+        if val[:optional].nil? || !val[:optional]
            assert(!(val[:content].nil? || val[:content].empty?), "Expected header #{key} was empty." ) if single_optional
         else
           single_optional = true
@@ -148,7 +159,7 @@ class DmsfWebdavHeadTest < RedmineDmsf::Test::IntegrationTest
   def check_headers_dont_exist
     assert !(response.headers.nil? || response.headers.empty?), 'Head returned without headers' # Headers exist?
     values = {}
-    values[:etag] = response.headers['Etag'];
+    values[:etag] = response.headers['Etag']
     values[:last_modified] = response.headers['Last-Modified']
     values.each do |key,val|
       assert (val.nil? || val.empty?), "Expected header #{key} should be empty."
diff --git a/test/integration/webdav/dmsf_webdav_lock_test.rb b/test/integration/webdav/dmsf_webdav_lock_test.rb
index 0110b4d3..946dd130 100644
--- a/test/integration/webdav/dmsf_webdav_lock_test.rb
+++ b/test/integration/webdav/dmsf_webdav_lock_test.rb
@@ -30,106 +30,106 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-
+    @project1 = Project.find 1
+    @file1 = DmsfFile.find 1
     # Fix permissions for jsmith's role
-    @role = Role.find 1 #
+    @role = Role.find_by(name: 'Manager')
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :folder_manipulation
-    
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
-    
-    super
+  end
+
+  def teardown
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+  end
+
+  def test_truth
+    assert_kind_of Project, @project1
+    assert_kind_of DmsfFile, @file1
+    assert_kind_of Role, @role
   end
   
   def test_lock_file_already_locked_by_other
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      file = DmsfFile.find_by_id 1
-
-      log_user 'admin', 'admin' # login as admin
-      assert !User.current.anonymous?, 'Current user is anonymous'
-      assert file.lock!, "File failed to be locked by #{User.current.name}"
-
-      xml_http_request :lock, "/dmsf/webdav/#{@project1.identifier}/#{file.name}",
-        "<?xml version=\"1.0\" encoding=\"utf-8\" ?>
-  <d:lockinfo xmlns:d=\"DAV:\">
-    <d:lockscope><d:exclusive/></d:lockscope>
-    <d:locktype><d:write/></d:locktype>
-    <d:owner>jsmith</d:owner>
-  </d:lockinfo>",
-        @jsmith.merge!({:HTTP_DEPTH => 'infinity',
-                        :HTTP_TIMEOUT => 'Infinite',})
-      assert_response 423 # Locked
-    end
+    log_user 'admin', 'admin' # login as admin
+    assert !User.current.anonymous?, 'Current user is anonymous'
+    assert @file1.lock!, "File failed to be locked by #{User.current.name}"
+    xml_http_request :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}",
+      %{<?xml version=\"1.0\" encoding=\"utf-8\" ?>
+        <d:lockinfo xmlns:d=\"DAV:\">
+          <d:lockscope><d:exclusive/></d:lockscope>
+          <d:locktype><d:write/></d:locktype>
+          <d:owner>jsmith</d:owner>
+        </d:lockinfo>},
+      @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
+    assert_response :locked
   end
   
   def test_lock_file
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      file = DmsfFile.find_by_id 1
+    create_time = Time.utc(2000, 1, 2, 3, 4, 5)
+    refresh_time = Time.utc(2000, 1, 2, 6, 7, 8)
 
-      create_time = Time.utc(2000, 1, 2, 3, 4, 5)
-      refresh_time = Time.utc(2000, 1, 2, 6, 7, 8)
+    # Time travel, will make the usec part of the time 0
+    travel_to create_time do
+      # Lock file
+      xml = %{<?xml version="1.0" encoding="utf-8" ?>
+                <d:lockinfo xmlns:d="DAV:">
+                  <d:lockscope><d:exclusive/></d:lockscope>
+                  <d:locktype><d:write/></d:locktype>
+                  <d:owner>jsmith</d:owner>
+                </d:lockinfo>}
+      xml_http_request :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", xml,
+        @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite' })
+      assert_response :success
+      # Verify the response
+      # <?xml version=\"1.0\"?>
+      # <d:prop xmlns:d=\"DAV:\">
+      #   <d:lockdiscovery>
+      #     <d:activelock>
+      #       <d:lockscope>exclusive</d:lockscope>
+      #       <d:locktype>write</d:locktype>
+      #       <d:depth>infinity</d:depth>
+      #       <d:timeout>Second-604800</d:timeout>
+      #       <d:locktoken>
+      #         <d:href>f5762389-6b49-4482-9a4b-ff1c8f975765</d:href>
+      #       </d:locktoken>
+      #     </d:activelock>
+      #   </d:lockdiscovery>
+      # </d:prop>
+      assert_match '<d:lockscope>exclusive</d:lockscope>', response.body
+      assert_match '<d:locktype>write</d:locktype>', response.body
+      assert_match '<d:depth>infinity</d:depth>', response.body
+      # 1.week = 7*24*3600=604800 seconds
+      assert_match '<d:timeout>Second-604800</d:timeout>', response.body
+      assert_match(/<d:locktoken><d:href>([a-z0-9\-]+)<\/d:href><\/d:locktoken>/, response.body)
+      # Extract the locktoken, needed when refreshing the lock
+      response.body.match(/<d:locktoken><d:href>([a-z0-9\-]+)<\/d:href><\/d:locktoken>/)
+      locktoken = $1
+      # Verify the lock in the db
+      l = @file1.lock.first
+      assert_equal create_time, l.created_at
+      assert_equal create_time, l.updated_at
+      assert_equal (create_time + 1.week), l.expires_at
 
-      # Time travel, will make the usec part of the time 0
-      travel_to create_time do
-        # Lock file
-        xml = %{<?xml version="1.0" encoding="utf-8" ?>
-    <d:lockinfo xmlns:d="DAV:">
-      <d:lockscope><d:exclusive/></d:lockscope>
-      <d:locktype><d:write/></d:locktype>
-      <d:owner>jsmith</d:owner>
-    </d:lockinfo>}
-        xml_http_request :lock, "/dmsf/webdav/#{@project1.identifier}/#{file.name}", xml,
-          @jsmith.merge!({:HTTP_DEPTH => 'infinity', :HTTP_TIMEOUT => 'Infinite',})
+      travel_to refresh_time do
+        # Refresh lock
+        xml_http_request :lock, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}",
+          nil,
+          @jsmith.merge!({ HTTP_DEPTH: 'infinity', HTTP_TIMEOUT: 'Infinite', HTTP_IF: locktoken })
         assert_response :success
-        # Verify the response
-        # <?xml version=\"1.0\"?>
-        # <d:prop xmlns:d=\"DAV:\">
-        #   <d:lockdiscovery>
-        #     <d:activelock>
-        #       <d:lockscope>exclusive</d:lockscope>
-        #       <d:locktype>write</d:locktype>
-        #       <d:depth>infinity</d:depth>
-        #       <d:timeout>Second-604800</d:timeout>
-        #       <d:locktoken>
-        #         <d:href>f5762389-6b49-4482-9a4b-ff1c8f975765</d:href>
-        #       </d:locktoken>
-        #     </d:activelock>
-        #   </d:lockdiscovery>
-        # </d:prop>
-        assert_match '<d:lockscope>exclusive</d:lockscope>', response.body
-        assert_match '<d:locktype>write</d:locktype>', response.body
-        assert_match '<d:depth>infinity</d:depth>', response.body
         # 1.week = 7*24*3600=604800 seconds
         assert_match '<d:timeout>Second-604800</d:timeout>', response.body
-        assert_match(/<d:locktoken><d:href>([a-z0-9\-]+)<\/d:href><\/d:locktoken>/, response.body)
-        # Extract the locktoken, needed when refreshing the lock
-        response.body.match(/<d:locktoken><d:href>([a-z0-9\-]+)<\/d:href><\/d:locktoken>/)
-        locktoken=$1
         # Verify the lock in the db
-        l = DmsfFile.find_by_id(1).lock.first
-        assert_equal l.created_at, create_time
-        assert_equal l.updated_at, create_time
-        assert_equal l.expires_at, create_time + 1.week
-
-        travel_to refresh_time do
-          # Refresh lock
-          xml_http_request :lock, "/dmsf/webdav/#{@project1.identifier}/#{file.name}",
-            nil,
-            @jsmith.merge!({:HTTP_DEPTH => 'infinity',
-                            :HTTP_TIMEOUT => 'Infinite',
-                            :HTTP_IF => "(#{locktoken})"})
-          assert_response :success
-          # 1.week = 7*24*3600=604800 seconds
-          assert_match '<d:timeout>Second-604800</d:timeout>', response.body
-          # Verify the lock in the db
-          l = DmsfFile.find_by_id(1).lock.first
-          assert_equal l.created_at, create_time
-          assert_equal l.updated_at, refresh_time
-          assert_equal l.expires_at, refresh_time + 1.week
-        end
+        @file1.reload
+        l = @file1.lock.first
+        assert_equal create_time, l.created_at
+        assert_equal refresh_time, l.updated_at
+        assert_equal (refresh_time + 1.week), l.expires_at
       end
     end
   end
+
 end
\ No newline at end of file
diff --git a/test/integration/webdav/dmsf_webdav_mkcol_test.rb b/test/integration/webdav/dmsf_webdav_mkcol_test.rb
index 688f979a..9c8f11f4 100644
--- a/test/integration/webdav/dmsf_webdav_mkcol_test.rb
+++ b/test/integration/webdav/dmsf_webdav_mkcol_test.rb
@@ -29,17 +29,35 @@ class DmsfWebdavMkcolTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @role = Role.find_by_id 1 # Manager
-    @folder6 = DmsfFolder.find_by_id 6    
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @role = Role.find_by(name: 'Manager')
+    @folder6 = DmsfFolder.find 6
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../../fixtures/files', __FILE__
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     User.current = nil        
   end
 
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+  end
+
   def test_truth
     assert_kind_of Project, @project1
     assert_kind_of Project, @project2
@@ -49,70 +67,56 @@ class DmsfWebdavMkcolTest < RedmineDmsf::Test::IntegrationTest
 
   def test_mkcol_requires_authentication
     xml_http_request  :mkcol, '/dmsf/webdav/test1'
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_mkcol_fails_to_create_folder_at_root_level
     xml_http_request  :mkcol, '/dmsf/webdav/test1', nil, @admin
-    assert_response 405 # 405 - Method Not Allowed
+    assert_response :method_not_allowed
   end
 
   def test_should_not_succeed_on_a_non_existant_project
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      xml_http_request  :mkcol, '/dmsf/webdav/project_doesnt_exist/test1', nil, @admin
-      assert_response :missing # Not found
-    end
+    xml_http_request  :mkcol, '/dmsf/webdav/project_doesnt_exist/test1', nil, @admin
+    assert_response :not_found
   end
 
   def test_should_not_succed_on_a_non_dmsf_enabled_project
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/folder", nil, @jsmith
-      assert_response :forbidden
-    end
+    xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/folder", nil, @jsmith
+    assert_response :forbidden
   end
 
   def test_should_not_create_folder_without_permissions
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf # Flag module enabled
-      xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/folder", nil, @jsmith
-      assert_response :forbidden
-    end
+    @project1.enable_module! :dmsf # Flag module enabled
+    xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/folder", nil, @jsmith
+    assert_response :forbidden
   end
 
   def test_should_fail_to_create_folder_that_already_exists
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf # Flag module enabled
-      @role.add_permission! :folder_manipulation
-      @role.add_permission! :view_dmsf_folders
-      xml_http_request :mkcol,
-        "/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}", nil, @jsmith
-      assert_response 405 # Method not Allowed
-    end
+    @project1.enable_module! :dmsf # Flag module enabled
+    @role.add_permission! :folder_manipulation
+    @role.add_permission! :view_dmsf_folders
+    xml_http_request :mkcol,
+      "/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}", nil, @jsmith
+    assert_response :method_not_allowed
   end
 
   def test_should_fail_to_create_folder_for_user_without_rights
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf # Flag module enabled
-      xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test1", nil, @jsmith
-      assert_response :forbidden
-    end
+    @project1.enable_module! :dmsf # Flag module enabled
+    xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test1", nil, @jsmith
+    assert_response :forbidden
   end
 
   def test_should_create_folder_for_non_admin_user_with_rights
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf
-      @role.add_permission! :folder_manipulation
-      xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test1", nil, @jsmith
-      assert_response 201 # Created
-      Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-      if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-        project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
-        xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test2", nil, @jsmith
-        assert_response 404
-        xml_http_request :mkcol, "/dmsf/webdav/#{project1_uri}/test3", nil, @jsmith
-        assert_response 201 # Created
-      end
-    end
+    @project1.enable_module! :dmsf
+    @role.add_permission! :folder_manipulation
+    xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test1", nil, @jsmith
+    assert_response :success # Created
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
+    project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
+    xml_http_request :mkcol, "/dmsf/webdav/#{@project1.identifier}/test2", nil, @jsmith
+    assert_response :not_found
+    xml_http_request :mkcol, "/dmsf/webdav/#{project1_uri}/test3", nil, @jsmith
+    assert_response :success # Created
   end
   
 end
\ No newline at end of file
diff --git a/test/integration/webdav/dmsf_webdav_move_test.rb b/test/integration/webdav/dmsf_webdav_move_test.rb
index 87ce741b..80057c76 100644
--- a/test/integration/webdav/dmsf_webdav_move_test.rb
+++ b/test/integration/webdav/dmsf_webdav_move_test.rb
@@ -28,28 +28,24 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     :enabled_modules, :dmsf_folders, :dmsf_files, :dmsf_file_revisions
     
   def setup
-    DmsfLock.delete_all # Delete all locks that are in our test DB - probably not safe but ho hum
-    timestamp = DateTime.now.strftime('%y%m%d%H%M')
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = DmsfHelper.temp_dir.join("dmsf_test-#{timestamp}").to_s
-    FileUtils.mkdir_p(DmsfFile.storage_path) unless DmsfFile.storage_path.exist?
-    # Copy the physical files to the temporary storage
-    files = File.expand_path('../../../fixtures/files', __FILE__) + '/.'
-    FileUtils.cp_r files, DmsfFile.storage_path
-    
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-    @file1 = DmsfFile.find_by_id 1
-    @file10 = DmsfFile.find_by_id 10
-    @folder1 = DmsfFolder.find_by_id 1
-
+    @project1 = Project.find 1
+    @file1 = DmsfFile.find 1
+    @file10 = DmsfFile.find 10
+    @folder1 = DmsfFolder.find 1
     # Fix permissions for jsmith's role
     @role = Role.find 1 #
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :folder_manipulation
-    
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
     
     super
@@ -62,6 +58,10 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     rescue Exception => e
       error e.message
     end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
   end
 
   def test_truth
@@ -77,131 +77,114 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     assert_no_difference '@file1.dmsf_file_revisions.count' do
       xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
         {:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"}
-      assert_response 401
+      assert_response :unauthorized
     end
   end
 
   def test_move_to_new_filename_without_folder_manipulation_permission
     @role.remove_permission! :folder_manipulation
     new_name = "#{@file1.name}.moved"
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      assert_no_difference '@file1.dmsf_file_revisions.count' do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-        assert_response 403
-      end
+    assert_no_difference '@file1.dmsf_file_revisions.count' do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
+      assert_response :forbidden
     end
   end
 
   def test_move_to_new_filename_without_folder_manipulation_permission_as_admin
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @role.remove_permission! :folder_manipulation
-      new_name = "#{@file1.name}.moved"
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @admin.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-        assert_response 201 # Created
-        f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
-        assert f, "Moved file '#{new_name}' not found in project."
-      end
+    @role.remove_permission! :folder_manipulation
+    new_name = "#{@file1.name}.moved"
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @admin.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
+      assert_response :created
+      f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
+      assert f, "Moved file '#{new_name}' not found in project."
     end
   end
 
   def test_move_non_existent_file
     xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/not_a_file.txt", nil,
       @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/moved_file.txt"})
-    assert_response 404 # NotFound
+    assert_response :not_found # NotFound
   end
 
   def test_move_to_new_filename
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      new_name = "#{@file1.name}.moved"
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-        assert_response 201 # Created
-        f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
-        assert f, "Moved file '#{new_name}' not found in project."
-      end
+    new_name = "#{@file1.name}.moved"
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
+      assert_response :created
+      f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
+      assert f, "Moved file '#{new_name}' not found in project."
     end
   end
 
   def test_move_to_new_filename_with_project_names
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
-      new_name = "#{@file1.name}.moved"
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{project1_uri}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{project1_uri}/#{new_name}"})
-        assert_response 201 # Created
-        f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
-        assert f, "Moved file '#{new_name}' not found in project."
-      end
+    project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
+    new_name = "#{@file1.name}.moved"
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{project1_uri}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{project1_uri}/#{new_name}"})
+      assert_response :created
+      f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
+      assert f, "Moved file '#{new_name}' not found in project."
     end
   end
 
   def test_move_zero_sized_to_new_filename
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      new_name = "#{@file10.name}.moved"
-      assert_no_difference '@file10.dmsf_file_revisions.count' do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file10.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-        assert_response 201 # Created
-        f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
-        assert f, "Moved file '#{new_name}' not found in project."
-      end
+    new_name = "#{@file10.name}.moved"
+    assert_no_difference '@file10.dmsf_file_revisions.count' do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file10.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
+      assert_response :created
+      f = DmsfFile.find_file_by_name @project1, nil, "#{new_name}"
+      assert f, "Moved file '#{new_name}' not found in project."
     end
   end
 
   def test_move_to_new_folder
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}/#{@file1.name}"})
-        assert_response 201 # Created
-        @file1.reload
-        assert_equal @folder1.id, @file1.dmsf_folder_id
-      end
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}/#{@file1.name}"})
+      assert_response :created
+      @file1.reload
+      assert_equal @folder1.id, @file1.dmsf_folder_id
     end
   end
 
   def test_move_to_new_folder_with_project_names
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-      project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{project1_uri}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{project1_uri}/#{@folder1.title}/#{@file1.name}"})
-        assert_response 201 # Created
-        @file1.reload
-        assert_equal @folder1.id, @file1.dmsf_folder_id
-      end
+    project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{project1_uri}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{project1_uri}/#{@folder1.title}/#{@file1.name}"})
+      assert_response :created
+      @file1.reload
+      assert_equal @folder1.id, @file1.dmsf_folder_id
     end
   end
 
   def test_move_zero_sized_to_new_folder
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      assert_no_difference '@file10.dmsf_file_revisions.count' do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file10.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}/#{@file10.name}"})
-        assert_response 201 # Created
-        @file10.reload
-        assert_equal @folder1.id, @file10.dmsf_folder_id
-      end
+    assert_no_difference '@file10.dmsf_file_revisions.count' do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file10.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}/#{@file10.name}"})
+      assert_response :created
+      @file10.reload
+      assert_equal @folder1.id, @file10.dmsf_folder_id
     end
   end
 
   def test_move_to_existing_filename
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      file2 = DmsfFile.find_by_id 9
-      new_name = "#{file2.name}"
-      assert_no_difference 'file2.dmsf_file_revisions.count' do
-        assert_no_difference '@file1.dmsf_file_revisions.count' do
-          xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-            @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-          assert_response 501 # NotImplemented
-        end
+    file9 = DmsfFile.find_by(id: 9)
+    assert file9
+    new_name = "#{file9.name}"
+    assert_no_difference 'file9.dmsf_file_revisions.count' do
+      assert_no_difference '@file1.dmsf_file_revisions.count' do
+        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
+        assert_response :not_implemented # NotImplemented
       end
     end
   end
@@ -214,7 +197,7 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     assert_no_difference '@file1.dmsf_file_revisions.count' do
       xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
         @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-      assert_response 423 # Locked
+      assert_response :locked
     end
   end
 
@@ -227,7 +210,7 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     assert_no_difference '@file1.dmsf_file_revisions.count' do
       xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
         @admin.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-      assert_response 423 # Locked
+      assert_response :locked
     end
   end
 
@@ -236,89 +219,85 @@ class DmsfWebdavMoveTest < RedmineDmsf::Test::IntegrationTest
     assert !User.current.anonymous?, 'Current user is anonymous'
     assert @file1.lock!, "File failed to be locked by #{User.current.name}"
 
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      # Move once
-      new_name = "#{@file1.name}.m1"
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
-        assert_response 201 # Created
-      end
-      # Move twice, make sure that the MsOffice store sequence is not disrupting normal move
-      new_name2 = "#{new_name}.m2"
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{new_name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name2}"})
-        assert_response 201 # Created
-      end
+    # Move once
+    new_name = "#{@file1.name}.m1"
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name}"})
+      assert_response :success # Created
+    end
+    # Move twice, make sure that the MsOffice store sequence is not disrupting normal move
+    new_name2 = "#{new_name}.m2"
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{new_name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{new_name2}"})
+      assert_response :success # Created
     end
   end
   
   def test_move_msoffice_save_locked_file
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      # When some versions of MsOffice save a file they use the following sequence:
-      # 1. Save changes to a new temporary document, XXX.tmp
-      # 2. Rename (MOVE) document to YYY.tmp. History is lost here if the original document is moved.
-      # 3. Rename (MOVE) XXX.tmp to document's name. XXX.tmp must be merged to the original document otherwise the history is lost.
-      # 4. Delete YYY.tmp.
-      # Verify that steps 2 and 3 work.
-      log_user 'jsmith', 'jsmith' # login as jsmith
-      assert !User.current.anonymous?, 'Current user is anonymous'
-      assert @file1.lock!, "File failed to be locked by #{User.current.name}"
+    # When some versions of MsOffice save a file they use the following sequence:
+    # 1. Save changes to a new temporary document, XXX.tmp
+    # 2. Rename (MOVE) document to YYY.tmp. History is lost here if the original document is moved.
+    # 3. Rename (MOVE) XXX.tmp to document's name. XXX.tmp must be merged to the original document otherwise the history is lost.
+    # 4. Delete YYY.tmp.
+    # Verify that steps 2 and 3 work.
+    log_user 'jsmith', 'jsmith' # login as jsmith
+    assert !User.current.anonymous?, 'Current user is anonymous'
+    assert @file1.lock!, "File failed to be locked by #{User.current.name}"
 
-      # First save while the file is locked, should create new revision
-      temp_file_name = 'AAAAAAAA.tmp'
+    # First save while the file is locked, should create new revision
+    temp_file_name = 'AAAAAAAA.tmp'
 
-      # Make sure that the temp-file does not exist.
-      temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
-      assert !temp_file, "File '#{temp_file_name}' should not exist yet."
+    # Make sure that the temp-file does not exist.
+    temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
+    assert !temp_file, "File '#{temp_file_name}' should not exist yet."
 
-      # Move the original file to AAAAAAAA.tmp. The original file should not changed but a new file should be created.
-      assert_no_difference '@file1.dmsf_file_revisions.count' do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}"})
-        assert_response 201 # Created
-      end
+    # Move the original file to AAAAAAAA.tmp. The original file should not changed but a new file should be created.
+    assert_no_difference '@file1.dmsf_file_revisions.count' do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}"})
+      assert_response :success # Created
+    end
 
-      # Verify that a new file has been created
-      temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
-      assert temp_file, "File '#{temp_file_name}' not found, move failed."
-      assert_equal temp_file.dmsf_file_revisions.count,1
-      assert_not_equal temp_file.id, @file1.id
+    # Verify that a new file has been created
+    temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
+    assert temp_file, "File '#{temp_file_name}' not found, move failed."
+    assert_equal temp_file.dmsf_file_revisions.count,1
+    assert_not_equal temp_file.id, @file1.id
 
-      # Move a temporary file (use AAAAAAAA.tmp) to the original file.
-      assert_difference '@file1.dmsf_file_revisions.count', +1 do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@file1.name}"})
-        assert_response 201 # Created
-      end
+    # Move a temporary file (use AAAAAAAA.tmp) to the original file.
+    assert_difference '@file1.dmsf_file_revisions.count', +1 do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@file1.name}"})
+      assert_response :success # Created
+    end
 
-      # Second save while file is locked, should NOT create new revision
-      temp_file_name = 'BBBBBBBB.tmp'
+    # Second save while file is locked, should NOT create new revision
+    temp_file_name = 'BBBBBBBB.tmp'
 
-      # Make sure that the temp-file does not exist.
-      temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
-      assert !temp_file, "File '#{temp_file_name}' should not exist yet."
+    # Make sure that the temp-file does not exist.
+    temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
+    assert !temp_file, "File '#{temp_file_name}' should not exist yet."
 
-      # Move the original file to BBBBBBBB.tmp. The original file should not change but a new file should be created.
-      assert_no_difference '@file1.dmsf_file_revisions.count' do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}"})
-        assert_response 201 # Created
-      end
+    # Move the original file to BBBBBBBB.tmp. The original file should not change but a new file should be created.
+    assert_no_difference '@file1.dmsf_file_revisions.count' do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{@file1.name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}"})
+      assert_response :success # Created
+    end
 
-      # Verify that a new file has been created
-      temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
-      assert temp_file, "File '#{temp_file_name}' not found, move failed."
-      assert_equal temp_file.dmsf_file_revisions.count,1
-      assert_not_equal temp_file.id, @file1.id
+    # Verify that a new file has been created
+    temp_file = DmsfFile.find_file_by_name @project1, nil, "#{temp_file_name}"
+    assert temp_file, "File '#{temp_file_name}' not found, move failed."
+    assert_equal temp_file.dmsf_file_revisions.count,1
+    assert_not_equal temp_file.id, @file1.id
 
-      # Move a temporary file (use BBBBBBBB.tmp) to the original file.
-      assert_no_difference '@file1.dmsf_file_revisions.count' do
-        xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}", nil,
-          @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@file1.name}"})
-        assert_response 201 # Created
-      end
+    # Move a temporary file (use BBBBBBBB.tmp) to the original file.
+    assert_no_difference '@file1.dmsf_file_revisions.count' do
+      xml_http_request :move, "/dmsf/webdav/#{@project1.identifier}/#{temp_file_name}", nil,
+        @jsmith.merge!({:destination => "http://www.example.com/dmsf/webdav/#{@project1.identifier}/#{@file1.name}"})
+      assert_response :success # Created
     end
   end
   
diff --git a/test/integration/webdav/dmsf_webdav_options_test.rb b/test/integration/webdav/dmsf_webdav_options_test.rb
index c4f74c03..dcaea560 100644
--- a/test/integration/webdav/dmsf_webdav_options_test.rb
+++ b/test/integration/webdav/dmsf_webdav_options_test.rb
@@ -29,12 +29,21 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
   end
+
+  def teardown
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
+  end
   
   def test_truth
     assert_kind_of Project, @project1
@@ -81,26 +90,26 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
 
   def test_options_requires_authentication_for_non_root_request
     xml_http_request :options, "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401 # Unauthorized
+    assert_response :unauthorized
   end
 
   def test_un_authenticated_options_returns_expected_allow_header
     xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401
+    assert_response :unauthorized
     assert !(response.headers.nil? || response.headers.empty?), 'Response headers are empty'
     assert_nil response.headers['Allow'] , 'Allow header should not exist'
   end
 
   def test_un_authenticated_options_returns_expected_dav_header
     xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401
+    assert_response :unauthorized
     assert !(response.headers.nil? || response.headers.empty?), 'Response headers are empty'
     assert_nil response.headers['Dav'] , 'Dav header should not exist'
   end
 
   def test_un_authenticated_options_returns_expected_ms_auth_via_header
     xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401
+    assert_response :unauthorized
     assert !(response.headers.nil? || response.headers.empty?), 'Response headers are empty'
     assert_nil response.headers['Ms-Author-Via'] , 'Ms-Author-Via header should not exist'
   end
@@ -131,7 +140,7 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
 
   def test_un_authenticated_options_for_msoffice_user_agent
     xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}", nil, {:HTTP_USER_AGENT => 'Microsoft Office Word 2014'}
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_authenticated_options_for_msoffice_user_agent
@@ -142,7 +151,7 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
 
   def test_un_authenticated_options_for_other_user_agent
     xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}", nil, {:HTTP_USER_AGENT => 'Other'}
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_authenticated_options_for_other_user_agent
@@ -151,7 +160,7 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
     xml_http_request  :options, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_USER_AGENT => 'Other'})
-    assert_response 404
+    assert_response :not_found
     xml_http_request  :options, "/dmsf/webdav/#{project1_uri}", nil, @admin.merge!({:HTTP_USER_AGENT => 'Other'})
     assert_response :success
   end
@@ -159,12 +168,12 @@ class DmsfWebdavOptionsTest < RedmineDmsf::Test::IntegrationTest
   def test_authenticated_options_returns_404_for_non_dmsf_enabled_items
     @project2.disable_module! :dmsf
     xml_http_request  :options, "/dmsf/webdav/#{@project2.identifier}", nil, @jsmith
-    assert_response 404
+    assert_response :not_found
   end
 
   def test_authenticated_options_returns_404_for_not_found
     xml_http_request  :options, '/dmsf/webdav/does-not-exist', nil, @jsmith
-    assert_response 404
+    assert_response :not_found
   end
 
 end
diff --git a/test/integration/webdav/dmsf_webdav_post_test.rb b/test/integration/webdav/dmsf_webdav_post_test.rb
index 7cb9ad7f..72ff6160 100644
--- a/test/integration/webdav/dmsf_webdav_post_test.rb
+++ b/test/integration/webdav/dmsf_webdav_post_test.rb
@@ -27,20 +27,24 @@ class DmsfWebdavPostTest < RedmineDmsf::Test::IntegrationTest
 
   def setup
     @admin = credentials 'admin'
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
-    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'    
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+  end
+
+  def teardown
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
   end
   
   # Test that any post request is authenticated
   def test_post_request_authenticated
     post '/dmsf/webdav/'
-    assert_response 401 # 401 Unauthorized
+    assert_response :unauthorized
   end
 
   # Test post is not implemented
   def test_post_not_implemented
     post '/dmsf/webdav/', nil, @admin
-    assert_response :error # 501 Not Implemented
+    assert_response :not_implemented
   end
   
 end
\ No newline at end of file
diff --git a/test/integration/webdav/dmsf_webdav_propfind_test.rb b/test/integration/webdav/dmsf_webdav_propfind_test.rb
index bdd75513..8b0bcb82 100644
--- a/test/integration/webdav/dmsf_webdav_propfind_test.rb
+++ b/test/integration/webdav/dmsf_webdav_propfind_test.rb
@@ -30,23 +30,31 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
   def setup
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith' # Not a member of project1
-    @project1 = Project.find_by_id 1 # DMSF enabled
-    @project2 = Project.find_by_id 2 # DMSF disabled
+    @project1 = Project.find 1 # DMSF enabled
+    @project2 = Project.find 2 # DMSF disabled
     # Folders in project1
-    @folder1 = DmsfFolder.find_by_id 1
-    @folder6 = DmsfFolder.find_by_id 6
+    @folder1 = DmsfFolder.find 1
+    @folder6 = DmsfFolder.find 6
     # Files in project1
-    @file1 = DmsfFile.find_by_id 1
-    @file9 = DmsfFile.find_by_id 9
-    @file10 = DmsfFile.find_by_id 10
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @file1 = DmsfFile.find 1
+    @file9 = DmsfFile.find 9
+    @file10 = DmsfFile.find 10
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
     # Temporarily enable project names to generate names for project1
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     @project1_name = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
     @project1_uri = Addressable::URI.escape(@project1_name)
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
-    Setting.plugin_redmine_dmsf['dmsf_webdav_caching_enabled'] = '1'
+  end
+
+  def teardown
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
   end
 
   def test_truth
@@ -56,33 +64,26 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
 
   def test_propfind_denied_for_anonymous
     xml_http_request :propfind, '/dmsf/webdav/', nil, {:HTTP_DEPTH => '0'}
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_propfind_depth0_on_root_for_non_member
     xml_http_request :propfind, '/dmsf/webdav/', nil, @jsmith.merge!({:HTTP_DEPTH => '0'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?('<d:href>http://www.example.com:80/dmsf/webdav/</d:href>')
     assert response.body.include?('<d:displayname>/</d:displayname>')
   end
 
   def test_propfind_depth1_on_root_for_non_member
     xml_http_request :propfind, '/dmsf/webdav/', nil, @jsmith.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?('<d:href>http://www.example.com:80/dmsf/webdav/</d:href>')
     assert response.body.include?( '<d:displayname>/</d:displayname>')
   end
 
   def test_propfind_depth0_on_root_for_admin
     xml_http_request :propfind, '/dmsf/webdav/', nil, @admin.merge!({:HTTP_DEPTH => '0'})
-    assert_response 207 # MultiStatus
-    assert response.body.include?('<d:href>http://www.example.com:80/dmsf/webdav/</d:href>')
-    assert response.body.include?('<d:displayname>/</d:displayname>')
-  end
-
-  def test_propfind_depth1_on_root_for_admin
-    xml_http_request :propfind, '/dmsf/webdav/', nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?('<d:href>http://www.example.com:80/dmsf/webdav/</d:href>')
     assert response.body.include?('<d:displayname>/</d:displayname>')
   end
@@ -90,7 +91,7 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
   def test_propfind_depth1_on_root_for_admin_with_project_names
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     xml_http_request :propfind, '/dmsf/webdav/', nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?('<d:href>http://www.example.com:80/dmsf/webdav/</d:href>')
     assert response.body.include?('<d:displayname>/</d:displayname>')
     # project.identifier should not match when using project names
@@ -103,12 +104,12 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
 
   def test_propfind_depth0_on_project1_for_non_member
     xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @jsmith.merge!({:HTTP_DEPTH => '0'})
-    assert_response :missing
+    assert_response :not_found
   end
 
   def test_propfind_depth0_on_project1_for_admin
     xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '0'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/</d:href>")
     assert response.body.include?("<d:displayname>#{@project1.identifier}</d:displayname>")
   end
@@ -116,16 +117,16 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
   def test_propfind_depth0_on_project1_for_admin_with_project_names
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '0'})
-    assert_response :missing
+    assert_response :not_found
     xml_http_request :propfind, "/dmsf/webdav/#{@project1_uri}", nil, @admin.merge!({:HTTP_DEPTH => '0'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</d:href>")
     assert response.body.include?("<d:displayname>#{@project1_name}</d:displayname>")
   end
 
   def test_propfind_depth1_on_project1_for_admin
     xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     # Project
     assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/</d:href>")
     assert response.body.include?("<d:displayname>#{@project1.identifier}</d:displayname>")
@@ -146,9 +147,9 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
   def test_propfind_depth1_on_project1_for_admin_with_project_names
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
     xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response :missing
+    assert_response :not_found
     xml_http_request :propfind, "/dmsf/webdav/#{@project1_uri}", nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     # Project
     assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1_uri}/</d:href>")
     # Folders
@@ -165,45 +166,15 @@ class DmsfWebdavPropfindTest < RedmineDmsf::Test::IntegrationTest
     assert response.body.include?("<d:displayname>#{@file10.name}</d:displayname>")
   end
 
-  def test_propfind_depth1_on_root_for_admin_with_project_names
+  def test_propfind_depth1_on_root_for_admin
     @project1.name = 'Online Cookbook'
     @project1.save!
     project1_new_name = RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1)
     project1_new_uri = Addressable::URI.escape(project1_new_name)
     xml_http_request :propfind, "/dmsf/webdav/#{project1_new_uri}", nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
+    assert_response :multi_status
     assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{project1_new_uri}/</d:href>")
     assert response.body.include?("<d:displayname>#{project1_new_name}</d:displayname>")
   end
 
-  def test_propfind_depth0_on_project1_for_admin
-    xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '0'})
-    assert_response 207 # MultiStatus
-    # Project
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/</d:href>")
-    xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '0'})
-    assert_response 207 # MultiStatus
-  end
-
-  def test_propfind_depth1_on_project1_for_admin
-    xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
-    # Project
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/</d:href>")
-    # Folders
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/#{@folder1.title}/</d:href>")
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/#{@folder6.title}/</d:href>")
-    # Files
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/#{@file1.name}</d:href>")
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/#{@file9.name}</d:href>")
-    assert response.body.include?("<d:href>http://www.example.com:80/dmsf/webdav/#{@project1.identifier}/#{@file10.name}</d:href>")
-  end
-
-  def test_propfind_depth1_on_project1_for_admin
-    log_user 'admin', 'admin' # login as admin
-    assert !User.current.anonymous?, 'Current user is anonymous'
-    xml_http_request :propfind, "/dmsf/webdav/#{@project1.identifier}", nil, @admin.merge!({:HTTP_DEPTH => '1'})
-    assert_response 207 # MultiStatus
-  end
-
 end
\ No newline at end of file
diff --git a/test/integration/webdav/dmsf_webdav_put_test.rb b/test/integration/webdav/dmsf_webdav_put_test.rb
index 661b6697..5de1eb95 100644
--- a/test/integration/webdav/dmsf_webdav_put_test.rb
+++ b/test/integration/webdav/dmsf_webdav_put_test.rb
@@ -28,19 +28,20 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
     :enabled_modules, :dmsf_folders, :dmsf_files, :dmsf_file_revisions
 
   def setup
-    DmsfLock.delete_all # Delete all locks that are in our test DB - probably not safe but ho hum
-    timestamp = DateTime.now.strftime("%y%m%d%H%M")
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = DmsfHelper.temp_dir.join("dmsf_test-#{timestamp}").to_s
-    FileUtils.mkdir_p(DmsfFile.storage_path) unless DmsfFile.storage_path.exist?
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
     @admin = credentials 'admin'
     @jsmith = credentials 'jsmith'
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @role = Role.find 1 #
-    Setting.plugin_redmine_dmsf['dmsf_webdav'] = '1'
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @role = Role.find_by(name: 'Manager')
+    @dmsf_webdav = Setting.plugin_redmine_dmsf['dmsf_webdav']
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = true
+    @dmsf_webdav_strategy = Setting.plugin_redmine_dmsf['dmsf_webdav_strategy']
     Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = 'WEBDAV_READ_WRITE'
+    @dmsf_webdav_use_project_names = Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names']
     Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = false
-    super
   end
 
   def teardown
@@ -50,6 +51,10 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
     rescue Exception => e
       error e.message
     end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
+    Setting.plugin_redmine_dmsf['dmsf_webdav'] = @dmsf_webdav
+    Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] = @dmsf_webdav_strategy
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = @dmsf_webdav_use_project_names
   end
 
   def test_truth
@@ -60,27 +65,27 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
 
   def test_put_denied_unless_authenticated_root
     put '/dmsf/webdav'
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_put_denied_unless_authenticated
     put "/dmsf/webdav/#{@project1.identifier}"
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_put_denied_with_failed_authentication_root
     put '/dmsf/webdav', nil, credentials('admin', 'badpassword')
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_put_denied_with_failed_authentication
     put "/dmsf/webdav/#{@project1.identifier}", nil, credentials('admin', 'badpassword')
-    assert_response 401
+    assert_response :unauthorized
   end
 
   def test_put_denied_at_root_level
     put '/dmsf/webdav/test.txt', '1234', @admin.merge!({:content_type => :text})
-    assert_response :error # 501
+    assert_response :not_implemented
   end
 
   def test_put_denied_on_folder
@@ -90,30 +95,26 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
 
   def test_put_failed_on_non_existant_project
     put '/dmsf/webdav/not_a_project/file.txt', '1234', @admin.merge!({:content_type => :text})
-    assert_response 409 # Conflict, not_a_project does not exist - file.txt cannot be created
+    assert_response :conflict # not_a_project does not exist - file.txt cannot be created
   end
 
   def test_put_as_admin_granted_on_dmsf_enabled_project
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
-      assert_response :success # 201 Created
-      # Lets check for our file
-      file = DmsfFile.find_file_by_name @project1, nil, 'test-1234.txt'
-      assert file, 'Check for files existance'
-      Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-      if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-        project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
-        put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
-        assert_response 409
-        put "/dmsf/webdav/#{project1_uri}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
-        assert_response :success # 201 Created
-      end
-    end
+    put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
+    assert_response :created
+    # Lets check for our file
+    file = DmsfFile.find_file_by_name @project1, nil, 'test-1234.txt'
+    assert file, 'Check for files existance'
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
+    project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
+    put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
+    assert_response :conflict
+    put "/dmsf/webdav/#{project1_uri}/test-1234.txt", '1234', @admin.merge!({:content_type => :text})
+    assert_response :created
   end
 
   def test_put_failed_as_jsmith_on_non_dmsf_enabled_project
     put "/dmsf/webdav/#{@project2.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-    assert_response 409 # Should report conflict, as project 2 technically doesn't exist if not enabled
+    assert_response :conflict # Should report conflict, as project 2 technically doesn't exist if not enabled
     # Lets check for our file
     file = DmsfFile.find_file_by_name @project2, nil, 'test-1234.txt'
     assert_nil file, 'Check for files existance'
@@ -122,16 +123,14 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
   def test_put_failed_when_no_permission
     @project2.enable_module! :dmsf # Flag module enabled
     put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-    assert_response 409 # We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
+    assert_response :conflict # We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
   end
 
   def test_put_failed_when_no_file_manipulation_permission
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf # Flag module enabled
-      @role.add_permission! :view_dmsf_folders
-      put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-      assert_response :forbidden # We don't hold the permission file_manipulation - so we're unable to do anything with files
-    end
+    @project1.enable_module! :dmsf # Flag module enabled
+    @role.add_permission! :view_dmsf_folders
+    put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
+    assert_response :forbidden # We don't hold the permission file_manipulation - so we're unable to do anything with files
   end
 
   def test_put_failed_when_no_view_dmsf_folders_permission
@@ -139,7 +138,7 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
     @role.add_permission! :file_manipulation
     # Check we don't have write access even if we do have the file_manipulation permission
     put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-    assert_response 409 # We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
+    assert_response :conflict # We don't hold the permission view_dmsf_folders, and thus project 2 doesn't exist to us.
     # Lets check for our file
     file = DmsfFile.find_file_by_name @project1, nil, 'test-1234.txt'
     assert_nil file, 'File test-1234 was found in projects dmsf folder.'
@@ -149,36 +148,30 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
     @project1.enable_module! :dmsf # Flag module enabled
     @role.add_permission! :view_dmsf_folders
     @role.add_permission! :file_manipulation
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-      assert_response :success # 201 - Now we have permissions
-      # Lets check for our file
-      file = DmsfFile.find_file_by_name @project1, nil, 'test-1234.txt'
-      assert file, 'File test-1234 was not found in projects dmsf folder.'
-      assert file.last_revision
-      assert_equal file.last_revision.digest_type, 'SHA256'
-      Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
-      if Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] == true
-        project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
-        put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response 409
-        put "/dmsf/webdav/#{project1_uri}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response :success # 201 - Now we have permissions
-      end
-    end
+    put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
+    assert_response :created # Now we have permissions
+    # Lets check for our file
+    file = DmsfFile.find_file_by_name @project1, nil, 'test-1234.txt'
+    assert file, 'File test-1234 was not found in projects dmsf folder.'
+    assert file.last_revision
+    assert_equal file.last_revision.digest_type, 'SHA256'
+    Setting.plugin_redmine_dmsf['dmsf_webdav_use_project_names'] = true
+    project1_uri = Addressable::URI.escape(RedmineDmsf::Webdav::ProjectResource.create_project_name(@project1))
+    put "/dmsf/webdav/#{@project1.identifier}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
+    assert_response :conflict
+    put "/dmsf/webdav/#{project1_uri}/test-1234.txt", '1234', @jsmith.merge!({:content_type => :text})
+    assert_response :created # Now we have permissions
   end
 
   def test_put_writes_revision_successfully_for_unlocked_file
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf #Flag module enabled
-      @role.add_permission! :view_dmsf_folders
-      @role.add_permission! :file_manipulation
-      file = DmsfFile.find_file_by_name @project1, nil, 'test.txt'
-      assert_not_nil file, 'test.txt file not found'
-      assert_difference 'file.dmsf_file_revisions.count', +1 do
-        put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response :success # 201 - Created
-      end
+    @project1.enable_module! :dmsf #Flag module enabled
+    @role.add_permission! :view_dmsf_folders
+    @role.add_permission! :file_manipulation
+    file = DmsfFile.find_file_by_name @project1, nil, 'test.txt'
+    assert_not_nil file, 'test.txt file not found'
+    assert_difference 'file.dmsf_file_revisions.count', +1 do
+      put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
+      assert_response :created
     end
   end
 
@@ -192,7 +185,7 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
     assert file.lock!, "File failed to be locked by #{User.current.name}"
     assert_no_difference 'file.dmsf_file_revisions.count' do
       put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
-      assert_response 423 # Locked
+      assert_response :locked
     end
   end
 
@@ -206,117 +199,119 @@ class DmsfWebdavPutTest < RedmineDmsf::Test::IntegrationTest
     assert file.lock!, "File failed to be locked by #{User.current.name}"
     assert_no_difference 'file.dmsf_file_revisions.count' do
       put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @admin.merge!({:content_type => :text})
-      assert_response 423 # Locked
+      assert_response :locked
     end
   end
 
   def test_put_accepts_revision_when_file_is_locked_and_user_is_same_as_lock_holder
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf # Flag module enabled
-      @role.add_permission! :view_dmsf_folders
-      @role.add_permission! :file_manipulation
-      
-      log_user 'jsmith', 'jsmith' # login as jsmith
-      assert !User.current.anonymous?, 'Current user is not anonymous'
-      file = DmsfFile.find_file_by_name @project1, nil, 'test.txt'
-      assert l=file.lock!, "File failed to be locked by #{User.current.name}"
-      assert_equal file.last_revision.id, l.dmsf_file_last_revision_id
-      
-      # First PUT should always create new revision.
-      assert_difference 'file.dmsf_file_revisions.count', +1 do
-        put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response :success # 201 - Created
-      end
-      # Second PUT on a locked file should only update the revision that were created on the first PUT
-      assert_no_difference 'file.dmsf_file_revisions.count' do
-        put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response :success # 201 - Created
-      end
-      # Unlock
-      assert file.unlock!, "File failed to be unlocked by #{User.current.name}"
+    @project1.enable_module! :dmsf # Flag module enabled
+    @role.add_permission! :view_dmsf_folders
+    @role.add_permission! :file_manipulation
 
-      # Lock file again, but this time delete the revision that were stored in the lock
-      file = DmsfFile.find_file_by_name @project1, nil, 'test.txt'
-      assert l=file.lock!, "File failed to be locked by #{User.current.name}"
-      assert_equal file.last_revision.id, l.dmsf_file_last_revision_id
-      
-      # Delete the last revision, the revision that were stored in the lock.
-      file.last_revision.delete(true)
-      
-      # First PUT should always create new revision.
-      assert_difference 'file.dmsf_file_revisions.count', +1 do
-        put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response :success # 201 - Created
-      end
-      # Second PUT on a locked file should only update the revision that were created on the first PUT
-      assert_no_difference 'file.dmsf_file_revisions.count' do
-        put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
-        assert_response :success # 201 - Created
-      end
+    log_user 'jsmith', 'jsmith' # login as jsmith
+    assert !User.current.anonymous?, 'Current user is not anonymous'
+    file = DmsfFile.find_file_by_name @project1, nil, 'test.txt'
+    assert l=file.lock!, "File failed to be locked by #{User.current.name}"
+    assert_equal file.last_revision.id, l.dmsf_file_last_revision_id
+
+    # First PUT should always create new revision.
+    assert_difference 'file.dmsf_file_revisions.count', +1 do
+      put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
+      assert_response :created
     end
+    # Second PUT on a locked file should only update the revision that were created on the first PUT
+    assert_no_difference 'file.dmsf_file_revisions.count' do
+      put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
+      assert_response :created
+    end
+    # Unlock
+    assert file.unlock!, "File failed to be unlocked by #{User.current.name}"
+
+    # Lock file again, but this time delete the revision that were stored in the lock
+    file = DmsfFile.find_file_by_name @project1, nil, 'test.txt'
+    assert l=file.lock!, "File failed to be locked by #{User.current.name}"
+    assert_equal file.last_revision.id, l.dmsf_file_last_revision_id
+
+    # Delete the last revision, the revision that were stored in the lock.
+    file.last_revision.delete(true)
+
+    # First PUT should always create new revision.
+    assert_difference 'file.dmsf_file_revisions.count', +1 do
+      put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
+      assert_response :created
+    end
+    # Second PUT on a locked file should only update the revision that were created on the first PUT
+    assert_no_difference 'file.dmsf_file_revisions.count' do
+      put "/dmsf/webdav/#{@project1.identifier}/test.txt", '1234', @jsmith.merge!({:content_type => :text})
+      assert_response :created
+      end
   end
-  
+
   def test_put_ignored_files_default
     # Ignored patterns: /^(\._|\.DS_Store$|Thumbs.db$)/
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf
-      @role.add_permission! :view_dmsf_folders
-      @role.add_permission! :file_manipulation
-      put "/dmsf/webdav/#{@project1.identifier}/._test.txt", '1234', @admin.merge!({:content_type => :text})
-      assert_response 204 # NoContent
-      put "/dmsf/webdav/#{@project1.identifier}/.DS_Store", '1234', @admin.merge!({:content_type => :text})
-      assert_response 204 # NoContent
-      put "/dmsf/webdav/#{@project1.identifier}/Thumbs.db", '1234', @admin.merge!({:content_type => :text})
-      assert_response 204 # NoContent
-      Setting.plugin_redmine_dmsf['dmsf_webdav_ignore'] = '.dump$'
-      put "/dmsf/webdav/#{@project1.identifier}/test.dump", '1234', @admin.merge!({:content_type => :text})
-      assert_response 204 # NoContent
-    end
+    @project1.enable_module! :dmsf
+    @role.add_permission! :view_dmsf_folders
+    @role.add_permission! :file_manipulation
+    put "/dmsf/webdav/#{@project1.identifier}/._test.txt", '1234', @admin.merge!({:content_type => :text})
+    assert_response :no_content
+    put "/dmsf/webdav/#{@project1.identifier}/.DS_Store", '1234', @admin.merge!({:content_type => :text})
+    assert_response :no_content
+    put "/dmsf/webdav/#{@project1.identifier}/Thumbs.db", '1234', @admin.merge!({:content_type => :text})
+    assert_response :no_content
+    original = Setting.plugin_redmine_dmsf['dmsf_webdav_ignore']
+    Setting.plugin_redmine_dmsf['dmsf_webdav_ignore'] = '.dump$'
+    put "/dmsf/webdav/#{@project1.identifier}/test.dump", '1234', @admin.merge!({:content_type => :text})
+    assert_response :no_content
+    Setting.plugin_redmine_dmsf['dmsf_webdav_ignore'] = original
   end
   
   def test_put_non_versioned_files
-    if Setting.plugin_redmine_dmsf['dmsf_webdav_strategy'] == 'WEBDAV_READ_WRITE'
-      @project1.enable_module! :dmsf
-      @role.add_permission! :view_dmsf_folders
-      @role.add_permission! :file_manipulation
+    @project1.enable_module! :dmsf
+    @role.add_permission! :view_dmsf_folders
+    @role.add_permission! :file_manipulation
+    credentials = @admin.merge!({ content_type: :text })
 
-      put "/dmsf/webdav/#{@project1.identifier}/file1.tmp", '1234', @admin.merge!({:content_type => :text})
-      assert_response :success
-      file1 = DmsfFile.find_file_by_name @project1, nil, 'file1.tmp'
-      assert_difference 'file1.dmsf_file_revisions.count', 0 do
-          put "/dmsf/webdav/#{@project1.identifier}/file1.tmp", '5678', @admin.merge!({:content_type => :text})
-          assert_response :success # 201 - Created
-      end
-      assert_difference 'file1.dmsf_file_revisions.count', 0 do
-          put "/dmsf/webdav/#{@project1.identifier}/file1.tmp", '9ABC', @admin.merge!({:content_type => :text})
-          assert_response :success # 201 - Created
-      end
-
-      put "/dmsf/webdav/#{@project1.identifier}/~$file2.txt", '1234', @admin.merge!({:content_type => :text})
-      assert_response :success
-      file2 = DmsfFile.find_file_by_name @project1, nil, '~$file2.txt'
-      assert_difference 'file1.dmsf_file_revisions.count', 0 do
-          put "/dmsf/webdav/#{@project1.identifier}/~$file2.txt", '5678', @admin.merge!({:content_type => :text})
-          assert_response :success # 201 - Created
-      end
-      assert_difference 'file1.dmsf_file_revisions.count', 0 do
-          put "/dmsf/webdav/#{@project1.identifier}/~$file2.txt", '9ABC', @admin.merge!({:content_type => :text})
-          assert_response :success # 201 - Created
-      end
-
-      Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning'] = '.dump$'
-      put "/dmsf/webdav/#{@project1.identifier}/file3.dump", '1234', @admin.merge!({:content_type => :text})
-      assert_response :success
-      file2 = DmsfFile.find_file_by_name @project1, nil, 'file3.dump'
-      assert_difference 'file1.dmsf_file_revisions.count', 0 do
-          put "/dmsf/webdav/#{@project1.identifier}/file3.dump", '5678', @admin.merge!({:content_type => :text})
-          assert_response :success # 201 - Created
-      end
-      assert_difference 'file1.dmsf_file_revisions.count', 0 do
-          put "/dmsf/webdav/#{@project1.identifier}/file3.dump", '9ABC', @admin.merge!({:content_type => :text})
-          assert_response :success # 201 - Created
-      end
+    put "/dmsf/webdav/#{@project1.identifier}/file1.tmp", '1234', credentials
+    assert_response :success
+    file1 = DmsfFile.find_by(project_id: @project1.id, dmsf_folder: nil, name: 'file1.tmp')
+    assert file1
+    assert_difference 'file1.dmsf_file_revisions.count', 0 do
+      put "/dmsf/webdav/#{@project1.identifier}/file1.tmp", '5678', credentials
+      assert_response :created
     end
+    assert_difference 'file1.dmsf_file_revisions.count', 0 do
+      put "/dmsf/webdav/#{@project1.identifier}/file1.tmp", '9ABC', credentials
+      assert_response :created
+    end
+
+    put "/dmsf/webdav/#{@project1.identifier}/~$file2.txt", '1234', credentials
+    assert_response :success
+    file2 = DmsfFile.find_by(project_id: @project1.id, dmsf_folder_id: nil, name: '~$file2.txt')
+    assert file2
+    assert_difference 'file2.dmsf_file_revisions.count', 0 do
+      put "/dmsf/webdav/#{@project1.identifier}/~$file2.txt", '5678', credentials
+      assert_response :created
+    end
+    assert_difference 'file2.dmsf_file_revisions.count', 0 do
+      put "/dmsf/webdav/#{@project1.identifier}/~$file2.txt", '9ABC', credentials
+      assert_response :created
+    end
+
+    original = Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning']
+    Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning'] = '.dump$'
+    put "/dmsf/webdav/#{@project1.identifier}/file3.dump", '1234', credentials
+    assert_response :success
+    file3 = DmsfFile.find_by(project_id: @project1.id, dmsf_folder_id: nil, name: 'file3.dump')
+    assert file3
+    assert_difference 'file3.dmsf_file_revisions.count', 0 do
+      put "/dmsf/webdav/#{@project1.identifier}/file3.dump", '5678', credentials
+      assert_response :created
+    end
+    assert_difference 'file3.dmsf_file_revisions.count', 0 do
+      put "/dmsf/webdav/#{@project1.identifier}/file3.dump", '9ABC', credentials
+      assert_response :created
+    end
+    Setting.plugin_redmine_dmsf['dmsf_webdav_disable_versioning'] = original
   end
   
 end
\ No newline at end of file
diff --git a/test/unit/attachable_patch_test.rb b/test/unit/attachable_patch_test.rb
index fe8bfef0..2bcad8ea 100644
--- a/test/unit/attachable_patch_test.rb
+++ b/test/unit/attachable_patch_test.rb
@@ -24,8 +24,8 @@ class AttachablePatchTest < RedmineDmsf::Test::UnitTest
   fixtures :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :issues
 
   def setup
-    @issue1 = Issue.find_by_id 1
-    @issue2 = Issue.find_by_id 2
+    @issue1 = Issue.find 1
+    @issue2 = Issue.find 2
   end
 
   def test_truth
diff --git a/test/unit/dmsf_file_revision_test.rb b/test/unit/dmsf_file_revision_test.rb
index 5b2546a1..d1d5f165 100644
--- a/test/unit/dmsf_file_revision_test.rb
+++ b/test/unit/dmsf_file_revision_test.rb
@@ -28,19 +28,33 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest
            :dmsf_workflow_step_assignments, :dmsf_workflow_step_actions
          
   def setup
-    @revision1 = DmsfFileRevision.find_by_id 1
-    @revision2 = DmsfFileRevision.find_by_id 2
-    @revision5 = DmsfFileRevision.find_by_id 5
-    @revision8 = DmsfFileRevision.find_by_id 8
-    @wf1 = DmsfWorkflow.find_by_id 1
-    @admin = User.find_by_id 1
-    @jsmith = User.find_by_id 2
-    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path '../../fixtures/files', __FILE__
+    @revision1 = DmsfFileRevision.find 1
+    @revision2 = DmsfFileRevision.find 2
+    @revision3 = DmsfFileRevision.find 3
+    @revision5 = DmsfFileRevision.find 5
+    @revision8 = DmsfFileRevision.find 8
+    @wf1 = DmsfWorkflow.find 1
+    @admin = User.find 1
+    @jsmith = User.find 2
+    @dmsf_storage_directory = Setting.plugin_redmine_dmsf['dmsf_storage_directory']
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = File.expand_path('../../fixtures/dmsf', __FILE__)
+    FileUtils.cp_r(File.expand_path('../../fixtures/files', __FILE__), Setting.plugin_redmine_dmsf['dmsf_storage_directory'])
+  end
+
+  def teardown
+    # Delete our tmp folder
+    begin
+      FileUtils.rm_rf DmsfFile.storage_path
+    rescue Exception => e
+      error e.message
+    end
+    Setting.plugin_redmine_dmsf['dmsf_storage_directory'] = @dmsf_storage_directory
   end
   
   def test_truth
     assert_kind_of DmsfFileRevision, @revision1
     assert_kind_of DmsfFileRevision, @revision2
+    assert_kind_of DmsfFileRevision, @revision3
     assert_kind_of DmsfFileRevision, @revision5
     assert_kind_of DmsfFileRevision, @revision8
     assert_kind_of DmsfWorkflow, @wf1
@@ -59,7 +73,7 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest
 
   def test_destroy
     @revision5.delete true
-    assert_nil DmsfFileRevision.find_by_id @revision5.id
+    assert_nil DmsfFileRevision.find_by(id: @revision5.id)
   end
 
   def test_create_digest
@@ -108,10 +122,10 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest
     # same second, so wait until the microsecond part of the DateTime is less than 10 ms, should be
     # plenty of time to do the rest then.
     wait_timeout = 2000
-    while (DateTime.now.usec > 10*1000)
+    while DateTime.current.usec > 10000
         wait_timeout -= 10
         if wait_timeout <= 0
-            flunk "Waited too long."
+            flunk 'Waited too long.'
         end
         sleep 0.01
     end
@@ -125,11 +139,10 @@ class DmsfFileRevisionTest < RedmineDmsf::Test::UnitTest
     end
 
     # Directly after the file has been stored generate the r2 storage filename.
-    # Hopefully the seconds part of the DateTime.now has not changed and the generated filename will
+    # Hopefully the seconds part of the DateTime.current has not changed and the generated filename will
     # be on the same second but it should then be increased by 1.
     r2.disk_filename = r2.new_storage_filename
-
-    assert_not_equal r1.disk_filename, r2.disk_filename, "The disk filename should not be equal for two revisions."
+    assert_not_equal r1.disk_filename, r2.disk_filename, 'The disk filename should not be equal for two revisions.'
   end
 
   def test_workflow_tooltip
diff --git a/test/unit/dmsf_file_test.rb b/test/unit/dmsf_file_test.rb
index dc8685ec..5edae479 100644
--- a/test/unit/dmsf_file_test.rb
+++ b/test/unit/dmsf_file_test.rb
@@ -23,25 +23,26 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class DmsfFileTest < RedmineDmsf::Test::UnitTest
   fixtures :projects, :users, :email_addresses, :dmsf_folders, :dmsf_files, :dmsf_file_revisions, :roles,
-           :members, :member_roles, :dmsf_locks, :issues, :dmsf_links, :dmsf_workflows, :dmsf_workflow_steps
+           :members, :member_roles, :dmsf_locks, :issues, :dmsf_links, :dmsf_workflows, :dmsf_workflow_steps,
+           :dmsf_workflow_step_assignments
 
   def setup
-    @admin = User.find_by_id 1
-    @jsmith = User.find_by_id 2
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @file1 = DmsfFile.find_by_id 1
-    @file2 = DmsfFile.find_by_id 2
-    @file3 = DmsfFile.find_by_id 3
-    @file4 = DmsfFile.find_by_id 4
-    @file5 = DmsfFile.find_by_id 5
-    @file6 = DmsfFile.find_by_id 6
-    @file7 = DmsfFile.find_by_id 7
-    @file8 = DmsfFile.find_by_id 8
-    @folder1 = DmsfFolder.find_by_id 1
-    @issue1 = Issue.find_by_id 1
-    @wf1 = DmsfWorkflow.find_by_id 1
-    @wf2 = DmsfWorkflow.find_by_id 2
+    @admin = User.find 1
+    @jsmith = User.find 2
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @file1 = DmsfFile.find 1
+    @file2 = DmsfFile.find 2
+    @file3 = DmsfFile.find 3
+    @file4 = DmsfFile.find 4
+    @file5 = DmsfFile.find 5
+    @file6 = DmsfFile.find 6
+    @file7 = DmsfFile.find 7
+    @file8 = DmsfFile.find 8
+    @folder1 = DmsfFolder.find 1
+    @issue1 = Issue.find 1
+    @wf1 = DmsfWorkflow.find 1
+    @wf2 = DmsfWorkflow.find 2
     User.current = nil
   end
 
@@ -65,7 +66,7 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_project_file_count_differs_from_project_visibility_count
-    assert_not_same(@project1.dmsf_files.count, @project1.dmsf_files.visible.count)
+    assert_not_same(@project1.dmsf_files.all.size, @project1.dmsf_files.visible.all.size)
   end
 
   def test_project_dmsf_file_listing_contains_deleted_items
@@ -113,8 +114,8 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_delete_restore
-    assert_equal 1, @file4.dmsf_file_revisions.visible.count
-    assert_equal 2, @file4.referenced_links.visible.count
+    assert_equal 1, @file4.dmsf_file_revisions.visible.all.size
+    assert_equal 2, @file4.referenced_links.visible.all.size
   end
 
   def test_delete
@@ -122,9 +123,9 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
     @file4.dmsf_folder.unlock!
     assert @file4.delete(false), @file4.errors.full_messages.to_sentence
     assert @file4.deleted?, "File #{@file4.name} is not deleted"
-    assert_equal 0, @file4.dmsf_file_revisions.visible.count
+    assert_equal 0, @file4.dmsf_file_revisions.visible.all.size
     # Links should not be deleted
-    assert_equal 2, @file4.referenced_links.visible.count
+    assert_equal 2, @file4.referenced_links.visible.all.size
     @file4.dmsf_folder.lock!
   end
 
@@ -134,19 +135,19 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
     assert @file4.delete(false), @file4.errors.full_messages.to_sentence
     @file4.restore
     assert !@file4.deleted?, "File #{@file4} hasn't been restored"
-    assert_equal 1, @file4.dmsf_file_revisions.visible.count
-    assert_equal 2, @file4.referenced_links.visible.count
+    assert_equal 1, @file4.dmsf_file_revisions.visible.all.size
+    assert_equal 2, @file4.referenced_links.visible.all.size
     @file4.dmsf_folder.lock!
   end
 
   def test_destroy
     User.current = @admin
     @file4.dmsf_folder.unlock!
-    assert_equal 1, @file4.dmsf_file_revisions.visible.count
-    assert_equal 2, @file4.referenced_links.visible.count
+    assert_equal 1, @file4.dmsf_file_revisions.visible.all.size
+    assert_equal 2, @file4.referenced_links.visible.all.size
     @file4.delete true
-    assert_equal 0, @file4.dmsf_file_revisions.count
-    assert_equal 0, @file4.referenced_links.count
+    assert_equal 0, @file4.dmsf_file_revisions.all.size
+    assert_equal 0, @file4.referenced_links.all.size
     @file4.dmsf_folder.lock!
   end
 
@@ -157,7 +158,7 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
       assert_nil new_file.dmsf_folder_id
       assert_nil @file1.dmsf_folder_id
       assert_not_equal new_file.name, @file1.name
-      assert_equal new_file.dmsf_file_revisions.count, 1
+      assert_equal new_file.dmsf_file_revisions.all.size, 1
       assert_nil new_file.last_revision.workflow
       assert_nil new_file.last_revision.dmsf_workflow_id
       assert_nil new_file.last_revision.dmsf_workflow_assigned_by
@@ -180,9 +181,9 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_copy_to_filename_with_workflow_to_the_same_project
-    @file1.last_revision.set_workflow(@wf1.id, nil)
-    @file1.last_revision.assign_workflow(@wf1.id)
-    new_file = @file1.copy_to_filename(@project1, nil, 'new_file.txt')
+    @file7.last_revision.set_workflow(@wf1.id, nil)
+    @file7.last_revision.assign_workflow(@wf1.id)
+    new_file = @file7.copy_to_filename(@project1, nil, 'new_file.txt')
     assert_equal DmsfWorkflow::STATE_ASSIGNED, new_file.last_revision.workflow
     assert_equal @wf1.id, new_file.last_revision.dmsf_workflow_id
     assert_equal User.current.id, new_file.last_revision.dmsf_workflow_assigned_by
@@ -192,9 +193,9 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_copy_to_filename_with_workflow_to_other_project
-    @file1.last_revision.set_workflow(@wf1.id, nil)
-    @file1.last_revision.assign_workflow(@wf1.id)
-    new_file = @file1.copy_to_filename(@project2, nil, 'new_file.txt')
+    @file7.last_revision.set_workflow(@wf1.id, nil)
+    @file7.last_revision.assign_workflow(@wf1.id)
+    new_file = @file7.copy_to_filename(@project2, nil, 'new_file.txt')
     assert_nil new_file.last_revision.workflow
     assert_nil new_file.last_revision.dmsf_workflow_id
     assert_nil new_file.last_revision.dmsf_workflow_assigned_by
@@ -210,7 +211,7 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
       assert_not_equal @file1.dmsf_folder_id, @folder1.id
       assert_equal new_file.dmsf_folder_id, @folder1.id
       assert_equal new_file.name, @file1.name
-      assert_equal new_file.dmsf_file_revisions.count, 1
+      assert_equal new_file.dmsf_file_revisions.all.size, 1
     end
   end
 
@@ -258,7 +259,7 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_to_csv
-    columns = ['id', 'title']
+    columns = %w(id title)
     csv = @file1.to_csv(columns, 0)
     assert_equal 2, csv.size
   end
@@ -302,10 +303,10 @@ class DmsfFileTest < RedmineDmsf::Test::UnitTest
   def test_assigned
     assert !@file1.assigned?(@admin)
     assert !@file1.assigned?(@jsmith)
-    @file1.last_revision.set_workflow(@wf1.id, nil)
-    @file1.last_revision.assign_workflow(@wf1.id)
-    assert @file1.assigned?(@admin)
-    assert @file1.assigned?(@jsmith)
+    @file7.last_revision.set_workflow(@wf1.id, nil)
+    @file7.last_revision.assign_workflow(@wf1.id)
+    assert @file7.assigned?(@admin)
+    assert @file7.assigned?(@jsmith)
   end
 
 end
\ No newline at end of file
diff --git a/test/unit/dmsf_folder_permission_test.rb b/test/unit/dmsf_folder_permission_test.rb
index 4fef2d43..cfe9bf41 100644
--- a/test/unit/dmsf_folder_permission_test.rb
+++ b/test/unit/dmsf_folder_permission_test.rb
@@ -34,15 +34,15 @@ class DmsfFolderPermissionTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_scope
-    assert_equal 2, DmsfFolderPermission.count
+    assert_equal 2, DmsfFolderPermission.all.size
   end
 
   def test_scope_users
-    assert_equal 1, DmsfFolderPermission.users.count
+    assert_equal 1, DmsfFolderPermission.users.all.size
   end
 
   def test_scope_roles
-    assert_equal 1, DmsfFolderPermission.roles.count
+    assert_equal 1, DmsfFolderPermission.roles.all.size
   end
 
   def test_copy_to
diff --git a/test/unit/dmsf_folder_test.rb b/test/unit/dmsf_folder_test.rb
index 83efbeea..0c9b94df 100644
--- a/test/unit/dmsf_folder_test.rb
+++ b/test/unit/dmsf_folder_test.rb
@@ -25,17 +25,16 @@ class DmsfFolderTest < RedmineDmsf::Test::UnitTest
   fixtures :projects, :users, :email_addresses, :dmsf_folders, :roles, :members, :member_roles, :dmsf_folder_permissions
          
   def setup
-    @project = Project.find_by_id 1
-    assert_not_nil @project
+    @project = Project.find 1
     @project.enable_module! :dmsf
-    @folder1 = DmsfFolder.find_by_id 1
-    @folder2 = DmsfFolder.find_by_id 2
-    @folder4 = DmsfFolder.find_by_id 4
-    @folder5 = DmsfFolder.find_by_id 5
-    @folder6 = DmsfFolder.find_by_id 6
-    @folder7 = DmsfFolder.find_by_id 7
-    @manager = User.find_by_id 2
-    @developer = User.find_by_id 3
+    @folder1 = DmsfFolder.find 1
+    @folder2 = DmsfFolder.find 2
+    @folder4 = DmsfFolder.find 4
+    @folder5 = DmsfFolder.find 5
+    @folder6 = DmsfFolder.find 6
+    @folder7 = DmsfFolder.find 7
+    @manager = User.find 2
+    @developer = User.find 3
     manager_role = Role.find 1
     manager_role.add_permission! :view_dmsf_folders
     developer_role = Role.find 2
@@ -58,17 +57,17 @@ class DmsfFolderTest < RedmineDmsf::Test::UnitTest
   def test_visiblity
     # The role has got permissions
     User.current = @manager
-    assert_equal 7, DmsfFolder.where(:project_id => 1).count
-    assert_equal 5, DmsfFolder.visible.where(:project_id => 1).count
+    assert_equal 7, DmsfFolder.where(project_id: 1).all.size
+    assert_equal 5, DmsfFolder.visible.where(project_id: 1).all.size
     # The user has got permissions
     User.current = @developer
     # Hasn't got permissions for @folder7
     @folder7.dmsf_folder_permissions.where(:object_type => 'User').delete_all
-    assert_equal 4, DmsfFolder.visible.where(:project_id => 1).count
+    assert_equal 4, DmsfFolder.visible.where(project_id: 1).all.size
     # Anonymous user
     User.current = User.anonymous
     @project.add_default_member User.anonymous
-    assert_equal 5, DmsfFolder.visible.where(:project_id => 1).count
+    assert_equal 5, DmsfFolder.visible.where(project_id: 1).all.size
   end
 
   def test_permissions
@@ -93,7 +92,7 @@ class DmsfFolderTest < RedmineDmsf::Test::UnitTest
 
   def test_destroy
     @folder6.delete true
-    assert_nil DmsfFolder.find_by_id(@folder6.id)
+    assert_nil DmsfFolder.find_by(id: @folder6.id)
   end
 
   def test_is_column_on_default
diff --git a/test/unit/dmsf_link_test.rb b/test/unit/dmsf_link_test.rb
index ae992dd2..8e0ea792 100644
--- a/test/unit/dmsf_link_test.rb
+++ b/test/unit/dmsf_link_test.rb
@@ -26,13 +26,13 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     :dmsf_folders, :dmsf_links
 
   def setup
-    @project1 = Project.find_by_id 1
-    @folder1 = DmsfFolder.find_by_id 1
-    @folder2 = DmsfFolder.find_by_id 2
-    @file1 = DmsfFile.find_by_id 1
-    @file4 = DmsfFile.find_by_id 4
-    @folder_link = DmsfLink.find_by_id 1
-    @file_link = DmsfLink.find_by_id 2
+    @project1 = Project.find 1
+    @folder1 = DmsfFolder.find 1
+    @folder2 = DmsfFolder.find 2
+    @file1 = DmsfFile.find 1
+    @file4 = DmsfFile.find 4
+    @folder_link = DmsfLink.find 1
+    @file_link = DmsfLink.find 2
   end
   
   def test_truth
@@ -52,8 +52,8 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     folder_link.target_type = DmsfFolder.model_name.to_s
     folder_link.name = 'folder1_link2'
     folder_link.project_id = @project1.id
-    folder_link.created_at = DateTime.now()
-    folder_link.updated_at = DateTime.now()
+    folder_link.created_at = DateTime.current
+    folder_link.updated_at = DateTime.current
     assert folder_link.save, folder_link.errors.full_messages.to_sentence
   end
   
@@ -64,8 +64,8 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     file_link.target_type = DmsfFile.model_name.to_s
     file_link.name = 'file1_link2'
     file_link.project_id = @project1.id
-    file_link.created_at = DateTime.now()
-    file_link.updated_at = DateTime.now()
+    file_link.created_at = DateTime.current
+    file_link.updated_at = DateTime.current
     assert file_link.save, file_link.errors.full_messages.to_sentence
   end
     
@@ -76,8 +76,8 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     external_link.target_type = 'DmsfUrl'
     external_link.name = 'DMSF plugin'
     external_link.project_id = @project1.id
-    external_link.created_at = DateTime.now()
-    external_link.updated_at = DateTime.now()
+    external_link.created_at = DateTime.current
+    external_link.updated_at = DateTime.current
     assert external_link.save, external_link.errors.full_messages.to_sentence
   end
   
@@ -85,14 +85,14 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     @folder_link.name = 'a' * 256
     assert !@folder_link.save, 
       "Folder link #{@folder_link.name} should have not been saved"
-    assert_equal 1, @folder_link.errors.count        
+    assert_equal 1, @folder_link.errors.size
   end
   
   def test_validate_name_presence
     @folder_link.name = ''
     assert !@folder_link.save,
       "Folder link #{@folder_link.name} should have not been saved"
-    assert_equal 1, @folder_link.errors.count        
+    assert_equal 1, @folder_link.errors.size
   end
   
   def test_validate_external_url_length
@@ -100,7 +100,7 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     @file_link.external_url = 'https://localhost/' + 'a' * 256
     assert !@file_link.save, 
       "External URL link #{@file_link.name} should have not been saved"
-    assert_equal 1, @file_link.errors.count        
+    assert_equal 1, @file_link.errors.size
   end
   
   def test_validate_external_url_presence
@@ -108,7 +108,7 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     @file_link.external_url = ''
     assert !@file_link.save,
       "External URL link #{@file_link.name} should have not been saved"
-    assert_equal 1, @file_link.errors.count        
+    assert_equal 1, @file_link.errors.size
   end
     
   def test_validate_external_url
@@ -116,19 +116,19 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
     @file_link.external_url = 'htt ps://abc.xyz'
     assert !@file_link.save, 
       "External URL link #{@file_link.name} should have not been saved"
-    assert_equal 1, @file_link.errors.count
+    assert_equal 1, @file_link.errors.size
   end
    
   def test_belongs_to_project
     @project1.destroy
-    assert_nil DmsfLink.find_by_id 1
-    assert_nil DmsfLink.find_by_id 2
+    assert_nil DmsfLink.find_by(id: 1)
+    assert_nil DmsfLink.find_by(id: 2)
   end
 
   def test_belongs_to_dmsf_folder
     @folder1.destroy
-    assert_nil DmsfLink.find_by_id 1
-    assert_nil DmsfLink.find_by_id 2
+    assert_nil DmsfLink.find_by(id: 1)
+    assert_nil DmsfLink.find_by(id: 2)
   end
   
   def test_target_folder_id
@@ -173,7 +173,7 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
   end
   
   def test_path
-    assert_equal 'folder1/folder2/test.txt', @file_link.path
+    assert_equal 'folder1/folder2/test4.txt', @file_link.path
     assert_equal 'folder1', @folder_link.path
   end
    
@@ -228,17 +228,17 @@ class DmsfLinksTest < RedmineDmsf::Test::UnitTest
   
   def test_destroy_file_link    
     assert @file_link.delete(true), @file_link.errors.full_messages.to_sentence
-    assert_nil DmsfLink.find_by_id @file_link.id
+    assert_nil DmsfLink.find_by(id: @file_link.id)
   end
     
   def test_destroy_folder_link
     assert @folder_link.delete(true), 
       @folder_link.errors.full_messages.to_sentence
-    assert_nil DmsfLink.find_by_id @folder_link.id
+    assert_nil DmsfLink.find_by(id: @folder_link.id)
   end
 
   def test_to_csv
-    columns = ['id', 'title']
+    columns = %w(id title)
     csv = @file_link.to_csv(columns, 0)
     assert_equal 0, csv.size
     @file_link.target_type = 'DmsfUrl'
diff --git a/test/unit/dmsf_lock_test.rb b/test/unit/dmsf_lock_test.rb
index 71682f9f..6759c00d 100644
--- a/test/unit/dmsf_lock_test.rb
+++ b/test/unit/dmsf_lock_test.rb
@@ -30,8 +30,8 @@ class DmsfLockTest < RedmineDmsf::Test::UnitTest
     @lock = dmsf_locks(:dmsf_locks_001)
     @folder2 = dmsf_folders(:dmsf_folders_002)
     @file4 = dmsf_files(:dmsf_files_004)
-    @jsmith = User.find_by_id 2
-    @admin = User.find_by_id 1
+    @jsmith = User.find 2
+    @admin = User.find 1
   end
 
   def test_truth
@@ -61,7 +61,7 @@ class DmsfLockTest < RedmineDmsf::Test::UnitTest
     if @lock.file
       assert_kind_of DmsfFile, @lock.file
     else
-      assert_kind_of DmsfFolder @lock.folder
+      assert_kind_of DmsfFolder, @lock.folder
     end
   end
 
@@ -117,9 +117,9 @@ class DmsfLockTest < RedmineDmsf::Test::UnitTest
     User.current = @jsmith
     lock = DmsfLock.new
     assert !lock.expired?
-    lock.expires_at = Time.now
+    lock.expires_at = Time.current
     assert lock.expired?
-    lock.expires_at = Time.now + 1.hour
+    lock.expires_at = Time.current + 1.hour
     assert !lock.expired?
   end
 
diff --git a/test/unit/dmsf_mailer_test.rb b/test/unit/dmsf_mailer_test.rb
index a1b9ea5c..fb97f19a 100644
--- a/test/unit/dmsf_mailer_test.rb
+++ b/test/unit/dmsf_mailer_test.rb
@@ -26,11 +26,11 @@ class DmsfMailerTest < RedmineDmsf::Test::UnitTest
   fixtures :users, :projects, :dmsf_files, :dmsf_workflows, :dmsf_file_revisions, :members
 
   def setup
-    @user2 = User.find_by_id 2
-    @file1 = DmsfFile.find_by_id 1
-    @wf1 = DmsfWorkflow.find_by_id 1
-    @rev2 = DmsfFileRevision.find_by_id 2
-    @project1 = Project.find_by_id 1
+    @user2 = User.find 2
+    @file1 = DmsfFile.find 1
+    @wf1 = DmsfWorkflow.find 1
+    @rev2 = DmsfFileRevision.find 2
+    @project1 = Project.find 1
   end
 
   def test_truth
@@ -64,7 +64,7 @@ class DmsfMailerTest < RedmineDmsf::Test::UnitTest
     email_params[:expired_at] = Date.today
     email_params[:folders] = nil
     email_params[:files] = "[\"#{@file1.id}\"]"
-    email = DmsfMailer.send_documents(@file1.project, @user2, email_params).deliver
+    email = DmsfMailer.send_documents(@file1.project, email_params).deliver
     assert email
     assert text_part(email).body.include? body
     assert html_part(email).body.include? body
diff --git a/test/unit/dmsf_public_url_test.rb b/test/unit/dmsf_public_url_test.rb
index c8634a52..f2ad35c4 100644
--- a/test/unit/dmsf_public_url_test.rb
+++ b/test/unit/dmsf_public_url_test.rb
@@ -25,12 +25,9 @@ class DmsfPublicUrlsTest < RedmineDmsf::Test::UnitTest
   fixtures :dmsf_files, :dmsf_file_revisions, :dmsf_public_urls, :users
 
   def setup
-    @file1 = DmsfFile.find_by_id 1
-    assert_not_nil @file1
-    @dmsf_public_url1 = DmsfPublicUrl.find_by_id 1
-    assert_not_nil @dmsf_public_url1
-    @user2 = User.find_by_id 2
-    assert_not_nil @user2
+    @file1 = DmsfFile.find 1
+    @dmsf_public_url1 = DmsfPublicUrl.find 1
+    @user2 = User.find 2
   end
   
   def test_truth
@@ -43,14 +40,14 @@ class DmsfPublicUrlsTest < RedmineDmsf::Test::UnitTest
     url = DmsfPublicUrl.new
     url.dmsf_file = @file1
     url.user = @user2
-    url.expire_at = DateTime.now() + 1.day
+    url.expire_at = DateTime.current + 1.day
     assert url.save, url.errors.full_messages.to_sentence
     assert_not_nil url.token
   end
    
   def test_belongs_to_file
     @file1.destroy
-    assert_nil DmsfPublicUrl.find_by_id 1
+    assert_nil DmsfPublicUrl.find_by(id: 1)
   end
 
 end
diff --git a/test/unit/dmsf_workflow_step_action_test.rb b/test/unit/dmsf_workflow_step_action_test.rb
index 8c2d1447..40ff0dbf 100644
--- a/test/unit/dmsf_workflow_step_action_test.rb
+++ b/test/unit/dmsf_workflow_step_action_test.rb
@@ -26,9 +26,9 @@ class DmsfWorkflowStepActionTest < RedmineDmsf::Test::UnitTest
   fixtures :dmsf_workflow_steps, :dmsf_workflow_step_actions
   
   def setup
-    @wfsac1 = DmsfWorkflowStepAction.find(1)
-    @wfsac2 = DmsfWorkflowStepAction.find(2)
-    @wfsac3 = DmsfWorkflowStepAction.find(3)
+    @wfsac1 = DmsfWorkflowStepAction.find 1
+    @wfsac2 = DmsfWorkflowStepAction.find 2
+    @wfsac3 = DmsfWorkflowStepAction.find 3
   end
   
   def test_truth
@@ -95,24 +95,24 @@ class DmsfWorkflowStepActionTest < RedmineDmsf::Test::UnitTest
   end
   
   def test_validate_dmsf_workflow_step_assignment_id_uniqueness    
-    @wfsac2.dmsf_workflow_step_assignment_id = @wfsac1.dmsf_workflow_step_assignment_id;
-    @wfsac2.action = @wfsac1.action;
+    @wfsac2.dmsf_workflow_step_assignment_id = @wfsac1.dmsf_workflow_step_assignment_id
+    @wfsac2.action = @wfsac1.action
     assert !@wfsac2.save
     assert_equal 1, @wfsac2.errors.count  
     @wfsac1.action = DmsfWorkflowStepAction::ACTION_REJECT
-    @wfsac2.action = @wfsac1.action;
+    @wfsac2.action = @wfsac1.action
     assert @wfsac1.save, @wfsac1.errors.full_messages.to_sentence
     assert !@wfsac2.save
     assert_equal 1, @wfsac2.errors.count
     @wfsac1.action = DmsfWorkflowStepAction::ACTION_DELEGATE
     assert @wfsac1.save
-    @wfsac2.action = @wfsac1.action;
+    @wfsac2.action = @wfsac1.action
     assert @wfsac2.save
   end
   
   def test_destroy  
     @wfsac1.destroy
-    assert_nil DmsfWorkflowStepAction.find_by_id(1)    
+    assert_nil DmsfWorkflowStepAction.find_by(id: 1)
   end  
 
   def test_is_finished
diff --git a/test/unit/dmsf_workflow_step_assignment_test.rb b/test/unit/dmsf_workflow_step_assignment_test.rb
index be89bec7..b2dd898f 100644
--- a/test/unit/dmsf_workflow_step_assignment_test.rb
+++ b/test/unit/dmsf_workflow_step_assignment_test.rb
@@ -26,8 +26,8 @@ class WorkflowStepAssignmentTest < RedmineDmsf::Test::UnitTest
     :dmsf_workflow_step_assignments
   
   def setup
-    @wfsa1 = DmsfWorkflowStepAssignment.find(1)
-    @wfsa2 = DmsfWorkflowStepAssignment.find(2)
+    @wfsa1 = DmsfWorkflowStepAssignment.find 1
+    @wfsa2 = DmsfWorkflowStepAssignment.find 2
   end
   
   def test_truth
@@ -75,8 +75,8 @@ class WorkflowStepAssignmentTest < RedmineDmsf::Test::UnitTest
   
   def test_destroy  
     @wfsa1.destroy
-    assert_nil DmsfWorkflowStepAssignment.find_by_id(1)
-    assert_nil DmsfWorkflowStepAction.find_by_id(1)
+    assert_nil DmsfWorkflowStepAssignment.find_by(id: 1)
+    assert_nil DmsfWorkflowStepAction.find_by(id: 1)
   end
   
 end
\ No newline at end of file
diff --git a/test/unit/dmsf_workflow_step_test.rb b/test/unit/dmsf_workflow_step_test.rb
index 067be5d9..77b2b55a 100644
--- a/test/unit/dmsf_workflow_step_test.rb
+++ b/test/unit/dmsf_workflow_step_test.rb
@@ -27,11 +27,12 @@ class DmsfWorkflowStepTest < RedmineDmsf::Test::UnitTest
     :dmsf_file_revisions
 
   def setup 
-    @wfs1 = DmsfWorkflowStep.find(1)
-    @wfs2 = DmsfWorkflowStep.find(2)
-    @wfs5 = DmsfWorkflowStep.find(5)
-    @revision1 = DmsfFileRevision.find_by_id 1
-    @wf2 = DmsfWorkflow.find(2)
+    @wfs1 = DmsfWorkflowStep.find 1
+    @wfs2 = DmsfWorkflowStep.find 2
+    @wfs5 = DmsfWorkflowStep.find 5
+    @revision1 = DmsfFileRevision.find 1
+    @revision2 = DmsfFileRevision.find 2
+    @wf2 = DmsfWorkflow.find 2
   end
   
   def test_truth
@@ -39,6 +40,7 @@ class DmsfWorkflowStepTest < RedmineDmsf::Test::UnitTest
     assert_kind_of DmsfWorkflowStep, @wfs2
     assert_kind_of DmsfWorkflowStep, @wfs5
     assert_kind_of DmsfFileRevision, @revision1
+    assert_kind_of DmsfFileRevision, @revision2
     assert_kind_of DmsfWorkflow, @wf2
   end
   
@@ -106,10 +108,10 @@ class DmsfWorkflowStepTest < RedmineDmsf::Test::UnitTest
   end
   
   def test_destroy
-    assert DmsfWorkflowStepAssignment.where(:dmsf_workflow_step_id => @wfs2.id).all.count > 0
+    assert DmsfWorkflowStepAssignment.where(dmsf_workflow_step_id: @wfs2.id).all.size > 0
     @wfs2.destroy
-    assert_nil DmsfWorkflowStep.find_by_id(2)
-    assert_equal DmsfWorkflowStepAssignment.where(:dmsf_workflow_step_id => @wfs2.id).all.count, 0
+    assert_nil DmsfWorkflowStep.find_by(id: 2)
+    assert_equal DmsfWorkflowStepAssignment.where(dmsf_workflow_step_id: @wfs2.id).all.size, 0
   end
   
   def test_soperator
@@ -117,18 +119,16 @@ class DmsfWorkflowStepTest < RedmineDmsf::Test::UnitTest
   end
   
   def test_user
-    assert_equal @wfs1.user, User.find_by_id(@wfs1.user_id)
+    assert_equal @wfs1.user, User.find_by(id: @wfs1.user_id)
   end
   
   def test_assign
-    @wfs5.assign(@revision1.id)
-    assert DmsfWorkflowStepAssignment.where(
-      :dmsf_workflow_step_id => @wfs5.id, 
-      :dmsf_file_revision_id => @revision1.id).first
+    @wfs5.assign(@revision2.id)
+    assert DmsfWorkflowStepAssignment.where(dmsf_workflow_step_id: @wfs5.id, dmsf_file_revision_id: @revision2.id).exists?
   end
 
   def test_copy_to
-    wfs = @wfs1.copy_to(@wf2);
+    wfs = @wfs1.copy_to(@wf2)
     assert_equal wfs.dmsf_workflow_id, @wf2.id
     assert_equal wfs.step, @wfs1.step
     assert_equal wfs.name, @wfs1.name
diff --git a/test/unit/dmsf_workflow_test.rb b/test/unit/dmsf_workflow_test.rb
index f0eafffa..85273fb0 100644
--- a/test/unit/dmsf_workflow_test.rb
+++ b/test/unit/dmsf_workflow_test.rb
@@ -27,24 +27,24 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     :dmsf_workflow_step_assignments, :dmsf_workflow_step_actions
 
   def setup    
-    @wf1 = DmsfWorkflow.find_by_id 1
-    @wf2 = DmsfWorkflow.find_by_id 2 
-    @wf3 = DmsfWorkflow.find_by_id 3 
-    @wfs1 = DmsfWorkflowStep.find_by_id 1
-    @wfs2 = DmsfWorkflowStep.find_by_id 2
-    @wfs3 = DmsfWorkflowStep.find_by_id 3
-    @wfs4 = DmsfWorkflowStep.find_by_id 4
-    @wfs5 = DmsfWorkflowStep.find_by_id 5
-    @wfsa1 = DmsfWorkflowStepAssignment.find_by_id 1
-    @wfsac1 = DmsfWorkflowStepAction.find_by_id 1
-    @revision1 = DmsfFileRevision.find_by_id 1
-    @revision2 = DmsfFileRevision.find_by_id 2
-    @project = Project.find_by_id 2
-    @project5 = Project.find_by_id 5
+    @wf1 = DmsfWorkflow.find 1
+    @wf2 = DmsfWorkflow.find 2
+    @wf3 = DmsfWorkflow.find 3
+    @wfs1 = DmsfWorkflowStep.find 1
+    @wfs2 = DmsfWorkflowStep.find 2
+    @wfs3 = DmsfWorkflowStep.find 3
+    @wfs4 = DmsfWorkflowStep.find 4
+    @wfs5 = DmsfWorkflowStep.find 5
+    @wfsa1 = DmsfWorkflowStepAssignment.find 1
+    @wfsac1 = DmsfWorkflowStepAction.find 1
+    @revision1 = DmsfFileRevision.find 1
+    @revision2 = DmsfFileRevision.find 2
+    @project = Project.find 2
+    @project5 = Project.find 5
   end
   
-  def test_truth    
-    assert_kind_of DmsfWorkflow, @wf1        
+  def test_truth
+    assert_kind_of DmsfWorkflow, @wf1
     assert_kind_of DmsfWorkflow, @wf2
     assert_kind_of DmsfWorkflow, @wf3
     assert_kind_of DmsfWorkflowStep, @wfs1
@@ -59,14 +59,14 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     assert_kind_of Project, @project
     assert_kind_of Project, @project5
   end
-  
+
   def test_create
     workflow = DmsfWorkflow.new
     workflow.name = 'wf'
     assert workflow.save, workflow.errors.full_messages.to_sentence
   end
-  
-  def test_update    
+
+  def test_update
     @wf1.name = 'wf1a'
     @wf1.project_id = 5
     assert @wf1.save, @wf1.errors.full_messages.to_sentence
@@ -74,38 +74,38 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     assert_equal 'wf1a', @wf1.name
     assert_equal 5, @wf1.project_id
   end
-  
+
   def test_validate_name_length
     @wf1.name = 'a' * 256
     assert !@wf1.save
-    assert_equal 1, @wf1.errors.count        
+    assert_equal 1, @wf1.errors.count
   end
-  
+
   def test_validate_name_presence
     @wf1.name = ''
     assert !@wf1.save
-    assert_equal 1, @wf1.errors.count        
+    assert_equal 1, @wf1.errors.count
   end
-  
-  def test_validate_name_uniqueness_globaly   
+
+  def test_validate_name_uniqueness_globaly
     @wf2.name = @wf1.name
     assert !@wf2.save
-    assert_equal 1, @wf2.errors.count        
+    assert_equal 1, @wf2.errors.count
   end
-  
+
   def test_validate_name_uniqueness_localy
     @wf2.name = @wf1.name
     @wf2.project_id = @wf1.project_id
     assert !@wf2.save
-    assert_equal 1, @wf2.errors.count        
+    assert_equal 1, @wf2.errors.count
   end
-  
-  def test_destroy      
+
+  def test_destroy
     @wf1.destroy
-    assert_nil DmsfWorkflow.find_by_id(1)
-    assert_nil DmsfWorkflowStep.find_by_id(@wfs1.id)
+    assert_nil DmsfWorkflow.find_by(id: 1)
+    assert_nil DmsfWorkflowStep.find_by(id: @wfs1.id)
   end
-  
+
   def test_project
     # Global workflow
     assert_nil @wf2.project
@@ -113,12 +113,12 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     @wf2.project_id = 5
     assert @wf2.project
   end
-  
+
   def test_to_s
     assert_equal @wf1.name, @wf1.to_s
-  end    
-  
-  def test_reorder_steps_highest    
+  end
+
+  def test_reorder_steps_highest
     @wf1.reorder_steps(3, 1)
     @wfs1.reload
     @wfs2.reload
@@ -129,10 +129,10 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     assert_equal @wfs1.step, 2
     assert_equal @wfs4.step, 2
     assert_equal @wfs2.step, 3
-    assert_equal @wfs3.step, 3        
+    assert_equal @wfs3.step, 3
   end
-  
-  def test_reorder_steps_higher    
+
+  def test_reorder_steps_higher
     @wf1.reorder_steps(3, 2)
     @wfs1.reload
     @wfs2.reload
@@ -143,90 +143,102 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     assert_equal @wfs4.step, 1
     assert_equal @wfs5.step, 2
     assert_equal @wfs2.step, 3
-    assert_equal @wfs3.step, 3        
+    assert_equal @wfs3.step, 3
   end
-  
-  def test_reorder_steps_lower   
+
+  def test_reorder_steps_lower
     @wf1.reorder_steps(1, 2)
     @wfs1.reload
     @wfs2.reload
     @wfs3.reload
     @wfs4.reload
-    @wfs5.reload    
+    @wfs5.reload
     assert_equal @wfs2.step, 1
-    assert_equal @wfs3.step, 1    
+    assert_equal @wfs3.step, 1
     assert_equal @wfs1.step, 2
     assert_equal @wfs4.step, 2
     assert_equal @wfs5.step, 3
   end
-  
-  def test_reorder_steps_lowest    
+
+  def test_reorder_steps_lowest
     @wf1.reorder_steps(1, 3)
     @wfs1.reload
     @wfs2.reload
     @wfs3.reload
     @wfs4.reload
-    @wfs5.reload    
+    @wfs5.reload
     assert_equal @wfs2.step, 1
-    assert_equal @wfs3.step, 1    
+    assert_equal @wfs3.step, 1
     assert_equal @wfs5.step, 2
     assert_equal @wfs1.step, 3
     assert_equal @wfs4.step, 3
-  end    
-  
-  def test_delegates    
-    delegates = @wf1.delegates(nil, nil, nil)
-    assert_equal(delegates.all.count + 1, @project5.users.all.count)
-    delegates = @wf1.delegates('Dave', nil, nil)        
-    assert_equal delegates.size, 1
-    delegates = @wf1.delegates(nil, @wfsa1.id, 2)        
-    assert !delegates.any?{|user| user.id == @wfsa1.user_id}
-    assert delegates.any?{|user| user.id == 8}    
   end
-  
-  def test_next_assignments    
+
+  def test_delegates
+    delegates = @wf1.delegates(nil, nil, nil)
+    assert_equal(delegates.size + 1, @project5.users.size)
+    delegates = @wf1.delegates('Dave', nil, nil)
+    assert_equal delegates.size, 1
+    delegates = @wf1.delegates(nil, @wfsa1.id, 2)
+    assert !delegates.any?{ |user| user.id == @wfsa1.user_id }
+    assert delegates.any?{ |user| user.id == 8 }
+  end
+
+  def test_next_assignments
     assignments = @wf1.next_assignments(2)
     assert_equal assignments.size, 1
-    assert_equal assignments[0].user_id, 2    
+    assert_equal assignments[0].user_id, 2
   end
-  
+
   def test_assign
-    @wf1.assign(1)
-    @wf1.dmsf_workflow_steps.each do |step|
-      assert_kind_of DmsfWorkflowStepAssignment, DmsfWorkflowStepAssignment.where(
-        :dmsf_workflow_step_id => step.id, :dmsf_file_revision_id => 1).first
-    end    
+    @wf2.assign @revision2.id
+    @wf2.dmsf_workflow_steps.each do |step|
+      assert DmsfWorkflowStepAssignment.where(dmsf_workflow_step_id: step.id, dmsf_file_revision_id: @revision2.id).exists?
+    end
   end
   
-  def test_try_finish        
-    @revision1.set_workflow @wf1.id, 'start'        
-    @wf1.try_finish @revision1, @wfsac1, User.current.id
+  def test_try_finish_yes
+    # The forkflow is waiting for an approval
+    assert_equal DmsfWorkflow::STATE_WAITING_FOR_APPROVAL, @revision1.workflow
+    # Do the approval
+    wsa = DmsfWorkflowStepAction.new
+    wsa.dmsf_workflow_step_assignment_id = 9
+    wsa.action = DmsfWorkflowStepAction::ACTION_APPROVE
+    wsa.author_id = User.current.id
+    assert wsa.save
+    # The workflow is finished
+    assert @wf1.try_finish(@revision1, @wfsac1, User.current.id)
     @revision1.reload
-    assert_equal @revision1.workflow, DmsfWorkflow::STATE_APPROVED
-    @revision2.set_workflow @wf1.id, 'start'        
-    @wf1.try_finish @revision2, @wfsac1, User.current.id
-    assert_equal @revision2.workflow, DmsfWorkflow::STATE_WAITING_FOR_APPROVAL    
+    assert_equal DmsfWorkflow::STATE_APPROVED, @revision1.workflow
+  end
+
+  def test_try_finish_no
+    # The forkflow is waiting for an approval
+    assert_equal DmsfWorkflow::STATE_WAITING_FOR_APPROVAL, @revision1.workflow
+    # The workflow is not finished
+    assert !@wf1.try_finish(@revision1, @wfsac1, User.current.id)
+    @revision1.reload
+    assert_equal DmsfWorkflow::STATE_WAITING_FOR_APPROVAL, @revision1.workflow
   end
   
   def test_participiants
-    participiants = @wf1.participiants    
-    assert_equal participiants.count, 2
+    assert_equal @wf1.participiants.count, 2
   end
-  
-  def test_locked    
+
+  def test_locked
     assert @wf3.locked?, "#{@wf2.name} status is #{@wf3.status}"
   end
-  
+
   def test_active
     assert @wf1.active?, "#{@wf1.name} status is #{@wf1.status}"
   end
-  
+
   def test_scope_active
-    assert_equal DmsfWorkflow.count, (DmsfWorkflow.active.count + 1)
+    assert_equal DmsfWorkflow.count, (DmsfWorkflow.active.all.size + 1)
   end
-  
-  def test_scope_status    
-    assert_equal 1, DmsfWorkflow.status(DmsfWorkflow::STATUS_LOCKED).count
+
+  def test_scope_status
+    assert_equal 1, DmsfWorkflow.status(DmsfWorkflow::STATUS_LOCKED).all.size
   end
 
   def test_copy_to
@@ -235,4 +247,4 @@ class DmsfWorkflowTest < RedmineDmsf::Test::UnitTest
     assert_equal wf.name, "#{@wf1.name}_copy"
   end
   
-end
+end
\ No newline at end of file
diff --git a/test/unit/issue_patch_test.rb b/test/unit/issue_patch_test.rb
index 9ee34dbb..99b81d27 100644
--- a/test/unit/issue_patch_test.rb
+++ b/test/unit/issue_patch_test.rb
@@ -22,8 +22,9 @@ require File.expand_path('../../test_helper', __FILE__)
 
 class IssuePatchTest < RedmineDmsf::Test::UnitTest
   fixtures :projects, :dmsf_files, :dmsf_file_revisions, :issues
+
   def setup
-    @issue1 = Issue.find_by_id 1
+    @issue1 = Issue.find 1
   end
 
   def test_truth
diff --git a/test/unit/project_patch_test.rb b/test/unit/project_patch_test.rb
index d6306663..deec9162 100644
--- a/test/unit/project_patch_test.rb
+++ b/test/unit/project_patch_test.rb
@@ -24,11 +24,10 @@ class ProjectPatchTest < RedmineDmsf::Test::UnitTest
   fixtures :projects, :dmsf_files, :dmsf_file_revisions, :dmsf_links, :dmsf_folders, :dmsf_workflows, :users
 
   def setup
-    @project1 = Project.find_by_id 1
-    @project2 = Project.find_by_id 2
-    @project3 = Project.find_by_id 3
-    admin = User.find 1
-    User.current = admin
+    @project1 = Project.find 1
+    @project2 = Project.find 2
+    @project3 = Project.find 3
+    User.current = User.find 1
   end
 
   def test_truth
@@ -72,29 +71,29 @@ class ProjectPatchTest < RedmineDmsf::Test::UnitTest
   end
 
   def test_copy_approval_workflows
-    assert_equal 1, @project1.dmsf_workflows.count
-    assert_equal 0, @project2.dmsf_workflows.count
+    assert_equal 1, @project1.dmsf_workflows.all.size
+    assert_equal 0, @project2.dmsf_workflows.all.size
     @project2.copy_approval_workflows(@project1)
-    assert_equal 1, @project2.dmsf_workflows.count
+    assert_equal 1, @project2.dmsf_workflows.all.size
   end
 
   def test_copy_dmsf
-    assert_equal 4, @project1.dmsf_files.visible.count
-    assert_equal 4, @project1.dmsf_folders.visible.count
-    assert_equal 1, @project1.file_links.visible.count
-    assert_equal 1, @project1.folder_links.visible.count
-    assert_equal 1, @project1.url_links.visible.count
-    assert_equal 0, @project3.dmsf_files.visible.count
-    assert_equal 0, @project3.dmsf_folders.count
-    assert_equal 0, @project3.file_links.visible.count
-    assert_equal 0, @project3.folder_links.visible.count
-    assert_equal 0, @project3.url_links.visible.count
+    assert_equal 4, @project1.dmsf_files.visible.all.size
+    assert_equal 4, @project1.dmsf_folders.visible.all.size
+    assert_equal 1, @project1.file_links.visible.all.size
+    assert_equal 1, @project1.folder_links.visible.all.size
+    assert_equal 1, @project1.url_links.visible.all.size
+    assert_equal 0, @project3.dmsf_files.visible.all.size
+    assert_equal 0, @project3.dmsf_folders.all.size
+    assert_equal 0, @project3.file_links.visible.all.size
+    assert_equal 0, @project3.folder_links.visible.all.size
+    assert_equal 0, @project3.url_links.visible.all.size
     @project3.copy_dmsf(@project1)
-    assert_equal 4, @project3.dmsf_files.visible.count
-    assert_equal 4, @project3.dmsf_folders.count
-    assert_equal 1, @project3.file_links.visible.count
-    assert_equal 1, @project3.folder_links.visible.count
-    assert_equal 1, @project3.url_links.visible.count
+    assert_equal 4, @project3.dmsf_files.visible.all.size
+    assert_equal 4, @project3.dmsf_folders.all.size
+    assert_equal 1, @project3.file_links.visible.all.size
+    assert_equal 1, @project3.folder_links.visible.all.size
+    assert_equal 1, @project3.url_links.visible.all.size
   end
 
 end
\ No newline at end of file
diff --git a/test/unit/user_patch_test.rb b/test/unit/user_patch_test.rb
index 83e12c51..e521f0fd 100644
--- a/test/unit/user_patch_test.rb
+++ b/test/unit/user_patch_test.rb
@@ -24,7 +24,7 @@ class UserPatchTest < RedmineDmsf::Test::UnitTest
   fixtures :users, :projects, :dmsf_files, :dmsf_file_revisions, :dmsf_folders, :dmsf_links
 
   def setup
-    @user2 = User.find_by_id 2
+    @user2 = User.find 2
   end
 
   def test_truth
@@ -34,18 +34,18 @@ class UserPatchTest < RedmineDmsf::Test::UnitTest
   def test_remove_dmsf_references
     id = @user2.id
     @user2.destroy
-    assert_equal 0, DmsfFileRevisionAccess.where(:user_id => id).count
-    assert_equal 0, DmsfFileRevision.where(:user_id => id).count
-    assert_equal 0, DmsfFile.where(:deleted_by_user_id => id).count
-    assert_equal 0, DmsfFolder.where(:user_id => id).count
-    assert_equal 0, DmsfFolder.where(:deleted_by_user_id => id).count
-    assert_equal 0, DmsfLink.where(:user_id => id).count
-    assert_equal 0, DmsfLink.where(:deleted_by_user_id => id).count
-    assert_equal 0, DmsfLock.where(:user_id => id).count
-    assert_equal 0, DmsfWorkflowStepAction.where(:author_id => id).count
-    assert_equal 0, DmsfWorkflowStepAssignment.where(:user_id => id).count
-    assert_equal 0, DmsfWorkflowStep.where(:user_id => id).count
-    assert_equal 0, DmsfWorkflow.where(:author_id => id).count
+    assert_equal 0, DmsfFileRevisionAccess.where(user_id: id).all.size
+    assert_equal 0, DmsfFileRevision.where(user_id: id).all.size
+    assert_equal 0, DmsfFile.where(deleted_by_user_id: id).all.size
+    assert_equal 0, DmsfFolder.where(user_id: id).all.size
+    assert_equal 0, DmsfFolder.where(deleted_by_user_id: id).all.size
+    assert_equal 0, DmsfLink.where(user_id: id).all.size
+    assert_equal 0, DmsfLink.where(deleted_by_user_id: id).all.size
+    assert_equal 0, DmsfLock.where(user_id: id).all.size
+    assert_equal 0, DmsfWorkflowStepAction.where(author_id: id).all.size
+    assert_equal 0, DmsfWorkflowStepAssignment.where(user_id: id).all.size
+    assert_equal 0, DmsfWorkflowStep.where(user_id: id).all.size
+    assert_equal 0, DmsfWorkflow.where(author_id: id).all.size
   end
 
 end
\ No newline at end of file