egn 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5fd9fc77598bf5d291ffa9860726c2059f4b4b44
-  data.tar.gz: 4d530a9ff62d70d59b07afef8b732c75349502f9
+  metadata.gz: cee82c8e708ea7a658400ed8e8bf7e092a5863a4
+  data.tar.gz: 674f9a620c7e20e250ede85e182bbbdb08368c39
 SHA512:
-  metadata.gz: b446790995f21809637b851ed25c4c457e0015323fef4af309c78fe8e921254ed3699ec73e933c6d5e3cf059a5c26e91eacd5682ce8b0426949da1a46ea7e380
-  data.tar.gz: 222960890a720fa8083eaca487e9fa6ef1a596cd6f132a7b74d8b54e2ebd3a88b48f22cb0d8f50d40a4b1c214f973ca1047c71d9ef2917a4473247e90eebafb5
+  metadata.gz: aef0b00b4fb230d1ce5a43fa05b6522bb16d58915a514505d03f6233fabe3b24bf4faaecdf05331a9415305757b8271e3cd761992ad0003185a2cea3efa15886
+  data.tar.gz: b81ae27bfc6cc0029947e7db3106fc27a27f9cd26c384396603aea361c67a614509c5c6d378b5244dd3f0b334d5101d7b4d4d853a22d22bcacf721a49ed5bfda

data/lib/egn/generator.rb

@@ -9,61 +9,95 @@ module Egn
     end
 
     def initialize(options={})
-      @options = defaults.merge(options)
-
-      validate!(@options)
+      validate!(options)
+      set_defaults!(options)
+      process!
     end
 
     # The generated EGN will be completely random if no opitons are given.
     # options is a hash that may have the following keys: :year, :month and :date
     def generate
-      randomize_options
+      #     YY                       MM                        DD                      REST
+      egn = format(options[:year]) + format(options[:month]) + format(options[:day]) + format(options[:region], 3)
+
+      egn + Util.egn_checksum(egn).to_s
+    end
 
-      egn = options[:year].to_s.rjust(2, '0') +
-            options[:month].to_s.rjust(2, '0') +
-            options[:day].to_s.rjust(2,'0') +
-            options[:region].to_s.rjust(3,'0')
+    private
 
-      return egn + Util.egn_checksum(egn).to_s
+    def set_defaults!(options)
+      @options = {}
+
+      until Date.valid_date?(@options[:year].to_i, @options[:month].to_i, @options[:day].to_i)
+        @options = defaults.merge(options)
+      end
+
+    end
+
+    # Little helper
+    def format(val, pre=2)
+      val.to_s.rjust(pre, '0')
     end
 
     # 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" unless (1800..2099).include?(options[:year])
-      raise ArgumentError, "Month out of bounds" unless (1..12).include?(options[:month])
-      raise ArgumentError, "Day out of bounds" unless (1..31).include?(options[:day])
-      raise ArgumentError, "Invalid sex; valid values: [:male, :female]" unless [:male, :female].include?(options[:sex])
+      raise ArgumentError, "Year out of bounds" if options[:year] && !(1800..2099).include?(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, "Sex should be one of #{sexes}" if options[:sex] && !sexes.include?(options[:sex])
     end
 
+    # Random defaults
     def defaults
-      date = Util.time_rand
+      date = -> { Util.time_rand }.call
       {
-        year:  date.year,
-        month: date.month,
-        day:   date.day,
-        sex:   [:male, :female].sample
+        year:    date.year,
+        month:   date.month,
+        day:     date.day,
+        sex:     sexes.sample,
+        region:  Random.rand(0..999)
       }
     end
 
-    def randomize_options
+    def process!
       # Get random century, region and sex
-      options[:century] = options[:year] - (options[:year] % 100)
-      options[:region] = Random.rand(0..999)
-
-      # Recalculate month based on the century
-      options[:month] += 20 if options[:century] == 1800
-      options[:month] += 40 if options[:century] == 2000
-
-      # Recalculate region based on sex
-      if options[:sex] == :male && options[:region].odd?
-        options[:region] -= 1
-      elsif options[:sex] == :female && options[:region].even?
-        options[:region] += 1
+      century = determine_century(options[:year])
+
+      options[:month] += month_delta(century)
+
+      options[:region] += region_delta(options[:sex], options[:region])
+
+      options[:year] = options[:year] - century
+    end
+
+    # Recalculate region based on sex
+    def region_delta(sex, region)
+      if sex == :male && region.odd?
+        -1
+      elsif sex == :female && region.even?
+        1
+      else
+        0
       end
+    end
 
-      options[:year] = options[:year] - options[:century]
+    def month_delta(century)
+      if century == 1800
+        20
+      elsif century == 2000
+        40
+      else
+        0
+      end
+    end
+
+    def determine_century(year)
+      year - (year % 100)
     end
 
+    def sexes
+      [:male, :female]
+    end
 
   end
 end

data/lib/egn/validator.rb

@@ -9,21 +9,26 @@ module Egn
 
     def initialize(egn)
       @egn = egn
+
+      @year, @month, @day = explode_date(egn)
     end
 
     # Checks if a given EGN is valid
     def validate
-      return false unless egn.length == 10
+      return false unless @egn.length == 10
+      return false unless Date.valid_date?(@year, @month, @day)
 
-      # Extract the correct year and month
-      year, month, day = egn.scan(/.{1,2}/).map(&:to_i)
-      year, month = Util.determine_date(year, month)
+      # Calculate the checksum and check if the given one is correct
+      checksum = Util.egn_checksum(@egn[0,9])
+      checksum == @egn[9].to_i
+    end
 
-      return false unless Date.valid_date? year, month, day
+    private
 
-      # Calculate the checksum and check if the given one is correct
-      checksum = Util.egn_checksum egn[0,9]
-      checksum == egn[9].to_i
+    def explode_date(egn)
+      year, month, day = egn.scan(/.{1,2}/).map(&:to_i)
+      year, month = Util.determine_date(year, month)
+      [year, month, day]
     end
 
   end

data/lib/egn/version.rb

@@ -1,3 +1,3 @@
 module Egn
-  VERSION = "1.2.1"
+  VERSION = "1.2.2"
 end

data/spec/egn/generator_spec.rb

@@ -43,10 +43,18 @@ describe Egn::Generator do
       end
 
       it "generates a new EGN with the given day" do
-        number = Egn::Generator.generate(day: 15)
+        number = Egn::Generator.generate(day: 29)
         egn = Egn::Egn.new(number)
 
-        expect(egn.day).to eq(15)
+        expect(egn.day).to eq(29)
+      end
+
+      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}"
+        end
+
       end
 
       it "generates female EGNs" do
@@ -65,9 +73,9 @@ describe Egn::Generator do
 
       it "validates the options" do
 
-        options = {year: 1960, month: 6, day: 3, sex: :male}
+        options = {year: 1960, month: 6, day: 3, sex: :male, region: 333}
 
-        Egn::Generator.any_instance.should_receive(:validate!).with(options)
+        Egn::Generator.any_instance.should_receive(:validate!)
 
         Egn::Generator.generate(options)
       end

data/spec/egn/validator_spec.rb

@@ -17,8 +17,7 @@ describe Egn::Validator do
     it "checks 10 000 of the generated numbers" do
       Array.new(10_000) { |i| Egn.generate }.each do |egn|
         result = Egn::Validator.validate(egn)
-        puts egn unless result
-        expect(result).to be_true
+        expect(result).to be_true, "Failed for #{egn}"
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egn
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - gmitrev