arkaan 1.3.4 → 1.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19efb40b34e772295e2e3d88d2d420c5f89259df
-  data.tar.gz: fb73957a53d5ba35423d94c889bb0357272a262a
+  metadata.gz: d2abfbdbc0cad893f79ed3b3b42616ef1a8bdf01
+  data.tar.gz: fc96c9ede1c2f95558f786391abaed4dc8868a2f
 SHA512:
-  metadata.gz: 9d3d4e798060c3bba039c5a670332cb66063955e10b7caa4d5811584bbc2cf02bde8c618826a17f7f4bed8aeb90c7ba621fea6c691ebeb319b7912c8122f0914
-  data.tar.gz: 1243cec2b101cc1dbe77503e2b353de557875e1c74b99b60b39bf269be7c89bc0c817a6841928436b4b47a8c48851767548ca0c2af430ce30d54ce5785e348eb
+  metadata.gz: '0438f9b21305372053ecf6e3cfa44348e9eb27084d34856c41011e046218f51f0e6ed715914443de6e421a8a21b07f5606bb5661bbbb8fbe2532aee03e0fd0ce'
+  data.tar.gz: c47f0f473589c893fee3cd8ad4d1f9f4f10a9d62ad0ec61a4f52625a6c7d94985670b914b516fb1e399a1375a95495fc5badab5aab9ce5652abcae0c502f6f59

data/lib/arkaan/campaigns/file.rb

@@ -14,6 +14,8 @@ module Arkaan
       #   @return [Integer] the size of the file in bytes.
       field :size, type: Integer, default: 0
 
+      mime_type ['image/*', 'text/plain']
+
       # @!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

data/lib/arkaan/concerns/mime_typable.rb

@@ -5,26 +5,30 @@ module Arkaan
     module MimeTypable
       extend ActiveSupport::Concern
 
-      # Module holding the class methods for the classes including this concern.
+      # Submodule holding all the static methods add to the current subclass.
       # @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
+      module ClassMethods
+        # Defines the MIME type attribute with the given possible MIME types.
+        # @param values [Array<String>] the possible MIME types, * can be used as wild cards.
+        def mime_type(values)
+
+          # @!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'}
+          validates :mime_type, presence: {message: 'required'}
 
-        validate :mime_type_validity, if: :mime_type?
+          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?
+          # 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.
+          define_method :mime_type_validity do
+            values.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
-          errors.add(:mime_type, 'pattern')
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.5
 platform: ruby
 authors:
 - Vincent Courtois