jsajax_wizard 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0bd3b1c41b5d9bbb8500c3d0d0ebcb6d7a4c0324443e1e7e993df4ddda6537d
-  data.tar.gz: 3dcc5ed2af475d525f39eb4e749e4396c1e2630c57a3c0b04d5ffc01e3cdb7f3
+  metadata.gz: 2e5f24b2ebcacd9a7ee478e85a59a75c2c35beec64d73b9a8760d8619a348dcf
+  data.tar.gz: 76c372f959a84223e54aead55212874516f7cf1f6d16bf751f592d5eef15ce28
 SHA512:
-  metadata.gz: 92ae05fa525f340700c44ee70c13dda97a884af72fad9e55c2f21c6f16c7521831878bf7dc54da65adf02b20b65678fa58ddb73c59327fd07edca335fc94bfce
-  data.tar.gz: 8632b42955a032d696560e017a397c1ab6805598e162a9eae55b90289b5df221b8458e1f3d0fe876629bdd67273ad333b442034ca2b0670436f0d5042f7d60a0
+  metadata.gz: 395c6ec4bb623457c154fd7bde1190f7e3bd6e9e31db65c814fb1db36e9974672652c67dea78c1582afb22a5d5aed8de4ce2415dcbdfe3a0d60f3132c921711c
+  data.tar.gz: c4b783ec09d4b5bb2e574b03f9c9f11f2e2de1bfa91a436da9e78a30131ed946e64aa48574892986e6eb43a3f1b5420248fdb0ef70067a56b3e60a440387dacf

data/lib/jsajax_wizard.rb

@@ -9,8 +9,9 @@ require 'rexle'
 require 'rexle-builder'
 
 class JsAjaxWizard
+  using ColouredText
 
-  def initialize(html: '', debug: false)
+  def initialize(html='', debug: false)
 
     @html, @debug = html, debug
     @requests = []
@@ -22,25 +23,67 @@ class JsAjaxWizard
   end
 
   def to_html()
+    
+    html = @html.empty? ? build_html : @html
+    
+    puts 'html: ' + html.inspect if @debug
+    
+    doc = Rexle.new(html)
+    puts 'doc.xml: ' + doc.xml(pretty: true) if @debug
+    add_events(doc)
+    doc.root.element('body').add(Rexle.new(build_js))    
+    
+    doc.xml    
+  end
 
-    a = RexleBuilder.build do |xml|
-      xml.html do 
-        xml.head do
-          xml.meta name: "viewport", content: \
-              "width=device-width, initial-scale=1"
-          xml.style "\nbody {font-family: Arial;}\n\n"
+  private
+  
+  def add_events(doc)    
+    
+    @requests.each.with_index do |x,i|
+      
+      element  = x[1]
+      
+      selector = if element[:id] then
+        '#' + element[:id]
+      elsif element[:type]
+        "*[type=%s]" % element[:type]
+      end
+      
+      if @debug then
+        puts "selector: *|%s|*" % selector.inspect 
+        puts 'doc: ' + doc.xml(pretty: true).inspect
+      end
+      
+      e = doc.at_css(selector)
+      puts ('e: ' + e.inspect).debug if @debug
+      
+      func = 'ajaxCall' + (i+1).to_s
+      event = e.attributes[:type] == 'button' ? func + '()' : func + '(this)'
+      
+      puts ('element: ' + element.inspect).debug if @debug
+      
+      key = if element[:event] then
+      
+        if element[:event].to_sym == :on_enter then
+          event = func + '(event.keyCode, this)'
+          :onkeyup
+        else
+          element[:event].to_sym
         end
-        xml.body build_html + "\n" + build_js()
+        
+      else
+        e.attributes[:type] == 'button' ? :onclick : :onkeyup
       end
+      
+      e.attributes[key] = event
+      
     end
-
-    doc = Rexle.new(a)
     
+    doc
   end
 
-  private
-
-  def build_html()
+  def build_elements()
 
     html = @requests.map.with_index do |x,i|
 
@@ -51,14 +94,11 @@ class JsAjaxWizard
 
       a = if e[:type].to_s == 'button' then
       
-        e[:event] = :onclick unless e[:event]
-        ["<button type='button' %s='ajaxCall%s()'>Change Content</button>" \
-          % [e[:event].to_s, i+1]]
+        ["<button type='button''>Change Content</button>"]
         
       elsif e[:type].to_s == 'text' then
         
-        e[:event] = :onkeyup unless e[:event]
-        ["<input type='text' %s='ajaxCall%s(this)'/>" % [e[:event].to_s, i+1]]
+        ["<input type='text'/>"]
         
       else
         ''
@@ -69,9 +109,26 @@ class JsAjaxWizard
 
     end
 
-    html.join("\n")
+    r = html.join("\n")
+    puts 'r: ' + r.inspect if @debug
+    r
 
   end
+  
+  def build_html()
+
+    RexleBuilder.build do |xml|
+      xml.html do 
+        xml.head do
+          xml.meta name: "viewport", content: \
+              "width=device-width, initial-scale=1"
+          xml.style "\nbody {font-family: Arial;}\n\n"
+        end
+        xml.body build_elements
+      end
+    end
+    
+  end
 
   def build_js()
 
@@ -99,11 +156,26 @@ EOF
       server, element, target_element = x
       
       a << if element[:type] == 'text' then
+      
+        if element[:event].to_sym == :on_enter then
         "
-function ajaxCall#{i+1}() {
-  ajaxRequest('#{server}', ajaxResponse#{i+1})
+function ajaxCall#{i+1}(keyCode, e) {
+  
+  if (keyCode==13){
+    ajaxRequest('#{server}' + e.value, ajaxResponse#{i+1})
+  }
+  
+  
+}
+"
+        else
+        "
+function ajaxCall#{i+1}(e) {
+  ajaxRequest('#{server}' + e.value, ajaxResponse#{i+1})
 }
 "
+        end
+        
       else
 "
 function ajaxCall#{i+1}() {

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsajax_wizard
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   pZTsghadsRxoGiI7mehrgxkeLLA7q3Zpafsvw3mLrERdifNsVFNBUDMjfE/OnJq8
   EOz+UVQEw8EJ9wHqaJYIbHBq
   -----END CERTIFICATE-----
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle