luhn 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acc7be20238719d56f27cf60436232d6933aeca2
-  data.tar.gz: 351bc940bea52556e369602a546c5bcebdaf1e02
+  metadata.gz: eece57290c12c551a1673bac68bbaf0b9674c5b2
+  data.tar.gz: e86edca6abea3b65d71edddef8114d65e1b2015c
 SHA512:
-  metadata.gz: 1c25701d9c3466526efc767fee9c0c0c7c384044c8894d84e635094b687aba5be016a1b99cfda8f0c7181693c7ac89a8cdd2d664263517d2b7132d0e1614c588
-  data.tar.gz: 6e0cff66c776898bb10ef90cb58129af34e64dfbef5b569af2f7998a8155c755c30d5ced4fd21f538f6f03d85e5cbb3930ea046b8752982e46723743a6cfae68
+  metadata.gz: 9149f14748ef4a961500f622dd114702f8c100c0425f75bddd0f1fae842a443139102598417aef83fc3d0d0dd9cec4d0bb0e26d037e6555e278d82ad8489cec3
+  data.tar.gz: 03dd2de39b1698ec77d947db29dc297cf4eb4d2ceec23e31170cd72047f67196b8da5e7f09f2ee48ba89a0b68cf92206272c4bd8f070d550b1a0b16d6efb4917

data/lib/luhn/civic_number.rb

@@ -2,14 +2,14 @@
 require 'ostruct'
 module Luhn
   class CivicNumber
-    attr_reader :civic_number
+    attr_reader :value
 
-    def initialize(string)
-      @civic_number = cleanup_string(string.to_s)
+    def initialize string
+      self.value = string
     end
 
     def valid?
-      @valid ||= civic_number.length == 10 && valid_date? && Luhn.valid?(civic_number)
+      @valid ||= value.length == 10 && valid_date? && Luhn.valid?(value)
     end
 
     def valid_date?
@@ -17,11 +17,11 @@ module Luhn
     end
 
     def control_digit
-      @control_digit ||= Luhn.control_digit(civic_number[0...9])
+      @control_digit ||= Luhn.control_digit(value[0...9])
     end
 
     def sex
-      @sex ||= valid? ? (civic_number[8...9].to_i.even? ? 'female' : 'male') : 'unknown'
+      valid? ? (value[8...9].to_i.even? ? 'female' : 'male') : 'unknown'
     end
 
     def female?
@@ -33,34 +33,38 @@ module Luhn
     end
 
     def birth_date
-      @date ||= OpenStruct.new({
-        :year  => civic_number[0...2].to_i,
-        :month => civic_number[2...4].to_i,
-        :day   => civic_number[4...6].to_i
+      OpenStruct.new({
+        :year  => value[0...2].to_i,
+        :month => value[2...4].to_i,
+        :day   => value[4...6].to_i
       })
     end
 
     def formatted
-      to_s.insert(civic_number.length - 4, "-")
+      return value if value.length < 10
+
+      value.insert(value.length - 4, "-")
     end
 
     def to_s
-      civic_number
+      value
     end
 
-    class << self
-      def generate
-        date = Time.local(Time.now.year - rand(100) - 1, rand(12) + 1, rand(31) + 1)
-        Luhn.generate(10, :prefix => date.strftime("%y%m%d"))
-      end
+    # For backwards compability
+    def civic_number
+      value
     end
 
-  private
-
-    def cleanup_string(string)
-      string.gsub!(/\D/, '')
-      string.length == 12 ? string[2...12] : string
+    def self.generate
+      date = Time.local(Time.now.year - rand(100) - 1, rand(12) + 1, rand(31) + 1)
+      Luhn.generate(10, :prefix => date.strftime("%y%m%d"))
     end
 
+    private
+
+    def value= string
+      val = string.to_s.gsub(/\D/, '')
+      @value = val.length == 12 ? val[2...12] : val
+    end
   end
 end

data/lib/luhn/version.rb

@@ -1,3 +1,3 @@
 module Luhn
-  Version = "1.0.0"
+  Version = "1.0.2"
 end

data/spec/spec_civic_number.rb

@@ -46,10 +46,18 @@ describe Luhn::CivicNumber do
     civic_number.birth_date.day.must_equal 1
   end
 
-  it "formats the civic number" do
-    civic_number = Luhn::CivicNumber.new('3001018194')
+  describe "#formatted" do
+    it "formats the civic number" do
+      civic_number = Luhn::CivicNumber.new('3001018194')
+
+      civic_number.formatted.must_equal "300101-8194"
+    end
+
+    it "returns the origial if the civic number is to short" do
+      civic_number = Luhn::CivicNumber.new('300101819')
 
-    civic_number.formatted.must_equal "300101-8194"
+      civic_number.formatted.must_equal "300101819"
+    end
   end
 
   it 'generates a valid random civic number' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luhn
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Joel Junström