personnummer 0.0.5 → 0.0.6

data/lib/personnummer.rb

@@ -10,17 +10,18 @@ class Personnummer
 
     # Match the number
     number = number.to_s
-    if number.match(/(\d{2})(\d{2})(\d{2})([\-\+]{0,1})(\d{3})(\d{0,1})/)
+    if number.match(/(\d{2}){0,1}(\d{2})(\d{2})(\d{2})([\-\+]{0,1})(\d{3})(\d{0,1})/)
 
       # Calculate the control digit based on the birth date and serial number
-      @control_digit = luhn_algorithm("#{$~[1]}#{$~[2]}#{$~[3]}#{$~[5]}")
+      @control_digit = luhn_algorithm("#{$~[2]}#{$~[3]}#{$~[4]}#{$~[6]}")
 
       # Get the different parts of the number
-      year     = $~[1].to_i
-      month    = $~[2].to_i
-      day      = $~[3].to_i
-      @divider  = $~[4]
-      @serial   = $~[5].to_i
+      century  = $~[1].to_i
+      year     = $~[2].to_i
+      month    = $~[3].to_i
+      day      = $~[4].to_i
+      @divider  = $~[5]
+      @serial   = $~[6].to_i
 
       # Set default divider if not present
       if @divider.empty?
@@ -28,20 +29,24 @@ class Personnummer
       end
 
       # Make the personnummer valid if the checksum is correct
-      @valid = true if @control_digit == $~[6].to_i && !$~[6].empty?
+      @valid = true if @control_digit == $~[7].to_i && !$~[7].empty?
 
       # Get the current date
       today = Date.today
 
-      # Decide which century corresponds to the number
-      if year < (today.year-2000) && @divider == '-'
-        century = 2000
-      elsif year < (today.year-2000) && @divider == '+'
-        century = 1900
-      elsif @divider == '+'
-        century = 1800
+      if century == 0
+        # Decide which century corresponds to the number
+        if year < (today.year-2000) && @divider == '-'
+          century = 2000
+        elsif year < (today.year-2000) && @divider == '+'
+          century = 1900
+        elsif @divider == '+'
+          century = 1800
+        else
+          century = 1900
+        end
       else
-        century = 1900
+        century *= 100
       end
 
       # Get the date the person was born

data/personnummer.gemspec

@@ -3,8 +3,8 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "personnummer"
-  s.version     = "0.0.5"
-  s.authors     = ["Peter Hellberg", "Victor Koronen"]
+  s.version     = "0.0.6"
+  s.authors     = ["Peter Hellberg", "Victor Koronen", "Sebastian Wallin"]
   s.email       = ["peter@c7.se"]
   s.homepage    = "https://github.com/c7/personnummer/"
   s.summary     = %q{Personnummer handles validation of Swedish personal identity numbers.}
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "ruby-debug19"
+  s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-bundler"

data/spec/lib/personnummer_spec.rb

@@ -9,36 +9,44 @@ describe Personnummer do
       expect{ Personnummer.new(9001010017) }.not_to raise_error(ArgumentError)
       expect{ Personnummer.new('900101-0017') }.not_to raise_error(ArgumentError)
       expect{ Personnummer.new('100101+0017') }.not_to raise_error(ArgumentError)
+      expect{ Personnummer.new('19900101-0017') }.not_to raise_error(ArgumentError)
     end
 
     it "accepts a valid personnummer (without control digit)" do
       expect{ Personnummer.new(900101001) }.not_to raise_error(ArgumentError)
       expect{ Personnummer.new('900101-001') }.not_to raise_error(ArgumentError)
       expect{ Personnummer.new('100101+001') }.not_to raise_error(ArgumentError)
+      expect{ Personnummer.new('19900101-001') }.not_to raise_error(ArgumentError)
     end
 
     it "throws ArgumentError on an invalid personnummer" do
       expect{ Personnummer.new(nil) }.to raise_error(ArgumentError)
       expect{ Personnummer.new(17) }.to raise_error(ArgumentError)
       expect{ Personnummer.new('112233-4455') }.to raise_error(ArgumentError)
+      expect{ Personnummer.new('19112233-4455') }.to raise_error(ArgumentError)
     end
   end
 
   describe "age" do
     it "calculates age correctly" do
       p = Personnummer.new('900101-001')
+      p2 = Personnummer.new('19900101-001')
 
       Timecop.freeze(Date.parse('1980-01-01')) do
         p.age.should == 0
+        p2.age.should == 0
       end
       Timecop.freeze(Date.parse('1990-01-01')) do
         p.age.should == 0
+        p2.age.should == 0
       end
       Timecop.freeze(Date.parse('2000-01-01')) do
         p.age.should == 10
+        p2.age.should == 10
       end
       Timecop.freeze(Date.parse('2090-01-01')) do
         p.age.should == 100
+        p2.age.should == 100
       end
     end
   end
@@ -49,6 +57,8 @@ describe Personnummer do
         Personnummer.new('900101-001').born.should == Date.parse('1990-01-01')
         Personnummer.new('010101-001').born.should == Date.parse('2001-01-01')
         Personnummer.new('100101+001').born.should == Date.parse('1810-01-01')
+        Personnummer.new('19900101-001').born.should == Date.parse('1990-01-01')
+        Personnummer.new('18900101-001').born.should == Date.parse('1890-01-01')
       end
     end
   end
@@ -101,6 +111,8 @@ describe Personnummer do
       Personnummer.new(9001010017).to_s.should == '900101-0017'
       Personnummer.new('900101-0017').to_s.should == '900101-0017'
       Personnummer.new('900101-001').to_s.should == '900101-0017'
+      Personnummer.new('19900101-001').to_s.should == '900101-0017'
+      Personnummer.new('18900101-001').to_s.should == '900101-0017'
     end
   end
 

metadata

@@ -1,20 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: personnummer
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
 - Peter Hellberg
 - Victor Koronen
+- Sebastian Wallin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-25 00:00:00.000000000Z
+date: 2012-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ruby-debug19
-  requirement: &70323661135380 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &70353993851320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +23,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661135380
+  version_requirements: *70353993851320
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70323661134940 !ruby/object:Gem::Requirement
+  requirement: &70353993850820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +34,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661134940
+  version_requirements: *70353993850820
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70323661134520 !ruby/object:Gem::Requirement
+  requirement: &70353993850400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +45,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661134520
+  version_requirements: *70353993850400
 - !ruby/object:Gem::Dependency
   name: guard-bundler
-  requirement: &70323661134100 !ruby/object:Gem::Requirement
+  requirement: &70353993849900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +56,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661134100
+  version_requirements: *70353993849900
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70323661133680 !ruby/object:Gem::Requirement
+  requirement: &70353993849460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +67,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661133680
+  version_requirements: *70353993849460
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &70323661133260 !ruby/object:Gem::Requirement
+  requirement: &70353993849020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +78,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661133260
+  version_requirements: *70353993849020
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70323661132840 !ruby/object:Gem::Requirement
+  requirement: &70353993848600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,7 +89,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70323661132840
+  version_requirements: *70353993848600
 description: Personnummer handles validation of Swedish personal identity numbers.
 email:
 - peter@c7.se
@@ -130,10 +131,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Personnummer handles validation of Swedish personal identity numbers.
 test_files:
 - spec/lib/personnummer_spec.rb
 - spec/spec_helper.rb
+has_rdoc: false