egn 0.4.0 → 1.0.0

data/lib/egn/generator.rb

@@ -1,49 +1,68 @@
 # Generates a random valid EGN
 module Egn
-  module Generator
+  class Generator
+    attr_reader :options
 
-    # 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
+    # Convinience method
     def self.generate(options={})
-      date = Util.time_rand
-
-      options = {
-        year:  date.year,
-        month: date.month,
-        day:   date.day
-      }.merge(options)
-
-      validate!(options)
-
-      century = options[:year] - (options[:year] % 100)
-      sex = Random.rand(1..2)
+      Generator.new(options).generate
+    end
 
-      if century == 1800
-        options[:month] += 20
-      elsif century == 2000
-        options[:month] += 40
-      end
+    def initialize(options={})
+      @options = defaults.merge(options)
 
-      region = Random.rand(0..999)
+      validate!(@options)
+    end
 
-      if sex == 1 && (region %2 != 0)
-        region -= 1
-      elsif sex == 2 && (region % 2 == 0)
-        region += 1
-      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
 
-      final_year = options[:year] - century
-      egn = final_year.to_s.rjust(2, '0') + options[:month].to_s.rjust(2, '0') + options[:day].to_s.rjust(2,'0') + region.to_s.rjust(3,'0')
+      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')
 
       return egn + Util.egn_checksum(egn).to_s
     end
 
     # Check if the options contain a date that is valid and be turned into an EGN
-    def self.validate!(options)
+    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])
     end
 
+    def defaults
+      date = Util.time_rand
+      {
+        year:  date.year,
+        month: date.month,
+        day:   date.day
+      }
+    end
+
+    def randomize_options
+      # 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?
+        options[:region] -= 1
+      elsif options[:sex] == 2 && options[:region].even?
+        options[:region] += 1
+      end
+
+      options[:year] = options[:year] - options[:century]
+    end
+
+
   end
 end

data/lib/egn/validator.rb

@@ -1,8 +1,18 @@
 module Egn
   class Validator
+    attr_reader :egn
 
-    # Checks if a given EGN is valid
+    # Convinience method
     def self.validate(egn)
+      Validator.new(egn).validate
+    end
+
+    def initialize(egn)
+      @egn = egn
+    end
+
+    # Checks if a given EGN is valid
+    def validate
       return false unless egn.length == 10
 
       # Extract the correct year and month

data/lib/egn/version.rb

@@ -1,3 +1,3 @@
 module Egn
-  VERSION = "0.4.0"
+  VERSION = "1.0.0"
 end

data/spec/egn/generator_spec.rb

@@ -53,7 +53,7 @@ describe Egn::Generator do
 
         options = {year: 1960, month: 6, day: 3}
 
-        Egn::Generator.should_receive(:validate!).with(options)
+        Egn::Generator.any_instance.should_receive(:validate!).with(options)
 
         Egn::Generator.generate(options)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: egn
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 152494033
+      hash: 3961938268472800387
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 152494033
+      hash: 3961938268472800387
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23