htmlcom 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c56bbfd02df1b1aa0af4dd6408b34301964015bcefed1a8a6a88b89c98d42d
-  data.tar.gz: 6dee7c3818848ce0428cfb5b3df0a2c7cf79b5b4139d22fde8389212dd6e7694
+  metadata.gz: e96d1c92647c0547a158d8372a2c51c41ccf6d3d22f68adf3546203511bac21f
+  data.tar.gz: 228aabfeb413f84de57e9cd1f29491b28c7a515fae798a3259d2531a117c0069
 SHA512:
-  metadata.gz: 31bdddd64984e4a344436918bb09e1a79acc0bb58d15a6878f8a0c28afa30da1b3486c7d68bf3464b4288faec8a7c55351f5f6bc33037dd7186bf0deb8be4c92
-  data.tar.gz: 46dfd28e68b5f40cabfbde02c854b2bfefaf1fbca2b7455945822b5b9635ea0f8ff45bb538130ecc987ae6e80137ab87b4b7f7c3d2dec4910fe37946a0e314ee
+  metadata.gz: 2b16a5343918b17349de476895f189c2623543dfae67b5963ff479389032c34ea1477c4d63dd437d9c083ac9039c04d60e1338767f35093fb3f86faa5cdc0840
+  data.tar.gz: 9192e38cad6df5088947398a7f42be5fb42c6f5468f0c7ebb61c4f8c40a9de87e9b1fb352dbd70a4bac0bb25d22870caa4380f8aca9dd1047fd37f4b27d59845

data/lib/htmlcom.rb

@@ -335,11 +335,14 @@ EOF
 
     def initialize(obj)
 
+      puts 'about to build object: ' + obj.inspect
       @doc = build(obj)
       puts '@doc.xml : ' + @doc.xml.inspect
+
       if @id then
+        puts '@tag, @html -> ' + [@tag, @htmltag].inspect
         elem = @doc.root.element(@tag + '/' + @htmltag)
-        puts 'elem: ' +elem.inspect
+        puts 'elem2: ' +elem.inspect
         elem.attributes[:name] = @id
         elem.attributes[:id] = @id
       end
@@ -354,7 +357,14 @@ EOF
       @doc
     end
 
+    def to_html()
+      html_element.xml pretty: true
+    end
+
+    private
+
     def build(rawobj)
+      puts 'rawobj: ' + rawobj.inspect
       obj = rawobj.is_a?(Hash) ? RexleBuilder.new(rawobj).to_a : rawobj
       Rexle.new(obj)
     end
@@ -365,6 +375,7 @@ EOF
 
     def initialize(rawobj)
 
+      puts '@tag: ' + @tag.inspect
       if @label then
 
         obj = [{label: @label}, rawobj]
@@ -427,6 +438,35 @@ EOF
 
   end
 
+
+  class Text < InputElement
+
+    def initialize(value='', text: value, label: nil, id: nil)
+
+      @tag = 'text'
+      @htmltag = 'input'
+      @id = id
+      @label = label
+      super( [@htmltag, {type: 'text', value: text}])
+      puts 'Text: after super'
+    end
+
+  end
+
+
+  class Hidden < InputElement
+
+    def initialize(value='', text: value, id: nil, label: nil)
+
+      @tag = 'hidden'
+      @htmltag = 'input'
+      @id = id
+      super( [@htmltag, {type: 'hidden', value: text}])
+
+    end
+
+  end
+
   class Form < Element
 
     def initialize(inputs=nil, id: nil, method: :get, action: '')
@@ -443,6 +483,11 @@ EOF
 
     end
 
+    def add_submit()
+      submit = Rexle.new(['input', {type: 'submit', value: 'Submit'}])
+      html_element().add submit
+    end
+
   end
 
 
@@ -454,11 +499,9 @@ EOF
 
   class FormBuilder
 
-
-
     def initialize(inputs: {}, options: {}, id: 'form1', method: :get, action: '', debug: false)
 
-      @debug = debug
+      @debug  = debug
 
       h = inputs.map do |key, value|
 
@@ -467,35 +510,49 @@ EOF
           puts 'klass: ' + value.first.inspect
         end
 
-        [key, [value.first]]
+        [key.to_sym, value]
       end.to_h
 
-      options.each do |key, value|
-        h[key] << value
+      if options then
+        options.each do |key, value|
+          h[key.to_sym] << value
+        end
       end
 
-      klass = {dropdown: HtmlCom::Dropdown, textarea: HtmlCom::Textarea}
+      klass = {
+        dropdown: HtmlCom::Dropdown,
+        textarea: HtmlCom::Textarea,
+        text: HtmlCom::Text,
+        hidden: HtmlCom::Hidden
+      }
 
       @form = HtmlCom::Form.new(id: id, method: method, action: action)
 
       h.each do |key, value|
 
         id = key
+        puts 'value: ' + value.inspect
         type, content = value
-        action = case type
+        action = case type.to_sym
         when :dropdown
+          content = value.last
           'Select'
         else
           'Enter'
         end
 
-        obj = klass[type].new content, id: id, label: action + ' ' + id.to_s
+        puts 'type: ' + type.inspect
+        obj = klass[type.to_sym].new content, id: id, label: action + ' ' + id.to_s
+        puts 'after klass'
 
         obj.to_doc.root.element(type.to_s).elements.each do |e|
           @form.html_element.add e
         end
 
       end
+
+      @form.add_submit
+
     end
 
     def to_doc()
@@ -503,7 +560,7 @@ EOF
     end
 
     def to_html()
-      @form.to_doc.root.xml pretty: true
+      @form.to_html
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: htmlcom
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   JNdZs/7/k4vQlgqYQ3HnoA6GgIanmCgNkediqllxv/epLyIkW2DSJGcYXM8QjSEk
   +4RQ8UHDCOWHpFPlT5Pgc0wPc7KyXosRYHg=
   -----END CERTIFICATE-----
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsmenubuilder