egn 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b592e6bdef03c4501e6ded89bcb6a5189c74653
-  data.tar.gz: be42449680d204b7498944fb1a4ce5c67a3e8375
+  metadata.gz: c50e9550220d451fd878ef94ef66a035d040ef2d
+  data.tar.gz: 0c4120ed1258d8e2ce27327dc2b4267d23152106
 SHA512:
-  metadata.gz: de32cb6efa8e5636232a318277ea58d00d1042bfe8da6ff818974f2799b4b5af1aebef926b29d65bd64e80baf2e66e01095c1c76fadfa1897b7a23ae623c701b
-  data.tar.gz: 633fdd168f71d7619ce2d17122c1172f051d72e6e82e38119b538cd43c11ce45f91464facf256b5d2560a63e0681465175dadd83aa516821b4541b6ee7b4fd67
+  metadata.gz: 48c9632edb348b3f00872c0fb12a41230c031c75bf7788d19f95ac08398e5b2b8555c0cc7e63ffce757d4593c19588a31a15fcbdb179a98b5abe23fcb0c35c67
+  data.tar.gz: 19cb7bbc9e23fba5ba47f6b1489ce1a9722b5e88aed4606f907105cb5392e40c369e16fdb42b5a2d14b85568e7618aef0f019ab1bd5e45bae15c4d56463aa694

data/lib/egn/generator.rb

@@ -32,6 +32,7 @@ module Egn
       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])
     end
 
     def defaults
@@ -39,7 +40,8 @@ module Egn
       {
         year:  date.year,
         month: date.month,
-        day:   date.day
+        day:   date.day,
+        sex:   [:male, :female].sample
       }
     end
 
@@ -47,16 +49,15 @@ module Egn
       # Get random century, region and sex
       options[:century] = options[:year] - (options[:year] % 100)
       options[:region] = Random.rand(0..999)
-      options[:sex] = Random.rand(1..2)
 
       # 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] == 1 && options[:region].odd?
+      if options[:sex] == :male && options[:region].odd?
         options[:region] -= 1
-      elsif options[:sex] == 2 && options[:region].even?
+      elsif options[:sex] == :female && options[:region].even?
         options[:region] += 1
       end
 

data/lib/egn/version.rb

@@ -1,3 +1,3 @@
 module Egn
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/spec/egn/generator_spec.rb

@@ -22,7 +22,7 @@ describe Egn::Generator do
 
     context "invoked with arguments" do
       it "generates a new EGN considering the given options" do
-        number = Egn::Generator.generate(year: 1990, month: 12, day: 30, sex: :m)
+        number = Egn::Generator.generate(year: 1990, month: 12, day: 30, sex: :male)
         egn = Egn::Egn.new(number)
 
         expect(egn).to be_valid
@@ -49,16 +49,29 @@ describe Egn::Generator do
         expect(egn.day).to eq(15)
       end
 
+      it "generates female EGNs" do
+        number = Egn::Generator.generate(sex: :female)
+        egn = Egn::Egn.new(number)
+
+        expect(egn.sex).to eq(:female)
+      end
+
+      it "generates male EGNs" do
+        number = Egn::Generator.generate(sex: :male)
+        egn = Egn::Egn.new(number)
+
+        expect(egn.sex).to eq(:male)
+      end
+
       it "validates the options" do
 
-        options = {year: 1960, month: 6, day: 3}
+        options = {year: 1960, month: 6, day: 3, sex: :male}
 
         Egn::Generator.any_instance.should_receive(:validate!).with(options)
 
         Egn::Generator.generate(options)
       end
 
-
     end
   end
 
@@ -82,6 +95,12 @@ describe Egn::Generator do
       }.to raise_error ArgumentError
     end
 
+    it "raises an exception if invalid sex is given" do
+      expect{
+        Egn::Generator.generate(sex: :none)
+      }.to raise_error ArgumentError
+    end
+
   end
 
 end

metadata

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