rvr 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 944027f324c281b9c477e12f63c08c3d651c6237
-  data.tar.gz: 3898c46558de9889ef2d15acbdd553526549028f
+  metadata.gz: dc790324e2847498d28314967d91439640b193c7
+  data.tar.gz: 2015a8c2580024b88dcd0fb457b716b6c06ae1b2
 SHA512:
-  metadata.gz: e235f90ca5ca3e385da21c7429df79eef15a52eb15a243f8015f9dbf2e81949f7cb92b538a2d79573938981a8f014b8000b1878618454a473428335f67f7cb87
-  data.tar.gz: dbbc6eb066fe76813689ca4a70ca477a30c32aadfb7f416faa929c6a833b4cea344608ac6356a9a49b8eb3e6240858617c9569153df6993684c165ee7852f8bd
+  metadata.gz: 921de401c3e8e7beec9c659bc7fab2619849e1cd56031f10525a9fe3d486806417982af58a0cf2fd24304a0e9edefa629d379e0bb94f0dc3d83bbd8fff1c5d16
+  data.tar.gz: 596649066094f8fe9720b6da96a6f6aa684446bbafab912abbbd4efd04078878566afcad14ec4e94a6ed1a17f0c56654d7e75c9bf6348187cc4f237cf6502f64

data/lib/rvr.rb

@@ -5,8 +5,9 @@ class Rvr
 
   attr_accessor :regon
 
-  validates :regon, presence: true, numericality: true, length: { is: 9 }
-  validate :checksum
+  validates :regon, presence: true, numericality: true
+  validate :check_length
+  validate :checksum, if: :regon?
 
   def initialize(value)
     self.regon = value
@@ -17,18 +18,26 @@ class Rvr
   end
 
   private
+  def check_length
+    errors.add(:regon) unless regon.size == 9 || regon.size == 14
+  end
+
+  def regon?
+    !regon.blank?
+  end
+
   def checksum
-    errors.add(:regon) unless control_number == regon[8].to_i
+    errors.add(:regon) unless control_number == regon[regon.length-1].to_i
   end
 
   def control_number
-    s = 0
-    (0..7).each { |i| s += (regon[i].to_i*control_array[i]) }
+    r = regon.split("")
+    s = control_array.inject(0) { |sum, a| sum += a*r.shift.to_i }
     s % 11 == 10 ? 0 : s % 11
   end
 
   def control_array
-    [8, 9, 2, 3, 4, 5, 6, 7]
+    regon.length == 9 ? [8, 9, 2, 3, 4, 5, 6, 7] : [2, 4, 8, 5, 0, 9, 7, 3, 6, 1, 2, 4, 8]
   end
 end
 

data/spec/rvr_spec.rb

@@ -11,32 +11,36 @@ describe Rvr do
       it { Rvr.new("12345").should_not be_valid }
 
       it { Rvr.new("1234567890").should_not be_valid }
+
+      it { Rvr.new("123456789123").should_not be_valid }
+
+      it { Rvr.new("123456789012345").should_not be_valid }
     end
 
     context "should verify numericality of regon" do
-      it { Rvr.new("abcdefghij").should_not be_valid }
+      it { Rvr.new("abcdefghi").should_not be_valid }
 
-      it { Rvr.new("12345678a0").should_not be_valid }
+      it { Rvr.new("12345678a").should_not be_valid }
     end
 
     it "regon always should be a string" do
-      @nvr = Rvr.new(1234567890)
-      @nvr.regon.should eq("1234567890")
+      @nvr = Rvr.new(123456789)
+      @nvr.regon.should eq("123456789")
     end
 
     it "should remove all spaces from regon" do
-      @nvr = Rvr.new("123 45 67 890")
-      @nvr.regon.should eq("1234567890")
+      @nvr = Rvr.new("123 45 67 89")
+      @nvr.regon.should eq("123456789")
     end
 
     it "should remove all dashes from regon" do
-      @nvr = Rvr.new("123-45-67-890")
-      @nvr.regon.should eq("1234567890")
+      @nvr = Rvr.new("123-45-67-89")
+      @nvr.regon.should eq("123456789")
     end
 
     context "checksum" do
       it "shouldn't accept incorrect regon number" do
-        Rvr.new("1234567890").should_not be_valid
+        Rvr.new("123456789").should_not be_valid
       end
 
       context "should accept correct regon numbers" do
@@ -45,6 +49,10 @@ describe Rvr do
         it { Rvr.new("000515780").should be_valid }
 
         it { Rvr.new("14-00-92-077").should be_valid }
+
+        it { Rvr.new(12345678512347).should be_valid }
+
+        it { Rvr.new("235 113 328 571 88").should be_valid }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rvr
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Szymon Rut
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel