From 886a0f480051c898c6d3fa0d559dc25e015c573c Mon Sep 17 00:00:00 2001 From: Fabio Teixeira Date: Thu, 11 Dec 2014 14:57:18 -0200 Subject: [PATCH] Refactory library.rb --- lib/library.rb | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/lib/library.rb b/lib/library.rb index 7c18f9a..d4b2b56 100644 --- a/lib/library.rb +++ b/lib/library.rb @@ -1,24 +1,10 @@ class Library < ActiveRecord::Base - - #TODO missing relations? - attr_accessible :name, :version, :license, :software_info_id - validate :validate_name, :validate_version, :validate_license - validates :name, length: { within: 0..20 } - validates_length_of :version, maximum: 20, too_long: _("Library is too long (maximum is 20 characters)") - validates_length_of :license, maximum: 20, too_long: _("Library is too long (maximum is 20 characters)") - - def validate_name - self.errors.add(:name, _("can't be blank")) if self.name.blank? && self.errors[:name].blank? - end - - def validate_version - self.errors.add(:version, _("can't be blank")) if self.version.blank? && self.errors[:version].blank? - end - - def validate_license - self.errors.add(:license, _("can't be blank")) if self.license.blank? && self.errors[:license].blank? - end - + validates :name, :version, :license, + presence: { message: _("can't be blank") }, + length: { + maximum: 20, + too_long: _("Too long (maximum is 20 characters)") + } end -- libgit2 0.21.2