license_plate_validator 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 612a3486dc6990acf095cf3f62f377c2576d0331
-  data.tar.gz: 07bdfab07e6e9846000e598e8abf38a5e476e9e0
+  metadata.gz: 6aeaa805d035520162078f5df5b5ed52f0763a5b
+  data.tar.gz: e15a05beec09888f7b0b78f7e82dade6a3148365
 SHA512:
-  metadata.gz: 65f07d4ac403bb6f5247fb1ff2f150e96505328fc5dc20e282c178a33d76f88e15a6470594deb9b47e38b1da1cfdbbd5f89249314af71f0bfd21ef3c2b333f3e
-  data.tar.gz: 6802d1f908ed1424bbea8fa5cc15d11c4d6543115fddd26ae4de65312b3978f6094165973690c67797d5bd872ddf95b2bd62cb47ca3c668fee2ec667ed0f7bec
+  metadata.gz: 0bb8eec8130aca606ea32c7645a526f2d8168d16540ab7176db6acd58825bb14a5c26564fc4892ec61e925eab8cf5be2e19ad8a25e6a0353a2f39edec6d1f183
+  data.tar.gz: 080a9d8642b57e7397548e38cb24ad0aef447b7910ae985fbf64016a01cd4d46fdad0c039d648f90760eb3913c22aaa8575cd7097014db9835dfe849fed20be3

data/README.md

@@ -1,5 +1,6 @@
 # License Plate Validator
 
+[![Gem Version](https://badge.fury.io/rb/license_plate_validator.png)](http://badge.fury.io/rb/license_plate_validator)
 [![Build Status](https://travis-ci.org/ariejan/license_plate_validator.png?branch=master)](https://travis-ci.org/ariejan/license_plate_validator)
 
 This gem allows you to easily valdiate license plate fields to be valid
@@ -31,17 +32,41 @@ Or install it yourself as:
 
 ## Usage
 
-Without ActiveModel or Rails:
-
-    LicensePlateValidator.new("60-NFH-1").valid?
+    LicensePlateValidator.new("60-NFH-1", country: :nl).valid?
     #=> true
 
-Or add it to your Rails 3.x or 4.x project, using ActiveModel:
+    LicensePlateValidator.new("SBA 5226", country: :nl).valid?
+    #=> false
+
+### Rails 3.x / 4.x
+
+You can use LicensePlateValidator with any ActiveModel class, including 
+ActiveRecord models:
 
     class Vehicle < ActiveRecord::Base
-      validates :license_plate_number, license_plate: true
+      validates :license_plate_number, license_plate: { country: :nl }
     end
 
+### Dynamic country selection
+
+If you supply a `Proc` it will be called with the current record begin validated.
+
+The `Proc` must return either `nil` (accept all the things) or a valid country code.
+
+    class Vehicle < ActiveRecord::Base
+      validates :license_plate_number,
+        license_plate: { country: Proc.new { |vehicle| vehicle.country } }
+    end
+
+### Edge cases
+
+ * When no country is selected (or set to `nil`), all plates are considered valid.
+ * When an unknown country is selected, all plates are considered valid (e.g. we assume there are no validation rules for that country)
+
+### Supported countries
+
+ * `:nl` Netherlands; all common "sidecode" number formats.
+
 ## I18n
 
 Locales for English and Dutch are provided. See [`lib/license_plate_validator/locales`](https://github.com/ariejan/license_plate_validator/tree/master/lib/license_plate_validator/locales)
@@ -71,6 +96,10 @@ specs.
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
 
+## Contributor
+
+ * Pascal Widdershoven - for the original regexes for Dutch license plate numbers.
+
 ## License
 
 See [LICENSE.txt](https://github.com/ariejan/license_plate_validator/blob/master/LICENSE.txt)

data/gem-private_key.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAyt2l9tkc4bL1zgKZk9UiNbqNElgCuRzV1pfk32Sb+S57RH9w
+CE8mkYituGW0mLAjxg9h/lcn424Q62D+vlSJsHyjsgisWtu3ZHg1uy6VE8xWlCaD
+tvOas51M8LNyQtS+f5pTy0WB4BOcKk5M9TwJDK4zX/CJBErxttBhYx1QJhiERHgg
+1wGFXQpUQAW5HW4FlXWgXtfvfljj9eE1bw5Qz3ycj8NE83kQOSS9NaKwX/ma60jb
+JJakiZmjMabkctpSGYw3rqiumQ3MV6li0TY+dBjNB9V7yldCvv9ud4Wws9PLtWHx
+cerYnGq6u9JRTT8NE8M+B7Xn7nKvt+6XGlBJJwIDAQABAoIBAA8haPd4Sgcradnr
+p7i29M49E7iCh/F2jRxsR83Bm0CCjv8U4i48eQvxvcM7ErUwrfpfu1dU+MylsO1d
+VqKre3mGUk89Bl3gdVUxAhDr8IKBgxOZq8lBchBjcxGg0KzbYTnzMLzAemdUDxm4
+rVS9HY+sjnhhYFbJoC2abSkPTqMInxOGfeb68C/MiKzckZO4P/ncgU83fxmOi0Xf
+h4hcxtdmd0ZjhkDgvyBv6tOdwvwH6U7zKkrqBjY2q0OYFLGcNSjjdYmTKTnK8iqk
+YyFfqyg3c0ZyqkqmHFaXkiJiP5zpS1rFXORXNnTleMaRU7DZUTO8RjhBXoEX1VXp
+g+5UBoECgYEA6b9Dzu/zPnSUGIaY15IxtQykXt0LGosIE/bfymtf6J99YpYbxcY/
+fy43U5glCKj1YJlsFQMMir3FbJBfQNWD4d7sElyHJYiwkn3kbXwIILyumK3XIPnh
+hVaMPLKM9j4CIMefj0nVyCHWWdfz/yVJlNFBly+olHrpn6+4dY7mw0kCgYEA3i3D
+icKPXjpV8lQs26m50Q1mquV59f7AbbjjYw8v6kXs3EmIqvCGPZpFOoD4EnZXU4S+
+irxWgbEtYT97KMNrCHkFn2af7BqezJ8v6o5vPZC7TgUMJHykTN+n8tG7CG98mYmV
+kdTogWO/p+fyu6BdRUxGeO/0q7puVHHbHVzoOO8CgYEAk0qr3u2C+LsbSy0diNGd
+svmJZiGhypMLfxEUygfJQtuldgci7whSoMCtqmZ4B7H4FWv4GHF4aMDWc+exrjgd
+R6piVduqabNtmJHt7DO5J2/eEWWR5zyuqIf2DJVykARY8PD5kaA0L01rNegH36JO
+cJE/5JXqg83EA5UGBkYLEckCgYAkcaFHcZCOxkbezwvkpDyEnAwhMC8HONhbpx41
+W4JijUHDCJTQZU+/vxRn+ku2y46bdoTCwQ33jBaDgyQylYtzAlb3xJ+q3Nr7eYkk
+kmSQ1rLCo3VQbtmMeotT+y8QvSjVDopoN2JEBxai9hsMx8tE2LQelk2t9ZCvbVWh
+xWGaJQKBgQCf6qjON5bqVyDh0sZOavngBXh4cjA47GCWnUlXNkdCTJ6Q2upd80jC
+mzJOeofZheY6OVrpvn1GVU+R57pM0XYsz4vC8ZXMcF5Yr888C6DM4sqWWJn0GAwU
+g4i7PDqi8ACxkRUIUCQw/m4HLSqg915mQyAckCtq6AP6kCk1c/nE9w==
+-----END RSA PRIVATE KEY-----

data/gem-public_cert.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDdDCCAlygAwIBAgIBATANBgkqhkiG9w0BAQUFADBAMRAwDgYDVQQDDAdhcmll
+amFuMRcwFQYKCZImiZPyLGQBGRYHYXJpZWphbjETMBEGCgmSJomT8ixkARkWA25l
+dDAeFw0xMzA3MjMxMjMxMTRaFw0xNDA3MjMxMjMxMTRaMEAxEDAOBgNVBAMMB2Fy
+aWVqYW4xFzAVBgoJkiaJk/IsZAEZFgdhcmllamFuMRMwEQYKCZImiZPyLGQBGRYD
+bmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyt2l9tkc4bL1zgKZ
+k9UiNbqNElgCuRzV1pfk32Sb+S57RH9wCE8mkYituGW0mLAjxg9h/lcn424Q62D+
+vlSJsHyjsgisWtu3ZHg1uy6VE8xWlCaDtvOas51M8LNyQtS+f5pTy0WB4BOcKk5M
+9TwJDK4zX/CJBErxttBhYx1QJhiERHgg1wGFXQpUQAW5HW4FlXWgXtfvfljj9eE1
+bw5Qz3ycj8NE83kQOSS9NaKwX/ma60jbJJakiZmjMabkctpSGYw3rqiumQ3MV6li
+0TY+dBjNB9V7yldCvv9ud4Wws9PLtWHxcerYnGq6u9JRTT8NE8M+B7Xn7nKvt+6X
+GlBJJwIDAQABo3kwdzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU
+ZwHc1uXiVvbwy96Xts52wSQspHQwHgYDVR0RBBcwFYETYXJpZWphbkBhcmllamFu
+Lm5ldDAeBgNVHRIEFzAVgRNhcmllamFuQGFyaWVqYW4ubmV0MA0GCSqGSIb3DQEB
+BQUAA4IBAQAyJDUHFZ8zy2L1PWTRQVxdTNfFLBwp/dj+vBgUrLrIL4L1sjTd8gli
+gKyC8EB4aWLQ3Ir1myHU/52mhjtijKvhN7PjedXnX1raLe276aivjkArn27iuspg
+sGjp2OtGm611w/h4ZC8n+HUzCMQaOTzNWOXQIIIjlNfYBSiPz9/b6zDtyuHxDhux
+bIKVdAi8hBPMZF3l9OMIoslpwPv5d0acAtRKX2YTaZgnoY9yKlrfP4vSqm2bdDhf
+7NiYH0Kuw9dhd6KTJkM9nkX0tYPEksLImmnf2di9+uZVXaXS0eNwX8OvHb48eoyM
+fYCqplVyUXI9SqwzVPOD1Bf+drhGNR2O
+-----END CERTIFICATE-----

data/lib/license_plate_validator.rb

@@ -1,27 +1,47 @@
 class LicensePlateValidator
 
-  PATTERNS = [
+  PATTERNS = {
     # Netherlands
-    /^([a-zA-Z]{2})-?([0-9]{2})-?([0-9]{2})$/,
-    /^([0-9]{2})-?([0-9]{2})-?([a-zA-Z]{2})$/,
-    /^([0-9]{2})-?([a-zA-Z]{2})-?([0-9]{2})$/,
-    /^([a-zA-Z]{2})-?([0-9]{2})-?([a-zA-Z]{2})$/,
-    /^([a-zA-Z]{2})-?([a-zA-Z]{2})-?([0-9]{2})$/,
-    /^([0-9]{2})-?([a-zA-Z]{2})-?([a-zA-Z]{2})$/,
-    /^([0-9]{2})-?([a-zA-Z]{3})-?([0-9]{1})$/,
-    /^([0-9]{1})-?([a-zA-Z]{3})-?([0-9]{2})$/,
-    /^([a-zA-Z]{2})-?([0-9]{3})-?([a-zA-Z]{1})$/,
-    /^([a-zA-Z]{1})-?([0-9]{3})-?([a-zA-Z]{2})$/
-  ].freeze
-
-  def initialize(raw)
+    nl: [
+      /^([a-zA-Z]{2})-?([0-9]{2})-?([0-9]{2})$/,
+      /^([0-9]{2})-?([0-9]{2})-?([a-zA-Z]{2})$/,
+      /^([0-9]{2})-?([a-zA-Z]{2})-?([0-9]{2})$/,
+      /^([a-zA-Z]{2})-?([0-9]{2})-?([a-zA-Z]{2})$/,
+      /^([a-zA-Z]{2})-?([a-zA-Z]{2})-?([0-9]{2})$/,
+      /^([0-9]{2})-?([a-zA-Z]{2})-?([a-zA-Z]{2})$/,
+      /^([0-9]{2})-?([a-zA-Z]{3})-?([0-9]{1})$/,
+      /^([0-9]{1})-?([a-zA-Z]{3})-?([0-9]{2})$/,
+      /^([a-zA-Z]{2})-?([0-9]{3})-?([a-zA-Z]{1})$/,
+      /^([a-zA-Z]{1})-?([0-9]{3})-?([a-zA-Z]{2})$/
+    ]
+  }.freeze
+
+  def initialize(raw, options = {})
+    @options = {
+      country: nil
+    }.merge(options)
+
     @raw = normalize(raw || "")
   end
 
   attr_reader :raw
 
   def valid?
-    PATTERNS.any? { |pattern| raw =~ pattern }
+    return true if @options[:country].nil?
+
+    country = @options[:country].to_sym
+
+    return true unless supported_countries.include?(country)
+
+    PATTERNS[country].any? { |pattern| raw =~ pattern }
+  end
+
+  def supported_countries
+    PATTERNS.keys
+  end
+
+  def patterns_for_country(country)
+    return PATTERNS[country] || []
   end
 
   def to_s

data/lib/license_plate_validator/active_model.rb

@@ -5,7 +5,13 @@ module ActiveModel
     class LicensePlateValidator < ::ActiveModel::EachValidator
 
       def validate_each(record, attribute, value)
-        license_plate = ::LicensePlateValidator.new(value.to_s)
+        country = case(options[:country])
+                  when Proc then options[:country].call(record)
+                  when nil then nil
+                  else options[:country].to_sym
+                  end
+
+        license_plate = ::LicensePlateValidator.new(value.to_s, { country: country })
 
         if !license_plate.valid?
           record.errors.add(attribute, :invalid_license_plate, message: options[:message])

data/lib/license_plate_validator/version.rb

@@ -1,3 +1,3 @@
 class LicensePlateValidator
-  VERSION = "1.0.1"
+  VERSION = "1.1.0"
 end

data/spec/license_plate_validator/active_model_spec.rb

@@ -1,16 +1,46 @@
 require 'spec_helper'
 
 if defined?(ActiveModel)
-  class Vehicle < ModelBase
+
+  class DutchVehicle < ModelBase
+    validates :number, license_plate: { country: :nl }
+  end
+
+  class DutchMethodVehicle < ModelBase
+    validates :number, license_plate: { country: Proc.new { |dmv| dmv.country } }
+  end
+
+  class UnknownVehicle < ModelBase
     validates :number, license_plate: true
   end
 
-  describe Vehicle do
-    context "with a valid license plate number" do
-      it "is valid" do
-        obj = Vehicle.new(number: "60-NFH-1")
-        expect(obj).to be_valid
-      end
+  describe DutchVehicle do
+    it "accepts Dutch plates only" do
+      obj = DutchVehicle.new(number: "60-NFH-1")
+      expect(obj).to be_valid
+
+      obj = DutchVehicle.new(number: "SBA5226")
+      expect(obj).not_to be_valid
+    end
+  end
+
+  describe DutchMethodVehicle do
+    it "accepts Dutch plates only" do
+      obj = DutchMethodVehicle.new(number: "60-NFH-1", country: "nl")
+      expect(obj).to be_valid
+
+      obj = DutchMethodVehicle.new(number: "SBA5226", country: "nl")
+      expect(obj).not_to be_valid
+    end
+  end
+
+  describe UnknownVehicle do
+    it "accepts both Dutch and German plates" do
+      obj = UnknownVehicle.new(number: "60-NFH-1")
+      expect(obj).to be_valid
+
+      obj = UnknownVehicle.new(number: "SBA5226")
+      expect(obj).to be_valid
     end
   end
 end

data/spec/license_plate_validator_spec.rb

@@ -6,10 +6,11 @@ describe LicensePlateValidator do
   end
 
   describe "#new" do
-    it 'demands one and only one argument' do
-      expect { LicensePlateValidator.new }.to raise_error
-      expect { LicensePlateValidator.new("a", "b") }.to raise_error
+    it 'demands one argument, optionally a second' do
+      expect { LicensePlateValidator.new() }.to raise_error
       expect { LicensePlateValidator.new ("a") }.not_to raise_error
+      expect { LicensePlateValidator.new("a", country: :nl) }.not_to raise_error
+      expect { LicensePlateValidator.new("a", country: nil) }.not_to raise_error
     end
 
     it 'normalizes the input string' do
@@ -18,6 +19,60 @@ describe LicensePlateValidator do
     end
   end
 
+  context "#supported countries" do
+    subject { LicensePlateValidator.new("a") }
+
+    it "returns array of symbols" do
+      expect(subject.supported_countries).to eql([:nl])
+    end
+  end
+
+  context "#patterns_for_country" do
+    subject { LicensePlateValidator.new("a") }
+
+    it "returns empty array for unknown countries" do
+      expect(subject.patterns_for_country(:se)).to eql([])
+    end
+
+    it "returns array of patterns for known countries" do
+      expect(subject.patterns_for_country(:nl).size).to eql(10)
+    end
+  end
+
+  context "country specific validations" do
+    context "with a specific country selected" do
+      it "accepts license plates for that country" do
+        license = LicensePlateValidator.new("60-NFH-1", country: :nl)
+        expect(license).to be_valid
+      end
+
+      it "does not accept foreign license plates" do
+        license = LicensePlateValidator.new("SBA5226", country: :nl)
+        expect(license).not_to be_valid
+      end
+    end
+
+    context "with an unknown country selected" do
+      it "accepts all license plates" do
+        license = LicensePlateValidator.new("60-NFH-1", country: :se)
+        expect(license).to be_valid
+
+        license = LicensePlateValidator.new("SBA5226", country: :se)
+        expect(license).to be_valid
+      end
+    end
+
+    context "without a country selected" do
+      it "accepts all license plates / does no validation" do
+        license = LicensePlateValidator.new("60-NFH-1", country: nil)
+        expect(license).to be_valid
+
+        license = LicensePlateValidator.new("SBA5226", country: nil)
+        expect(license).to be_valid
+      end
+    end
+  end
+
   context "NL - Netherlands" do
     NL_VALID_SAMPLES = [
       "FZ-61-24",
@@ -41,14 +96,14 @@ describe LicensePlateValidator do
 
     NL_VALID_SAMPLES.each do |number|
       it "accepts '#{number}'" do
-        license = LicensePlateValidator.new(number)
+        license = LicensePlateValidator.new(number, country: :nl)
         expect(license).to be_valid
       end
     end
 
     NL_INVALID_SAMPLES.each do |number|
       it "does not accept '#{number}'" do
-        license = LicensePlateValidator.new(number)
+        license = LicensePlateValidator.new(number, country: :nl)
         expect(license).not_to be_valid
       end
     end

data/spec/spec_helper.rb

@@ -22,5 +22,10 @@ if defined?(ActiveModel)
     def read_attribute_for_validation(key)
       @attributes[key.to_sym]
     end
+
+    def method_missing(method_name, *args, &block)
+      return super unless @attributes.keys.any? { |k| k == method_name }
+      @attributes[method_name.to_sym]
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: license_plate_validator
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Ariejan de Vroom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-23 00:00:00.000000000 Z
+date: 2013-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- gem-private_key.pem
+- gem-public_cert.pem
 - gemfiles/activemodel-3-2
 - gemfiles/activemodel-4
 - gemfiles/standalone