judge 2.1.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcf1e3ed1bb5500b69d1cc9e5074e56f43e86a46
-  data.tar.gz: 9536e4c10547ccf7abbcb7dd6e83699096f7c282
+  metadata.gz: dca4cf9efce355af38a266acbebedbf4e9a248bc
+  data.tar.gz: 8d7c349e62de4f849f624a4ad752c15ca5ea4697
 SHA512:
-  metadata.gz: 208177747be57442d0ff59bf79b86ceda1a675c40ae2d28f9b883a40da6b7fd8f7281b746074138e3c9e885d47a78ec31b29f424bd971f3816527e9c9156b90f
-  data.tar.gz: b7893ca20ab01d91c325de6585642177af687a2065ca2931543f45a73459e8628063bfd535f77bbef8cd7916eb3673ba9abc9ebfaeacfa35c5aad8d99b387921
+  metadata.gz: a86cf16382daebc3d30cb73b27505f388d48dda9129c9e599c626d2672b89df8ba1bb9839562951dd6015e943a1ddb2f77ae597308cef7162862b9ad0a8b42a7
+  data.tar.gz: a7bf16c54d06e2546a7dbc7b4b069e37fdcfcaf3a555812e07bf7ea9fa64799dad5cc438994d562046e4205444fa717a247a850a4510cb272ce57029fb679afb

data/README.md

@@ -12,7 +12,8 @@ In many cases it would be simpler to safely expose the validation information fr
 
 ## Installation
 
-Judge supports Rails >= 3.1.
+Judge supports Rails 5.0+.
+If you require Rails 4 support, please use version 2.1.x.
 
 Judge relies on [Underscore.js](underscore) in general and [JSON2.js](json2) for browsers that lack proper JSON support. If your application already makes use of these files, you can safely ignore the versions provided with Judge.
 
@@ -116,7 +117,48 @@ end
 * uniqueness;
 * any `EachValidator` that you have written, provided you add a JavaScript version too and add it to `judge.eachValidators`.
 
-The *allow_blank* option is available everywhere it should be. Error messages are looked up according to the [Rails i18n API](http://guides.rubyonrails.org/i18n.html#translations-for-active-record-models).
+The *allow_blank* option is available everywhere it should be.
+
+### Error messages
+Error messages are looked up according to the [Rails i18n API](http://guides.rubyonrails.org/i18n.html#error-message-interpolation).
+
+To override error messages, add entries to `config/locales/en.yml` for the messages you'd like to customize. Here's an example with Rails default values:
+```
+en:
+  errors:
+    format: "%{attribute} %{message}"
+    messages:
+      accepted: must be accepted
+      blank: can't be blank
+      present: must be blank
+      confirmation: doesn't match %{attribute}
+      empty: can't be empty
+      equal_to: must be equal to %{count}
+      even: must be even
+      exclusion: is reserved
+      greater_than: must be greater than %{count}
+      greater_than_or_equal_to: must be greater than or equal to %{count}
+      inclusion: is not included in the list
+      invalid: is invalid
+      less_than: must be less than %{count}
+      less_than_or_equal_to: must be less than or equal to %{count}
+      model_invalid: "Validation failed: %{errors}"
+      not_a_number: is not a number
+      not_an_integer: must be an integer
+      odd: must be odd
+      required: must exist
+      taken: has already been taken
+      too_long:
+        one: is too long (maximum is 1 character)
+        other: is too long (maximum is %{count} characters)
+      too_short:
+        one: is too short (minimum is 1 character)
+        other: is too short (minimum is %{count} characters)
+      wrong_length:
+        one: is the wrong length (should be 1 character)
+        other: is the wrong length (should be %{count} characters)
+      other_than: must be other than %{count}
+```
 
 ## Validating uniqueness
 
@@ -321,6 +363,6 @@ $ bundle exec rake appraisal
 
 ## Credit
 
-Created by [Joe Corcoran](mailto:joecorcoran@gmail.com), whose [blog](http://blog.joecorcoran.co.uk) and [tweets](http://twitter.com/josephcorcoran) you can read on the world wide internet. Thank you to every user, email corresponder and pull request submitter.
+Created by [Joe Corcoran](https://corcoran.io). Thank you to every user, email corresponder and pull request submitter.
 
 [Released under an MIT license](https://github.com/joecorcoran/judge/blob/master/LICENSE.txt).

data/app/assets/config/manifest.js

@@ -0,0 +1 @@
+//= link javascripts/judge.js

data/lib/judge/config.rb

@@ -6,9 +6,10 @@ module Judge
 
     @@exposed = {}
     @@ignore_unsupported_validators = false
+    @@use_association_name_for_validations = false
 
     def expose(klass, *attributes)
-      attrs = (@@exposed[klass] ||= [])
+      attrs = (@@exposed[klass.name] ||= [])
       attrs.concat(attributes).uniq!
     end
 
@@ -17,15 +18,15 @@ module Judge
     end
 
     def exposed?(klass, attribute)
-      @@exposed.has_key?(klass) && @@exposed[klass].include?(attribute)
+      @@exposed.has_key?(klass.name) && @@exposed[klass.name].include?(attribute)
     end
 
     def unexpose(klass, *attributes)
       attributes.each do |a|
-        @@exposed[klass].delete(a)
+        @@exposed[klass.name].delete(a)
       end
-      if attributes.empty? || @@exposed[klass].empty?
-        @@exposed.delete(klass)
+      if attributes.empty? || @@exposed[klass.name].empty?
+        @@exposed.delete(klass.name)
       end
     end
     
@@ -36,6 +37,14 @@ module Judge
     def ignore_unsupported_validators?
       @@ignore_unsupported_validators
     end
+
+    def use_association_name_for_validations(status)
+      @@use_association_name_for_validations = status
+    end
+
+    def use_association_name_for_validations?
+      @@use_association_name_for_validations
+    end
   end
 
   def self.config
@@ -45,4 +54,4 @@ module Judge
   def self.configure(&block)
     Config.instance.instance_eval(&block)
   end
-end
+end

data/lib/judge/controller.rb

@@ -1,5 +1,3 @@
-require 'uri'
-
 module Judge
   module Controller
 
@@ -41,9 +39,9 @@ module Judge
         params = params.dup.keep_if {|k| REQUIRED_PARAMS.include?(k) || (k == 'original_value' && params[:kind] == 'uniqueness')}
         params[:klass]     = find_klass(params[:klass]) if params[:klass]
         params[:attribute] = params[:attribute].to_sym  if params[:attribute]
-        params[:value]     = URI.decode(params[:value]) if params[:value]
+        params[:value]     = CGI::unescape(params[:value]) if params[:value]
         params[:kind]      = params[:kind].to_sym       if params[:kind]
-        params[:original_value] = URI.decode(params[:original_value]) if params[:original_value]
+        params[:original_value] = CGI::unescape(params[:original_value]) if params[:original_value]
         params
       end
 

data/lib/judge/form_builder.rb

@@ -4,7 +4,7 @@ module Judge
 
     include Judge::Html
 
-    %w{text_field text_area password_field email_field}.each do |type|
+    %w{text_field text_area password_field email_field telephone_field}.each do |type|
       helper = <<-END
         def #{type}(method, options = {})
           add_validate_attr!(self.object, method, options)

data/lib/judge/validation.rb

@@ -33,7 +33,7 @@ module Judge
     end
 
     def as_json(options = {})
-      record.errors.get(@attribute) || []
+      record.errors[@attribute] || []
     end
   end
 
@@ -51,4 +51,4 @@ module Judge
     end
   end
 
-end
+end

data/lib/judge/validator_collection.rb

@@ -33,7 +33,23 @@ module Judge
       #   unsupported by Judge
       # if it's a confirmation field, an AM::V like class is added to handle the confirmation validations
       def amvs
-        amvs = object.class.validators_on(method)
+        method_to_search = method
+        
+        if Judge.config.use_association_name_for_validations?
+          # since the method that gets passed in here for associations comes in the form of the generated form attribute 
+          # i.e. :wine_id or :acclaim_ids
+          # object.class.validators_on(:wine_id) will fail if the active model validation is on the association directly
+          # this ensures that validations defined as 'validates :wine, presence: true' still get applied 
+          # and client side error messages get generated 
+          regex_for_assocations = /_id|_ids/
+          if method.to_s =~ regex_for_assocations
+            parsed_method = method.to_s.gsub(regex_for_assocations, '');
+            reflection = find_association_reflection(parsed_method)
+            method_to_search = reflection.name if reflection
+          end
+        end
+
+        amvs = object.class.validators_on(method_to_search)
         amvs = amvs.reject { |amv| reject?(amv) || amv.class.name['ConfirmationValidator'] }
         amvs = amvs.reject { |amv| unsupported_options?(amv) && reject?(amv) != false } if Judge.config.ignore_unsupported_validators?
         amvs << Judge::ConfirmationValidator.new(object, method) if is_confirmation?
@@ -41,6 +57,12 @@ module Judge
         amvs
       end
 
+      def find_association_reflection(association)
+        if object.class.respond_to?(:reflect_on_association)
+          object.class.reflect_on_association(association) || object.class.reflect_on_association(association.pluralize)
+        end
+      end
+
       def unsupported_options?(amv)
         unsupported = !(amv.options.keys & UNSUPPORTED_OPTIONS).empty?
         return false unless unsupported

data/lib/judge/version.rb

@@ -1,3 +1,3 @@
 module Judge
-  VERSION = '2.1.1'
+  VERSION = '3.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judge
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Joe Corcoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-24 00:00:00.000000000 Z
+date: 2023-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: rspec-extra-formatters
   requirement: !ruby/object:Gem::Requirement
@@ -116,6 +116,7 @@ extra_rdoc_files: []
 files:
 - LICENSE.txt
 - README.md
+- app/assets/config/manifest.js
 - app/assets/javascripts/judge.js
 - app/controllers/judge/validations_controller.rb
 - config/routes.rb
@@ -158,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.5.2.3
 signing_key: 
 specification_version: 4
 summary: Client side validation for Rails