jsajax_wizard 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d47308716886d846f412552df1209e87c256301406d322e51eeb8b524f779d1
-  data.tar.gz: 7226513448a6d28ab34b06ac9e832db49e0e8ea64ff34ef15f0d6bfd0e7cb1cd
+  metadata.gz: 44ae828bcda7ae8306c1012efd612f2ee13f462e4aa62a4449b8cd780aced624
+  data.tar.gz: 1c4c9bb9169ea27f2618ec0f6e0299afe18ccf9d8af502ef4c2e4fb5360950e1
 SHA512:
-  metadata.gz: d577bbacdb719b9c161c6e7e14a64574ccb7f0a390eb7eab134bf052db352c85eec4c9282f8f93c05d15128e3bfc908514bffd4a7dbea5afc2cd2c24ad7b88db
-  data.tar.gz: aaab0ad3519c47d8c4e5700bc6674f795ae3cf6bbe78d18c1d6f274a5305385ea8abcaa707fb862c05e799b1306965c8b8439ba54d4efe600a45530d9c6b111d
+  metadata.gz: 0ceadd9dbda94ed48fe241f736a865ae434bc0b1087d7f3098da4bb23a18e46278b60cba85bfa63f93e47ee1556556a1333ca1e5ae3fbc7a199ea2be2aa705da
+  data.tar.gz: a6d6abb9c4ff6540687b83f5fad0facf44f8446170cb2a61263d2cc7ce7e47c3f87b1c338acc16c4f8cc363c23bcc30c79df575adf300deace9c3d18d12563be

data/lib/jsajax_wizard.rb

@@ -29,6 +29,11 @@
 # AJAX triggered from a button press with the text response passed to eval
 # jaw.add_request server: 'hello', element: {type: 'button', event: 'onclick'}, target_eval: true
 
+# AJAX triggered from a speech recognition result
+# jaw.add_request server: 'hello', trigger: 'recognition.onresult', target_eval: true
+
+
+
 
 require 'rexle'
 require 'rexle-builder'
@@ -46,8 +51,10 @@ class JsAjaxWizard
 
   end
 
-  def add_request(server: '', element: {}, target_element: {}, target_eval: false)
-    @requests << [server, element, target_eval || target_element ]
+  def add_request(server: '', element: {}, trigger: nil, target_element: {}, 
+                  target_eval: false)
+    type = element.any? ? [:element, element] : [:trigger, trigger]
+    @requests << [server, type, target_element, target_eval ]
   end
 
   def to_html()
@@ -59,57 +66,101 @@ class JsAjaxWizard
     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))    
+    js = build_js(doc)
+    doc.root.element('body').add(Rexle.new(js))    
     
     doc.xml    
   end
 
   private
   
-  def add_events(doc)    
+  def add_element_function(element, i, server, target, target_eval)
+    
+    puts ('element: ' + element.inspect).debug if @debug
+    puts '::' + [element, i, server, target, target_eval].inspect if @debug
+    
+    a = []
+    
+    a << if element.is_a?(Hash) then
+    
+      if element[:type] == 'text' then
     
-    @requests.each.with_index do |x,i|
-      
-      puts ('x: ' + x.inspect).debug if @debug
-      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).debug
-        puts 'doc: ' + doc.xml(pretty: true).inspect
-      end
-      
-      e = doc.at_css(selector)
-      puts ('e: ' + e.inspect).debug if @debug
-      next unless e
-      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
+      "
+function ajaxCall#{i+1}(keyCode, e) {
+
+if (keyCode==13){
+  ajaxRequest('#{server}' + e.value, ajaxResponse#{i+1})
+}  
+
+}
+"
         else
-          element[:event].to_sym
+      "
+function ajaxCall#{i+1}(e) {
+  ajaxRequest('#{server}' + e.value, ajaxResponse#{i+1})
+}
+"
         end
         
+      elsif element[:type] == 'timer'
+      "
+setInterval(
+function() {
+  ajaxRequest('#{server}', ajaxResponse#{i+1})
+}, #{element[:interval]});
+"        
       else
-        e.attributes[:type] == 'button' ? :onclick : :onkeyup
+"
+function ajaxCall#{i+1}() {
+  ajaxRequest('#{server}', ajaxResponse#{i+1})
+}
+"  
       end
       
-      e.attributes[key] = event
+    else
+      
+ "
+function ajaxCall#{i+1}(s) {
+  ajaxRequest('#{server}' + escape(s), ajaxResponse#{i+1})
+}
+"     
+    end
+
+a << "
+function ajaxResponse#{i+1}(xhttp) {
+"      
+
+    if target.is_a?(Hash) and target[:id] then
+      
+      a << "  document.getElementById('#{target[:id]}')" + 
+          ".innerHTML = xhttp.responseText;"
+    end
+
+    if target_eval then
+      
+      a << "  eval(xhttp.responseText);"
       
     end
+
+a << "
+}
+"      
+
+    a.join
+
+  
+  end
+  
+  def add_events(doc)    
+    
+    @requests.each.with_index do |x,i|
+      
+      puts ('request x: ' + x.inspect).debug if @debug
+      
+      method(('modify_' + x[1].first.to_s).to_sym).call(x[1].last, doc, i)
+            
+    end
     
     doc
   end
@@ -118,7 +169,9 @@ class JsAjaxWizard
 
     html = @requests.map.with_index do |x,i|
 
-      e, e2 = x[1..-1]
+      raw_e, e2 = x[1..-1]
+      
+      e = raw_e.last
       
       # e = element e.g. {type: 'button', event: 'onclick'} 
       # e2 = target_element: {id: '', property: :innerHTML}
@@ -161,11 +214,8 @@ class JsAjaxWizard
     
   end
 
-  def build_js()
+  def build_js(doc)
 
-    func_calls = @requests.length.times.map do |i|
-      "// ajaxCall#{i+1}();"
-    end
 
 ajax=<<EOF
 function ajaxRequest(url, cFunction) {
@@ -183,68 +233,79 @@ EOF
 
     funcs_defined = @requests.map.with_index do |x,i|
       
-      a = []
-      server, element, target = x
-      
-      a << if element[:type] == 'text' then
+      puts ('x: ' + x.inspect).debug if @debug
+      server, raw_type, target, target_eval = x
       
-        if element[:event].to_sym == :on_enter then
-        "
-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
-        
-      elsif element[:type] == 'timer'
-        "
-setInterval(
-  function() {
-    ajaxRequest('#{server}', ajaxResponse#{i+1})
-  }, #{element[:interval]});
-"        
-      else
-"
-function ajaxCall#{i+1}() {
-  ajaxRequest('#{server}', ajaxResponse#{i+1})
-}
-"
+      if raw_type.first == :trigger then
+        modify_trigger_function(raw_type.last, i, server, doc)
       end
+      
+      add_element_function(raw_type.last, i, server, target, target_eval)
+      
+    end
+    
+    s = "\n\n" + ajax + "\n\n" + funcs_defined.join
+    "\n  <script>\n%s\n  </script>\n" % s  
 
-a << "
-function ajaxResponse#{i+1}(xhttp) {
-"      
-      if target.is_a? Hash and target[:id] then
-        
-        a << "  document.getElementById('#{target[:id]}')" + 
-            ".innerHTML = xhttp.responseText;"
+  end
   
+  def modify_element(element, doc, i)
+    
+    selector = if element[:id] then
+      '#' + element[:id]
+    elsif element[:type]
+      "*[@type='%s']" % element[:type]
+    end
+    
+    if @debug then
+      puts ("selector: %s" % selector.inspect).debug
+      puts 'doc: ' + doc.xml(pretty: true).inspect
+    end
+    
+    e = doc.at_css(selector)
+    puts ('e: ' + e.inspect).debug if @debug
+    return unless e
+    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
-        
-        a << "  eval(xhttp.responseText);"
-        
+        element[:event].to_sym
       end
       
-a << "
-}
-"      
-
-      a.join
+    else
+      e.attributes[:type] == 'button' ? :onclick : :onkeyup
     end
-
-    s = func_calls.join("\n") + "\n\n" + ajax + "\n\n" + funcs_defined.join
-    "\n  <script>\n%s\n  </script>\n" % s
-
+    
+    e.attributes[key] = event    
+  end
+  
+  def modify_trigger(element, doc, i)
+  end
+  
+  def modify_trigger_function(trigger, i, server, doc)
+    
+    doc.root.xpath('//script').each do |script|
+      puts 'script: ' + script.inspect
+      s = script.text.to_s
+      
+      script.text = s.sub(/#{trigger} = function\(\) {[^}]+/) {|x|
+        a = x.lines
+        indent = a[1][/\s+/]
+        a[0..-2].join + indent + "ajaxCall#{i+1}(event.results[0][0]." + 
+                                                       "transcript);\n" + a[-1]
+      }
+      
+    end
+    
   end
   
   # find the ajax requests

metadata

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