judge 2.0.6 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f46fa47785d02705ddf4d8fc1bc44c18d8625be1
-  data.tar.gz: cde40c05c5b5d63dab3117d925f13d5ad40fd945
+  metadata.gz: 7746ff63f79624cba084792b725bc8b70c30ec8b
+  data.tar.gz: fe99a88f47c70dcb900230c0d307bcbff8a8173f
 SHA512:
-  metadata.gz: ba10fa7f328e9e6577e4d21f372ff0d179dc701c3c368d0291c9cdb3eb77f1171316e49a68070817a2cb941c7791ed9051e44ea4bb97900a0c984d25904e707d
-  data.tar.gz: 85c3535040272861e1dffaab43c8ae26885e4da4cd12148b655dad54cd7b11ebd64f9e10a1496d7a1473e767ef30547bd50e70be3ed120310dfa4c82a9aa711d
+  metadata.gz: e0d8848464312ae4e0c2797399335b41f990f162c450698b6b74641b1efee11b8f64e6aad73a00f3cb6ab4595289f3fa8097411064713fa351dc0a7669b9019f
+  data.tar.gz: 15f8d536e8431785c0cde1f7125ad647a3f5d824a47b1cd59dc827685d1d6d8caffa5394b0ef63faeeb75059d7f3e04596e791111f323fcede6d4367d5d3f74f

data/README.md

@@ -2,8 +2,6 @@
 
 [![Build status](https://secure.travis-ci.org/joecorcoran/judge.png?branch=master)](http://travis-ci.org/joecorcoran/judge)
 
-Looking for a nice open source project to contribute to? **[Maintainers needed!](https://github.com/joecorcoran/judge/issues/47)**
-
 Judge allows easy client side form validation for Rails by porting many `ActiveModel::Validation` features to JavaScript. The most common validations work through JSON strings stored within HTML5 data attributes and are executed purely on the client side. Wherever you need to, Judge provides a simple interface for AJAX validations too.
 
 ## Rationale

data/app/assets/javascripts/judge.js

@@ -1,4 +1,4 @@
-// Judge 2.0.6
+// Judge 2.1.0
 // (c) 2011-2013 Joe Corcoran
 // http://raw.github.com/joecorcoran/judge/master/LICENSE.txt
 
@@ -14,7 +14,7 @@
   var judge = root.judge = {},
       _     = root._;
 
-  judge.VERSION = '2.0.6';
+  judge.VERSION = '2.1.0';
 
   // Trying to be a bit more descriptive than the basic error types allow.
   var DependencyError = function(message) {
@@ -78,7 +78,7 @@
   var convertRegExp = function(string) {
     var parts  = string.slice(1, -1).split(':'),
         flags  = parts.shift().replace('?', ''),
-        source = parts.join(':').replace(/\\\\/g, '\\');
+        source = parts.join(':').replace(/\\\\/g, '\\').replace('\\A', '^').replace('\\z', '$');
     return new RegExp(source, convertFlags(flags));
   };
 
@@ -256,7 +256,12 @@
   judge.eachValidators = {
     // ActiveModel::Validations::PresenceValidator
     presence: function(options, messages) {
-      return closed(this.value.length ? [] : [messages.blank]);
+      if (this.type === 'radio') {
+        var is_selected = root.document.querySelectorAll('[name="'+this.name+'"]:checked').length;
+        return closed(is_selected ? [] : [messages.blank]);
+      } else {
+        return closed(this.value.length ? [] : [messages.blank]);
+      }
     },
 
     // ActiveModel::Validations::LengthValidator
@@ -350,7 +355,7 @@
     // ActiveModel::Validations::ConfirmationValidator
     confirmation: function(options, messages) {
       var id       = this.getAttribute('id'),
-          confId   = id + '_confirmation',
+          confId   = id.replace('_confirmation', ''),
           confElem = root.document.getElementById(confId);
       return closed(
         this.value === confElem.value ? [] : [messages.confirmation]

data/lib/judge.rb

@@ -9,6 +9,7 @@ files = [
   'form_builder',
   'each_validator',
   'validation',
-  'controller'
+  'controller',
+  'confirmation_validator'
 ]
 files.each { |filename| require "judge/#{filename}" }

data/lib/judge/confirmation_validator.rb

@@ -0,0 +1,35 @@
+module Judge
+  class ConfirmationValidator
+
+    include Judge::EachValidator
+
+    attr_reader :object, :method, :amv
+
+    def initialize(object, method)
+      @object = object
+      @method = method
+      @amv = amv_from_original
+    end
+
+    def kind
+      @amv.kind if @amv.present?
+    end
+
+    def options
+      @amv.options if @amv.present?
+    end
+
+    private
+
+    def amv_from_original
+      original_amv = nil
+      original_method = method.to_s.gsub('_confirmation', '').to_sym
+      object.class.validators_on(original_method).each do |v|
+        original_amv = v if v.class.name['ConfirmationValidator']
+      end
+
+      original_amv
+    end
+
+  end
+end

data/lib/judge/form_builder.rb

@@ -3,8 +3,8 @@ module Judge
   class FormBuilder < ActionView::Helpers::FormBuilder
 
     include Judge::Html
-    
-    %w{text_field text_area password_field}.each do |type|
+
+    %w{text_field text_area password_field email_field}.each do |type|
       helper = <<-END
         def #{type}(method, options = {})
           add_validate_attr!(self.object, method, options)
@@ -18,7 +18,7 @@ module Judge
       add_validate_attr!(self.object, method, options)
       super
     end
-    
+
     def check_box(method, options = {}, checked_value = "1", unchecked_value = "0")
       add_validate_attr!(self.object, method, options)
       super
@@ -62,7 +62,7 @@ module Judge
           options_to_merge.merge! attrs_for(object, method)
         end
       end
-    
+
   end
 
 end

data/lib/judge/validator_collection.rb

@@ -4,12 +4,11 @@ module Judge
 
     include Enumerable
 
-    attr_reader :validators
-    
+    attr_reader :validators, :object, :method
+
     def initialize(object, method)
-      amvs = object.class.validators_on(method)
-      amvs = amvs.reject { |amv| reject?(amv) }
-      amvs = amvs.reject { |amv| unsupported_options?(amv) && reject?(amv) != false } if Judge.config.ignore_unsupported_validators?
+      @object = object
+      @method = method
       @validators = amvs.map { |amv| Judge::Validator.new(object, method, amv) }
     end
 
@@ -22,11 +21,26 @@ module Judge
     def to_json
       validators.map { |v| v.to_hash }.to_json
     end
-    
+
     protected
-    
+
       UNSUPPORTED_OPTIONS = [:if, :on, :unless, :tokenizer, :scope, :case_sensitive]
 
+      # returns an array of ActiveModel::Validations
+      # starts with all Validations attached to method and removes one that are:
+      #   ignored based on a config
+      #   ConfirmationValidators, which are moved directly to the confirmation method
+      #   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)
+        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?
+
+        amvs
+      end
+
       def unsupported_options?(amv)
         unsupported = !(amv.options.keys & UNSUPPORTED_OPTIONS).empty?
         return false unless unsupported
@@ -36,7 +50,7 @@ module Judge
         unsupported = amv.options.keys & UNSUPPORTED_OPTIONS
         unsupported.length > 1 || unsupported != [:case_sensitive] || amv.options[:case_sensitive] == false
       end
-      
+
       # decides whether to reject a validation based on the presence of the judge option.
       # return values:
       #   true  when :judge => :ignore is present in the options
@@ -44,7 +58,11 @@ module Judge
       #   nil otherwise (e.g. when no :judge option or an unknown option is present)
       def reject?(amv)
         return unless [:force, :ignore].include?( amv.options[:judge] )
-        amv.options[:judge] == :ignore ? true : false
+        amv.options[:judge] == :ignore
+      end
+
+      def is_confirmation?
+        method.to_s['_confirmation']
       end
 
   end

data/lib/judge/version.rb

@@ -1,3 +1,3 @@
 module Judge
-  VERSION = '2.0.6'
+  VERSION = '2.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: judge
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.1.0
 platform: ruby
 authors:
 - Joe Corcoran
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-27 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -122,6 +122,7 @@ files:
 - lib/generators/judge/install/install_generator.rb
 - lib/judge.rb
 - lib/judge/config.rb
+- lib/judge/confirmation_validator.rb
 - lib/judge/controller.rb
 - lib/judge/each_validator.rb
 - lib/judge/engine.rb