personnummer 0.0.7 → 0.0.8

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0fc6165e81ecc9904de06d3afdf83461feb9eb95
+  data.tar.gz: c6928771697ab2d52624352bca95a8ad45c7d40a
+SHA512:
+  metadata.gz: e98dd51c3bc8905d85776f2ac45569d69753f31192a979893c17a8ec4522cf6d5a728c09d2be2d4dbe1c1fe97c1cccf16ee739a89b63df7ae37496fc5d75eb16
+  data.tar.gz: 91016101d1c9f6e7f14ed09717074922a82e474ef3c3035874035ef62599e0de22b5910d3801ecc3257f039d454eb786248f140318f8e290cc6683d265cf61da

data/Changelog

@@ -1,14 +1,22 @@
+0.0.8 Released
+
+  2014-06-29: Support for co-ordination numbers (theneubeck)
+
+0.0.7 Released
+
+  2012-09-12: Don't alter an existing control digit, even if it’s wrong
+
 0.0.6 Released
 
-	2011-04-18: Now supports century if given
+  2011-04-18: Now supports century if given
 
 0.0.5 Released
 
-	2011-11-25: Tests!
+  2011-11-25: Tests!
 
 0.0.4 Released
 
-	2011-01-09: Ruby 1.9 support
+  2011-01-09: Ruby 1.9 support
 
 0.0.3 Released
 

data/Gemfile.lock

@@ -1,16 +1,11 @@
 PATH
   remote: .
   specs:
-    personnummer (0.0.7)
+    personnummer (0.0.8)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    configatron (2.9.1)
-      yamler (>= 0.1.0)
-    cover_me (1.2.0)
-      configatron
-      hashie
     diff-lcs (1.1.3)
     guard (1.3.2)
       listen (>= 0.4.2)
@@ -20,7 +15,6 @@ GEM
       guard (~> 1.1)
     guard-rspec (1.2.1)
       guard (>= 1.1)
-    hashie (1.2.0)
     listen (0.5.0)
     rake (0.9.2.2)
     rspec (2.11.0)
@@ -33,13 +27,11 @@ GEM
     rspec-mocks (2.11.2)
     thor (0.16.0)
     timecop (0.4.6)
-    yamler (0.1.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  cover_me
   guard
   guard-bundler
   guard-rspec

data/README.markdown

@@ -9,7 +9,23 @@ Personnummer is a ruby class that handles [Swedish personal identity number](htt
 ### Example usage
 
 <pre>&gt;&gt; p = Personnummer.new('830428-5912')
-=&gt; #&lt;Personnummer:0x301128 @number="830428-5912", @age=25, @valid=true, @region="Skaraborgs l\303\244n",
-@male=true, @born=#&lt;Date: 4890905/2,0,2299161&gt;&gt;
+#&gt;&gt;Personnummer:0x007fc971369100 @valid=true, @control_digit=2, @divider="-", @serial=591, @born=#&gt;&gt;PersonnummerDate:0x007fc971368318 @divider="-", @day=28, @month=4, @year=1983&gt; #&lt;, @region="Skaraborgs län", @female=false&gt; #&lt;
+
 &gt;&gt; p.valid?
 =&gt; true</pre>
+</pre>
+
+### This implementation also supports co-ordination numbers
+
+[Information about co-ordination numbers (in swedish)](https://www.skatteverket.se/rattsinformation/reglerochstallningstaganden/meddelanden/2010/meddelanden2010/skvm201003.5.233f91f71260075abe8800024297.html)
+
+These numbers are obtained by adding 60 to the day of the birth date
+
+<pre>
+&gt;&gt; p = Personnummer.new('830488-5912')
+=&gt; #&lt;Personnummer:0x007fbafd1458d8 @valid=false, @control_digit=2, @divider="-", @serial=591, @born=#&lt;PersonnummerDate:0x007fbafd144af0 @divider="-", @day=88, @month=4, @year=1983&gt;, @region="Skaraborgs län", @female=false&gt;
+&gt;&gt; p.born_at
+=&gt; #&lt;Date: 1983-04-28 ((2445453j,0s,0n),+0s,2299161j)&gt;
+&gt;&gt; p.co_ordination_number?
+=&gt; true
+</pre>

data/Rakefile

@@ -3,12 +3,4 @@ require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 
-namespace :cover_me do
-  desc "Generates and opens code coverage report."
-  task :report do
-    require 'cover_me'
-    CoverMe.complete!
-  end
-end
-
 task :default => :spec

data/lib/personnummer.rb

@@ -3,15 +3,15 @@ require 'date'
 
 class Personnummer
   # Public readonly attributes
-  attr_reader :born, :region, :control_digit
+  attr_reader :region, :control_digit
 
   def initialize(number)
     @valid = false
 
     # Match the number
     number = number.to_s
-    if number.match(/(\d{2}){0,1}(\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
       cd = luhn_algorithm("#{$~[2]}#{$~[3]}#{$~[4]}#{$~[6]}")
 
@@ -34,26 +34,8 @@ class Personnummer
       # Make the personnummer valid if the checksum is correct
       @valid = true if @control_digit == cd && !$~[7].empty?
 
-      # Get the current date
-      today = Date.today
-
-      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 *= 100
-      end
-
-      # Get the date the person was born
-      @born   = Date.parse("#{century+year}-#{month}-#{day}")
+      @born  = Born.new(century, year, month, day, @divider)
+      @valid = @born.valid? && @valid
 
       # Get the region name
       @region = region_name(@serial)
@@ -66,15 +48,15 @@ class Personnummer
   end
 
   def age
-    if Date.today > @born
-      (Date.today - @born).to_i/365
-    else
-      0
-    end
+    @born.age
+  end
+
+  def born
+    @born.to_date
   end
 
   def to_s
-    "%s%s%03d%d" % [@born.strftime("%y%m%d"), @divider, @serial, @control_digit]
+    "%s%s%03d%d" % [born.strftime("%y%m%d"), @divider, @serial, @control_digit]
   end
 
   def valid?
@@ -89,6 +71,10 @@ class Personnummer
     @female
   end
 
+  def co_ordination_number?
+    @born.co_ordination_number?
+  end
+
 private
 
   def luhn_algorithm(number)
@@ -155,4 +141,63 @@ private
       when 930..999 then 'Födda utomlands eller utländska medborgare födda i Sverige'
     end
   end
+
+  class Born
+    attr_reader :year, :month
+
+    def initialize(century, year, month, day, divider)
+      @divider = divider
+      @day     = day
+      @month   = month
+      @year    = calculate_century(century, year) + year
+    end
+
+    def day
+      co_ordination_number? ? @day - 60 : @day
+    end
+
+    def co_ordination_number?
+      @day && 60 < @day and @day < 92
+    end
+
+    def to_date
+      Date.parse("#{year}-#{month}-#{day}")
+    end
+
+    def valid?
+      to_date && true
+    end
+
+    def age
+      if Date.today > to_date
+        (Date.today - to_date).to_i/365
+      else
+        0
+      end
+    end
+
+    private
+
+    def calculate_century(century, year)
+      # Get the current date
+      today = Date.today
+
+      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 *= 100
+      end
+
+      return century
+    end
+  end
 end

data/personnummer.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "personnummer"
-  s.version     = "0.0.7"
+  s.version     = "0.0.8"
   s.authors     = ["Peter Hellberg", "Victor Koronen", "Sebastian Wallin"]
   s.email       = ["peter@c7.se"]
   s.homepage    = "https://github.com/c7/personnummer/"
@@ -22,6 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-bundler"
   s.add_development_dependency "guard-rspec"
-  s.add_development_dependency "cover_me"
   s.add_development_dependency "timecop"
 end

data/spec/lib/personnummer_spec.rb

@@ -36,14 +36,17 @@ describe Personnummer 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
@@ -154,7 +157,17 @@ describe Personnummer do
     end
   end
 
-private
+  describe "co-ordination number" do
+    it "should accept a samordningsnummer" do
+      Personnummer.new('701063-2391').should be_valid
+    end
+    it "should not accept an invalid samordningsnummer with less than 62" do
+      Personnummer.new('900161-0017').should_not be_valid
+    end
+    it "should not accept an invalid samordningsnummer with more than 90" do
+      Personnummer.new('900191-0017').should_not be_valid
+    end
+  end
 
   def it_maps_range_to_region(range, region)
     Personnummer.new('901231-%03d' % range.first).region.should == region

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 $: << File.join(File.dirname(__FILE__), '..', 'lib')
 
-require 'cover_me'
-
 RSpec.configure do |config|
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: personnummer
 version: !ruby/object:Gem::Version
-  version: 0.0.7
-  prerelease: 
+  version: 0.0.8
 platform: ruby
 authors:
 - Peter Hellberg
@@ -11,118 +10,90 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2014-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: cover_me
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Personnummer handles validation of Swedish personal identity numbers.
@@ -132,8 +103,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Changelog
 - Gemfile
 - Gemfile.lock
@@ -148,33 +119,26 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/c7/personnummer/
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1400477195476666740
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 1400477195476666740
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.3.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Personnummer handles validation of Swedish personal identity numbers.
 test_files:
 - spec/lib/personnummer_spec.rb