egn 1.3.2 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ece6e3fe8e7fc520d7833f9256610261b9e4622
-  data.tar.gz: 5ca30adca2f40f3731eee66d98b3a45e344025cc
+  metadata.gz: a86c041349bc20394ea046da1a9d4a777dde322b
+  data.tar.gz: 69a89c71ad2e3d9df349b22af0c0fe6ca0867a71
 SHA512:
-  metadata.gz: 05ac63f17dc43b25e440243b54da13442795cf7a7c70303537110a0ed5ae4553c360fecc77e51ff16ecaf5a8c91514a30be0837917ddb3577755cbafbae5bcc7
-  data.tar.gz: 3f3180fb9357bc264e0a33f341b2316c1806a91cd99b240aa0dba99bb6d166f1c67c767d41a43c0eaf552ba5b5c15ad185b58c60b31b1f72bedb280ebb72dad7
+  metadata.gz: 99c8f0cc69329cc40f4b0898953898554b5ac16614abee4563ffddd6fa6eb9a1e4948a0e72b9f1e944ea054afee2f8fea4c38a4e5165b6a8a487a3d3ef1c9d68
+  data.tar.gz: 210c8a9827e4bd59e8df12020283642f4d032e69eec08e9e9f0e9df7735fa7ed727024cae1996832fe2d08e726f4d747d598e099098ad6cae25df3d2604ca553

data/README.md

@@ -23,51 +23,51 @@ Or install it yourself as:
 
 ## Usage
 
-    require "egn"
+    require 'egn'
 
     # Quickly generate a random number
     Egn.generate
-    # => "6101047500"
+    => '6101047500'
 
     # Validate a given number
-    Egn.validate("6101047500")
-    # => true
+    Egn.validate('6101047500')
+    => true
 
     # Create an new EGN object with a random number
     egn = Egn::Egn.new
-    # => 9212094524
+    => 9212094524
 
     # OR generate EGN for a specific date
-    egn = Egn::Egn.new({year: 1945, month: 5, day: 8})
-    # => 4505085346
+    egn = Egn::Egn.new(year: 1945, month: 5, day: 8)
+    => 4505085346
 
     # OR parse an existing one
-    egn = Egn.parse("6101047500")
-    # => 6101047500
+    egn = Egn.parse('6101047500')
+    => 6101047500
 
     egn.birth_date
-    # => #<Date: 1961-01-04 ((2437304j,0s,0n),+0s,2299161j)>
+    => #<Date: 1961-01-04 ((2437304j,0s,0n),+0s,2299161j)>
 
     egn.year
-    # => 1961
+    => 1961
 
     egn.month
-    # => 1
+    => 1
 
     egn.day
-    # => 10
+    => 10
 
     egn.gender # egn.sex can also be used
-    # => :male
+    => :male
 
     egn.gender(format: :char)
-    # => 'm'
+    => 'm'
 
     egn.gender(format: :number)
-    # => 1
+    => 1
 
     egn.valid?
-    # => true
+    => true
 
 ## Contributing
 

data/Rakefile

@@ -1,10 +1,10 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 
 require 'rake'
 
 require 'coveralls/rake/task'
 Coveralls::RakeTask.new
-task :test_with_coveralls => [:spec, :features, 'coveralls:push']
+task test_with_coveralls: [:spec, :features, 'coveralls:push']
 
 require 'rspec/core'
 require 'rspec/core/rake_task'

data/egn.gemspec

@@ -4,22 +4,22 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'egn/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "egn"
+  spec.name          = 'egn'
   spec.version       = Egn::VERSION
-  spec.authors       = ["gmitrev"]
-  spec.email         = ["gvmitrev@gmail.com"]
-  spec.description   = %q{Generator, validator and info parser for EGN numbers}
-  spec.summary       = %q{An easy way to generate and validate EGN numbers and parse them for useful information}
-  spec.homepage      = "https://github.com/gmitrev/egn"
-  spec.license       = "MIT"
+  spec.authors       = ['gmitrev']
+  spec.email         = ['gvmitrev@gmail.com']
+  spec.description   = 'Generator, validator and info parser for EGN numbers'
+  spec.summary       = 'An easy way to generate and validate EGN numbers and parse them for useful information'
+  spec.homepage      = 'https://github.com/gmitrev/egn'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 2.6"
-  spec.add_development_dependency "coveralls"
+  spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'rspec', '~> 2.6'
+  spec.add_development_dependency 'coveralls'
 end

data/lib/egn/egn.rb

@@ -3,12 +3,11 @@ module Egn
   class Egn
     attr_reader :number, :birth_date
 
-    # Creates a new EGN object. Has different effects depending on the argument.
-    # When no arguments are given, it generates a new random EGN
-    # When a String is given, it is assumed that it is an EGN and is parsed
-    # When a hash is given, a new EGN is generated with the provided options
-    def initialize(args=nil)
-
+    # Creates a new EGN object. Has different effects depending on the arguments:
+    # when no arguments are given, it generates a new random EGN;
+    # when a String is given, it is parsed as an EGN;
+    # when a hash is given, a new EGN is generated with the provided options.
+    def initialize(args = nil)
       if args.nil?
         @number = Generator.generate
       else
@@ -17,9 +16,9 @@ module Egn
           @number = Generator.generate(args)
         when String
           @number = args
-          raise ArgumentError, "Invalid EGN" unless self.valid?
+          raise ArgumentError, 'Invalid EGN' unless self.valid?
         else
-          raise ArgumentError, "Egn#new should be called either with an EGN or with an options hash"
+          raise ArgumentError, 'Egn#new should be called either with an EGN or with an options hash'
         end
       end
 
@@ -47,12 +46,12 @@ module Egn
     # default: :male | :female
     # number:      1 | 2
     # char:      'm' | 'f'
-    def sex(options={})
+    def sex(options = {})
       options = {
         format: :default
       }.merge(options)
 
-      male = number[8,1].to_i.even?
+      male = number[8, 1].to_i.even?
 
       case options[:format]
       when :default
@@ -77,6 +76,5 @@ module Egn
 
       @birth_date = info.date
     end
-
   end
 end

data/lib/egn/generator.rb

@@ -3,18 +3,18 @@ module Egn
   class Generator
     attr_reader :options
 
-    # Convinience method
-    def self.generate(options={})
+    # Convenience method
+    def self.generate(options = {})
       Generator.new(options).generate
     end
 
-    def initialize(options={})
+    def initialize(options = {})
       validate!(options)
       set_defaults!(options)
       process!
     end
 
-    # The generated EGN will be completely random if no opitons are given.
+    # The generated EGN will be completely random if no options are given.
     # options is a hash that may have the following keys: :year, :month, :day, :gender
     def generate
       egn = format(options[:year]) +
@@ -33,19 +33,18 @@ module Egn
       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)
+    # Little helper that prefixes strings with 0s
+    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" 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, '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, "Gender should be one of #{genders}" if options[:gender] && !genders.include?(options[:gender])
     end
 
@@ -100,6 +99,5 @@ module Egn
     def genders
       [:male, :female]
     end
-
   end
 end

data/lib/egn/parser.rb

@@ -5,7 +5,7 @@ module Egn
     # Parses the given EGN and returns all information that can be
     # extracted from it: date, sex and region
     def initialize(egn)
-      raise ArgumentError, "Invalid EGN" unless Validator.validate(egn)
+      raise ArgumentError, 'Invalid EGN' unless Validator.validate(egn)
 
       # Extract the correct date
       year, month, day = egn.scan(/.{1,2}/).map(&:to_i)
@@ -13,6 +13,5 @@ module Egn
 
       @date = Date.new(year.to_i, month, day)
     end
-
   end
 end

data/lib/egn/util.rb

@@ -1,7 +1,7 @@
 # Contains some utility methods that are used by the other classes
 module Egn
   module Util
-    WEIGHTS = [2,4,8,5,10,9,7,3,6]
+    WEIGHTS = [2, 4, 8, 5, 10, 9, 7, 3, 6]
 
     # The EGN can have three different formats depending on the century. It can
     # be determined by examining the month.
@@ -36,6 +36,5 @@ module Egn
     def self.time_rand(from = 0.0, to = Time.now)
       Time.at(from + rand * (to.to_f - from.to_f))
     end
-
   end
 end

data/lib/egn/validator.rb

@@ -19,7 +19,7 @@ module Egn
       return false unless Date.valid_date?(@year, @month, @day)
 
       # Calculate the checksum and check if the given one is correct
-      checksum = Util.egn_checksum(@egn[0,9])
+      checksum = Util.egn_checksum(@egn[0, 9])
       checksum == @egn[9].to_i
     end
 
@@ -30,6 +30,5 @@ module Egn
       year, month = Util.determine_date(year, month)
       [year, month, day]
     end
-
   end
 end

data/lib/egn/version.rb

@@ -1,3 +1,3 @@
 module Egn
-  VERSION = "1.3.2"
+  VERSION = '1.3.3'
 end

data/lib/egn.rb

@@ -1,16 +1,15 @@
-require "date"
+require 'date'
 
-require "egn/egn"
-require "egn/parser"
-require "egn/validator"
-require "egn/generator"
-require "egn/version"
-require "egn/util"
+require 'egn/egn'
+require 'egn/parser'
+require 'egn/validator'
+require 'egn/generator'
+require 'egn/version'
+require 'egn/util'
 
 module Egn
-
   # Quick generate: returns a new number
-  def self.generate(options={})
+  def self.generate(options = {})
     Generator.generate(options)
   end
 
@@ -23,5 +22,4 @@ module Egn
   def self.parse(egn)
     Egn.new(egn)
   end
-
 end

data/spec/egn/egn_spec.rb

@@ -1,11 +1,8 @@
 require 'spec_helper'
 
-describe "Egn" do
-
+describe 'Egn' do
   describe '.initialize' do
-
-    context "invoked with no args" do
-
+    context 'invoked with no args' do
       it 'generates a valid number' do
         egn = Egn::Egn.new
 
@@ -19,34 +16,29 @@ describe "Egn" do
         expect(egn1.number).not_to eq egn2.number
       end
 
-      it "delegates the creation to Generators::Egn" do
-
-        Egn::Generator.should_receive(:generate).and_return "6101047500"
+      it 'delegates the creation to Generators::Egn' do
+        Egn::Generator.should_receive(:generate).and_return '6101047500'
 
         Egn::Egn.new
       end
-
     end
 
-    context "invoked with an EGN " do
-
-      it "returns a new Egn object if the provided EGN is valid" do
+    context 'invoked with an EGN ' do
+      it 'returns a new Egn object if the provided EGN is valid' do
         egn = Egn::Egn.new('6101047500')
 
         expect(egn).to be_valid
       end
 
-      it "raises an ArgumentError if the provided EGN is not valid" do
-        expect{
+      it 'raises an ArgumentError if the provided EGN is not valid' do
+        expect do
           Egn::Egn.new("I'm invalid")
-        }.to raise_error ArgumentError
+        end.to raise_error ArgumentError
       end
-
     end
 
-    context "invoked with an options hash" do
-
-      it "passes the options to the #generate method" do
+    context 'invoked with an options hash' do
+      it 'passes the options to the #generate method' do
         options = {
           year: 1960,
           month: 12
@@ -56,19 +48,18 @@ describe "Egn" do
 
         Egn::Egn.new(options)
       end
-
     end
 
-    context "invoked with something else" do
+    context 'invoked with something else' do
       it 'raises an ArgumentError' do
-        expect{
-          Egn::Egn.new([1,2,'hi'])
-        }.to raise_error ArgumentError
+        expect do
+          Egn::Egn.new([1, 2, 'hi'])
+        end.to raise_error ArgumentError
       end
     end
   end
 
-  describe "valid?" do
+  describe 'valid?' do
     it 'delegates the validation to Validators::Egn' do
       egn = Egn::Egn.new
       Egn::Validator.should_receive(:validate).with(egn.number)
@@ -76,13 +67,11 @@ describe "Egn" do
     end
   end
 
-
   describe 'validating'
 
   describe 'parsing'
 
   describe 'sex' do
-
     # Female
     %w(4702054631 5202079211 8012304154 9506062719 9308110830).each do |female_egn|
       it "works for female with egn #{female_egn}" do
@@ -100,22 +89,19 @@ describe "Egn" do
     end
 
     it 'allows an option to be passed that changes the output to numbers' do
-      male   = Egn.parse("0612318303")
-      female = Egn.parse("5202079211")
+      male   = Egn.parse('0612318303')
+      female = Egn.parse('5202079211')
 
       expect(male.sex(format: :number)).to eq 1
       expect(female.sex(format: :number)).to eq 2
     end
 
     it 'allows an option to be passed that changes the output to a single char' do
-      male   = Egn.parse("0612318303")
-      female = Egn.parse("5202079211")
+      male   = Egn.parse('0612318303')
+      female = Egn.parse('5202079211')
 
       expect(male.sex(format: :char)).to eq 'm'
       expect(female.sex(format: :char)).to eq 'f'
     end
-
   end
-
 end
-

data/spec/egn/generator_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe Egn::Generator do
-
-  describe "#generate" do
-    context "invoked with no arguments" do
-
+  describe '#generate' do
+    context 'invoked with no arguments' do
       it 'generates a valid number' do
         egn = Egn::Generator.generate
 
@@ -17,32 +15,31 @@ describe Egn::Generator do
 
         expect(egn1).not_to eq egn2
       end
-
     end
 
-    context "invoked with arguments" do
-      it "generates a new EGN considering the given options" 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, gender: :male)
         egn = Egn::Egn.new(number)
 
         expect(egn).to be_valid
       end
 
-      it "generates a new EGN with the given year" do
+      it 'generates a new EGN with the given year' do
         number = Egn::Generator.generate(year: 1990)
         egn = Egn::Egn.new(number)
 
         expect(egn.year).to eq(1990)
       end
 
-      it "generates a new EGN with the given month" do
+      it 'generates a new EGN with the given month' do
         number = Egn::Generator.generate(month: 6)
         egn = Egn::Egn.new(number)
 
         expect(egn.month).to eq(6)
       end
 
-      it "generates a new EGN with the given day" do
+      it 'generates a new EGN with the given day' do
         number = Egn::Generator.generate(day: 29)
         egn = Egn::Egn.new(number)
 
@@ -50,66 +47,59 @@ describe Egn::Generator do
       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|
+        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
+      it 'generates female EGNs' do
         number = Egn::Generator.generate(gender: :female)
         egn = Egn::Egn.new(number)
 
         expect(egn.gender).to eq(:female)
       end
 
-      it "generates male EGNs" do
+      it 'generates male EGNs' do
         number = Egn::Generator.generate(gender: :male)
         egn = Egn::Egn.new(number)
 
         expect(egn.gender).to eq(:male)
       end
 
-      it "validates the options" do
-
-        options = {year: 1960, month: 6, day: 3, gender: :male, region: 333}
+      it 'validates the options' do
+        options = { year: 1960, month: 6, day: 3, gender: :male, region: 333 }
 
         Egn::Generator.any_instance.should_receive(:validate!)
 
         Egn::Generator.generate(options)
       end
-
     end
   end
 
-  describe "#validate!" do
-
-    it "raises an exception if invalid year is given" do
-      expect{
+  describe '#validate!' do
+    it 'raises an exception if invalid year is given' do
+      expect do
         Egn::Generator.generate(year: 1500)
-      }.to raise_error ArgumentError
+      end.to raise_error ArgumentError
     end
 
-    it "raises an exception if invalid month is given" do
-      expect{
+    it 'raises an exception if invalid month is given' do
+      expect do
         Egn::Generator.generate(month: 15)
-      }.to raise_error ArgumentError
+      end.to raise_error ArgumentError
     end
 
-    it "raises an exception if invalid day is given" do
-      expect{
+    it 'raises an exception if invalid day is given' do
+      expect do
         Egn::Generator.generate(day: 33)
-      }.to raise_error ArgumentError
+      end.to raise_error ArgumentError
     end
 
-    it "raises an exception if invalid gender is given" do
-      expect{
+    it 'raises an exception if invalid gender is given' do
+      expect do
         Egn::Generator.generate(gender: :none)
-      }.to raise_error ArgumentError
+      end.to raise_error ArgumentError
     end
-
   end
-
 end
-

data/spec/egn/parser_spec.rb

@@ -1,12 +1,9 @@
 require 'spec_helper'
 
 describe Egn::Parser do
-
-  describe "#initialize" do
-    it "raises an exception if the argument is invalid" do
-      expect{ Egn::Parser.new("12345678") }.to raise_error ArgumentError
+  describe '#initialize' do
+    it 'raises an exception if the argument is invalid' do
+      expect { Egn::Parser.new('12345678') }.to raise_error ArgumentError
     end
   end
-
 end
-

data/spec/egn/validator_spec.rb

@@ -1,27 +1,21 @@
 require 'spec_helper'
 
 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
+  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
     end
 
-    it "fails for incorrect dates" do
-
-      expect(Egn::Validator.validate("6101347500")).to be_false
+    it 'fails for incorrect dates' do
+      expect(Egn::Validator.validate('6101347500')).to be_false
     end
 
-    it "checks 10 000 of the generated numbers" do
-      Array.new(10_000) { |i| Egn.generate }.each do |egn|
+    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}"
       end
     end
-
   end
-
 end
-

data/spec/spec_helper.rb

@@ -12,6 +12,5 @@ RSpec.configure do |config|
   config.filter_run :focus
   config.filter_run_excluding :brute
 
-
   config.order = 'random'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: egn
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors:
 - gmitrev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2015-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: An easy way to generate and validate EGN numbers and parse them for useful