markita 3.1.210913 → 3.2.210915

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d48cd0cacac70dc9974733968e16d5958676172aae7ac7138995855ef82839b7
-  data.tar.gz: 1355e68fa3255f16331a4afc36f2d47ecfbd1583fbf2f16a9742c53e50390414
+  metadata.gz: 2d00ccf97d0939c6b5ebd695e248046eabda96bc285b528f42ccec7e0ecddfaf
+  data.tar.gz: c3ad41a468998efd4511e72bae1cba352aca5f6ad7309f8ecb969fd3f83fe670
 SHA512:
-  metadata.gz: 54630f6cef7d9632699c16b8e9e447799c85806adc75202cc774272066de82927260ba5fbb4da5f974860dc48d5a26ef9e96d463c4825676a801207c28f850bd
-  data.tar.gz: 34a7e703827b69fb3e0c4e406d477c3ab35d605fc9f1d87c9cae1a2724b8e01099de74b7c6b1ee5f6c220f35bc277e717637925464dfab5938303fcfb37f601b
+  metadata.gz: d24749f9a8550b67efe84f3ed16c42461f7a9cdfd5ab2608bc16af580af761c0761f86c4b7906feef3114f8c5f62ff67222e865cee85061799f6983ad509948b
+  data.tar.gz: 051d4e295dcff13a3b6bdf3679196741c18853cc8c9167ef6ac9a6bf20381c2fed38525e44c4def393e409d4d0bfa565e8e3a60388db4c117a3c320f976f5184

data/README.md

@@ -1,6 +1,6 @@
 # Markita
 
-* [VERSION 3.1.210913](https://github.com/carlosjhr64/markita/releases)
+* [VERSION 3.2.210915](https://github.com/carlosjhr64/markita/releases)
 * [github](https://www.github.com/carlosjhr64/markita)
 * [rubygems](https://rubygems.org/gems/markita)
 
@@ -96,6 +96,9 @@ Markdown:
     ! Address:[address]
     ! Code:[code="1234"]
 
+    A selection list:
+    ! Color:[color="Red","White","Blue"]
+
 ### Template substitutions
 
 Markdown:

data/bin/markita

@@ -20,7 +20,6 @@ Types:
   DIRECTORY /^~?[\\/\\w\\.]+$/
   BIND      /^[\\w\\.]+$/
   PORT      /^\\d+$/
-  THEME     /^[\\w\\.]+$/
   IPS       /^[\\d\\.\\,]+$/
 # NOTE:
 # Assuming site is in ~/vimwiki,

data/lib/markita/markdown.rb

@@ -360,7 +360,9 @@ class Markdown
   end
 
   # Forms
-  FORMS = /^!( (\w+:)?\[\*?\w+(="[^"]*")?\])+/
+  FIELD = '(\w+:)?\[(\*)?(\w+)(=("[^"]+")(,"[^"]+")*)?\]'
+  FIELDS = Regexp.new FIELD
+  FORMS = Regexp.new "^!( #{FIELD})+"
   PARSERS << :forms
   def forms
     md = FORMS.match(@line) or return false
@@ -370,16 +372,26 @@ class Markdown
     while md
       n += 1
       form << '  <br>' if n > 1
-      @line.scan(/(\w+:)?\[(\*)?(\w+)(="[^"]*")?\]/).each do |field, pwd, name, value|
+      @line.scan(FIELDS).each do |field, pwd, name, value|
         method ||= ' method="post"' if pwd
         field &&= field[0...-1]
         value &&= value[2...-1]
         if field
-          fields += 1
           type = (pwd)? 'password' : 'text'
           if value
-            form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
+            if (values = value.split('","')).length > 1
+form << %Q(#{field}:<select name="#{name}">)
+values.each do |value|
+  fields += 1
+  form << %Q(  <option value="#{value}">#{value}</option>)
+end
+form << "</select>"
+            else
+fields += 1
+form << %Q{  #{field}:<input type="#{type}" name="#{name}" value="#{value}">}
+            end
           else
+            fields += 1
             form << %Q{  #{field}:<input type="#{type}" name="#{name}">}
           end
         elsif name=='submit'

data/lib/markita.rb

@@ -1,5 +1,5 @@
 module Markita
-  VERSION = '3.1.210913'
+  VERSION = '3.2.210915'
 
   def self.run!
     # Standard libraries

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: markita
 version: !ruby/object:Gem::Version
-  version: 3.1.210913
+  version: 3.2.210915
 platform: ruby
 authors:
 - CarlosJHR64
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-13 00:00:00.000000000 Z
+date: 2021-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: help_parser