guardsjs-rails 1.3.0 → 1.3.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4ecaddb03b89008086fe01b4fb8a192361d7932c
+  data.tar.gz: 7ac29aeec4958754ce9287e3b4a394c784ad4179
+SHA512:
+  metadata.gz: e46265182f15c0aa8428589ee3d55f4083e5ae3ff6bb8ce116c3c569b28d8cb068cb1378cee554bcbed984b576eac40a37e84f5db78c35dddc5818a12b88cbfe
+  data.tar.gz: 3350e7fdf53ae9c936a0607ef7867701e5d5bd31a488e2d51d9bec0151122fe0f48b57106ab77497a80b71b76227e52c55bf3b226bf556a263cf7163c173df30

data/app/assets/javascripts/guards.js

@@ -1,5 +1,5 @@
 /*!
- * Guards JavaScript jQuery Plugin v1.3.0
+ * Guards JavaScript jQuery Plugin v1.3.1
  * https://github.com/on-site/guards.js
  *
  * Copyright 2010-2014, On-Site.com, http://www.on-site.com/
@@ -8,7 +8,7 @@
  * Includes code for email and phone number validation from the jQuery
  * Validation plugin.  http://docs.jquery.com/Plugins/Validation
  *
- * Date: Wed Apr  9 15:06:00 2014 -0700
+ * Date: Sun Apr 13 13:33:25 2014 -0700
  */
 
 /**
@@ -48,7 +48,7 @@
         return $.guards.add(selector);
     };
 
-    $.guard.version = "1.3.0";
+    $.guard.version = "1.3.1";
 
     $.Guards = function() {
         var self = this;
@@ -151,8 +151,34 @@
          *     </p>
          *   </div>
          * </div>
+         *
+         * <p>
+         *   As of version 1.3.1, the allowed words can be specified via an object with a string property
+         *   named <code>words</code> delimited by spaces by default, or delimited with the
+         *   <code>delimiter</code> property.  This is primarily to support the <a href="data_attributes.html">data attributes</a>
+         *   form of guards.
+         * </p>
+         *
+         * <div class="example">
+         *   <div class="display">
+         *     <script>
+         *       $.guard(".primary-color-2").using("allow", { words: "red yellow blue" });
+         *       $.guard(".country").using("allow", { words: "United States,Canada", delimiter: "," });
+         *     </script>
+         *
+         *     <p>
+         *       <input class="primary-color" type="text" /><br />
+         *       <small>Allowed values: red, yellow, blue</small>
+         *     </p>
+         *
+         *     <p>
+         *       <input class="country" type="text" /><br />
+         *       <small>Allowed values: United States, Canada</small>
+         *     </p>
+         *   </div>
+         * </div>
          */
-        this.name("allow").using(this.aggregate(this.isAllValid, this.isAllowed)).message(this.arrayMessage("Please enter one of: #{0}."));
+        this.name("allow").using(this.aggregate(this.isAllValid, this.isAllowed)).message(this.wordsArrayMessage("Please enter one of: #{0}."));
 
         /**
          * @page Named Guards
@@ -226,8 +252,34 @@
          *     </p>
          *   </div>
          * </div>
+         *
+         * <p>
+         *   As of version 1.3.1, the disallowed words can be specified via an object with a string property
+         *   named <code>words</code> delimited by spaces by default, or delimited with the
+         *   <code>delimiter</code> property.  This is primarily to support the <a href="data_attributes.html">data attributes</a>
+         *   form of guards.
+         * </p>
+         *
+         * <div class="example">
+         *   <div class="display">
+         *     <script>
+         *       $.guard(".not-primary-color-2").using("disallow", { words: "red yellow blue" });
+         *       $.guard(".not-country").using("disallow", { words: "United States,Canada", delimiter: "," });
+         *     </script>
+         *
+         *     <p>
+         *       <input class="not-primary-color-2" type="text" /><br />
+         *       <small>Disallowed values: red, yellow, blue</small>
+         *     </p>
+         *
+         *     <p>
+         *       <input class="not-country" type="text" /><br />
+         *       <small>Disallowed values: United States, Canada</small>
+         *     </p>
+         *   </div>
+         * </div>
          */
-        this.name("disallow").using(this.aggregate(this.isAllValid, this.isDisallowed)).message(this.arrayMessage("Please don't enter: #{0}."));
+        this.name("disallow").using(this.aggregate(this.isAllValid, this.isDisallowed)).message(this.wordsArrayMessage("Please don't enter: #{0}."));
 
         /**
          * @page Named Guards
@@ -561,6 +613,25 @@
          *     </p>
          *   </div>
          * </div>
+         *
+         * <p>
+         *   As of version 1.3.1, the regex can be specified via an object with a string property named
+         *   <code>pattern</code>.  This is primarily to support the <a href="data_attributes.html">data attributes</a>
+         *   form of guards.
+         * </p>
+         *
+         * <div class="example">
+         *   <div class="display">
+         *     <script>
+         *       $.guard(".regex2").using("regex", { pattern: "^abc\\d{1,3}$" });
+         *     </script>
+         *
+         *     <p>
+         *       <input class="regex2" type="text" /><br />
+         *       <small>abc with 1-3 digits is required, like 'abc123'</small>
+         *     </p>
+         *   </div>
+         * </div>
          */
         this.name("regex").using(this.aggregate(this.isAllValid, this.matchesRegex)).message("Please enter valid input.");
 
@@ -674,7 +745,7 @@
      *   This version of guards.js library as a string, like <code>"1.0.0"</code>.
      * </p>
      */
-    $.Guards.prototype.version = "1.3.0";
+    $.Guards.prototype.version = "1.3.1";
 
     $.Guards.prototype.parentContext = function(element) {
         var $element = $(element);
@@ -741,6 +812,16 @@
         return result;
     };
 
+    $.Guards.prototype.wordsArrayMessage = function(formatting) {
+        var self = this;
+        var formattingFn = this.arrayMessage(formatting);
+
+        return function(array) {
+            array = self.getWordsArray(array);
+            return formattingFn(array);
+        };
+    };
+
     $.Guards.prototype.arrayMessage = function(formatting) {
         var self = this;
 
@@ -1007,6 +1088,23 @@
         return false;
     };
 
+    /**
+     * The given object will either already be an array, or will be an
+     * object describing the array (a string words property with
+     * implicitly " " delimiter, or an explicit delimiter property).
+     */
+    $.Guards.prototype.getWordsArray = function(obj) {
+        if ($.type(obj) === "object" && !this.isNullOrUndefined(obj.words)) {
+            return obj.words.split(obj.delimiter || " ");
+        }
+
+        if ($.type(obj) === "array") {
+            return obj;
+        }
+
+        throw new Error("Invalid type, expecting array or object with words property and optional delimiter property, got " + $.type(obj));
+    };
+
     /**
      * Return whether or not the value exists in the given allowed
      * list.  The allowed parameter must be an array of valid values.
@@ -1015,6 +1113,7 @@
      */
     $.Guards.prototype.isAllowed = function(value, allowed) {
         value = $.trim(value);
+        allowed = this.getWordsArray(allowed);
         return $.inArray(value, $.map(allowed, function(x) { return $.trim("" + x); })) !== -1;
     };
 
@@ -1305,7 +1404,11 @@
      * Validates the given value matches the given regex.
      */
     $.Guards.prototype.matchesRegex = function(value, regex) {
-        if ($.type(regex) != "regexp") {
+        if ($.type(regex) === "object" && regex.pattern) {
+            regex = new RegExp(regex.pattern);
+        }
+
+        if ($.type(regex) !== "regexp") {
             throw new Error("The regex must be provided as an option!");
         }
 
@@ -1346,7 +1449,7 @@
      *
      * Example: $.guards.add(".validPhone").using("phoneUS");
      * Example: $.guards.add(".custom").using(function(value, element) {
-     *            return value != "invalid";
+     *            return value !== "invalid";
      *          }).message("Don't use the keyword 'invalid'.");
      * Example: $.guards.add(".custom").grouped().using(function(values, elements) {
      *            return $.inArray("invalid", values) == -1;

data/lib/guardsjs-rails/version.rb

@@ -1,5 +1,5 @@
 module GuardsJS
   module Rails
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

metadata

@@ -1,36 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: guardsjs-rails
 version: !ruby/object:Gem::Version
-  version: 1.3.0
-  prerelease: 
+  version: 1.3.1
 platform: ruby
 authors:
 - Mike Virata-Stone
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-10 00:00:00.000000000 Z
+date: 2014-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '5.0'
 description: This gem wraps the guards.js jQuery validation library as a Rails asset
@@ -41,35 +38,31 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/guardsjs-rails/version.rb
-- lib/guardsjs-rails.rb
 - app/assets/javascripts/guards.js
+- lib/guardsjs-rails.rb
+- lib/guardsjs-rails/version.rb
 homepage: http://guardsjs.com/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 986596030085484236
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Rails asset gem for guards.js.
 test_files: []