Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Maczukin <tomasz@maczukin.pl>2018-03-23 02:12:15 +0300
committerTomasz Maczukin <tomasz@maczukin.pl>2018-03-28 15:00:04 +0300
commitc2bc153314f14566abfdcbf92020cff41fc05a7e (patch)
tree308173161813c8de8ef315a6ce23a63b47b4f86d /app/models/concerns/chronic_duration_attribute.rb
parent973e4030b13adbcc4eb7fad347b928a5164a04ff (diff)
Refactorize ChronicDurationAttribute concern
Diffstat (limited to 'app/models/concerns/chronic_duration_attribute.rb')
-rw-r--r--app/models/concerns/chronic_duration_attribute.rb51
1 files changed, 20 insertions, 31 deletions
diff --git a/app/models/concerns/chronic_duration_attribute.rb b/app/models/concerns/chronic_duration_attribute.rb
index ad8934f58d8..fa1eafb1d7a 100644
--- a/app/models/concerns/chronic_duration_attribute.rb
+++ b/app/models/concerns/chronic_duration_attribute.rb
@@ -2,49 +2,38 @@ module ChronicDurationAttribute
extend ActiveSupport::Concern
class_methods do
- def chronic_duration_attr(virtual_attribute, source_attribute)
- chronic_duration_attr_reader(virtual_attribute, source_attribute)
- chronic_duration_attr_writer(virtual_attribute, source_attribute)
- end
-
def chronic_duration_attr_reader(virtual_attribute, source_attribute)
define_method(virtual_attribute) do
- value = self.send(source_attribute) # rubocop:disable GitlabSecurity/PublicSend
-
- return '' if value.nil?
-
- ChronicDuration.output(value, format: :short)
+ chronic_duration_attributes[virtual_attribute] || output_chronic_duration_attribute(source_attribute)
end
end
def chronic_duration_attr_writer(virtual_attribute, source_attribute)
- virtual_attribute_validator = "#{virtual_attribute}_validator".to_sym
- validation_error = "#{virtual_attribute}_error".to_sym
-
- validate virtual_attribute_validator
- attr_accessor validation_error
+ chronic_duration_attr_reader(virtual_attribute, source_attribute)
define_method("#{virtual_attribute}=") do |value|
+ chronic_duration_attributes[virtual_attribute] = value.presence || ''
+
begin
- self.send("#{validation_error}=", '') # rubocop:disable GitlabSecurity/PublicSend
-
- new_value =
- if value.blank?
- nil
- else
- ChronicDuration.parse(value).to_i
- end
-
- self.send("#{source_attribute}=", new_value) # rubocop:disable GitlabSecurity/PublicSend
- rescue ChronicDuration::DurationParseError => ex
- self.send("#{validation_error}=", ex.message) # rubocop:disable GitlabSecurity/PublicSend
+ new_value = ChronicDuration.parse(value).to_i if value.present?
+ assign_attributes(source_attribute => new_value)
+ rescue ChronicDuration::DurationParseError
+ # ignore error as it will be caught by validation
end
end
- define_method(virtual_attribute_validator) do
- error = self.send(validation_error) # rubocop:disable GitlabSecurity/PublicSend
- self.send('errors').add(source_attribute, error) unless error.blank? # rubocop:disable GitlabSecurity/PublicSend
- end
+ validates virtual_attribute, allow_nil: true, duration: true
end
+
+ alias_method :chronic_duration_attr, :chronic_duration_attr_writer
+ end
+
+ def chronic_duration_attributes
+ @chronic_duration_attributes ||= {}
+ end
+
+ def output_chronic_duration_attribute(source_attribute)
+ value = attributes[source_attribute.to_s]
+ ChronicDuration.output(value, format: :short) if value
end
end