simple_form 2.0.0 → 3.5.1

data/lib/simple_form/components/maxlength.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Maxlength
-      def maxlength
+      def maxlength(wrapper_options = nil)
         input_html_options[:maxlength] ||= maximum_length_from_validation || limit
         nil
       end
@@ -15,25 +16,31 @@ module SimpleForm
           maxlength
         else
           length_validator = find_length_validator
-
-          if length_validator && !has_tokenizer?(length_validator)
-            length_validator.options[:is] || length_validator.options[:maximum]
-          end
+          maximum_length_value_from(length_validator)
         end
       end
 
       def find_length_validator
-        find_validator(ActiveModel::Validations::LengthValidator)
+        find_validator(:length)
       end
 
       def has_tokenizer?(length_validator)
-        tokenizer = length_validator.options[:tokenizer]
+        length_validator.options[:tokenizer]
+      end
 
-        # TODO: Remove this check when we drop Rails 3.0 support
-        if ActiveModel::Validations::LengthValidator.const_defined?(:DEFAULT_TOKENIZER)
-          tokenizer && tokenizer != ActiveModel::Validations::LengthValidator::DEFAULT_TOKENIZER
-        else
-          tokenizer
+      # Use validation with tokenizer if version of Rails is less than 5,
+      # if not validate without the tokenizer, if version is greater than Rails 4.
+      if ActionPack::VERSION::STRING < '5'
+        def maximum_length_value_from(length_validator)
+          if length_validator && !has_tokenizer?(length_validator)
+            length_validator.options[:is] || length_validator.options[:maximum]
+          end
+        end
+      elsif ActionPack::VERSION::STRING >= '5'
+        def maximum_length_value_from(length_validator)
+          if length_validator
+            length_validator.options[:is] || length_validator.options[:maximum]
+          end
         end
       end
     end

data/lib/simple_form/components/min_max.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
 module SimpleForm
   module Components
     module MinMax
-      def min_max
+      def min_max(wrapper_options = nil)
         if numeric_validator = find_numericality_validator
           validator_options = numeric_validator.options
           input_html_options[:min] ||= minimum_value(validator_options)
           input_html_options[:max] ||= maximum_value(validator_options)
         end
+        nil
       end
 
       private
@@ -32,7 +34,7 @@ module SimpleForm
       end
 
       def find_numericality_validator
-        find_validator(ActiveModel::Validations::NumericalityValidator)
+        find_validator(:numericality)
       end
 
       def evaluate_numericality_validator_option(option)

data/lib/simple_form/components/minlength.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+module SimpleForm
+  module Components
+    # Needs to be enabled in order to do automatic lookups.
+    module Minlength
+      def minlength(wrapper_options = nil)
+        input_html_options[:minlength] ||= minimum_length_from_validation
+        nil
+      end
+
+      private
+
+      def minimum_length_from_validation
+        minlength = options[:minlength]
+        if minlength.is_a?(String) || minlength.is_a?(Integer)
+          minlength
+        else
+          length_validator = find_length_validator
+          minimum_length_value_from(length_validator)
+        end
+      end
+
+      def find_length_validator
+        find_validator(:length)
+      end
+
+      def has_tokenizer?(length_validator)
+        length_validator.options[:tokenizer]
+      end
+
+      # Use validation with tokenizer if version of Rails is less than 5,
+      # if not validate without the tokenizer, if version is greater than Rails 4.
+      if ActionPack::VERSION::STRING < '5'
+        def minimum_length_value_from(length_validator)
+          if length_validator && !has_tokenizer?(length_validator)
+            length_validator.options[:is] || length_validator.options[:minimum]
+          end
+        end
+      elsif ActionPack::VERSION::STRING >= '5'
+        def minimum_length_value_from(length_validator)
+          if length_validator
+            length_validator.options[:is] || length_validator.options[:minimum]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/simple_form/components/pattern.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Pattern
-      def pattern
+      def pattern(wrapper_options = nil)
         input_html_options[:pattern] ||= pattern_source
         nil
       end
@@ -13,13 +14,13 @@ module SimpleForm
         pattern = options[:pattern]
         if pattern.is_a?(String)
           pattern
-        elsif pattern_validator = find_pattern_validator
-          evaluate_format_validator_option(pattern_validator.options[:with]).source
+        elsif (pattern_validator = find_pattern_validator) && (with = pattern_validator.options[:with])
+          evaluate_format_validator_option(with).source
         end
       end
 
       def find_pattern_validator
-        find_validator(ActiveModel::Validations::FormatValidator)
+        find_validator(:format)
       end
 
       def evaluate_format_validator_option(option)

data/lib/simple_form/components/placeholders.rb

@@ -1,15 +1,16 @@
+# frozen_string_literal: true
 module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Placeholders
-      def placeholder
+      def placeholder(wrapper_options = nil)
         input_html_options[:placeholder] ||= placeholder_text
         nil
       end
 
       def placeholder_text
         placeholder = options[:placeholder]
-        placeholder.is_a?(String) ? placeholder : translate(:placeholders)
+        placeholder.is_a?(String) ? placeholder : translate_from_namespace(:placeholders)
       end
     end
   end

data/lib/simple_form/components/readonly.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
 module SimpleForm
   module Components
     # Needs to be enabled in order to do automatic lookups.
     module Readonly
-      def readonly
+      def readonly(wrapper_options = nil)
         if readonly_attribute? && !has_readonly?
           input_html_options[:readonly] ||= true
           input_html_classes << :readonly
@@ -15,7 +16,7 @@ module SimpleForm
       def readonly_attribute?
         object.class.respond_to?(:readonly_attributes) &&
           object.persisted? &&
-          object.class.readonly_attributes.include?(attribute_name)
+          object.class.readonly_attributes.include?(attribute_name.to_s)
       end
     end
   end

data/lib/simple_form/components.rb

@@ -1,20 +1,24 @@
+# frozen_string_literal: true
 module SimpleForm
   # Components are a special type of helpers that can work on their own.
   # For example, by using a component, it will automatically change the
   # output under given circumstances without user input. For example,
-  # the disabled helper always need a :disabled => true option given
+  # the disabled helper always need a disabled: true option given
   # to the input in order to be enabled. On the other hand, things like
   # hints can generate output automatically by doing I18n lookups.
   module Components
-    autoload :Errors,       'simple_form/components/errors'
-    autoload :Hints,        'simple_form/components/hints'
-    autoload :HTML5,        'simple_form/components/html5'
-    autoload :LabelInput,   'simple_form/components/label_input'
-    autoload :Labels,       'simple_form/components/labels'
-    autoload :MinMax,       'simple_form/components/min_max'
-    autoload :Maxlength,    'simple_form/components/maxlength'
-    autoload :Pattern,      'simple_form/components/pattern'
-    autoload :Placeholders, 'simple_form/components/placeholders'
-    autoload :Readonly,     'simple_form/components/readonly'
+    extend ActiveSupport::Autoload
+
+    autoload :Errors
+    autoload :Hints
+    autoload :HTML5
+    autoload :LabelInput
+    autoload :Labels
+    autoload :MinMax
+    autoload :Maxlength
+    autoload :Minlength
+    autoload :Pattern
+    autoload :Placeholders
+    autoload :Readonly
   end
 end

data/lib/simple_form/error_notification.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 module SimpleForm
   class ErrorNotification
-    delegate :object, :object_name, :template, :to => :@builder
+    delegate :object, :object_name, :template, to: :@builder
 
     def initialize(builder, options)
       @builder = builder
@@ -41,8 +42,8 @@ module SimpleForm
       lookups = []
       lookups << :"#{object_name}"
       lookups << :default_message
-      lookups << "Some errors were found, please take a look:"
-      I18n.t(lookups.shift, :scope => :"simple_form.error_notification", :default => lookups)
+      lookups << "Please review the problems below:"
+      I18n.t(lookups.shift, scope: :"simple_form.error_notification", default: lookups)
     end
   end
 end