uuid_validator 0.0.3 → 0.0.4

data/lib/active_model/validations/uuid_validator.rb

@@ -1,12 +1,25 @@
+require 'active_model'
 require 'active_model/validator'
 
 module ActiveModel
   module Validations
     class UuidValidator < ActiveModel::EachValidator
-      RE = /\A[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}\z/i
+      RE_STRING = "[0-9A-F]{8}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{4}-[0-9A-F]{12}"
+
+      def initialize(options)
+        super
+        @re = case
+              when options[:upper_only]
+                /\A#{RE_STRING.upcase}\z/
+              when options[:lower_only]
+                /\A#{RE_STRING.downcase}\z/
+              else
+                /\A#{RE_STRING}\z/i
+              end
+      end
 
       def validate_each(record, attribute, value)
-        record.errors.add(attribute, :not_an_uuid) unless value =~ RE
+        record.errors.add(attribute, :not_an_uuid) unless value =~ @re
       end
 
     end

data/lib/uuid_validator/version.rb

@@ -1,3 +1,3 @@
 module UuidValidator
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/uuid_validator_test.rb

@@ -9,6 +9,17 @@ describe ActiveModel::Validations::UuidValidator do
     I18n.locale = 'en'
   end
 
+  def must_be_valid(key)
+    TestModel.new(key: key).valid?.must_equal true
+  end
+
+  def must_be_error(key, error = 'is not an uuid')
+    model = TestModel.new(key: key)
+    model.valid?.must_equal false
+    model.errors[:key].must_equal [error]
+  end
+
+
   describe "validates :key, :uuid => true" do
     before do
       TestModel.validates :key, :uuid => true
@@ -16,69 +27,111 @@ describe ActiveModel::Validations::UuidValidator do
 
     describe "passes for wikipedia sample" do
       it "is valid" do
-        key = "550e8400-e29b-41d4-a716-446655440000"
-        model = TestModel.new(key: key)
-        model.valid?.must_equal true
+        must_be_valid "550e8400-e29b-41d4-a716-446655440000"
       end
     end
 
     describe "test for SecureRandom.uuid" do
       it "is valid" do
-        model = TestModel.new(key: SecureRandom.uuid)
-        model.valid?.must_equal true
+        must_be_valid SecureRandom.uuid
       end
     end
 
     describe "test for UUIDTools" do
       it "is valid for md5_create" do
-        key = UUIDTools::UUID.md5_create(UUIDTools::UUID_DNS_NAMESPACE, "www.example.com").to_s
-        model = TestModel.new(key: key)
-        model.valid?.must_equal true
+        must_be_valid UUIDTools::UUID.md5_create(UUIDTools::UUID_DNS_NAMESPACE, "www.example.com").to_s
       end
 
       it "is valid for sha1_create" do
-        key = UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, "www.example.com").to_s
-        model = TestModel.new(key: key)
-        model.valid?.must_equal true
+        must_be_valid UUIDTools::UUID.sha1_create(UUIDTools::UUID_DNS_NAMESPACE, "www.example.com").to_s
       end
 
       it "is valid for timestamp_create" do
-        key = UUIDTools::UUID.timestamp_create.to_s
-        model = TestModel.new(key: key)
-        model.valid?.must_equal true
+        must_be_valid UUIDTools::UUID.timestamp_create.to_s
       end
 
       it "is valid for random_create" do
-        key = UUIDTools::UUID.random_create.to_s
-        model = TestModel.new(key: key)
-        model.valid?.must_equal true
+        must_be_valid UUIDTools::UUID.random_create.to_s
       end
     end
 
-    def error_in(model)
-      model.valid?.must_equal false
-      model.errors[:key].must_equal ["is not an uuid"]
-    end
-
     describe "when nil" do
       it "is invalid" do
-        error_in TestModel.new(key: nil)
+        must_be_error nil
       end
     end
 
     describe "when empty string" do
       it "is invalid" do
-        error_in TestModel.new(key: '')
+        must_be_error ''
       end
     end
 
     describe "when non number" do
       it "is invalid" do
-        key = "550e8400-e29b-41d4-a716-XXXXXXXXXXXX"
-        error_in TestModel.new(key: key)
+        must_be_error "550e8400-e29b-41d4-a716-XXXXXXXXXXXX"
+      end
+    end
+  end
+
+  describe "validates :key, :uuid => {lower_only: true}" do
+    before do
+      TestModel.validates :key, :uuid => {lower_only: true}
+    end
+
+    describe "passes for wikipedia sample" do
+      it "is valid" do
+        must_be_valid "550e8400-e29b-41d4-a716-446655440000"
+      end
+    end
+
+    describe "SecureRandom.uuid" do
+      it "is valid" do
+        must_be_valid SecureRandom.uuid
+      end
+    end
+
+    describe "SecureRandom.uuid.upcase" do
+      it "is invalid" do
+        must_be_error SecureRandom.uuid.upcase
+      end
+    end
+
+    describe "when nil" do
+      it "is invalid" do
+        must_be_error nil
+      end
+    end
+  end
+
+  describe "validates :key, :uuid => {upper_only: true}" do
+    before do
+      TestModel.validates :key, :uuid => {upper_only: true}
+    end
+
+    describe "passes for wikipedia sample" do
+      it "is invalid" do
+        must_be_error "550e8400-e29b-41d4-a716-446655440000"
       end
     end
 
+    describe "SecureRandom.uuid" do
+      it "is invalid" do
+        must_be_error SecureRandom.uuid
+      end
+    end
+
+    describe "SecureRandom.uuid.upcase" do
+      it "is valid" do
+        must_be_valid SecureRandom.uuid.upcase
+      end
+    end
+
+    describe "when nil" do
+      it "is invalid" do
+        must_be_error nil
+      end
+    end
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: uuid_validator
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-11 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1890446842735761420
+      hash: -2748658622935870302
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -102,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1890446842735761420
+      hash: -2748658622935870302
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24