simple_form_with_client_validation 0.0.0 → 0.0.2

data/README.md

@@ -776,7 +776,7 @@ https://github.com/Wbunker/Simple-Form-With-Client-Validation/issues
 ## Maintainers
 
 * Will Bunker (https://github.com/Wbunker)
-* Scott Levy
+* Scott Levy  (https://github.com/slevy)
 
 ## License
 

data/lib/generators/simple_form_with_client_validation/install_generator.rb

@@ -17,6 +17,11 @@ module SimpleFormWithClientValidation
         directory 'config'
       end
 
+      def copy_javascript
+         copy_file "simple_form_with_client_extensions.js", "app/assets/javascripts/simple_form_with_client_extensions.js"
+         puts "Need to add //= require simple_form_with_client_extensions to your application.js file in apps/assets/applications file"
+      end
+
       def copy_scaffold_template
         engine = options[:template_engine]
         copy_file "_form.html.#{engine}", "lib/templates/#{engine}/scaffold/_form.html.#{engine}"

data/lib/generators/simple_form_with_client_validation/templates/simple_form_with_client_extensions.js

@@ -0,0 +1,112 @@
+   /*
+  JQuery validation plugin code 
+*/
+jQuery.validator.addMethod(
+        "regex",
+        function(value, element, regexp) {
+            return this.optional(element) || regexp.test(value);
+        },
+        "Please check your input."
+);
+
+//must build  rules based on html tags
+jQuery(document).ready(function() {
+    
+    var $ = jQuery;
+    $("form.simple_form").each(function(index, el) {
+        var rules = {};
+        var messages = {};
+
+        var findErrorMessage= function(rule_name, rule_type, el,  message_attribute, default_error_message ) {
+
+            //make sure we have a messages section
+            if (typeof messages[rule_name] === 'undefined') {
+                messages[rule_name] = {};
+            }
+
+            //grab the message to create message
+            //user sees if this pattern doesn't match 
+            var message = el.attr(message_attribute);
+            if (message !== null  && typeof message !== 'undefined') {
+                messages[rule_name][rule_type] = message;
+            } else if (typeof default_error_message !== 'undefined'){
+                messages[rule_name][rule_type] = default_error_message;
+            }
+        }
+        
+        var findInputName = function(el) {
+            var inputName = el.attr('name');
+            if (typeof rules[inputName] === 'undefined') {
+                rules[inputName] = {};
+            }
+            return inputName;
+            
+        }
+
+
+        // handle all required files
+        $(el).find("input.required").each(function(indexRequired, requiredEl) {
+            
+            requiredEl = $(requiredEl);
+            
+            //create a rule for this element
+            var inputName = findInputName(requiredEl);
+            requiredEl.data("has_validator", true);
+            rules[inputName]["required"] = true;
+            
+            //grab the data-pattern-message to create message
+            //user sees if this pattern doesn't match
+            findErrorMessage(inputName, "required", requiredEl,  'data-required-message', "This is required" )
+
+        });
+
+    
+        //handle all regular expression by looking for data-pattern
+        $(el).find("input[data-pattern]").each(function(indexRegex, inputEle) {
+            
+            var regExpEl = $(inputEle);
+            var regExprString = regExpEl.attr("data-pattern");
+            var regExpr = null;
+            
+            //tries to create RegExp object and gives up if this fails
+            try {
+                regExpr = new RegExp(regExprString);
+            } catch(e) {
+                //can't build rule with this regular expression
+                console.log("couldn't build validator for data-pattern=" + regExprString)
+                return;
+            }
+            
+            //create a rule for this element
+            var inputName = findInputName(regExpEl);
+            rules[inputName]["regex"] = regExpr;
+            regExpEl.data("has_validator", true);
+            
+            //grab the data-pattern-message to create message
+            //user sees if this pattern doesn't match 
+            findErrorMessage(inputName, "regex", regExpEl,  'data-pattern-message' )
+        })
+
+        var validateOptions = {
+            onfocusout: function(element) {
+                element = $(element);
+                
+                //don't do anything if not marked for validation
+                if (element.data("has_validator") !== true) {
+                    return;
+                }
+                
+                var isValid = $(element).valid();
+                if (!isValid){
+                    $(element).focus();
+                }
+            },
+            rules: rules,
+            messages: messages,
+            errorLabelContainer: "form.simple_form .errorArea"
+        };
+        $(el).validate(validateOptions)
+    })
+    
+})
+

data/lib/simple_form_with_client_validation/components/pattern.rb

@@ -1,20 +1,39 @@
+require 'simple_form_with_client_validation/core_ext/regexp'
+
 module SimpleFormWithClientValidation
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Pattern
       def pattern
         input_html_options[:pattern] ||= pattern_source
+        input_html_options[:'data-pattern'] = input_html_options[:pattern]
+        input_html_options[:'data-pattern-message'] = options[:'data-pattern-message'] || pattern_error_message
         nil
       end
 
       private
 
+      def pattern_error_message
+
+        pattern_error = options[:'data-pattern-message']
+        if pattern_error.is_a?(String)
+          pattern_error
+        elsif pattern_validator = find_pattern_validator
+          if pattern_validator.options.has_key?(:message)
+             pattern_validator.options[:message]
+          else
+            ""
+          end
+        end
+      end
+
       def pattern_source
         pattern = options[:pattern]
         if pattern.is_a?(String)
           pattern
         elsif pattern_validator = find_pattern_validator
-          evaluate_format_validator_option(pattern_validator.options[:with]).source
+          pattern = evaluate_format_validator_option(pattern_validator.options[:with]).to_javascript
+          pattern.slice(1,pattern.length-2)
         end
       end
 

data/lib/simple_form_with_client_validation/core_ext/regexp.rb

@@ -0,0 +1,7 @@
+# this came from
+# http://reefpoints.dockyard.com/ruby/2011/11/18/convert-ruby-regexp-to-javascript-regex.html
+class Regexp
+  def to_javascript
+    Regexp.new(inspect.sub('\\A','^').sub('\\Z','$').sub('\\z','$').sub(/^\//,'').sub(/\/[a-z]*$/,'').gsub(/\(\?#.+\)/, '').gsub(/\(\?-\w+:/,'('), self.options).inspect
+  end
+end

data/lib/simple_form_with_client_validation/version.rb

@@ -1,3 +1,3 @@
 module SimpleFormWithClientValidation
-  VERSION = "0.0.0".freeze
+  VERSION = "0.0.2".freeze
 end

data/test/action_view_extensions/builder_test.rb

@@ -242,17 +242,6 @@ class BuilderTest < ActionView::TestCase
     end
   end
 
-  test 'collection_radio helper is deprecated in favor of collection_radio_buttons' do
-    assert_deprecated "[SIMPLE_FORM] The `collection_radio` helper is deprecated, " \
-      "please use `collection_radio_buttons` instead" do
-      with_concat_form_for(@user) do |f|
-        f.collection_radio :active, [true, false], :to_s, :to_s
-      end
-    end
-
-    assert_select 'input[type=radio][value=true]'
-    assert_select 'input[type=radio][value=false]'
-  end
 
   # COLLECTION CHECK BOX
   test 'collection check box accepts a collection and generate a serie of checkboxes for value method' do

data/test/inputs/string_input_test.rb

@@ -82,6 +82,21 @@ class StringInputTest < ActionView::TestCase
     assert_select 'input[pattern="\w+"]'
   end
 
+  test 'input should infer data-pattern from attributes' do
+    with_input_for @other_validating_user, :country, :string, :pattern => true
+    assert_select 'input[data-pattern="\w+"]'
+  end 
+  
+  test 'input should infer data-pattern-message from attributes' do
+    with_input_for @other_validating_user, :country, :string, :pattern => true
+    assert_select 'input[data-pattern-message="Country is wrong format."]'
+  end
+
+  test 'input should infer emptyp data-pattern-message from attributes' do
+    with_input_for @other_validating_user, :name, :string, :pattern => true
+    assert_select 'input[data-pattern-message=""]'
+  end
+
   test 'input should infer pattern from attributes using proc' do
     with_input_for @other_validating_user, :name, :string, :pattern => true
     assert_select 'input[pattern="\w+"]'

data/test/support/models.rb

@@ -188,7 +188,7 @@ class OtherValidatingUser < User
     :less_than_or_equal_to => Proc.new { |user| user.age + 100},
     :only_integer => true
 
-  validates_format_of :country, :with => /\w+/
+  validates_format_of :country, :with => /\w+/, :message=>"Country is wrong format."
 
   # TODO: Remove this check when we drop Rails 3.0 support
   if ActiveModel::VERSION::MAJOR == 3 && ActiveModel::VERSION::MINOR >= 1

data/test/test_helper.rb

@@ -60,7 +60,7 @@ class ActionView::TestCase
 
     @validating_user = ValidatingUser.new({
       :id => 1,
-      :name => 'New in SimpleFormWithClientValidation!',
+      :name => 'New in SimpleForm!',
       :description => 'Hello!',
       :home_picture => 'Home picture',
       :created_at => Time.now,

metadata

@@ -1,21 +1,22 @@
 --- !ruby/object:Gem::Specification 
 name: simple_form_with_client_validation
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Will Bunker
+- Scott Levy
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2012-03-12 00:00:00 Z
+date: 2012-03-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activemodel
@@ -66,6 +67,7 @@ files:
 - lib/generators/simple_form_with_client_validation/templates/config/initializers/simple_form.rb.tt
 - lib/generators/simple_form_with_client_validation/templates/config/locales/simple_form.en.yml
 - lib/generators/simple_form_with_client_validation/templates/README
+- lib/generators/simple_form_with_client_validation/templates/simple_form_with_client_extensions.js
 - lib/generators/simple_form_with_client_validation/USAGE
 - lib/simple_form_with_client_validation/action_view_extensions/builder.rb
 - lib/simple_form_with_client_validation/action_view_extensions/form_helper.rb
@@ -82,6 +84,7 @@ files:
 - lib/simple_form_with_client_validation/components/readonly.rb
 - lib/simple_form_with_client_validation/components.rb
 - lib/simple_form_with_client_validation/core_ext/hash.rb
+- lib/simple_form_with_client_validation/core_ext/regexp.rb
 - lib/simple_form_with_client_validation/error_notification.rb
 - lib/simple_form_with_client_validation/form_builder.rb
 - lib/simple_form_with_client_validation/helpers/autofocus.rb
@@ -154,7 +157,7 @@ files:
 - test/support/mock_response.rb
 - test/support/models.rb
 - test/test_helper.rb
-homepage: https://github.com/plataformatec/simple_form
+homepage: https://github.com/Wbunker/Simple-Form-With-Client-Validation
 licenses: []
 
 post_install_message: