bootstrap3_form_builder 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc3951fe0fc7fda12703f114b3ff5ac5f11615a3
-  data.tar.gz: fa9e5ee5ca9ca2e78a53ab5ff339e7b136558043
+  metadata.gz: ddc817fe53c8092e66dcd7eca2995694e244b3c7
+  data.tar.gz: 46f68dc84ff1589abd0d8f8bafd3ba58316cc844
 SHA512:
-  metadata.gz: 638c2133d75e8569307b773b61c7529c71069a18c8b2eddd3aa82395207ed4206af2f26dab4f58ad3e0ba58c0bed976b1b1f04e16a307be08740f15488d9502d
-  data.tar.gz: f38e42d88da03b7900ecf280e061a32e8bd94718b4ca00d8785426d2d200b030b15b2a6c3713d97c6a079fb9d2dc447151f23f3aa9ef4d127be47aa3eab6ba53
+  metadata.gz: 617e8916bce502c0365eab4f123f8ab6fec9294ed0a6694ba70eac7109ffadab5c16129a1ed713d6178d3c2c6f4e7921781b0d50ab8eb6717deca9d819e77b5f
+  data.tar.gz: c66acb6ebb27109e86fed5969df45acf5cace740847d91adc0a5356e5232ee719e22da1aacfc45a55248b4cb6ab035a8d8091dfb0f5a46c7e465acd94282a188

data/lib/bootstrap3_form_builder/form_builder.rb

@@ -18,87 +18,22 @@ Generates form fields that work with Twitter Bootstrap 3.
         options[:title] = options[:title] || custom_label.capitalize
         label_class = options[:label_class] || ""
 
-        validators = @object.class.validators_on(label)
+        allow_pattern = allow_pattern?(options)
 
-        if validators.collect(&:class).include?(ActiveRecord::Validations::PresenceValidator) || validators.collect(&:class).include?(ActiveModel::Validations::PresenceValidator)
-          options[:required] = true
-        end
-
-        allow_pattern = true
-        if options[:pattern]
-          allow_pattern = false
-        end
-
-        length_validator = (validators.select { |v| v.class == ActiveModel::Validations::LengthValidator}).first
-
-        if length_validator && allow_pattern
-          maximum = length_validator.options[:maximum] || length_validator.options[:is] || (length_validator.options[:in] ? length_validator.options[:in].max : "")
-          minimum = length_validator.options[:minimum] || length_validator.options[:is] || (length_validator.options[:in] ? length_validator.options[:in].min : "0")
-
-          options[:pattern] = ".{#{minimum},#{maximum}}"
-
-          if minimum == "0"
-            options[:title] = "#{options[:title]} - #{maximum} characters maximum"
-          elsif maximum == ""
-            options[:title] = "#{options[:title]} - #{minimum} characters minimum"
-          elsif minimum == maximum
-            options[:title] = "#{options[:title]} - Must be exactly #{maximum} characters"
-          else
-            options[:title] = "#{options[:title]} - #{minimum} to #{maximum} characters"
-          end
-        end
-
-        inclusion_validator = (validators.select { |v| v.class == ActiveModel::Validations::InclusionValidator}).first
-
-        if inclusion_validator && allow_pattern
-          valid_options = inclusion_validator.options[:in] || inclusion_validator.options[:within]
-
-          options[:pattern] = "(#{valid_options.join("|")})"
-          options[:title] = inclusion_validator.options[:message] || "#{options[:title]} - Must be one of the following: #{valid_options.join(", ")}"
-        end
-
-        numericality_validator = (validators.select{ |v| v.class == ActiveModel::Validations::NumericalityValidator}).first
-
-        if numericality_validator && !options[:type]
-          options[:type] = "number"
+        validators = @object.class.validators_on(label).select { |validator| !validator.options.key? :if }
 
-          if allow_pattern
-            options[:pattern] = "\\d*"
-          end
-
-          if numericality_validator.options[:only_integer]
-            options[:step] = 1
-          else
-            options[:step] = "any"
-          end
-        end
-
-        format_validator = (validators.select { |v| v.class == ActiveModel::Validations::FormatValidator}).first
-
-        if format_validator && allow_pattern && !method_name.to_s.include?('email')
-          options[:pattern] = format_validator.options[:with].source.html_safe
-          options[:title] = format_validator.options[:message] || "#{options[:title]} is not a valid format"
-        end
-
-        control_group_class = "form-group"
-        if @object.errors.messages[label]
-          control_group_class = control_group_class + " error"
-        end
+        set_presence_options(validators, options)
+        set_length_options(validators, options)
+        set_inclusion_options(validators, options)
+        set_numericality_options(validators, options)
+        set_format_options(validators, options, method_name)
 
         if !options[:class]
           options[:class] = "form-control"
         end
 
-        input_prefix = ""
-        input_suffix = ""
-
-        if options[:input_prefix]
-          input_prefix = @template.content_tag("div", options[:input_prefix], :class => "input-group-addon")
-        end
-
-        if options[:input_suffix]
-          input_suffix = @template.content_tag("div", options[:input_suffix], :class => "input-group-addon")
-        end
+        input_prefix = options[:input_prefix] ? @template.content_tag("div", options[:input_prefix], :class => "input-group-addon") : ""
+        input_suffix = options[:input_suffix] ? @template.content_tag("div", options[:input_suffix], :class => "input-group-addon") : ""
 
         if !input_prefix.empty? || !input_suffix.empty?
           input = @template.content_tag("div",
@@ -123,12 +58,94 @@ Generates form fields that work with Twitter Bootstrap 3.
                     custom_label,
                     :for => "#{@object_name}_#{label}",
                     :class => label_class)  + input.html_safe,
-                      :class => control_group_class)
+                      :class => control_group_class(label))
       end
     end
 
     field_helpers.each do |name|
       create_tagged_field(name)
     end
+
+    private
+    def allow_pattern?(options)
+      if options[:pattern]
+        return false
+      end
+
+      true
+    end
+
+    def set_presence_options(validators, options)
+      if validators.collect(&:class).include?(ActiveRecord::Validations::PresenceValidator) || validators.collect(&:class).include?(ActiveModel::Validations::PresenceValidator)
+        options[:required] = true
+      end
+    end
+
+    def set_length_options(validators, options)
+      length_validator = (validators.select { |v| v.class == ActiveModel::Validations::LengthValidator}).first
+
+      if length_validator && allow_pattern?(options)
+        maximum = length_validator.options[:maximum] || length_validator.options[:is] || (length_validator.options[:in] ? length_validator.options[:in].max : "")
+        minimum = length_validator.options[:minimum] || length_validator.options[:is] || (length_validator.options[:in] ? length_validator.options[:in].min : "0")
+
+        options[:pattern] = ".{#{minimum},#{maximum}}"
+
+        if minimum == "0"
+          options[:title] = "#{options[:title]} - #{maximum} characters maximum"
+        elsif maximum == ""
+          options[:title] = "#{options[:title]} - #{minimum} characters minimum"
+        elsif minimum == maximum
+          options[:title] = "#{options[:title]} - Must be exactly #{maximum} characters"
+        else
+          options[:title] = "#{options[:title]} - #{minimum} to #{maximum} characters"
+        end
+      end
+    end
+
+    def set_inclusion_options(validators, options)
+      inclusion_validator = (validators.select { |v| v.class == ActiveModel::Validations::InclusionValidator}).first
+
+        if inclusion_validator && allow_pattern?(options)
+          valid_options = inclusion_validator.options[:in] || inclusion_validator.options[:within]
+
+          options[:pattern] = "(#{valid_options.join("|")})"
+          options[:title] = inclusion_validator.options[:message] || "#{options[:title]} - Must be one of the following: #{valid_options.join(", ")}"
+        end
+    end
+
+    def set_numericality_options(validators, options)
+      numericality_validator = (validators.select{ |v| v.class == ActiveModel::Validations::NumericalityValidator}).first
+
+      if numericality_validator && !options[:type]
+        options[:type] = "number"
+
+        if allow_pattern?(options)
+          options[:pattern] = "\\d*"
+        end
+
+        if numericality_validator.options[:only_integer]
+          options[:step] = 1
+        else
+          options[:step] = "any"
+        end
+      end
+    end
+
+    def set_format_options(validators, options, method_name)
+      format_validator = (validators.select { |v| v.class == ActiveModel::Validations::FormatValidator}).first
+
+      if format_validator && allow_pattern?(options) && !method_name.to_s.include?('email')
+        options[:pattern] = format_validator.options[:with].source.html_safe
+        options[:title] = format_validator.options[:message] || "#{options[:title]} is not a valid format"
+      end
+    end
+
+    def control_group_class(label)
+      if @object.errors.messages[label]
+        return "form-group error"
+      end
+
+      "form-group"
+    end
   end
 end

data/lib/bootstrap3_form_builder/version.rb

@@ -1,3 +1,3 @@
 module Bootstrap3FormBuilder
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bootstrap3_form_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Zachary Wright
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-14 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails