elfproef_plan 0.0.3 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfa42898abc518152edf4d21d68563d115d4ba3d
-  data.tar.gz: 963091a87ae309ab00cf3939c5c1db8036322c98
+  metadata.gz: 4dfdc682e9684ec384b703d01f9823a7855881de
+  data.tar.gz: b12c78ac361810acf0fd4ea6dd39ea383659a2e4
 SHA512:
-  metadata.gz: 9c70fc800482e850f8bd6af88d22f743094557a70f4dcdec74642557f372c90799b1bf09808b0975957d100792eb7c2537d02f96b67263acfc35bca532035e1b
-  data.tar.gz: 9f967e3e0e2ca7bc9f88c9ca2072c2ec84b43301136f5c6584b3b17af1db3311fc69012f7a1e2699b9d4aac4135cd5cc3ed4563d3dd58f6a4c62a480543ad13b
+  metadata.gz: d34ae2dc02729a19b5339e506253617870d1d975b6c19978a8506892890fa7152009e01d3769a6fc73d212d8048848bc4ec4b747ce6e45837986848586361594
+  data.tar.gz: 38906aa608e5a06188665918519c4a0d225b7dd2d9946e2c539241bedea764d22ba53bd32330a115d25dd6575ec0ebeeade3fc7e2475ca1d0857cdf9dd15a5f7

data/README.md

@@ -69,10 +69,21 @@ or optional
 validates :my_attribute_name, rekeningnummer: {message: "this message overrides the default"}
 ```
 
+
+```ruby
+validates :my_attribute_name, loonheffingennummer: true
+```
+or optional
+
+```ruby
+validates :my_attribute_name, loonheffingennummer: {message: "this message overrides the default"}
+```
+
 it will handle validations just like rails does with other validations.
 
 the rekening-validation just validates the plain, old accountnumber. Validation of BIC-code is yet to be implemented.
 
+
 ## elfproef.js.coffee
 
 ElfProef takes an value, and validates the given number/string.
@@ -81,8 +92,10 @@ ElfProef takes an value, and validates the given number/string.
 
 * it calls ElfProef.new(@value).validRek() to check a bank-account-number
 
-To use these client-side checks, just add a class "checkMyBsn" or "checkMyRekening" to your input-field.
-Add a div with class "rekening_message" or "bsn_message" to yout form to display the returned message.
+* it calls ElfProef.new(@value).validLoonheffingennummer() to check a tax-number
+
+To use these client-side checks, just add a class "checkMyBsn","checkMyRekening" or "checkMyLoonheffing" to your input-field.
+Add a div with class "rekening_message", "bsn_message" or "loonheffing_message" to your form to display the returned message.
 
 
 The code can be included by requiring elfproef_plan, or just the elfproef-file:

data/app/assets/javascripts/elfproef/elfproef.coffee

@@ -1,8 +1,7 @@
 class ElfProef
-    constructor: (nr) ->
-      @nr = nr.toString().match(/[\d+$]/g)
+    constructor: (input) ->
       @nrs = [2..9].reverse()
-      @str = @nr.join('')
+      [@match, @nummer, @letter, @subnummer] = input.toString().match(/[0-9a-z]/gi).join("").toUpperCase().match(/([0-9]*)([A-Z]*)([0-9]*)/i)
 
     elfproef: (a) -> 
         @nrs.push(a)
@@ -13,19 +12,30 @@ class ElfProef
         som % 11 == 0 && som>0
 
     validBsn: () ->
+        @nr = @nummer.match(/./g)
         return false if @nr.length > 9
-        while @nr.length < 9
-          @nr.unshift(0)
+        @nr.unshift(0) while @nr.length < 9
 
         @elfproef(-1)
 
     validRekening: () ->
+        @nr = @nummer.match(/./g)
         return false unless @nr.length in [9,10]
-        if @nr.length==10
-          @nrs.unshift 10
-
+        @nrs.unshift 10 if @nr.length==10
+        
         @elfproef(1)
 
+    validLoonheffingennummer: () ->
+        @nr = @nummer.match(/./g)
+        check = true
+        check = false unless @validBsn()
+        check = false unless @letter == "L"
+        check = false unless @subnummer && @subnummer.length==2
+        check = false unless @subnummer && @subnummer.match(/./g).reduce (a,b) -> parseInt(a) + parseInt(b) > 0
+        check
+
+        
+
 
 zip = () ->
   lengthArray = (arr.length for arr in arguments)
@@ -36,22 +46,32 @@ zip = () ->
 
 $ ->
   $(document).on 'blur', '.checkMyBsn',  ->
-    bsn = new ElfProef(@value)
-    if bsn.validBsn()
-      $(".checkMyBsn").val(bsn.str) 
-      $(".bsn_message").text("ok")
-    else
-      $(".bsn_message").text("geen geldig bsn-nummer")
+    if @value
+      e = new ElfProef(@value)
+      if e.validBsn()
+        $(".checkMyBsn").val(e.nummer) 
+        $(".bsn_message").text("ok")
+      else
+        $(".bsn_message").text("geen geldig bsn-nummer")
 
    $(document).on 'blur', '.checkMyRekening',  ->
-    rek = new ElfProef(@value)
-    if rek.validRekening()
-      $(".checkMyRekening").val(rek.str) 
-      $(".rekening_message").text("ok")
-    else
-      $(".rekening_message").text("geen geldig rekening-nummer")
+    if @value
+      e = new ElfProef(@value) 
+      if e.validRekening()
+        $(".checkMyRekening").val(e.match) 
+        $(".rekening_message").text("ok")
+      else
+        $(".rekening_message").text("geen geldig rekening-nummer")
 
 
+   $(document).on 'blur', '.checkMyLoonheffing',  ->
+    if @value
+      e = new ElfProef(@value)
+      if e.validLoonheffingennummer()
+        $(".checkMyLoonheffing").val(e.match) 
+        $(".loonheffing_message").text("ok")
+      else
+        $(".loonheffing_message").text("geen geldig loonheffingen-nummer") if @value
 
 root = exports ? window
 root.ElfProef = ElfProef

data/changelog.md

@@ -1,3 +1,10 @@
+###### 0.0.5
+removed .ds_store-files from repo
+###### 0.0.4
+added validation for dutch tax-number
+refactored ElfProef
+refactored RexEx functions
+
 ###### 0.0.3
 start logging changes
 

data/lib/elfproef_plan/version.rb

@@ -1,3 +1,3 @@
 module ElfproefPlan
-  VERSION = "0.0.3"
+  VERSION = "0.0.5"
 end

data/lib/elfproef_plan.rb

@@ -13,41 +13,55 @@ require "elfproef_plan/engine"
 	  	end
 	end
 
+	class LoonheffingennummerValidator < ActiveModel::EachValidator
+
+		def validate_each(record,attribute,value)
+			record.errors.add(attribute, options[:message] || "ongeldig loonheffingennummer nr", options) unless ElfproefPlan::ElfProef.new(value).validLoonheffingennummer
+	  	end
+	end
+
 module ElfproefPlan
 	class ElfProef
-		attr_accessor :nr, :nrs
+		attr_accessor :nr, :nrs,  :letter, :subnr
 
-		def initialize(nr)
-			@nr = nr.to_s.scan(/./).map{|x| x.to_i} if nr.to_s.scan(/[\d+$]/)==nr.to_s.scan(/./)
+		def initialize(input)
 			@nrs = (2..9).to_a.reverse
+      
+      		@nr, @letter, @subnr = input.to_s.scan(/[0-9a-zA-Z+$]/).join().upcase().match(/([0-9]*)([A-Z]*)([0-9]*)/i).captures.map{|x| x.scan(/./)}
+      		@nr, @subnr = @nr.map{|x| x.to_i}, @subnr.map{|x| x.to_i}
+
 		end
 
 		def validRekening
-			return false unless @nr
 			return false unless [9, 10].include? @nr.length
-			nrs.unshift 10 if @nr.length == 10
+			@nrs.unshift 10 if @nr.length == 10
 			elfproef(1)
 		end
 
 		def validBsn
-			return false unless @nr
 			return false if @nr.length > 9
 			@nr.unshift 0 while @nr.length < 9
 			return false if @nr[0,3].sum < 1
 			elfproef(-1)
 		end
 
+		def validLoonheffingennummer
+			return false unless validBsn
+			return false unless @letter==["L"]
+			return false unless @subnr.reduce(:+)>0
+			true
+
+		end
+
 	private
 
 
 
 		def elfproef(b)
-			
-			som=0
-
 			@nrs.push b
 			reeks = @nr.zip(@nrs)
-			reeks.each{|x| som+= x[0]*x[1]}
+			@nrs.pop
+			som = reeks.inject(0){|som, x| som + (x[0]*x[1]) }
 			som.remainder(11)==0 && som>0
 			
 		end

data/test/controllers/employees_controller_test.rb

@@ -20,7 +20,7 @@ class EmployeesControllerTest < ActionController::TestCase
   test "should create employee" do
     assert_difference('Employee.count') do
 
-      post :create, employee: { name: @employee.name, number: @employee.number , accountnumber: @employee.accountnumber}
+      post :create, employee: { name: @employee.name, number: @employee.number , accountnumber: @employee.accountnumber ,  taxnumber: '123456782L01'}
 
     end
 

data/test/dummy/app/controllers/employees_controller.rb

@@ -53,6 +53,6 @@ class EmployeesController < ApplicationController
 
     # Only allow a trusted parameter "white list" through.
     def employee_params
-      params.require(:employee).permit(:name, :number, :accountnumber)
+      params.require(:employee).permit(:name, :number, :accountnumber, :taxnumber)
     end
 end

data/test/dummy/app/models/employee.rb

@@ -2,4 +2,5 @@ class Employee < ActiveRecord::Base
 	validates :number, bsn: {message: "mijn boodschapje"}
 	validates :name, length: {minimum: 5}
 	validates :accountnumber, rekening: true
+	validates :taxnumber, loonheffingennummer: true
 end

data/test/dummy/app/views/employees/_form.html.erb

@@ -20,15 +20,28 @@
     <%= f.text_field :number , class: 'checkMyBsn'%>
 
   </div>
-  <div class = "bsn_message"></div>
+  <div class = "bsn_message"> </div>
 
   <div class="field">
     <%= f.label :accountnumber %><br>
     <%= f.text_field :accountnumber , class: 'checkMyRekening'%>
 
   </div>
-  <div class = "rekening_message"></div>
+
+  <div class = "rekening_message"> </div>
+
+
+
+
+  <div class="field">
+    <%= f.label :taxnumber %><br>
+    <%= f.text_field :taxnumber , class: 'checkMyLoonheffing'%>
+
+  </div>
+  <div class = "loonheffing_message"> </div>
+
   <div class="actions">
     <%= f.submit %>
   </div>
+
 <% end %>

data/test/dummy/db/migrate/20151120090423_create_employees.rb

@@ -4,6 +4,7 @@ class CreateEmployees < ActiveRecord::Migration
       t.string :name
       t.integer :number
       t.integer :accountnumber
+      t.string :taxnumber
 
       t.timestamps null: false
     end

data/test/dummy/db/schema.rb

@@ -17,6 +17,7 @@ ActiveRecord::Schema.define(version: 20151120090423) do
     t.string   "name",          limit: 255
     t.integer  "number",        limit: 4
     t.integer  "accountnumber", limit: 4
+    t.string   "taxnumber",     limit: 255
     t.datetime "created_at",                null: false
     t.datetime "updated_at",                null: false
   end