arkaan 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e39623177ee5030ea01c5247ff141e16cf822ff
-  data.tar.gz: c6ece8164773ae0dbd40cdb9f81ea2cb3f51ff2e
+  metadata.gz: fddc22f0b04607f2fc9e415ff3d6d7b557936bec
+  data.tar.gz: dfb2e5b7a06d076800c44584154fc9febf13fd37
 SHA512:
-  metadata.gz: a7a0158cf4887d94e9213497c0281076ddabdd230884d1fc5b7fd605376f3568b303aeedada76ba685a4696c6678dad53668441323e9300fc00580e144ca26c4
-  data.tar.gz: c37f7e89de3de5a144233b69cddae20baa1a2670a0f1513dd9e95c9f3d1bcface464d0fcb92ae43aa80c75cd0096b9af44021b77bb0d574e64bd747ee67feb9c
+  metadata.gz: 0206f995a6d7e37f87da7955dbcdb8f7dc0011202a3a32ff947547a79fb7c0c1cd2da9e3c3112c9767db8f28784ee76baf44dec066f2ee2a64939f963ad21d25
+  data.tar.gz: 27444f0ffbdca19cbb3e085618b01bcc737389c1f8dc9deda271a2906fb4ffefe50847ce87212ca7520e4049d7463c6ea4106c0d8aa0f3450a28b913f5e71f97

data/lib/arkaan/campaigns/file.rb

@@ -15,6 +15,51 @@ module Arkaan
       mime_type ['image/*', 'text/plain']
 
       validates :name, presence: {message: 'required'}
+
+      validate :name_unicity
+
+      # Checks if the name is unique in the campaign, and if it is not then modifies it.
+      # The modifications are the same than in a windows or UNIX system :
+      # - if the name exists as it is given, the system adds the suffix "(1)" to it.
+      # - if the name with the suffix still exists, the system tries to increment it until an available name is found.
+      # - the found name is then afected to the name of the current file.
+      def name_unicity
+        if !campaign.nil? && !self[:name].nil?
+          if exists_in_campaign(self[:name])
+            suffix = 1
+            while exists_in_campaign(merge_suffix(suffix))
+              suffix = suffix + 1
+            end
+            self[:name] = merge_suffix(suffix)
+          end
+        end
+      end
+
+      # Merges the given suffix with the name correctly.
+      # @param suffix [String] the suffix to append between perenthesis at the end of the file name, but before the extension.
+      # @return [String] the complete name for the file, with the suffix correctly appended.
+      def merge_suffix(suffix)
+        return "#{raw_name} (#{suffix}).#{extension}"
+      end
+
+      # Checks if the given name already exists for a file in the campaign.
+      # @param tmp_name [String] the name to check the existence of in the campaign.
+      # @return [Boolean] TRUE if the file exists in the campaign, FALSE otherwise.
+      def exists_in_campaign(tmp_name)
+        campaign.files.where(name: tmp_name, :id.ne => id).exists?
+      end
+
+      # Returns the file name without the extension for the current file.
+      # @return [String] the name of the file without the extension.
+      def raw_name
+        return self[:name].gsub(".#{extension}", '')
+      end
+
+      # Returns the extension of the file, without the dot.
+      # @return [String] the text representation for this file extension, without the leading dot.
+      def extension
+        return self[:name].split('.').last
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Vincent Courtois
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-02 00:00:00.000000000 Z
+date: 2018-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec