Fix years around 2k

lib/egn/generator.rb

@@ -42,7 +42,7 @@ def format(val, pre = 2)
 
     # Check if the options contain a date that is valid and be turned into an EGN
     def validate!(options)
-      raise ArgumentError, 'Year out of bounds' if options[:year] && !(1800..2099).include?(options[:year])
+      raise ArgumentError, 'Year out of bounds' if options[:year] && !Util.year_in_range?(options[:year])
       raise ArgumentError, 'Month out of bounds' if options[:month] && !(1..12).include?(options[:month])
       raise ArgumentError, 'Day out of bounds' if options[:day] && !(1..31).include?(options[:day])
       raise ArgumentError, "Gender should be one of #{genders}" if options[:gender] && !genders.include?(options[:gender])

lib/egn/util.rb

@@ -12,13 +12,13 @@ module Util
     def self.determine_date(year, month)
       case month
       when (1..12)
-        year = "19#{year}"
+        year = "19%02d" % [ year ]
       when (21..32)
         month -= 20
-        year = "18#{year}"
+        year = "18%02d" % [ year ]
       when (41..52)
         month -= 40
-        year = "20#{year}"
+        year = "20%02d" % [ year ]
       end
 
       [year.to_i, month]
@@ -36,5 +36,9 @@ def self.egn_checksum(egn)
     def self.time_rand(from = 0.0, to = Time.now)
       Time.at(from + rand * (to.to_f - from.to_f))
     end
+
+    def self.year_in_range?(year)
+      (1800..2099).include?(year)
+    end
   end
 end

lib/egn/validator.rb

@@ -17,6 +17,7 @@ def initialize(egn)
     def validate
       return false unless @egn.length == 10
       return false unless Date.valid_date?(@year, @month, @day)
+      return false unless Util.year_in_range?(@year)
 
       # Calculate the checksum and check if the given one is correct
       checksum = Util.egn_checksum(@egn[0, 9])

spec/egn/egn_spec.rb

@@ -67,7 +67,12 @@
     end
   end
 
-  describe 'validating'
+  describe 'validating' do
+    egn = Egn.parse('0150247881')
+    it "year must be in this decade #{egn}" do
+      expect(egn.year).to eq 2001
+    end
+  end
 
   describe 'parsing'
 

spec/egn/generator_spec.rb

@@ -49,7 +49,7 @@
       it "doesn't generate invalid EGN's for day 29 (in case of february)" do
         Array.new(10_000) { |_i| Egn.generate(day: 29) }.each do |egn|
           result = Egn::Validator.validate(egn)
-          expect(result).to be_true, "Failed for #{egn}"
+          expect(result).to be_truthy, "Failed for #{egn}"
         end
       end
 

spec/egn/validator_spec.rb

@@ -3,18 +3,23 @@
 describe Egn::Validator do
   describe '#validate' do
     it 'fails for strings with incorrect size' do
-      expect(Egn::Validator.validate('123456789')).to be_false
-      expect(Egn::Validator.validate('12345678901')).to be_false
+      expect(Egn::Validator.validate('123456789')).to be_falsey
+      expect(Egn::Validator.validate('12345678901')).to be_falsey
     end
 
     it 'fails for incorrect dates' do
-      expect(Egn::Validator.validate('6101347500')).to be_false
+      expect(Egn::Validator.validate('6101347500')).to be_falsey
+    end
+
+    it 'fails if year is out of range' do
+      expect(Egn::Util.year_in_range?(1990)).to be_truthy
+      expect(Egn::Util.year_in_range?(201)).to be_falsey
     end
 
     it 'checks 10 000 of the generated numbers' do
       Array.new(10_000) { |_| Egn.generate }.each do |egn|
         result = Egn::Validator.validate(egn)
-        expect(result).to be_true, "Failed for #{egn}"
+        expect(result).to be_truthy, "Failed for #{egn}"
       end
     end
   end