From 7258edade9422fdfba1311be779d2ba40d2d042c Mon Sep 17 00:00:00 2001 From: elijah Date: Tue, 21 Jun 2016 15:08:54 -0700 Subject: remove ActiveModel and ActiveSupport dependency (yeah!) --- .../lib/certificate_authority/certificate.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'vendor/certificate_authority/lib/certificate_authority/certificate.rb') diff --git a/vendor/certificate_authority/lib/certificate_authority/certificate.rb b/vendor/certificate_authority/lib/certificate_authority/certificate.rb index 496d91e..cdf432c 100644 --- a/vendor/certificate_authority/lib/certificate_authority/certificate.rb +++ b/vendor/certificate_authority/lib/certificate_authority/certificate.rb @@ -1,6 +1,6 @@ module CertificateAuthority class Certificate - include ActiveModel::Validations + include Validations include Revocable attr_accessor :distinguished_name @@ -15,7 +15,7 @@ module CertificateAuthority attr_accessor :parent - validate do |certificate| + def validate errors.add :base, "Distinguished name must be valid" unless distinguished_name.valid? errors.add :base, "Key material must be valid" unless key_material.valid? errors.add :base, "Serial number must be valid" unless serial_number.valid? @@ -32,8 +32,8 @@ module CertificateAuthority self.distinguished_name = DistinguishedName.new self.serial_number = SerialNumber.new self.key_material = MemoryKeyMaterial.new - self.not_before = Time.now - self.not_after = Time.now + 60 * 60 * 24 * 365 # One year + self.not_before = Date.today.utc + self.not_after = Date.today.advance(:years => 1).utc self.parent = self self.extensions = load_extensions() -- cgit v1.2.3