client_side_validations 9.1.0 → 9.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90df211b4f5892467d0353fe4de921dd9424cca3
-  data.tar.gz: 42dbbd51195d63ad7b9fb99015d197a298b9dae6
+  metadata.gz: 5c97aaa7e427726552ee50a3c5ef04aefb79df5d
+  data.tar.gz: 01ba6bb6c9d6219ee83a27cf2615c6571680f6d0
 SHA512:
-  metadata.gz: 61fff69cc9fd41f3aae9e4840a4905ffa4dc558eda4076adfa52071b1733803edbd137fba8e5600d7117e73ff588848f186912183a3ea3965bcf19ee38fd2183
-  data.tar.gz: 3637f5796ec4ff194f03a3bb5b1282289beff41231dbf5a54fb6a8d8dc646feace8e22b1061330913ccc3ad4469c6df712edd7bf58b6077842f87bb01849122f
+  metadata.gz: 21557913adad69294d2b05244bdf6b317f40cb38fe355335133b8e615b18e7c29d1828db4feb4565d1af955132b6f0c246b36821b8475bed3de791ef699eb699
+  data.tar.gz: 16c28cb2b54cc7ea8a961e21b25781dbb6fd14d243f2baac9e95a2bf6626b308ab78b63518e0626bd92a2815e78de04c18dc9f76320d5c055e240cbae2d7bd9a

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## 9.2.0 / 2017-03-23
+
+* [ENHANCEMENT] Use Ruby 2.3's Frozen String Literal Pragma
+* [ENHANCEMENT] Code cleanup
+* [ENHANCEMENT] Test against Ruby 2.4.1 and Rails 5.1.0.rc1
+* [ENHANCEMENT] Test against jQuery 3.2.0 and 3.2.1
+* [ENHANCEMENT] Update jquery-rails runtime depenency to 4.3
+* [ENHANCEMENT] Update development dependencies
+
 ## 9.1.0 / 2017-03-07
 
 * [ENHANCEMENT] Rails 5.1 compatibility

data/lib/client_side_validations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'client_side_validations/config'
 require 'client_side_validations/active_model'  if defined?(::ActiveModel)
 require 'client_side_validations/active_record' if defined?(::ActiveRecord)

data/lib/client_side_validations/action_view.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActionView
     module Helpers

data/lib/client_side_validations/action_view/form_builder.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActionView
     module Helpers

data/lib/client_side_validations/active_model.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'client_side_validations/core_ext'
 require 'client_side_validations/extender'
 require 'client_side_validations/active_model/conditionals'
@@ -31,14 +32,7 @@ module ClientSideValidations
         _validators.inject({}) do |attr_hash, attr|
           return attr_hash if [nil, :block].include?(attr[0])
 
-          validator_hash = attr[1].each_with_object(Hash.new { |h, k| h[k] = [] }) do |validator, kind_hash|
-            next unless can_use_for_client_side_validation?(attr[0], validator, force)
-
-            client_side_hash = validator.client_side_hash(self, attr[0], extract_force_option(attr[0], force))
-            if client_side_hash
-              kind_hash[validator.kind] << client_side_hash.except(:on, :if, :unless)
-            end
-          end
+          validator_hash = validator_hash_for(attr, force)
 
           if validator_hash.present?
             attr_hash.merge!(attr[0] => validator_hash)
@@ -50,6 +44,17 @@ module ClientSideValidations
 
       private
 
+      def validator_hash_for(attr, force)
+        attr[1].each_with_object(Hash.new { |h, k| h[k] = [] }) do |validator, kind_hash|
+          next unless can_use_for_client_side_validation?(attr[0], validator, force)
+
+          client_side_hash = validator.client_side_hash(self, attr[0], extract_force_option(attr[0], force))
+          if client_side_hash
+            kind_hash[validator.kind] << client_side_hash.except(:on, :if, :unless)
+          end
+        end
+      end
+
       def extract_force_option(attr, force)
         case force
         when FalseClass, TrueClass, NilClass

data/lib/client_side_validations/active_model/absence.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Absence

data/lib/client_side_validations/active_model/acceptance.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Acceptance

data/lib/client_side_validations/active_model/conditionals.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Conditionals

data/lib/client_side_validations/active_model/exclusion.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Exclusion

data/lib/client_side_validations/active_model/format.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Format

data/lib/client_side_validations/active_model/inclusion.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Inclusion

data/lib/client_side_validations/active_model/length.rb

@@ -1,11 +1,10 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Length
       def client_side_hash(model, attribute, _force = nil)
         options = self.options.dup
-        hash    = { messages: {} }
-        hash[:js_tokenizer] = options[:js_tokenizer] if options[:js_tokenizer]
-        hash[:allow_blank]  = true if options[:allow_blank]
+        hash    = options_hash(options)
 
         self.class::MESSAGES.each do |option, message_type|
           count = options[option]
@@ -21,6 +20,15 @@ module ClientSideValidations
 
         hash
       end
+
+      private
+
+      def options_hash(options)
+        hash = { messages: {} }
+        hash[:js_tokenizer] = options[:js_tokenizer] if options[:js_tokenizer]
+        hash[:allow_blank]  = true if options[:allow_blank]
+        hash
+      end
     end
   end
 end

data/lib/client_side_validations/active_model/numericality.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Numericality
@@ -9,14 +10,7 @@ module ClientSideValidations
 
       def client_side_hash(model, attribute, force = nil)
         options = self.options.dup
-        hash    = { messages: { numericality: model.errors.generate_message(attribute, :not_a_number, options) } }
-
-        if options[:only_integer]
-          hash[:messages][:only_integer] = model.errors.generate_message(attribute, :not_an_integer, options)
-          hash[:only_integer] = true
-        end
-
-        hash[:allow_blank] = true if options[:allow_nil] || options[:allow_blank]
+        hash    = options_hash(model, attribute, options)
 
         @@option_map.each do |option, message_type|
           count = options[option]
@@ -35,6 +29,21 @@ module ClientSideValidations
 
         hash
       end
+
+      private
+
+      def options_hash(model, attribute, options)
+        hash = { messages: { numericality: model.errors.generate_message(attribute, :not_a_number, options) } }
+
+        if options[:only_integer]
+          hash[:messages][:only_integer] = model.errors.generate_message(attribute, :not_an_integer, options)
+          hash[:only_integer] = true
+        end
+
+        hash[:allow_blank] = true if options[:allow_nil] || options[:allow_blank]
+
+        hash
+      end
     end
   end
 end

data/lib/client_side_validations/active_model/presence.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveModel
     module Presence

data/lib/client_side_validations/active_record.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'client_side_validations/active_model'
 require 'client_side_validations/extender'
 

data/lib/client_side_validations/active_record/uniqueness.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module ActiveRecord
     module Uniqueness

data/lib/client_side_validations/config.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module Config
     class << self

data/lib/client_side_validations/core_ext.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'active_support/json'
 require 'client_side_validations/core_ext/range'
 require 'client_side_validations/core_ext/regexp'

data/lib/client_side_validations/core_ext/range.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Range
   def as_json(*)
     [first, last]

data/lib/client_side_validations/core_ext/regexp.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'js_regex'
 
 class Regexp

data/lib/client_side_validations/engine.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   class Engine < ::Rails::Engine
   end

data/lib/client_side_validations/extender.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module Extender
     module_function

data/lib/client_side_validations/files.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This is only used by dependant libraries that need to find the files
 
 module ClientSideValidations

data/lib/client_side_validations/generators.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module Generators
     @@assets = []

data/lib/client_side_validations/generators/rails_validations.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module Generators
     class RailsValidations

data/lib/client_side_validations/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ClientSideValidations
-  VERSION = '9.1.0'.freeze
+  VERSION = '9.2.0'.freeze
 end

data/lib/generators/client_side_validations/copy_assets_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ClientSideValidations
   module Generators
     class CopyAssetsGenerator < Rails::Generators::Base

data/lib/generators/client_side_validations/install_generator.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'generators/client_side_validations/copy_assets_generator'
 
 module ClientSideValidations

data/lib/generators/templates/client_side_validations/initializer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # ClientSideValidations Initializer
 
 # Disabled validators

data/vendor/assets/javascripts/rails.validations.js

@@ -1,6 +1,6 @@
 
 /*!
- * Client Side Validations - v9.1.0 (https://github.com/DavyJonesLocker/client_side_validations)
+ * Client Side Validations - v9.2.0 (https://github.com/DavyJonesLocker/client_side_validations)
  * Copyright (c) 2017 Geremia Taglialatela, Brian Cardarella
  * Licensed under MIT (http://opensource.org/licenses/mit-license.php)
  */

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: client_side_validations
 version: !ruby/object:Gem::Version
-  version: 9.1.0
+  version: 9.2.0
 platform: ruby
 authors:
 - Geremia Taglialatela
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -37,14 +37,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: js_regex
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +205,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.rc1
+        version: 2.0.0.rc2
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -316,7 +316,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.9
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Client Side Validations