arkaan 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1421f9b29b1a34819afe826ac72a4599644381c1
-  data.tar.gz: 5835dde200cc11c279637ab10fd2db1fc1f21ff4
+  metadata.gz: 19efb40b34e772295e2e3d88d2d420c5f89259df
+  data.tar.gz: fb73957a53d5ba35423d94c889bb0357272a262a
 SHA512:
-  metadata.gz: ef6a293b1b11a01c0abcb834de89bc1e4723b87885099ccf6e427d175fa1e894abd7366c72989d6cd350c9a49571cb8ea918a95877123fb0d4b3cbd774f91d81
-  data.tar.gz: 3e793f2fc1170ff3fbc0be21505a11f4a4a5ed4c9647ee59326dc5c998a741eebb8c44c9cf5ffb69165f71407d509eecbd22b913406973b5ee44fb5a524673b4
+  metadata.gz: 9d3d4e798060c3bba039c5a670332cb66063955e10b7caa4d5811584bbc2cf02bde8c618826a17f7f4bed8aeb90c7ba621fea6c691ebeb319b7912c8122f0914
+  data.tar.gz: 1243cec2b101cc1dbe77503e2b353de557875e1c74b99b60b39bf269be7c89bc0c817a6841928436b4b47a8c48851767548ca0c2af430ce30d54ce5785e348eb

data/lib/arkaan/campaigns/file.rb

@@ -5,6 +5,7 @@ module Arkaan
     class File
       include Mongoid::Document
       include Mongoid::Timestamps
+      include Arkaan::Concerns::MimeTypable
 
       # @!attribute [rw] filename
       #   @return [String] the name of the file, corresponding to the AWS name.
@@ -12,16 +13,12 @@ module Arkaan
       # @!attribute [rw] size
       #   @return [Integer] the size of the file in bytes.
       field :size, type: Integer, default: 0
-      # @!attribute [rw] mime_type
-      #   @return [String] the MIME type of the file, obtained from the uploaded file.
-      field :mime_type, type: String
 
       # @!attribute [rw] invitation
       #   @return [Arkaan::Campaigns::Invitation] the link to the user creator of the file and the campaign it's created in.
       embedded_in :invitation, class_name: 'Arkaan::Campaigns::Invitation', inverse_of: :files
 
-      validates 'name'     , presence: {message: 'required'}
-      validates 'mime_type', presence: {message: 'required'}
+      validates :name     , presence: {message: 'required'}
     end
   end
 end

data/lib/arkaan/concerns.rb

@@ -5,6 +5,7 @@ module Arkaan
     autoload :Activable     , 'arkaan/concerns/activable'
     autoload :Diagnosticable, 'arkaan/concerns/diagnosticable'
     autoload :Enumerable    , 'arkaan/concerns/enumerable'
+    autoload :MimeTypable   , 'arkaan/concerns/mime_typable'
     autoload :Premiumable   , 'arkaan/concerns/premiumable'
     autoload :Sluggable     , 'arkaan/concerns/sluggable'
     autoload :Typable       , 'arkaan/concerns/typable'

data/lib/arkaan/concerns/mime_typable.rb

@@ -0,0 +1,32 @@
+module Arkaan
+  module Concerns
+    # Includes the MIME type field to files to ensure only supported types are included.
+    # @author Vincent Courtois <courtois.vincent@outlook.com>
+    module MimeTypable
+      extend ActiveSupport::Concern
+
+      # Module holding the class methods for the classes including this concern.
+      # @author Vincent Courtois <courtois.vincent@outlook.com>
+      included do
+        # @!attribute [rw] mime_type
+        #   @return [String] the MIME type of the file, obtained from the uploaded file.
+        field :mime_type, type: String
+      
+        validates :mime_type, presence: {message: 'required'}
+
+        validate :mime_type_validity, if: :mime_type?
+
+        # Validates the validity of the MIME type by checking if it respects any of the given mime types.
+        # If it does not respect any MIME types possible, it adds an error to the mime_type field and invalidates.
+        def mime_type_validity
+          accepted = ['image/*', 'text/plain']
+          accepted.each do |type|
+            type_regex = ::Regexp.new("^#{type.sub(/\*/, '(.+)')}$")
+            return true if !type_regex.match(mime_type).nil?
+          end
+          errors.add(:mime_type, 'pattern')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Vincent Courtois
@@ -268,6 +268,7 @@ files:
 - lib/arkaan/concerns/activable.rb
 - lib/arkaan/concerns/diagnosticable.rb
 - lib/arkaan/concerns/enumerable.rb
+- lib/arkaan/concerns/mime_typable.rb
 - lib/arkaan/concerns/premiumable.rb
 - lib/arkaan/concerns/sluggable.rb
 - lib/arkaan/concerns/typable.rb