formular 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e07c2e8826a8660e76871f7c8796643f2ce14af6
-  data.tar.gz: 5d890ae78955fe7e751c441eb52ef817d73822e1
+  metadata.gz: 49e056b4c2f65fb7db5df6f8959368489c495d85
+  data.tar.gz: a7faddc0568164592acd2d5c87a03ba939f257ac
 SHA512:
-  metadata.gz: 66b87984f1027e268b7af86abb863c40f3f55b0c7bbbe1c973ad98b27a200d34961b5c8113fd2fa1c7311cd691be10140c2bc3c28d202008217b07937691c86f
-  data.tar.gz: c1f1f2f559011007f56f9f3d3c7efebf87716c11c921f5cf039384d37db7867ee58ea5657fd9c9676a3cc4e729d1a8ea7646a4fadab9bc21a1e24c07044ce4ab
+  metadata.gz: 7f3bc6591e37af24cda64fb4c4680780803b84ce93f36b82576c28050847b5ce88d29f44db46b7425575c556d25bab90cb9a2a1f86c92e4ae713e5bf53013977
+  data.tar.gz: e91dfbcc181e96c59fb157a93483c9c7a0bd223a218babbec65f0757f9d2160a574a4a017c75f6111e41eed245649b6f0e1a05ceca9d0ec360cbda6ecc83a3c4

data/CHANGELOG.md

@@ -1,4 +1,9 @@
 # Master
+# v0.2.3 2017-12-08
+### Fixed
+
+* Improve Escape html - use for option values and optgroup labels
+* Multi Select elements now mark options as selected
 
 # v0.2.2 2017-09-13
 

data/lib/formular/element/modules/control.rb

@@ -7,7 +7,6 @@ module Formular
       # name & value based on the attribute name
       module Control
         include Formular::Element::Module
-        include Formular::Element::Modules::EscapeValue
 
         add_option_keys :attribute_name
 

data/lib/formular/elements.rb

@@ -16,7 +16,6 @@ module Formular
     Wrapped = Class.new(Formular::Element) { include Formular::Element::Modules::Wrapped }
 
     # define some base classes to build from or easily use elsewhere
-    OptGroup = Class.new(Container) { tag :optgroup }
     Fieldset = Class.new(Container) { tag :fieldset }
     Legend = Class.new(Container) { tag :legend }
     Div = Class.new(Container) { tag :div }
@@ -24,13 +23,19 @@ module Formular
     Span = Class.new(Container) { tag :span }
     Small = Class.new(Container) { tag :small }
 
+    class OptGroup < Container
+      include HtmlEscape
+      tag :optgroup
+      process_option :label, :html_escape
+    end
+
     class Option < Container
       tag :option
       include Formular::Element::Modules::EscapeValue
     end
 
-
     class Hidden < Control
+      include Formular::Element::Modules::EscapeValue
       tag :input
       set_default :type, 'hidden'
 
@@ -162,17 +167,17 @@ module Formular
     end # class Submit
 
     class Button < Container
+      include Formular::Element::Modules::EscapeValue
       include Formular::Element::Modules::Control
 
       tag :button
     end # class Button
 
     class Input < Control
-      include HtmlEscape
+      include Formular::Element::Modules::EscapeValue
 
       tag :input
       set_default :type, 'text'
-      process_option :value, :html_escape
 
       html { closed_start_tag }
     end # class Input
@@ -262,12 +267,19 @@ module Formular
                  {}
                end
 
-        opts[:value] = item.send(options[:value_method])
+        opts[:value] = html_escape(item.send(options[:value_method]))
         opts[:content] = item.send(options[:label_method])
-        opts[:selected] = 'selected' if opts[:value].to_s == options[:value].to_s
+
+        opts[:selected] = 'selected' if item_is_selected(opts[:value], options[:value], options[:multiple])
 
         Formular::Element::Option.new(opts).to_s
       end
+
+      def item_is_selected(option_val, current_val, multiple)
+        return option_val == current_val.to_s unless multiple && current_val.is_a?(Array)
+
+        current_val.map(&:to_s).include?(option_val) # TODO Perf improvement here - do we need the map?
+      end
     end # class Select
 
     class Checkbox < Control

data/lib/formular/version.rb

@@ -1,3 +1,3 @@
 module Formular
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formular
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Nick Sutterer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: declarative
@@ -221,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Form builder based on Cells. Fast, Furious, and Framework-Agnostic.