formgroups-rails 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 294fa8ac75fd2c282df2c5a438fee7d7bf82b20b
-  data.tar.gz: 576085dc9ede62d2509edb986a834c211d05bf68
+  metadata.gz: 9f9479def9f703406cbe035f829f43440db7ae07
+  data.tar.gz: 6c10c93e4056cb5a69fc84092b4f7d3a0dc7aa8f
 SHA512:
-  metadata.gz: debba5e7b956cd1fbd1355b670bdc290f71adfa859ed5f2d28aaf5bb2a09c96c229e0af17dcc192adae10ed439fcb48e275dfaa2f1b1fc010aa84d76114fec14
-  data.tar.gz: 1631d4029713fbe661be3f3410e3cd97fa651a9c226cdd696ccd901138e99600371ca8cb744f1c617b491d51db6798d3f9e8850471f2012e9670435ea4338f17
+  metadata.gz: 54263a4b0bde87d236b1d88cb292df0859acb4a727d8c632dbad028399416a39f140f6aeac68ef2ddc09addb038990b7da7215eb0ff79000ebba4948541622f2
+  data.tar.gz: 18d258814ac6de81b2320ee475a3efc7e76b06f4c68759cc062f66a9f7830c6bc36aa2d9c24a55f7a29c95553fbea77a53f3fb00f5257583f9e079df47317786

data/lib/form_groups/configuration.rb

@@ -6,16 +6,25 @@ module FormGroups
   mattr_reader :validator_mapping do
     mappings = {}
 
-    mappings['ActiveModel::Validations::LengthValidator'] = Proc.new do |validator, result|
+    mappings[ActiveModel::Validations::LengthValidator] = Proc.new do |validator, result|
       result['minlength'] = validator.options[:minimum] if validator.options[:minimum]
       result['maxlength'] = validator.options[:maximum] if validator.options[:maximum]
     end
 
-    mappings['ActiveModel::Validations::PresenceValidator'] = Proc.new do |validator, result|
+    mappings[ActiveModel::Validations::PresenceValidator] = Proc.new do |validator, result|
       result['required'] = 'true'
       result['aria-required'] = 'true'
     end
 
+    mappings[ActiveModel::Validations::InclusionValidator] = Proc.new do |validator, result|
+      range = validator.options[:within]
+
+      if range.is_a? Range
+        result['min'] = range.min
+        result['max'] = range.max
+      end
+    end
+
     mappings
   end
 

data/lib/form_groups/field_builder.rb

@@ -15,8 +15,8 @@ module FormGroups
     end
 
     OTHER_HELPERS.each do |selector|
-      define_method selector do |options = {}|
-        @template.send selector, @method, validated_options(options)
+      define_method selector do |value, options = {}|
+        @template.send selector, @method, value, validated_options(options)
       end
     end
 
@@ -31,12 +31,15 @@ module FormGroups
       @object.errors[@method]
     end
 
-    def label text, options = {}
-      @template.label @method, text, unvalidated_options(options)
+    def label text, sub_id = '', **options
+      full_id  = @method.to_s
+      full_id += "_#{sub_id}" unless sub_id.nil? or sub_id.to_s.empty?
+
+      @template.label full_id.to_sym, text, object_options.merge(options)
     end
 
     def text_area placeholder = nil, **options
-      options[:placeholder    ] = placeholder
+      options['placeholder'   ] = placeholder
       options['aria-multiline'] = true
 
       @template.text_area @method, validated_options(options)
@@ -45,39 +48,43 @@ module FormGroups
     def select placeholder = nil, **options, &block
       options['data-placeholder'] = placeholder
 
-      @template.select @method, nil, {}, validated_options(options), &block
+      @template.select @method, nil, object_options, html_options(options), &block
     end
 
     private
 
-    def unvalidated_options options
-      @default_options.merge(options).merge(object: @object)
-    end
+      def object_options
+        @default_options.merge(object: @object)
+      end
 
-    def validated_options options
-      options = unvalidated_options(options).merge(validations) if FormGroups.map_validators
-      options = options.merge('aria-invalid' => 'true') if errors.any?
+      def html_options options = {}
+        options = options.merge(validations) if FormGroups.map_validators
+        options = options.merge('aria-invalid' => 'true') if errors.any?
 
-      options
-    end
+        options
+      end
 
-    def validations
-      validations = validators.map do |validator|
-        result  = {}
+      def validated_options options
+        object_options.merge html_options(options)
+      end
 
-        mapping = FormGroups.validator_mapping[validator.class.name]
-        mapping.call(validator, result) if mapping
+      def validations
+        validations = validators.map do |validator|
+          result  = {}
 
-        result
-      end
+          mapping = FormGroups.validator_mapping.select { |v| validator.is_a? v }
+          mapping.each_value { |m| m.call validator, result }
 
-      Hash[*validations.collect{ |h| h.to_a }.flatten]
-    end
+          result
+        end
 
-    def validators
-      @object.class.validators.select do |validator|
-        validator.attributes.include? @method
+        Hash[*validations.collect{ |h| h.to_a }.flatten]
+      end
+
+      def validators
+        @object.class.validators.select do |validator|
+          validator.attributes.include? @method
+        end
       end
-    end
   end
 end

data/lib/form_groups/group_builder.rb

@@ -9,8 +9,15 @@ module FormGroups
         FieldTag.new(object_name, method, object, @template, self, options).render(&block)
       end
 
-      private
+      def id method
+          @sanitized_id ||= object_name.to_s.gsub(/\]\[|[^-a-zA-Z0-9:.]/, "_").sub(/_$/, "")
+      end
 
+      def value method
+        object[method]
+      end
+
+      private
         def objectify options
           options.merge(object: object)
         end

data/lib/form_groups/version.rb

@@ -1,3 +1,3 @@
 module FormGroups
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: formgroups-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexey Chernetsov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-05 00:00:00.000000000 Z
+date: 2015-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails