From 8e1a35166d6343768c2efcd49a5485f32176d4fe Mon Sep 17 00:00:00 2001
From: Daniel Munn <dan.munn@munnster.co.uk>
Date: Mon, 4 Jun 2012 02:25:24 +0100
Subject: [PATCH] Version 1.4.0 [cleanup outstanding, and more coverage testing
 required]

---
 Gemfile                                  |  2 ++
 app/controllers/dmsf_controller.rb       |  3 ---
 app/controllers/dmsf_state_controller.rb |  2 --
 config/routes.rb                         | 18 +++++++++++-------
 init.rb                                  |  6 ++----
 5 files changed, 15 insertions(+), 16 deletions(-)
 create mode 100644 Gemfile

diff --git a/Gemfile b/Gemfile
new file mode 100644
index 00000000..d763b449
--- /dev/null
+++ b/Gemfile
@@ -0,0 +1,2 @@
+gem "zip"
+gem "xapian-full", :require => false
diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index b5571381..1bed4a89 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -24,9 +24,6 @@ class DmsfController < ApplicationController
   before_filter :find_folder, :except => [:new, :create, :edit_root, :save_root]
   before_filter :find_parent, :only => [:new, :create]
   
-#  verify :method => :post, :only => [:delete_entries, :create, :save, :delete, :save_root, :notify_activate, :notify_deactivate], 
-#    :render => { :nothing => true, :status => :method_not_allowed }
-
   helper :all
 
   def show
diff --git a/app/controllers/dmsf_state_controller.rb b/app/controllers/dmsf_state_controller.rb
index 4eecd4a2..b1dd41f8 100644
--- a/app/controllers/dmsf_state_controller.rb
+++ b/app/controllers/dmsf_state_controller.rb
@@ -24,8 +24,6 @@ class DmsfStateController < ApplicationController
   before_filter :find_project
   before_filter :authorize
 
-#  verify :method => :post, :only => [:user_pref_save], :render => { :nothing => true, :status => :method_not_allowed }
-
   helper :all
 
   def user_pref_save
diff --git a/config/routes.rb b/config/routes.rb
index a87d4e9c..8c4d7739 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -17,16 +17,12 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 RedmineApp::Application.routes.draw do
-#  resources :dmsf
-
 
   #
   # dmsf controller
   #   /projects/<project>/dmsf
+  #   [As this controller also processes 'folders' it maybe better to branch into a folder route rather than leaving it as is]
   ##
-
-  #  verify :method => :post, :only => [:delete_entries, :create, :save, :delete, :save_root, :notify_activate, :notify_deactivate],
-  #    :render => { :nothing => true, :status => :method_not_allowed }
   post '/projects/:id/dmsf/create', :controller => 'dmsf', :action => 'create'
   post '/projects/:id/dmsf/notify/activate', :controller => 'dmsf', :action => 'notify_activate'
   post '/projects/:id/dmsf/notify/deactivate', :controller => 'dmsf', :action => 'notify_deactivate'
@@ -50,13 +46,19 @@ RedmineApp::Application.routes.draw do
   post '/projects/:id/dmsf/state', :controller => 'dmsf_state', :action => 'user_pref_save'
 
 
-  #/projects/<project>/dmsf/upload - dmsf_upload controller
+  #
+  #  dmsf_upload controller
+  #   /projects/<project>/dmsf/upload - dmsf_upload controller
+  ##
 
   post '/projects/:id/dmsf/upload/files', :controller => 'dmsf_upload', :action => 'upload_files'
   post '/projects/:id/dmsf/upload/file', :controller => 'dmsf_upload', :action => 'upload_file'
   post '/projects/:id/dmsf/upload/commit', :controller => 'dmsf_upload', :action => 'commit_files'
   
-  #/dmsf/files - dmsf_files controller
+  #
+  # dmsf_files controller
+  #   /dmsf/files/<file id>
+  ##
   post '/dmsf/files/:id/notify/activate', :controller => 'dmsf_files', :action => 'notify_activate'
   post '/dmsf/files/:id/notify/deactivate', :controller => 'dmsf_files', :action => 'notify_deactivate'
   post '/dmsf/files/:id/lock', :controller => 'dmsf_files', :action => 'lock'
@@ -72,6 +74,7 @@ RedmineApp::Application.routes.draw do
 
   #
   # files_copy controller
+  #   /dmsf/files/<file id>/copy
   ##
   post '/dmsf/files/:id/copy/create', :controller => 'dmsf_files_copy', :action => 'create'
   post '/dmsf/files/:id/copy/move', :controller => 'dmsf_files_copy', :action => 'move'
@@ -79,6 +82,7 @@ RedmineApp::Application.routes.draw do
 
   #
   # folders_copy controller
+  #   /dmsf/folders/<folder id>/copy
   ##
   #verify :method => :post, :only => [:copy_to], :render => { :nothing => true, :status => :method_not_allowed }
   post '/dmsf/folders/:id/copy/to', :controller => 'dmsf_folders_copy', :action => 'copy_to'
diff --git a/init.rb b/init.rb
index 89723de1..b37c1ae0 100644
--- a/init.rb
+++ b/init.rb
@@ -30,19 +30,17 @@ Rails.configuration.to_prepare do
     end
 
     Project.send(:include, RedmineDmsf::Patches::ProjectPatch)
-    STDOUT.puts "PATCHES SENT\n"
-    STDOUT.flush
 end
 
 Redmine::Plugin.register :redmine_dmsf do
   name "DMSF"
   author "Vít Jonáš"
   description "Document Management System Features"
-  version "1.3.0 devel"
+  version "1.4.0 devel"
   url "http://code.google.com/p/redmine-dmsf/"
   author_url "mailto:vit.jonas@gmail.com"
   
-  requires_redmine :version_or_higher => '1.1.0'
+  requires_redmine :version_or_higher => '2.0.0'
   
   settings  :partial => 'settings/dmsf_settings',
             :default => {