archiver.rb in cranium-0.4.3

- old
+ new
@@ -1,36 +1,37 @@
 require 'fileutils'
 
 module Cranium::Archiver
+  class << self
+    def archive(*files)
+      create_directory(Cranium.configuration.archive_directory)
+      archive_datetime = Time.now.strftime("%Y-%m-%d_%Hh%Mm%Ss")
+      move_files_from_upload_directory(files, Cranium.configuration.archive_directory, prefix: "#{archive_datetime}_")
+    end
 
-  def self.archive(*files)
-    create_archive_directory
-    archive_files files
-  end
+    def remove(*files)
+      files.each do |file_name|
+        FileUtils.rm File.join(Cranium.configuration.upload_path, file_name)
+      end
+    end
 
+    def move(*files, target_directory:)
+      create_directory(target_directory)
+      move_files_from_upload_directory(files, target_directory)
+    end
 
+    private
 
-  def self.remove(*files)
-    files.each do |file_name|
-      FileUtils.rm File.join(Cranium.configuration.upload_path, file_name)
+    def create_directory(path)
+      FileUtils.mkdir_p(path)
     end
-  end
 
-
-
-  private
-
-  def self.create_archive_directory
-    FileUtils.mkpath Cranium.configuration.archive_directory unless Dir.exists? Cranium.configuration.archive_directory
-  end
-
-
-
-  def self.archive_files(files)
-    archive_datetime = Time.now.strftime("%Y-%m-%d_%Hh%Mm%Ss")
-    files.each do |file_name|
-      FileUtils.mv File.join(Cranium.configuration.upload_path, file_name),
-                   File.join(Cranium.configuration.archive_directory, "#{archive_datetime}_#{file_name}")
+    def move_files_from_upload_directory(files, target_directory, prefix: "")
+      files.each do |file_name|
+        FileUtils.mv(
+          File.join(Cranium.configuration.upload_path, file_name),
+          File.join(target_directory, "#{prefix}#{file_name}")
+        )
+      end
     end
   end
-
 end