data_maker 2.4.1 → 2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 79d6395ccae55becbbee7d42d320ecea06ee313f
-  data.tar.gz: 09e338eb94b0557ea1b796bd80226eadb374ebdf
+  metadata.gz: e5d9c0e06534748ce6186d400d744f8fc5e83b8b
+  data.tar.gz: 96598cc670dabefe72b9a6f4681e3fc94d709ccc
 SHA512:
-  metadata.gz: 421db6f0dde6eefcd35ae6dbc4b38efd5bcdaadd188bbc5111b85fc5086c08ebbb9510ad071787ba915674452ceef457577c42c4f87a32711eb5e8b1ff21f50e
-  data.tar.gz: 86c622b1989cf9b8153657a3a6a751dc05e949d19c36c33b77e6c60e4a6963d2cabf70a3e7d9a780d3d14059db24f6bc2c8cd667aa1f4fee6b88f65500f04e38
+  metadata.gz: 7a6f3318e77a0d34b2413a3d972af54e9dc313b858085fec8f2d33a1fcf570de0f0a6d8b93cb1306d69fdfa76d99f8996567a02f07694f7549dde57a118cd4bf
+  data.tar.gz: d9d44920fb482bd2721e7b43705adfc9ef38c49cca7bd5c8a80651e4bbcd8c904e11e3adcf2fe3d05bc6e5d9bf92d37035211c0b54a5ec4e30ffe3bcd73cc9b1

data/lib/data_maker/cn/nin.rb

@@ -9,51 +9,27 @@ module DataMaker
       end
 
       class GenerateNationalIDNumber
-        attr_accessor :birthdate
-
-        def initialize
-          self.birthdate = generate_birthdate
-        end
-
         def generate
           nin = national_id_number
-          while DataMaker::Validators::ChineseNINValidator.valid?(nin)
-            nin = national_id_number
-          end
+          # while DataMaker::Validators::ChineseNINValidator.valid?(nin)
+          #   nin = national_id_number
+          #   break if DataMaker::Validators::ChineseNINValidator.valid?(nin)
+          # end
           nin
         end
 
         private
 
-        def generate_birthdate
-          rand(1920..1998).to_s + rand(1..12).to_s.rjust(2, '0') + rand(1..30).to_s.rjust(2, '0')
-        end
-
-        def base_number
-          rand(10 ** 6).to_s.rjust(6, '0') + birthdate + rand(10 ** 3).to_s.rjust(3, '0')
-        end
-
         def national_id_number
-          self.birthdate = generate_birthdate
-          base_number + DataMaker::CN::NIN::GenerateChecksum.new(base_number).generate
-        end
-      end
-
-      class GenerateChecksum
-        attr_accessor :base_number
-
-        def initialize(base_number)
-          self.base_number = base_number
-        end
-
-        def generate
+          birthdate = rand(1920..1998).to_s + rand(1..12).to_s.rjust(2, '0') + rand(1..30).to_s.rjust(2, '0')
+          base_number = rand(10 ** 6).to_s.rjust(6, '0') + birthdate + rand(10 ** 3).to_s.rjust(3, '0')
           weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
-          summod  = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2]
+          summod = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2]
           checksum = 0
-          weights.each_with_index do |weight, index|
-            checksum += (weight.to_i * base_number[index].to_i)
+          weights.each_with_index do |weight, i|
+            checksum += (weight * base_number[i].to_i)
           end
-          summod[(checksum % 11)].to_s
+          base_number + summod[(checksum % 11)].to_s
         end
       end
     end

data/lib/data_maker/validators/chinese_nin_validator.rb

@@ -13,15 +13,21 @@ module DataMaker
 
       def valid?
         raise ArgumentError, "Please pass a NIN to validate!" if nin.nil?
-        valid_length? && valid_checksum?
+        valid_length? && valid_nin?
       end
 
       def valid_length?
         nin.length == 18
       end
 
-      def valid_checksum?
-        DataMaker::CN::NIN::GenerateChecksum.new(nin[0..-2]).generate == nin[-1]
+      def valid_nin?
+        checksum = 0
+        weights = [7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2]
+        summod = [1, 0, "X", 9, 8, 7, 6, 5, 4, 3, 2]
+        weights.each_with_index do |weight, i|
+          checksum += (weight * nin[i].to_i)
+        end
+        nin[17] == summod[(checksum % 11)].to_s
       end
     end
   end

data/lib/data_maker/version.rb

@@ -1,3 +1,3 @@
 module DataMaker
-  VERSION = '2.4.1'
+  VERSION = '2.4.2'
 end

data/spec/lib/data_maker/cn/nin_spec.rb

@@ -24,17 +24,10 @@ RSpec.describe DataMaker::CN::NIN do
         expect(generate.length).to eq(18)
       end
 
-      it "generates a valid checksum using DataMaker::CN::GenerateChecksum" do
+      it "generates a valid national id number" do
         nin = generate
-        checksum = described_class::GenerateChecksum.new(nin[0..-2])
-        expect(checksum.generate).to_not eq(nin[-1])
+        expect(DataMaker::Validators::ChineseNINValidator.valid?(nin)).to be_truthy
       end
     end
   end
-
-  describe "::GenerateChecksum" do
-    it "generates a checksum per http://en.wikipedia.org/wiki/Resident_Identity_Card#Identity_card_number" do
-      expect(described_class::GenerateChecksum.new('123456789012345677').generate).to eq('7')
-    end
-  end
 end

data/spec/lib/data_maker/data_maker_spec.rb

@@ -5,7 +5,7 @@ RSpec.describe DataMaker do
 
   describe "#VERSION" do
     # For each iteration of a version this would always get changed.
-    let(:current_version) { "2.4.1" }
+    let(:current_version) { "2.4.2" }
 
     it { expect(described_class).to be_const_defined(:VERSION) }
     it { expect(described_class::VERSION).to eq(current_version) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: data_maker
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.4.2
 platform: ruby
 authors:
 - Kareem Gan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov