activevalidators 3.0.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 50acb6e676e5e32669572b48f94484fedef7fb82
-  data.tar.gz: ebef42c4c60c751e58305630094717d65e249930
+  metadata.gz: adf039c3ae7e345db0269ff8495f4125dabb9816
+  data.tar.gz: 9fd34dd568a845762a29134badb745a48bc6e0b3
 SHA512:
-  metadata.gz: 2e1223d430d4cde1ef2918f77d22373e45f6652e8a12262e88678357faf6a90a1afe19958603fa18a597e8a2fc08e53f8615cdc3a1462324496fbed6a796e7a4
-  data.tar.gz: 4564020ef5cf74254bed1a98b25028c1cd8001b3d7432a15787402cab83e57886dc42c69b9367c14873a5b8146c7454eb986b4ef325b006777741e305d07fc58
+  metadata.gz: bcc06c8016bd48391ca41556b371a88630694d0f7372455cfa9d25871aa4b64e3723c2a3658a4db4cdbe2ea0f07f2ac4adb84a4b196be45a4f465b94eb6805f0
+  data.tar.gz: 0c232fbf6d0dbb28e93663266ba400753397a86be0fa350df708fa4280763185a7fe1e52d225c89d0fa202e69adb398745feb0a65303c728ccb3718b8fe2f63b

data/ChangeLog.md

@@ -1,8 +1,15 @@
-# UNRELEASED (3.0.1)
+# UNRELEASED
+
+  * Nothing yet.
+
+# 3.1.0
 
 ## FEATURES
 
   * Remove default requiring
+  * Remove deprecation messages about `ActiveValidators.activate`
+
+# 3.0.1 (yanked, it's now 3.1.0)
 
 # 3.0.0
 

data/README.md

@@ -10,6 +10,10 @@ ActiveValidators is a collection of off-the-shelf and tested ActiveModel/ActiveR
 
 This projects follows [Semantic Versioning a.k.a SemVer](http://semver.org). If you use Bundler, you can use the stabby specifier `~>` safely.
 
+What it means is that you should specify an ActiveValidators version like this :
+
+    gem 'activevalidators', '~> 3.0.0' # <-- mind the patch version
+
 Once you have `require`'d the gem, you will have to activate the validators you
 want to use as ActiveValidators doesn't force you to use them all :
 
@@ -95,7 +99,7 @@ Exhaustive list of supported validators and their implementation:
 * `tracking_number`: based on a set of predefined masks
 * `twitter` : based on a regular expression
 * `url`   : based on a regular expression
-* `barcode`   : based on known formats (default: EAN 13)
+* `barcode`   : based on known formats (:ean13 only for now)
 
 ## Todo
 

data/activevalidators.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'activevalidators'
-  s.version     = '3.0.0'
+  s.version     = '3.1.1'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Franck Verrot', 'Paco Guzmán', 'Oriol Gual', 'Garrett Bjerkhoel', 'Renato Riccieri Santos Zannon', 'Brian Moseley', 'Serj L aka Loremaster']
   s.email       = ['franck@verrot.fr']
@@ -21,19 +21,4 @@ Gem::Specification.new do |s|
 
   s.files              = `git ls-files`.split("\n")
   s.test_files         = `git ls-files -- {test,spec,features}/*`.split("\n")
-
-  s.post_install_message = """
-######################################################################
-#                      ActiveValidators v3.0.0                       #
-######################################################################
-#                                                                    #
-# Version 3 of ActiveValidators stopped requiring all the validators #
-# for you. So you will have to use `ActiveValidators.activate`.      #
-#                                                                    #
-# By default, v3.0.0 does `ActiveValidators.activate(:all)` to help  #
-# transitioning to v3, but 3.0.1 won't do that anymore.              #
-#                                                                    #
-# Thanks for using ActiveValidators !                                #
-#                                                                    #
-######################################################################"""
 end

data/lib/active_model/validations/barcode_validator.rb

@@ -1,11 +1,17 @@
 module ActiveModel
   module Validations
     class BarcodeValidator < EachValidator
-      def validate_each(record, attribute, value)
-        # EAN13 by default
-        format = options.fetch(:format, :ean13)  
+      # We check the validity of :format option
+      # More at https://github.com/rails/rails/blob/aa7fdfb859d8a73f58460a7aba7174a47b5101d5/activemodel/lib/active_model/validator.rb#L180
+      def check_validity!
+        format = options.fetch(:format)
+        raise ArgumentError, ":format cannot be blank!" if format.blank?
         method = "valid_#{format.to_s}?"
-        raise "Barcode format not supported (#{format})" unless self.respond_to?(method)
+        raise ArgumentError, "Barcode format (#{format}) not supported" unless self.respond_to?(method)
+      end
+
+      def validate_each(record, attribute, value)
+        method = "valid_#{options[:format].to_s}?"
         record.errors.add(attribute) if value.blank? || !self.send(method, value)
       end
 

data/lib/activevalidators.rb

@@ -30,6 +30,3 @@ module ActiveValidators
     end
   end
 end
-
-# Deprecated
-warn "[deprecated] ActiveValidators.activate is the recommended solution to require your validators. Please check instructions in the README. Thanks a lot !"

data/test/validations/barcode_test.rb

@@ -22,7 +22,7 @@ describe "Barcode Validation" do
         subject.errors.size.must_equal 1
       end
 
-      it "rejects EAN13S with invalid format" do
+      it "rejects EAN13s with invalid value (not only integers)" do
         subject = build_barcode_record :ean13, :barcode => "502392de872e4"
         subject.valid?.must_equal false
         subject.errors.size.must_equal 1
@@ -30,6 +30,22 @@ describe "Barcode Validation" do
     end
   end
 
+  describe "Invalid options given to the validator" do
+    it "raises an error when format is not supported" do
+      error = assert_raises ArgumentError do
+        build_barcode_record :format_not_supported, :barcode => "9782940199617"
+      end
+      error.message.must_equal "Barcode format (format_not_supported) not supported"
+    end
+
+    it "raises an error when you omit format option" do
+      error = assert_raises ArgumentError do
+        build_barcode_record nil, :barcode => "9782940199617"
+      end
+      error.message.must_equal ":format cannot be blank!"
+    end
+  end
+
   def build_barcode_record(type, attrs = {})
     TestRecord.reset_callbacks(:validate)
     TestRecord.validates :barcode, :barcode => { :format => type }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activevalidators
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.1
 platform: ruby
 authors:
 - Franck Verrot
@@ -185,21 +185,7 @@ homepage: http://github.com/franckverrot/activevalidators
 licenses:
 - MIT
 metadata: {}
-post_install_message: |2-
-
-  ######################################################################
-  #                      ActiveValidators v3.0.0                       #
-  ######################################################################
-  #                                                                    #
-  # Version 3 of ActiveValidators stopped requiring all the validators #
-  # for you. So you will have to use `ActiveValidators.activate`.      #
-  #                                                                    #
-  # By default, v3.0.0 does `ActiveValidators.activate(:all)` to help  #
-  # transitioning to v3, but 3.0.1 won't do that anymore.              #
-  #                                                                    #
-  # Thanks for using ActiveValidators !                                #
-  #                                                                    #
-  ######################################################################
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib