custom_fields 2.12.1 → 2.13.1

data/lib/custom_fields/types/color.rb

@@ -1,17 +1,14 @@
-module CustomFields
+# frozen_string_literal: true
 
+module CustomFields
   module Types
-
     module Color
-
       module Field; end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Add a color field
           #
           # @param [ Class ] klass The class to modify
@@ -30,7 +27,7 @@ module CustomFields
           # @return [ Hash ] field name => raw value
           #
           def color_attribute_get(instance, name)
-            self.default_attribute_get(instance, name)
+            default_attribute_get(instance, name)
           end
 
           # Set the value for the instance and the color field specified by
@@ -41,15 +38,10 @@ module CustomFields
           # @param [ Hash ] attributes The attributes used to fetch the values
           #
           def color_attribute_set(instance, name, attributes)
-            self.default_attribute_set(instance, name, attributes)
+            default_attribute_set(instance, name, attributes)
           end
-
         end
-
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/date.rb

@@ -1,17 +1,14 @@
-module CustomFields
+# frozen_string_literal: true
 
+module CustomFields
   module Types
-
     module Date
-
       module Field; end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Adds a date field
           #
           # @param [ Class ] klass The class to modify
@@ -26,9 +23,9 @@ module CustomFields
             klass.send(:define_method, :"formatted_#{name}") { _get_formatted_date(name) }
             klass.send(:define_method, :"formatted_#{name}=") { |value| _set_formatted_date(name, value) }
 
-            if rule['required']
-              klass.validates_presence_of name, :"formatted_#{name}"
-            end
+            return unless rule['required']
+
+            klass.validates_presence_of name, :"formatted_#{name}"
           end
 
           # Build a hash storing the formatted value for
@@ -61,37 +58,38 @@ module CustomFields
 
             instance.send(:"formatted_#{name}=", value)
           end
-
         end
 
         protected
 
         def _set_formatted_date(name, value)
           if value.is_a?(::String) && !value.blank?
-            date = ::Date._strptime(value, self._formatted_date_format)
-
-            if date
-              value = ::Date.new(date[:year], date[:mon], date[:mday])
-            else
-              value = ::Date.parse(value) rescue nil
-            end
+            date = ::Date._strptime(value, _formatted_date_format)
+
+            value = if date
+                      ::Date.new(date[:year], date[:mon], date[:mday])
+                    else
+                      begin
+                        ::Date.parse(value)
+                      rescue StandardError
+                        nil
+                      end
+                    end
           end
 
-          self.send(:"#{name}=", value)
+          send(:"#{name}=", value)
         end
 
         def _get_formatted_date(name)
-          self.send(name.to_sym).strftime(self._formatted_date_format) rescue nil
+          send(name.to_sym).strftime(_formatted_date_format)
+        rescue StandardError
+          nil
         end
 
         def _formatted_date_format
           I18n.t('date.formats.default')
         end
-
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/date_time.rb

@@ -1,17 +1,14 @@
-module CustomFields
+# frozen_string_literal: true
 
+module CustomFields
   module Types
-
     module DateTime
-
       module Field; end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Adds a date_time field
           #
           # @param [ Class ] klass The class to modify
@@ -26,9 +23,9 @@ module CustomFields
             klass.send(:define_method, :"formatted_#{name}") { _get_formatted_date_time(name) }
             klass.send(:define_method, :"formatted_#{name}=") { |value| _set_formatted_date_time(name, value) }
 
-            if rule['required']
-              klass.validates_presence_of name, :"formatted_#{name}"
-            end
+            return unless rule['required']
+
+            klass.validates_presence_of name, :"formatted_#{name}"
           end
 
           # Build a hash storing the formatted value for
@@ -61,37 +58,38 @@ module CustomFields
 
             instance.send(:"formatted_#{name}=", value)
           end
-
         end
 
         protected
 
         def _set_formatted_date_time(name, value)
           if value.is_a?(::String) && !value.blank?
-            date_time = ::DateTime._strptime(value, self._formatted_date_time_format)
+            date_time = ::DateTime._strptime(value, _formatted_date_time_format)
 
             if date_time
-              value = ::Time.zone.local(date_time[:year], date_time[:mon], date_time[:mday], date_time[:hour], date_time[:min], date_time[:sec] || 0)#, date_time[:zone] || "")
+              value = ::Time.zone.local(date_time[:year], date_time[:mon], date_time[:mday], date_time[:hour], date_time[:min], date_time[:sec] || 0) # , date_time[:zone] || "")
             else
-              value = ::Time.zone.parse(value) rescue nil
+              value = begin
+                ::Time.zone.parse(value)
+              rescue StandardError
+                nil
+              end
             end
           end
 
-          self.send(:"#{name}=", value)
+          send(:"#{name}=", value)
         end
 
         def _get_formatted_date_time(name)
-          self.send(name.to_sym).strftime(self._formatted_date_time_format) rescue nil
+          send(name.to_sym).strftime(_formatted_date_time_format)
+        rescue StandardError
+          nil
         end
 
         def _formatted_date_time_format
           I18n.t('time.formats.default')
         end
-
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/default.rb

@@ -1,11 +1,9 @@
-module CustomFields
+# frozen_string_literal: true
 
+module CustomFields
   module Types
-
     module Default
-
       module Field
-
         # Build the mongodb updates based on
         # the new state of the field
         #
@@ -15,30 +13,27 @@ module CustomFields
         #
         def collect_default_diff(memo)
           # puts "collect_default_diff #{self.name}: #{self.persisted?} / #{self.destroyed?}" # DEBUG
-          if self.persisted?
-            if self.destroyed?
-              memo['$unset'][self.name] = 1
-            elsif self.changed?
-              if self.changes.key?('name')
-                old_name, new_name = self.changes['name']
+          if persisted?
+            if destroyed?
+              memo['$unset'][name] = 1
+            elsif changed?
+              if changes.key?('name')
+                old_name, new_name = changes['name']
                 memo['$rename'][old_name] = new_name
               end
             end
           end
 
-          (memo['$set']['custom_fields_recipe.rules'] ||= []) << self.to_recipe
+          (memo['$set']['custom_fields_recipe.rules'] ||= []) << to_recipe
 
           memo
         end
-
       end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Modify the target class according to the rule.
           # By default, it declares the field and a validator
           # if specified by the rule
@@ -51,9 +46,11 @@ module CustomFields
 
             klass.validates_presence_of rule['name'] if rule['required']
 
+            return unless rule['unique']
+
             klass.validates_uniqueness_of rule['name'],
-              scope: :_type,
-              allow_blank: !rule['required'] if rule['unique']
+                                          scope: :_type,
+                                          allow_blank: !rule['required']
           end
 
           # Build a hash storing the formatted (or not) values
@@ -70,10 +67,10 @@ module CustomFields
           # @return [ Hash ] field name => formatted value or empty hash if no value
           #
           def default_attribute_get(instance, name)
-            unless (value = instance.send(name.to_sym)).nil?
-              { name => instance.send(name.to_sym) }
-            else
+            if (value = instance.send(name.to_sym)).nil?
               {}
+            else
+              { name => instance.send(name.to_sym) }
             end
           end
 
@@ -94,13 +91,8 @@ module CustomFields
             # simple assign
             instance.send(:"#{name}=", attributes[name])
           end
-
         end
-
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/email.rb

@@ -1,17 +1,14 @@
-module CustomFields
+# frozen_string_literal: true
 
+module CustomFields
   module Types
-
     module Email
-
       module Field; end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Add a string field
           #
           # @param [ Class ] klass The class to modify
@@ -22,7 +19,8 @@ module CustomFields
 
             klass.field name, type: ::String, localize: rule['localized'] || false, default: rule['default']
             klass.validates_presence_of name if rule['required']
-            klass.validates_format_of name, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/, allow_blank: !rule['required']
+            klass.validates_format_of name, with: /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\Z/,
+                                            allow_blank: !rule['required']
             klass.validates_uniqueness_of rule['name'], scope: :_type if rule['unique']
           end
 
@@ -35,7 +33,7 @@ module CustomFields
           # @return [ Hash ] field name => raw value
           #
           def email_attribute_get(instance, name)
-            self.default_attribute_get(instance, name)
+            default_attribute_get(instance, name)
           end
 
           # Set the value for the instance and the string field specified by
@@ -46,15 +44,10 @@ module CustomFields
           # @param [ Hash ] attributes The attributes used to fetch the values
           #
           def email_attribute_set(instance, name, attributes)
-            self.default_attribute_set(instance, name, attributes)
+            default_attribute_set(instance, name, attributes)
           end
-
         end
-
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/file.rb

@@ -1,17 +1,14 @@
-module CustomFields
+# frozen_string_literal: true
 
+module CustomFields
   module Types
-
     module File
-
       module Field; end
 
       module Target
-
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Adds a file field (using carrierwave)
           #
           # @param [ Class ] klass The class to modify
@@ -23,16 +20,14 @@ module CustomFields
             klass.mount_uploader name, FileUploader
             klass.field :"#{name}_size", type: ::Hash, default: {}
 
-            if rule['localized'] == true
-              klass.replace_field name, ::String, true
-            end
+            klass.replace_field name, ::String, true if rule['localized'] == true
+
+            return unless rule['required']
 
-            if rule['required']
-              # FIXME: previously, we called "klass.validates_presence_of name"
-              # but it didn't work well with localized fields.
-              klass.validate do |object|
-                UploaderPresenceValidator.new(object, name).validate
-              end
+            # FIXME: previously, we called "klass.validates_presence_of name"
+            # but it didn't work well with localized fields.
+            klass.validate do |object|
+              UploaderPresenceValidator.new(object, name).validate
             end
           end
 
@@ -44,7 +39,7 @@ module CustomFields
           # @return [ Hash ] field name => url or empty hash if no file
           #
           def file_attribute_get(instance, name)
-            if instance.send(:"#{name}?") #"
+            if instance.send(:"#{name}?") # "
               value = instance.send(name.to_sym).url
               { name => value, "#{name}_url" => value }
             else
@@ -61,32 +56,32 @@ module CustomFields
           #
           def file_attribute_set(instance, name, attributes)
             [name, "remote_#{name}_url", "remove_#{name}"].each do |_name|
-              self.default_attribute_set(instance, _name, attributes)
+              default_attribute_set(instance, _name, attributes)
             end.compact
           end
-
         end
-
       end
 
       class UploaderPresenceValidator
-
         def initialize(document, name)
-          @document, @name = document, name
+          @document = document
+          @name = name
         end
 
         def validate
-          if @document.send(@name).blank?
-            @document.errors.add(@name, :blank)
-          end
-        end
+          return unless @document.send(@name).blank?
 
+          @document.errors.add(@name, :blank)
+        end
       end
 
       class FileUploader < ::CarrierWave::Uploader::Base
-
         process :set_size_in_model
 
+        def present?
+          serializable_hash.present?
+        end
+
         def filename
           if original_filename && model.fields[mounted_as.to_s].localized?
             _original_filename, extension = original_filename.split('.')
@@ -99,19 +94,15 @@ module CustomFields
         def set_size_in_model
           size_field_name = :"#{mounted_as}_size"
 
-          if model.respond_to?(size_field_name)
-            is_localized  = model.fields[mounted_as.to_s].options[:localize]
-            key           = is_localized ? ::Mongoid::Fields::I18n.locale.to_s : 'default'
-            values        = model.send(size_field_name)
+          return unless model.respond_to?(size_field_name)
 
-            values[key] = file.size
-          end
-        end
+          is_localized  = model.fields[mounted_as.to_s].options[:localize]
+          key           = is_localized ? ::Mongoid::Fields::I18n.locale.to_s : 'default'
+          values        = model.send(size_field_name)
 
+          values[key] = file.size
+        end
       end
-
     end
-
   end
-
 end

data/lib/custom_fields/types/float.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 module CustomFields
   module Types
     module Float
-
       module Field; end
 
       module Target
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Add a string field
           #
           # @param [ Class ] klass The class to modify
@@ -17,7 +17,7 @@ module CustomFields
           def apply_float_custom_field(klass, rule)
             klass.field rule['name'], type: ::Float, localize: rule['localized'] || false, default: rule['default']
             klass.validates_presence_of rule['name'] if rule['required']
-            klass.validates rule['name'], numericality: true, if: ->(x){ rule['required'] }
+            klass.validates rule['name'], numericality: true, if: ->(_x) { rule['required'] }
           end
 
           # Build a hash storing the raw value for
@@ -29,7 +29,7 @@ module CustomFields
           # @return [ Hash ] field name => raw value
           #
           def float_attribute_get(instance, name)
-            self.default_attribute_get(instance, name)
+            default_attribute_get(instance, name)
           end
 
           # Set the value for the instance and the string field specified by
@@ -40,13 +40,10 @@ module CustomFields
           # @param [ Hash ] attributes The attributes used to fetch the values
           #
           def float_attribute_set(instance, name, attributes)
-            self.default_attribute_set(instance, name, attributes)
+            default_attribute_set(instance, name, attributes)
           end
-
-        end # ClassMethods
-
-      end # Target
-
-    end # Float
-  end # Types
-end # CustomFields
+        end
+      end
+    end
+  end
+end

data/lib/custom_fields/types/has_many.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module CustomFields
   module Types
     module HasMany
@@ -5,13 +7,12 @@ module CustomFields
         extend ActiveSupport::Concern
 
         included do
-
           def has_many_to_recipe
-            { 'class_name' => self.class_name, 'inverse_of' => self.inverse_of, 'order_by' => self.order_by }
+            { 'class_name' => class_name, 'inverse_of' => inverse_of, 'order_by' => order_by }
           end
 
           def has_many_is_relationship?
-            self.type == 'has_many'
+            type == 'has_many'
           end
         end
       end
@@ -19,7 +20,6 @@ module CustomFields
       module Target
         extend ActiveSupport::Concern
         module ClassMethods
-
           # Adds a has_many relationship between 2 mongoid models
           #
           # @param [ Class ] klass The class to modify
@@ -32,25 +32,21 @@ module CustomFields
             _order_by   = rule['order_by'] || position_name.to_sym.asc
             _inverse_of = rule['inverse_of'].blank? ? nil : rule['inverse_of'] # an empty String can cause weird behaviours
 
-            klass.has_many rule['name'], class_name: rule['class_name'], inverse_of: _inverse_of, order: _order_by, validate: false do
-
+            klass.has_many rule['name'], class_name: rule['class_name'], inverse_of: _inverse_of, order: _order_by,
+                                         validate: false do
               def filtered(conditions = {}, order_by = nil)
-                list = conditions.empty? ? self.unscoped : self.where(conditions)
+                list = conditions.empty? ? unscoped : where(conditions)
 
-                if order_by
-                  list.order_by(order_by)
-                else
-                  list.order_by(relation_metadata.order)
-                end
+                list.order_by(order_by || association.options[:order])
               end
-              alias :ordered :filtered # backward compatibility + semantic purpose
+              alias_method :ordered, :filtered # backward compatibility + semantic purpose
             end
 
             klass.accepts_nested_attributes_for rule['name'], allow_destroy: true
 
-            if rule['required']
-              klass.validates_collection_size_of rule['name'], minimum: 1, message: :at_least_one_element, on: :update
-            end
+            return unless rule['required']
+
+            klass.validates_collection_size_of rule['name'], minimum: 1, message: :at_least_one_element, on: :update
           end
         end
       end

data/lib/custom_fields/types/integer.rb

@@ -1,14 +1,14 @@
+# frozen_string_literal: true
+
 module CustomFields
   module Types
     module Integer
-
       module Field; end
 
       module Target
         extend ActiveSupport::Concern
 
         module ClassMethods
-
           # Add a integer field
           #
           # @param [ Class ] klass The class to modify
@@ -19,7 +19,7 @@ module CustomFields
 
             klass.field name, type: ::Integer, localize: rule['localized'] || false, default: rule['default']
             klass.validates_presence_of name if rule['required']
-            klass.validates name, numericality: { only_integer: true }, if: ->(x){ rule['required'] }
+            klass.validates name, numericality: { only_integer: true }, if: ->(_x) { rule['required'] }
           end
 
           # Build a hash storing the raw value for
@@ -31,7 +31,7 @@ module CustomFields
           # @return [ Hash ] field name => raw value
           #
           def integer_attribute_get(instance, name)
-            self.default_attribute_get(instance, name)
+            default_attribute_get(instance, name)
           end
 
           # Set the value for the instance and the string field specified by
@@ -42,13 +42,10 @@ module CustomFields
           # @param [ Hash ] attributes The attributes used to fetch the values
           #
           def integer_attribute_set(instance, name, attributes)
-            self.default_attribute_set(instance, name, attributes)
+            default_attribute_set(instance, name, attributes)
           end
-
-        end # ClassMethods
-
-      end # Target
-
-    end # Integer
-  end # Types
-end # CustomFields
+        end
+      end
+    end
+  end
+end