rails4_client_side_validations 0.0.4 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ad7d2b05a00e5ce63f9a1e7443fd0d991d2f6f3
-  data.tar.gz: 9611698a23af73868534bcb49b7a619eb658f92d
+  metadata.gz: d8b093c6b17d7b641997d3bfbbb4e98726b1de02
+  data.tar.gz: 62995c5131322f8dcd4d67a7c8c551906a71a34c
 SHA512:
-  metadata.gz: 53f7c96caae0ca0afb27fc32d55de40ffee7ac46949220739bf34b5828c3d9283d81479a64c9da4cd589299974d1f391464ef253529b71a19a11c84dcefcd37f
-  data.tar.gz: f91ae6fc15f363bfb8433355be929705e3ee11202cc9b1646209217d49389abc103f6dbc16ccb2140239544e75d1691679f6d4ee52cef2d69aaef16288fe2f22
+  metadata.gz: c2fb46377e7241745c17ce084fe160af267a1aa0f902379212ba77fc426c4be96a35746e83b52422d93a1fc476b9dc5e9c66cb95cb9bd8af7ee1ce545a15b24a
+  data.tar.gz: f33e5a9bc2c6dee2387d8fc8f4c78ad614a596b6f433a98431477f268f11e06fcdd6a55b1dfb57dffbea66a823456f5b978930a36e9e8a395c6c8c9899541a46

data/README.md

@@ -1,9 +1,14 @@
-[![Gem Version](https://badge.fury.io/rb/rails4_client_side_validations.png)](http://badge.fury.io/rb/rails4_client_side_validations)
-[![Build Status](https://travis-ci.org/kalkov/rails4_client_side_validations.png)](https://travis-ci.org/kalkov/rails4_client_side_validations)
-[![Code Climate](https://codeclimate.com/github/kalkov/rails4_client_side_validations.png)](https://codeclimate.com/github/kalkov/rails4_client_side_validations)
-[![Dependency Status](https://gemnasium.com/kalkov/rails4_client_side_validations.svg)](https://gemnasium.com/kalkov/rails4_client_side_validations)
+Original repo is here: [client_side_validations](https://github.com/DavyJonesLocker/client_side_validations)
 
+The purpose ot this repo is that you can install it like a 'normal' gem from rubygems, instead of Github.
 
-Important
----------
-It's not recommended to use this gem. It's modified version of [client_side_validations](https://github.com/bcardarella/client_side_validations.git), which supports Rails 4. But I can't understand well the codebase, so no guarantee I'll continue to support it.
+
+## Install
+
+```ruby
+gem 'rails4_client_side_validations'
+```
+
+## Usage
+
+Same as original gem.

data/lib/client_side_validations.rb

@@ -0,0 +1,12 @@
+module ClientSideValidations
+end
+
+require 'client_side_validations/config'
+require 'client_side_validations/active_model'  if defined?(::ActiveModel)
+require 'client_side_validations/active_record' if defined?(::ActiveRecord)
+require 'client_side_validations/action_view'   if defined?(::ActionView)
+if defined?(::Rails)
+  require 'client_side_validations/generators'
+  require 'client_side_validations/middleware'
+  require 'client_side_validations/engine'
+end

data/lib/client_side_validations/action_view.rb

@@ -0,0 +1,13 @@
+module ClientSideValidations::ActionView
+  module Helpers
+  end
+end
+
+require 'client_side_validations/core_ext'
+require 'client_side_validations/action_view/form_helper'
+require 'client_side_validations/action_view/form_tag_helper'
+require 'client_side_validations/action_view/form_builder'
+
+ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormHelper)
+ActionView::Base.send(:include, ClientSideValidations::ActionView::Helpers::FormTagHelper)
+ActionView::Helpers::FormBuilder.send(:include, ClientSideValidations::ActionView::Helpers::FormBuilder)

data/lib/client_side_validations/action_view/form_builder.rb

@@ -0,0 +1,105 @@
+module ClientSideValidations::ActionView::Helpers
+  module FormBuilder
+
+    def self.included(base)
+      (base.field_helpers.map(&:to_s) - %w(apply_form_for_options! label check_box radio_button fields_for hidden_field)).each do |selector|
+        base.class_eval <<-RUBY_EVAL
+          def #{selector}_with_client_side_validations(method, options = {})
+            build_validation_options(method, options)
+            options.delete(:validate)
+            #{selector}_without_client_side_validations(method, options)
+          end
+        RUBY_EVAL
+
+        base.class_eval { alias_method_chain selector, :client_side_validations }
+      end
+
+      base.class_eval do
+        alias_method_chain :initialize,                :client_side_validations
+        alias_method_chain :fields_for,                :client_side_validations
+        alias_method_chain :check_box,                 :client_side_validations
+        alias_method_chain :radio_button,              :client_side_validations
+        alias_method_chain :select,                    :client_side_validations
+        alias_method_chain :collection_select,         :client_side_validations
+        alias_method_chain :grouped_collection_select, :client_side_validations
+        alias_method_chain :time_zone_select,          :client_side_validations
+
+        def client_side_form_settings(options, form_helper)
+          {
+            type: self.class.to_s,
+            input_tag: form_helper.class.field_error_proc.call(%{<span id="input_tag" />},  Struct.new(:error_message, :tag_id).new([], "")),
+            label_tag: form_helper.class.field_error_proc.call(%{<label id="label_tag" />}, Struct.new(:error_message, :tag_id).new([], ""))
+          }
+        end
+      end
+    end
+
+    def validate(*attrs)
+      options = attrs.pop if attrs.last.is_a?(Hash)
+      (attrs.present? ? attrs : @object._validators.keys).each do |attr|
+        build_validation_options(attr, validate: options)
+      end
+      nil
+    end
+
+    def initialize_with_client_side_validations(object_name, object, *args)
+      initialize_without_client_side_validations(object_name, object, *args)
+      @options[:validators] = { object => {} }
+    end
+
+    def fields_for_with_client_side_validations(record_or_name_or_array, *args, &block)
+      options = args.extract_options!
+      options[:validate] ||= @options[:validate] if @options[:validate] && !options.key?(:validate)
+      fields_for_without_client_side_validations(record_or_name_or_array, *(args << options), &block)
+    end
+
+    def check_box_with_client_side_validations(method, options = {}, checked_value = "1", unchecked_value = "0")
+      build_validation_options(method, options)
+      options.delete(:validate)
+      check_box_without_client_side_validations(method, options, checked_value, unchecked_value)
+    end
+
+    def radio_button_with_client_side_validations(method, tag_value, options = {})
+      build_validation_options(method, options)
+      options.delete(:validate)
+      radio_button_without_client_side_validations(method, tag_value, options)
+    end
+
+    def select_with_client_side_validations(method, choices, options = {}, html_options = {})
+      build_validation_options(method, html_options.merge(name: options[:name]))
+      html_options.delete(:validate)
+      select_without_client_side_validations(method, choices, options, html_options)
+    end
+
+    def collection_select_with_client_side_validations(method, collection, value_method, text_method, options = {}, html_options = {})
+      build_validation_options(method, html_options.merge(name: options[:name]))
+      html_options.delete(:validate)
+      collection_select_without_client_side_validations(method, collection, value_method, text_method, options, html_options)
+    end
+
+    def grouped_collection_select_with_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options = {}, html_options = {})
+      build_validation_options(method, html_options.merge(name: options[:name]))
+      html_options.delete(:validate)
+      grouped_collection_select_without_client_side_validations(method, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
+    end
+
+    def time_zone_select_with_client_side_validations(method, priority_zones = nil, options = {}, html_options = {})
+      build_validation_options(method, html_options.merge(name: options[:name]))
+      html_options.delete(:validate)
+      time_zone_select_without_client_side_validations(method, priority_zones, options, html_options)
+    end
+
+  private
+
+    def build_validation_options(method, options = {})
+      if @options[:validate]
+        index = @default_options[:index].present? ? "[#{@default_options[:index]}]" : ''
+        name = options[:name] || "#{@object_name}#{index}[#{method}]"
+        child_index = @options[:child_index] ? "(\\d+|#{Regexp.escape(@options[:child_index].to_s)})" : "\\d+"
+        name = name.to_s.gsub(/_attributes\]\[#{child_index}\]/, '_attributes][]')
+        name = "#{name}#{options[:multiple] ? "[]" : nil}"
+        @options[:validators][@object][method] = { name: name, options: options[:validate] }
+      end
+    end
+  end
+end

data/lib/{rails4_client_side_validations → client_side_validations}/action_view/form_helper.rb

@@ -1,10 +1,9 @@
-module Rails4ClientSideValidations::ActionView::Helpers
+module ClientSideValidations::ActionView::Helpers
   module FormHelper
     class Error < StandardError; end
 
-    def form_for(record, *args, &block)
+    def form_for(record, options = {}, &block)
       raise ArgumentError, "Missing block" unless block_given?
-      options = args.extract_options!
       if options[:validate]
 
         # Always turn off HTML5 Validations
@@ -13,7 +12,7 @@ module Rails4ClientSideValidations::ActionView::Helpers
 
         case record
         when String, Symbol
-          raise Rails4ClientSideValidations::ActionView::Helpers::FormHelper::Error, 'Using form_for(:name, @resource) is not supported with ClientSideValidations. Please use form_for(@resource, :as => :name) instead.'
+          raise ClientSideValidations::ActionView::Helpers::FormHelper::Error, 'Using form_for(:name, @resource) is not supported with ClientSideValidations. Please use form_for(@resource, as: :name) instead.'
         else
           object = record.is_a?(Array) ? record.last : record
           object_name = options[:as] || model_name_from_record_or_class(object).param_key
@@ -24,12 +23,11 @@ module Rails4ClientSideValidations::ActionView::Helpers
 
       # Order matters here. Rails mutates the options object
       html_id = options[:html][:id] if options[:html]
-      form = super(record, *(args << options), &block)
+      form = super(record, options, &block)
       options[:id] = html_id if html_id
 
-      process_validators options
+      build_bound_validators options
       builder = instantiate_builder(object_name, object, options) if object_name and object
-
       script = client_side_form_settings(object, options, builder)
 
       # Because of the load order requirement above this sub is necessary
@@ -50,20 +48,20 @@ module Rails4ClientSideValidations::ActionView::Helpers
       end
     end
 
-    def apply_form_for_options!(object_or_array, object, options)
+    def apply_form_for_options!(record, object, options)
       super
       options[:html][:validate] = true if options[:validate]
     end
 
     def fields_for(record_or_name_or_array, record_object = nil, options = {}, &block)
       output = super
-      process_validators options
+      build_bound_validators options
       output
     end
 
     private
 
-    def process_validators(options)
+    def build_bound_validators(options)
       if @validators
         options[:validators].each do |key, value|
           if @validators.key?(key)
@@ -120,20 +118,18 @@ module Rails4ClientSideValidations::ActionView::Helpers
           end
         end
 
-        if Rails4ClientSideValidations::Config.number_format_with_locale and defined?(I18n)
-          number_format = I18n.t("number.format").slice(:separator, :delimiter)
+        if ClientSideValidations::Config.number_format_with_locale and defined?(I18n)
+          number_format = I18n.t('number.format').slice(:separator, :delimiter)
         else
-          number_format = {:separator=>".", :delimiter=>","}
+          number_format = { separator:'.', delimiter:',' }
         end
-        patterns = {:numericality=>"/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/"}
+        patterns = { numericality:"/^(-|\\+)?(?:\\d+|\\d{1,3}(?:\\#{number_format[:delimiter]}\\d{3})+)(?:\\#{number_format[:separator]}\\d*)?$/" }
 
 
         content_tag(:script) do
-          "//<![CDATA[\nif(window.Rails4ClientSideValidations===undefined)window.Rails4ClientSideValidations={};window.Rails4ClientSideValidations.disabled_validators=#{Rails4ClientSideValidations::Config.disabled_validators.to_json};window.Rails4ClientSideValidations.number_format=#{number_format.to_json};if(window.Rails4ClientSideValidations.patterns===undefined)window.Rails4ClientSideValidations.patterns = {};window.Rails4ClientSideValidations.patterns.numericality=#{patterns[:numericality]};if(window.Rails4ClientSideValidations.remote_validators_prefix===undefined)window.Rails4ClientSideValidations.remote_validators_prefix='#{(Rails4ClientSideValidations::Config.root_path||"").sub(/\/+\Z/,'')}';if(window.Rails4ClientSideValidations.forms===undefined)window.Rails4ClientSideValidations.forms={};window.Rails4ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(:validators => 'validator_hash').to_json};\n//]]>".html_safe
+          "//<![CDATA[\nif(window.ClientSideValidations===undefined)window.ClientSideValidations={};window.ClientSideValidations.disabled_validators=#{ClientSideValidations::Config.disabled_validators.to_json};window.ClientSideValidations.number_format=#{number_format.to_json};if(window.ClientSideValidations.patterns===undefined)window.ClientSideValidations.patterns = {};window.ClientSideValidations.patterns.numericality=#{patterns[:numericality]};#{"if(window.ClientSideValidations.remote_validators_prefix===undefined)window.ClientSideValidations.remote_validators_prefix='#{(ClientSideValidations::Config.root_path).sub(/\/+\Z/,'')}';" if ClientSideValidations::Config.root_path.present? }if(window.ClientSideValidations.forms===undefined)window.ClientSideValidations.forms={};window.ClientSideValidations.forms['#{var_name}'] = #{builder.client_side_form_settings(options, self).merge(validators: 'validator_hash').to_json};\n//]]>".html_safe
         end
       end
     end
-
   end
 end
-

data/lib/client_side_validations/action_view/form_tag_helper.rb

@@ -0,0 +1,11 @@
+module ClientSideValidations::ActionView::Helpers
+  module FormTagHelper
+    private
+      def html_options_for_form(url_for_options, options)
+        options.stringify_keys!
+        html_options = {}
+        html_options['data-validate'] = options.delete('validate') if options['validate']
+        html_options.merge!(super(url_for_options, options))
+      end
+  end
+end

data/lib/{rails4_client_side_validations → client_side_validations}/active_model.rb

@@ -1,6 +1,6 @@
-require 'rails4_client_side_validations/core_ext'
+require 'client_side_validations/core_ext'
 
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Validator
 
     def client_side_hash(model, attribute, force = nil)
@@ -14,7 +14,7 @@ module Rails4ClientSideValidations::ActiveModel
     private
 
     def build_client_side_hash(model, attribute, options)
-      { :message => model.errors.generate_message(attribute, message_type, options) }.merge(options.except(*::ActiveModel::Errors::CALLBACKS_OPTIONS - [:allow_blank, :if, :unless]))
+      { message: model.errors.generate_message(attribute, message_type, options) }.merge(options.except(*::ActiveModel::Errors::CALLBACKS_OPTIONS - [:allow_blank, :if, :unless]))
     end
 
     def message_type
@@ -108,7 +108,7 @@ module Rails4ClientSideValidations::ActiveModel
           false
         end
       else
-        ::Rails4ClientSideValidations::Config.disabled_validators.include?(validator.kind)
+        ::ClientSideValidations::Config.disabled_validators.include?(validator.kind)
       end
     end
 
@@ -130,14 +130,36 @@ module Rails4ClientSideValidations::ActiveModel
       end
     end
   end
+
+  module EnumerableValidator
+    def client_side_hash(model, attribute, force = nil)
+      options = self.options.dup
+      if options[:in].respond_to?(:call)
+        if force
+          options[:in] = options[:in].call(model)
+          hash = build_client_side_hash(model, attribute, options)
+        else
+          return
+        end
+      else
+        hash = build_client_side_hash(model, attribute, options)
+      end
+
+      if hash[:in].is_a?(Range)
+        hash[:range] = hash[:in]
+        hash.delete(:in)
+      end
+
+      hash
+    end
+  end
 end
 
-ActiveModel::Validator.send(:include, Rails4ClientSideValidations::ActiveModel::Validator)
-ActiveModel::Validations.send(:include, Rails4ClientSideValidations::ActiveModel::Validations)
+ActiveModel::Validator.send(:include, ClientSideValidations::ActiveModel::Validator)
+ActiveModel::Validations.send(:include, ClientSideValidations::ActiveModel::Validations)
 
 %w{absence acceptance exclusion inclusion length format numericality presence}.each do |validator|
-  require "rails4_client_side_validations/active_model/#{validator}"
+  require "client_side_validations/active_model/#{validator}"
   validator.capitalize!
-  eval "ActiveModel::Validations::#{validator}Validator.send(:include, Rails4ClientSideValidations::ActiveModel::#{validator})"
+  eval "ActiveModel::Validations::#{validator}Validator.send(:include, ClientSideValidations::ActiveModel::#{validator})"
 end
-

data/lib/{rails4_client_side_validations → client_side_validations}/active_model/absence.rb

@@ -1,4 +1,4 @@
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Absence
     private
 
@@ -7,4 +7,3 @@ module Rails4ClientSideValidations::ActiveModel
     end
   end
 end
-

data/lib/{rails4_client_side_validations → client_side_validations}/active_model/acceptance.rb

@@ -1,4 +1,4 @@
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Acceptance
     private
 
@@ -7,4 +7,3 @@ module Rails4ClientSideValidations::ActiveModel
     end
   end
 end
-

data/lib/client_side_validations/active_model/exclusion.rb

@@ -0,0 +1,7 @@
+module ClientSideValidations::ActiveModel
+  module Exclusion
+
+    include EnumerableValidator
+
+  end
+end

data/lib/{rails4_client_side_validations → client_side_validations}/active_model/format.rb

@@ -1,4 +1,4 @@
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Format
     def client_side_hash(model, attribute, force = nil)
       options = self.options.dup
@@ -28,4 +28,3 @@ module Rails4ClientSideValidations::ActiveModel
     end
   end
 end
-

data/lib/client_side_validations/active_model/inclusion.rb

@@ -0,0 +1,7 @@
+module ClientSideValidations::ActiveModel
+  module Inclusion
+
+    include EnumerableValidator
+
+  end
+end

data/lib/{rails4_client_side_validations → client_side_validations}/active_model/length.rb

@@ -1,9 +1,9 @@
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Length
 
     def client_side_hash(model, attribute, force = nil)
       options = self.options.dup
-      hash    = { :messages => {} }
+      hash    = { messages: {} }
       hash[:js_tokenizer] = options[:js_tokenizer] if options[:js_tokenizer]
       hash[:allow_blank]  = true if options[:allow_blank]
 
@@ -11,7 +11,7 @@ module Rails4ClientSideValidations::ActiveModel
         if count = options[option]
           options[:message] = options[message_type] if options[message_type].present?
           options.delete(:message) if options[:message].nil?
-          hash[:messages][option] = model.errors.generate_message(attribute, message_type, options.merge(:count => count))
+          hash[:messages][option] = model.errors.generate_message(attribute, message_type, options.merge(count: count))
           hash[option] = count
         end
       end
@@ -23,4 +23,3 @@ module Rails4ClientSideValidations::ActiveModel
 
   end
 end
-

data/lib/{rails4_client_side_validations → client_side_validations}/active_model/numericality.rb

@@ -1,4 +1,4 @@
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Numericality
 
     OPTION_MAP = {}
@@ -9,7 +9,7 @@ module Rails4ClientSideValidations::ActiveModel
 
     def client_side_hash(model, attribute, force = nil)
       options = self.options.dup
-      hash    = { :messages => { :numericality => model.errors.generate_message(attribute, :not_a_number, 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)
@@ -27,7 +27,7 @@ module Rails4ClientSideValidations::ActiveModel
               next
             end
           end
-          hash[:messages][option] = model.errors.generate_message(attribute, message_type, options.merge(:count => count))
+          hash[:messages][option] = model.errors.generate_message(attribute, message_type, options.merge(count: count))
           hash[option] = count
         end
       end
@@ -39,4 +39,3 @@ module Rails4ClientSideValidations::ActiveModel
 
   end
 end
-

data/lib/{rails4_client_side_validations → client_side_validations}/active_model/presence.rb

@@ -1,4 +1,4 @@
-module Rails4ClientSideValidations::ActiveModel
+module ClientSideValidations::ActiveModel
   module Presence
     private
 
@@ -7,4 +7,3 @@ module Rails4ClientSideValidations::ActiveModel
     end
   end
 end
-