added original value to uniqueness validations

app/assets/javascripts/judge.js

@@ -136,6 +136,11 @@
         return $1.toUpperCase().replace('_','');
       });
     };
+    originalValue = function(el) {
+      var validations = JSON.parse(el.getAttribute('data-validate'));
+      var validation = _.filter(validations, function (validation) { return validation.kind == "uniqueness"})[0];
+      return validation.original_value;
+    };
 
   // Build the URL necessary to send a GET request to the mounted validations
   // controller to check the validity of the given form element.
@@ -147,6 +152,9 @@
           'value'    : el.value,
           'kind'     : kind
         };
+        if (kind == 'uniqueness') {
+          params['original_value'] = originalValue(el);
+        }
     return path + queryString(params);
   };
 
@@ -265,7 +273,7 @@
     presence: function(options, messages) {
       return closed(this.value.length ? [] : [messages.blank]);
     },
-    
+
     // ActiveModel::Validations::LengthValidator
     length: function(options, messages) {
       var msgs = [],
@@ -282,7 +290,7 @@
       }, this);
       return closed(msgs);
     },
-    
+
     // ActiveModel::Validations::ExclusionValidator
     exclusion: function(options, messages) {
       var stringIn = _(options['in']).map(function(o) {
@@ -292,7 +300,7 @@
         _.include(stringIn, this.value) ? [messages.exclusion] : []
       );
     },
-    
+
     // ActiveModel::Validations::InclusionValidator
     inclusion: function(options, messages) {
       var stringIn = _(options['in']).map(function(o) {
@@ -302,7 +310,7 @@
         !_.include(stringIn, this.value) ? [messages.inclusion] : []
       );
     },
-    
+
     // ActiveModel::Validations::NumericalityValidator
     numericality: function(options, messages) {
       var operators = {
@@ -313,7 +321,7 @@
             less_than_or_equal_to: '<='
           },
           msgs = [],
-          parsedValue = parseFloat(this.value, 10); 
+          parsedValue = parseFloat(this.value, 10);
 
       if (isNaN(Number(this.value))) {
         msgs.push(messages.not_a_number);
@@ -330,7 +338,7 @@
       }
       return closed(msgs);
     },
-    
+
     // ActiveModel::Validations::FormatValidator
     format: function(options, messages) {
       var msgs  = [];
@@ -348,12 +356,12 @@
       }
       return closed(msgs);
     },
-    
+
     // ActiveModel::Validations::AcceptanceValidator
     acceptance: function(options, messages) {
       return closed(this.checked === true ? [] : [messages.accepted]);
     },
-    
+
     // ActiveModel::Validations::ConfirmationValidator
     confirmation: function(options, messages) {
       var id       = this.getAttribute('id'),
@@ -366,7 +374,7 @@
 
     // ActiveModel::Validations::UniquenessValidator
     uniqueness: function(options, messages) {
-      var validation = pending();          
+      var validation = pending();
       get(urlFor(this, 'uniqueness'), {
         success: function(status, headers, text) {
           validation.close(text);

lib/judge/controller.rb

@@ -14,7 +14,7 @@ def validation(params)
 
     private
 
-      REQUIRED_PARAMS = %w{klass attribute value kind}
+      REQUIRED_PARAMS = %w{klass attribute value kind original_value}
 
       def params_exposed?(params)
         Judge.config.exposed?(params[:klass], params[:attribute])
@@ -25,11 +25,12 @@ def params_present?(params)
       end
 
       def normalized_params(params)
-        params = params.dup.keep_if { |k| REQUIRED_PARAMS.include?(k) }
+        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[:kind]      = params[:kind].to_sym       if params[:kind]
+        params[:original_value] = URI.decode(params[:original_value]) if params[:original_value]
         params
       end
 

lib/judge/validation.rb

@@ -6,6 +6,7 @@ def initialize(params)
       @attribute = params[:attribute]
       @value     = params[:value]
       @kind      = params[:kind]
+      @original_value = params[:original_value]
       validate!
     end
 
@@ -27,7 +28,7 @@ def record
 
     def validate!
       record.errors.delete(@attribute)
-      amv.validate_each(record, @attribute, @value)
+      amv.validate_each(record, @attribute, @value) unless amv.kind == :uniqueness && @value == @original_value && @original_value != ""
       self
     end
 

lib/judge/validator.rb

@@ -2,7 +2,7 @@ module Judge
 
   class Validator
 
-    attr_reader :active_model_validator, :kind, :options, :method, :messages
+    attr_reader :active_model_validator, :kind, :options, :method, :messages, :original_value
 
     REJECTED_OPTIONS = [:if, :on, :unless, :tokenizer, :scope, :case_sensitive, :judge]
 
@@ -11,14 +11,17 @@ def initialize(object, method, amv)
       @options  = amv.options.reject { |key| REJECTED_OPTIONS.include?(key)  }
       @method   = method
       @messages = Judge::MessageCollection.new(object, method, amv)
+      @original_value    = object.send(method)
     end
 
     def to_hash
-      {
+      params = {
         :kind => kind,
         :options => options,
         :messages => messages.to_hash
       }
+      params[:original_value] = original_value if kind == :uniqueness
+      params
     end
 
   end

spec/controllers/judge/validations_controller_spec.rb

@@ -5,15 +5,16 @@
   let(:headers) do
     { :accept => "application/json" }
   end
-  
+
   let(:valid_params) do
     {
       :use_route => :judge,
       :format => :json,
       :klass => "User",
       :attribute => "username",
-      :value => "invisibleman",
-      :kind => "uniqueness"
+      :value => "tinbucktwo",
+      :kind => "uniqueness",
+      :original_value => "tinbucktwo"
     }
   end
 
@@ -24,7 +25,8 @@
       :klass => "User",
       :attribute => "city",
       :value => "",
-      :kind => "city"
+      :kind => "city",
+      :original_value => "nil"
     }
   end
 
@@ -36,6 +38,12 @@
         response.should be_success
         response.body.should eql "[]"
       end
+      it "responds with empty JSON array if original_value equals the value" do
+        FactoryGirl.create(:user, username: 'tinbucktwo')
+        get :build, valid_params, headers
+        response.should be_success
+        response.body.should eql "[]"
+      end
       it "responds with JSON array of error messages if invalid" do
         get :build, invalid_params, headers
         response.should be_success

spec/javascripts/judge-spec.js

@@ -1,8 +1,8 @@
 describe('judge', function() {
   var server,
-      uniquenessAttr   = '[{"kind":"uniqueness","options":{},"messages":{}}]',
+      uniquenessAttr   = '[{"kind":"uniqueness","options":{},"messages":{},"original_value":"leader"}]',
       presenceAttr     = '[{"kind":"presence","options":{},"messages":{"blank":"must not be blank"}}]',
-      uniqPresenceAttr = '[{"kind":"uniqueness","options":{},"messages":{}},{"kind":"presence","options":{},"messages":{"blank":"must not be blank"}}]',
+      uniqPresenceAttr = '[{"kind":"uniqueness","options":{},"messages":{},"original_value":"leader"},{"kind":"presence","options":{},"messages":{"blank":"must not be blank"}}]',
       mixedAttr        = '[{"kind":"presence","options":{},"messages":{"blank":"must not be blank"}},{"kind":"inclusion","options":{"in":["a","b"]},"messages":{"inclusion":"must be a or b"}}]',
       uniqAndIncAttr  = '[{"kind":"uniqueness","options":{},"messages":{}},{"kind":"inclusion","options":{"in":["a","b"]},"messages":{"inclusion":"must be a or b"}}]';
 
@@ -446,6 +446,7 @@ describe('judge', function() {
         validator  = _.bind(judge.eachValidators.uniqueness, el);
         el.value   = '[email protected]';
         el.name    = 'team[leader][email]';
+        el.setAttribute('data-validate', uniquenessAttr)
       });
       it('returns a pending Validation', function() {
         validation = validator({}, {});
@@ -460,7 +461,7 @@ describe('judge', function() {
           server.respond();
         });
         runs(function() {
-          expect(server.requests[0].url).toBe('/judge?klass=Leader&attribute=email&value=leader%40team.com&kind=uniqueness');
+          expect(server.requests[0].url).toBe('/judge?klass=Leader&attribute=email&value=leader%40team.com&kind=uniqueness&original_value=leader');
         });
       });
       it('closes Validation as valid if the server responds with an empty JSON array', function() {