resident 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d93a0b9f267f96e0a266917baa460796b855613a
-  data.tar.gz: b3fe8f7e4392247dd2f2184562a7c347ae8d2e62
+  metadata.gz: f353c0782a96c1d79d67c61cb7d29d7508ad45bb
+  data.tar.gz: adfc48cdb9ca18ab426aff09572f8d5a1d4903cf
 SHA512:
-  metadata.gz: 206a9d30f1f4d83d75e007b192fa56fe682750fc7c1aaf9fc5b092eeb3f54c600e43c0f0ba7872637cfc523b451348e69d2cca941de579affc114ce6f7dafe77
-  data.tar.gz: a1e8a71fdbcc5b007ddf25e61e449254da96cfcf9f78452111bc4ec697db99f2ce2a700ed708efdba38ee4933aee8b4368a7b222f1767cb1f1509ba397308ee0
+  metadata.gz: 87117786abbf0a70b38ec3a654fcf133fae1fbdac1c3e8c1b3b957bf037a8abec7b049225627d6d6233f0dcbe91ad6802b7c42eb225b492322a9030f0dcaedce
+  data.tar.gz: 11458275db57866d20915a61cf480ca50ec7b3922f787f5bc2dd2cfe0bf70857dabd253b87500af7d13796e95393dabcaa4a6f20c7e7d37a6bef2cf66d65d2b3

data/README.md

@@ -12,15 +12,16 @@ There is a special focus on identifying these numbers robustly (i.e. you can saf
 
 ## Usage
 
-Really, you can just use <tt>valid?</tt>, <tt>to_s</tt>, and <tt>age</tt> like so:
+Really, you can just use <tt>valid?</tt>, <tt>sanitize</tt>, <tt>to_s</tt>, and <tt>age</tt> like so:
 
     require 'resident'
 
     number = NationalIdentificationNumber::Swedish.new('0501261853')
 
-    number.valid?  #=> true
-    number.to_s    #=> "050126-1853"
-    number.age     #=> 9
+    number.valid?   #=> true
+    number.to_s     #=> "050126-1853"
+    number.sanitize #=> "050126-1853" (Would have been nil if invalid)
+    number.age      #=> 9
 
 Please have a look at the specs to see how the national identification numbers of various countries are handled.
 
@@ -55,4 +56,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+THE SOFTWARE.

data/lib/national_identification_number/base.rb

@@ -17,6 +17,10 @@ module NationalIdentificationNumber
       @number
     end
 
+    def sanitize
+      to_s if valid?
+    end
+
     def age
       age_for_dob date
     end

data/lib/national_identification_number/swedish.rb

@@ -4,7 +4,6 @@ module NationalIdentificationNumber
   # Inspired by https://github.com/c7/personnummer/blob/master/lib/personnummer.rb
   # Copyright (c) 2008 Peter Hellberg MIT
   class Swedish < Base
-
     attr_reader :date # used for testing
 
     # Generator for valid Swedish personnummer: http://en.wikipedia.org/wiki/Personal_identity_number_(Sweden)
@@ -31,7 +30,12 @@ module NationalIdentificationNumber
       if @number.match(/\A(\d{0}|\d{2})(\d{6})(\-{0,1})(\d{4})\Z/)
         @number = "#{$2}-#{$4}"
       else
-        @number.gsub!(/[^\d\-\+]/, '')
+        candidate = @number.gsub(/[^\d\-\+]/, '')
+        if candidate.match(/\A(\d{0}|\d{2})(\d{6})(\-{0,1})(\d{4})\Z/)
+          @number = "#{$2}-#{$4}"
+        else
+          @number = candidate
+        end
       end
     end
 
@@ -98,15 +102,14 @@ module NationalIdentificationNumber
       end
       control_digit
     end
-
   end
 end
 
-if $0 == __FILE__
-  # Randomize every part
-  puts Bukowskis::NationalIdentificationNumber::Swedish.generate
-  # Use given date, randomize serial
-  puts Bukowskis::NationalIdentificationNumber::Swedish.generate(Date.new(1975,1,1))
-  # Use given date and serial, calculate checksum
-  puts Bukowskis::NationalIdentificationNumber::Swedish.generate(Date.new(1975,1,1), 123)
-end
+# if $0 == __FILE__
+#   # Randomize every part
+#   puts Bukowskis::NationalIdentificationNumber::Swedish.generate
+#   # Use given date, randomize serial
+#   puts Bukowskis::NationalIdentificationNumber::Swedish.generate(Date.new(1975,1,1))
+#   # Use given date and serial, calculate checksum
+#   puts Bukowskis::NationalIdentificationNumber::Swedish.generate(Date.new(1975,1,1), 123)
+# end

data/spec/national_identification_number/finnish_spec.rb

@@ -5,7 +5,6 @@ include NationalIdentificationNumber
 
 describe Finnish do
   describe '#valid?' do
-
     it "recognizes valid numbers" do
       expect( Finnish.new('311280-999J') ).to be_valid
       expect( Finnish.new('131052-308T') ).to be_valid
@@ -32,7 +31,39 @@ describe Finnish do
       expect( Finnish.new(1234567890) ).to_not be_valid
       expect( Finnish.new(:really_bad_input_value) ).to_not be_valid
     end
+  end
 
+  describe 'sanitize' do
+    context 'valid numbers' do
+      it 'is the formatted number' do
+        expect(Finnish.new('311280-999J').sanitize).to eq '311280-999J'
+        expect(Finnish.new('131052-308T').sanitize).to eq '131052-308T'
+        expect(Finnish.new('290164-862u').sanitize).to eq '290164-862U'
+        expect(Finnish.new('270368A172X').sanitize).to eq '270368A172X'
+        expect(Finnish.new('310145A586a').sanitize).to eq '310145A586A'
+        expect(Finnish.new('080266+183P').sanitize).to eq '080266+183P'
+        expect(Finnish.new('290248+145c').sanitize).to eq '290248+145C'
+      end
+    end
+
+    context 'invalid numbers' do
+      it 'is nil' do
+        expect(Finnish.new('671301A172V').sanitize).to be nil
+        expect(Finnish.new('830231A172M').sanitize).to be nil
+        expect(Finnish.new('311180-999J').sanitize).to be nil
+        expect(Finnish.new('131052-308S').sanitize).to be nil
+        expect(Finnish.new('290164X862U').sanitize).to be nil
+        expect(Finnish.new('670368A172X').sanitize).to be nil
+        expect(Finnish.new('310145--586A').sanitize).to be nil
+        expect(Finnish.new('asdf').sanitize).to be nil
+        expect(Finnish.new('1234567890').sanitize).to be nil
+        expect(Finnish.new('0000000000000').sanitize).to be nil
+        expect(Finnish.new('000000-0000').sanitize).to be nil
+        expect(Finnish.new('').sanitize).to be nil
+        expect(Finnish.new(1234567890).sanitize).to be nil
+        expect(Finnish.new(:really_bad_input_value).sanitize).to be nil
+      end
+    end
   end
 
   describe 'age' do
@@ -94,4 +125,4 @@ describe Finnish do
     end
 
   end
-end
+end

data/spec/national_identification_number/swedish_spec.rb

@@ -41,6 +41,40 @@ describe Swedish, '.generate' do
 
   end
 
+  describe 'sanitize' do
+    context 'invalid numbers' do
+      it 'is nil' do
+        expect(Swedish.new('991301-1236').sanitize).to be nil # valid checksum, invalid month
+        expect(Swedish.new('830231-5554').sanitize).to be nil # valid checksum, invalid day
+        expect(Swedish.new('050112--2451').sanitize).to be nil
+        expect(Swedish.new('123456-1239').sanitize).to be nil
+        expect(Swedish.new('180123-2668').sanitize).to be nil
+        expect(Swedish.new('150D1261853').sanitize).to be nil
+        expect(Swedish.new('750112-2451').sanitize).to be nil
+        expect(Swedish.new('123').sanitize).to be nil
+        expect(Swedish.new('000000-0000').sanitize).to be nil
+        expect(Swedish.new('0000000000').sanitize).to be nil
+        expect(Swedish.new('asdfghj').sanitize).to be nil
+        expect(Swedish.new('').sanitize).to be nil
+        expect(Swedish.new(12345678).sanitize).to be nil
+        expect(Swedish.new(:really_bad_input).sanitize).to be nil
+      end
+    end
+
+    context 'valid numbers' do
+      it 'is the sanitize dnumber' do
+        expect(Swedish.new('19180123-2669').sanitize).to eq '180123-2669'
+        expect(Swedish.new('00180123-2669').sanitize).to eq '180123-2669'
+        expect(Swedish.new('000180123-2669').sanitize).to eq '180123-2669'
+        expect(Swedish.new('050126-1853').sanitize).to eq '050126-1853'
+        expect(Swedish.new('0asdfghj501261853').sanitize).to eq '050126-1853'
+        expect(Swedish.new('050112-2451').sanitize).to eq '050112-2451'
+        expect(Swedish.new('450202-6950').sanitize).to eq '450202-6950'
+        expect(Swedish.new('19450202-6950').sanitize).to eq '450202-6950'
+      end
+    end
+  end
+
   describe '#age' do
 
     before do
@@ -90,6 +124,7 @@ describe Swedish, '.generate' do
     it "return the number normalized if the number is valid" do
       expect( Swedish.new('0501261853').to_s ).to eq '050126-1853'
       expect( Swedish.new('050126-1853').to_s ).to eq '050126-1853'
+      expect( Swedish.new('0asdfghj501261853').to_s).to eq '050126-1853'
       expect( Swedish.new("190501261853").to_s ).to eq '050126-1853'
       expect( Swedish.new("19050126-1853").to_s ).to eq '050126-1853'
       expect( Swedish.new("19050126-185d3").to_s ).to eq '050126-1853'
@@ -180,4 +215,4 @@ describe Swedish, '.generate' do
     end
   end
 
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resident
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Bukowskis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Validate National Identification Numbers.