rapscallion 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa06bd28f1365091b089b92ff92cdf1acd1d1338
-  data.tar.gz: 4190f2bc25f317f245a380ba4a4c198b849a7eca
+  metadata.gz: 5af40b9502879aab2135668af56670f1a4c566bb
+  data.tar.gz: 132d602bcbc1de4cb194409f4d7956303f682564
 SHA512:
-  metadata.gz: 5267c559e760b5369292e9f03439da45b69c1c5c43d4f5972d8701ee595e7d6cd9ca8181ec0c727fa500074448d75269e672fb67b9ad2c6296381ea4e8c3e966
-  data.tar.gz: aa85ca22db6cdd28b51cd8bd25cae977710a1b34aca1d388dce6e09b7bc22714dfca2ac32d188cc07f95b5b73feba5f5c034d5b2e3697d29eff875a8db2de526
+  metadata.gz: 6b39cdb7c5d94a55f4402cd88f5135242653a47782f85faa539198471b71c72dc36424d432769b281ee2919115151841ed589347521ff34b0385388b58c4a814
+  data.tar.gz: 0a4dca65c9001c542c3c65c284433a438a3af2fe6c8629a5cc5586b6108b00c791ff84edde0893e11ca6472613b638f6af69b856b01db77cff44c00d58b6c62a

data/app/assets/javascripts/rapscallion/validations.js

@@ -57,12 +57,12 @@
         confirmation fields are special cases, and add the field to confirm for 
         eg password and password_confirmation
         */
-        if (attr.match(/.*_confirmation/) !== undefined) {
+        if (attr.match(/(.*)_confirmation/) !== undefined) {
           var confirmation_field = attr.replace('_confirmation', '');
           var confirmation_value = form.find('#' + klass + "_" + confirmation_field).val();
         }
 
-        validation_data[confirmation_field] = confirmation_value;
+        validation_data['confirmation_field'] = confirmation_value;
 
         /* existing record? */
         if (form.data('existing-record') !== undefined) {
@@ -83,6 +83,7 @@
 
             /* if no errors present field is valid, add is_valid css class */
             if (data.length === 0) {
+              console.log('is valid');
               el.removeClass(settings.field_with_error_class).addClass(settings.field_valid_class);
 
             /* if error present field is not valid, add has_error class to input, and error messages after input */

data/app/controllers/rapscallion/validations_controller.rb

@@ -3,38 +3,30 @@ module Rapscallion
 	class ValidationsController < ::ApplicationController
 
 		eval %[skip_filter #{_process_action_callbacks.select { |c|
-    [:before, :after, :around].include? c.kind }.collect{|c|
-      c.filter.inspect}.join(", ")
-    }]
+	  	[:before, :after, :around].include? c.kind }.collect{|c|
+	    c.filter.inspect}.join(", ")
+	  }]
 
 		def create
 			klass = params[:klass].camelize.constantize
-
-			if params[:existing_record].present?
-				item = klass.find(params[:existing_record])
-			else
-				item = klass.new
-			end
-
+			item = params[:existing_record].present? ? klass.find(params[:existing_record]) : klass.new
 			field = params[:attr]
 			value = params[:field_val]
 			item.send("#{field}=", value)
 			item.valid?
 			errors = item.errors[field].uniq
-
-			if !field.match(/_confirmation/).nil?
-				field_to_confirm_against = field.gsub('_confirmation', '')
-				x = params[field_to_confirm_against.to_sym]
-				
-				errors = ["doesn't match confirmation"]  unless value == x
-			end
-
+			errors = check_confirmation_field_match(field, value) if !field.match(/_confirmation/).nil?
 			render json: errors.to_json
-			
 			rescue => e
 				logger.info "ERROR: #{e}"
+		end # end create
+
+		def check_confirmation_field_match(field, value)
+			field_to_confirm_against = field.gsub('_confirmation', '')
+			value == params['confirmation_field'] ? [] : ["doesn't match confirmation"]   
 		end
+		private :check_confirmation_field_match
 
-	end
+	end # end ValidationsController
 
-end
+end # end Rapscallion module

data/lib/rapscallion/version.rb

@@ -1,3 +1,3 @@
 module Rapscallion
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rapscallion
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Gordon Isnor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-10 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails