jsajax_wizard 0.2.2 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9109f2df9aa36be696a07f567abb93063d6d1c52922fd1e238a6eb4d40b711e
-  data.tar.gz: 275891dcee8e8b5aeb6adaeab39e93af233461d6504e3f2c926b0d7546910fab
+  metadata.gz: 89704032c52cf38c12530d284a7b7374bfa85bb945def3b7f3f2aefa876f9131
+  data.tar.gz: 54b45c9161ec895b29bec017a242ab37941ddc5f101f99582067764d00953726
 SHA512:
-  metadata.gz: bb78b176471f9ebd9b701ff5db8e151edc30ff0b391da62ba0d0c565ea571f8d4754e910556db85e7a03bb4d90434efa84e87840ca4381f94567e84cd03c52ac
-  data.tar.gz: 3fbf00b323808692e7550940c44a6feb8a8da1ad634b63a87f82915f8b58037fc2ce972ca36357b837490df7a31f7d2d3c3aa9331739dda28fdea8961164b26b
+  metadata.gz: 19b66ee5f96e404bbce6a6d7f6c74918a83bbd458b82c799573cf96bfa39ddc72fbdc4103cbd29ab4ba14a96e1127784040303e70a7540bae31e8275701c0aac
+  data.tar.gz: c227a108f313819be77e9e03a046f722030c3b7f4b97e1e4ed81e0a367b9053429819fb26ed7036aec625183cb17cda3fc53885b2f00e871156851d5ec93f6b8

data/lib/jsajax_wizard.rb

@@ -21,10 +21,22 @@
 # jaw.add_request server: 'hello', element: {type: 'timer', 
 #         interval: '5000'}, target_element: {id: 'demo', property: :innerHTML}
 
+# 03 Oct 2019 : An HTML document can be passed in containing an
+#               AJAX placeholder e.g. 
+#            <button onclick='$[x][/someurl/]'></button><div id='demo'>$x</div>
+#
+
+# 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 'rxfhelper'
 require 'rexle-builder'
 
 class JsAjaxWizard
@@ -40,8 +52,10 @@ class JsAjaxWizard
 
   end
 
-  def add_request(server: '', element: {}, target_element: {})
-    @requests << [server, element, 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()
@@ -53,55 +67,100 @@ 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|
-      
-      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
@@ -111,7 +170,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}
@@ -127,8 +188,8 @@ class JsAjaxWizard
       else
         ['']
       end
-
-      a << "<div id='%s'></div>" % [e2[:id]]
+      
+      a << "<div id='%s'></div>" % [e2[:id]] if e2.is_a? Hash
       a.join("\n")
 
     end
@@ -154,11 +215,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) {
@@ -176,56 +234,79 @@ EOF
 
     funcs_defined = @requests.map.with_index do |x,i|
       
-      a = []
-      server, element, target_element = x
+      puts ('x: ' + x.inspect).debug if @debug
+      server, raw_type, target, target_eval = x
       
-      a << if element[:type] == 'text' then
+      if raw_type.first == :trigger then
+        modify_trigger_function(raw_type.last, i, server, doc)
+      end
       
-        if element[:event].to_sym == :on_enter then
-        "
-function ajaxCall#{i+1}(keyCode, e) {
-  
-  if (keyCode==13){
-    ajaxRequest('#{server}' + e.value, ajaxResponse#{i+1})
-  }  
+      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  
+
+  end
   
-}
-"
-        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]});
-"        
+  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
-"
-function ajaxCall#{i+1}() {
-  ajaxRequest('#{server}', ajaxResponse#{i+1})
-}
-"
+        element[:event].to_sym
       end
-
-a << "
-function ajaxResponse#{i+1}(xhttp) {
-  document.getElementById('#{target_element[:id]}').innerHTML = xhttp.responseText;
-}
-"
-
-      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
@@ -233,15 +314,15 @@ function ajaxResponse#{i+1}(xhttp) {
   def scan_requests(html)
     
 
-    a = html.scan(/\$\[([^\]])+\]\(([^\)]+)/)
+    a = html.scan(/\$\[([^\]]+)?\]\(([^\)]+)/)
 
     a.each do |var, url|
 
       #== fetch the trigger element details
 
-      tag = html[/<[^<]+\$\[([^\]])+\]\(#{url}[^\>]+>/]
+      tag = html[/<[^<]+\$\[([^\]]+)?\]\(#{url}[^\>]+>/]
       element_name  = tag[/(?<=<)\w+/]
-      event = tag[/(\w+)=["']\$\[([^\]])+\]\(#{url}/,1]
+      event = tag[/(\w+)=["']\$\[([^\]]+)?\]\(#{url}/,1]
 
       # is there an id?
       id = tag[/(?<=id=["'])[^"']+/]
@@ -254,6 +335,13 @@ function ajaxResponse#{i+1}(xhttp) {
 
       element = h2.merge(event: event)
 
+      if var.nil? then
+        
+        add_request(server: url, element: element, target_eval: true)
+        next
+        
+      end
+
       #== fetch the target element details
 
       tag2 = html[/<[^<]+>\$#{var}</]
@@ -264,7 +352,7 @@ function ajaxResponse#{i+1}(xhttp) {
 
       property = if inner_html then
       
-        html.sub!(/>\$#{var}</,'')
+        html.sub!(/>\$#{var}</,'>&nbsp;<')
         :innerHTML
         
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jsajax_wizard
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.1
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   pZTsghadsRxoGiI7mehrgxkeLLA7q3Zpafsvw3mLrERdifNsVFNBUDMjfE/OnJq8
   EOz+UVQEw8EJ9wHqaJYIbHBq
   -----END CERTIFICATE-----
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2020-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -46,7 +46,7 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,7 +56,27 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.2
+        version: 1.5.7
+- !ruby/object:Gem::Dependency
+  name: rxfhelper
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: james@jamesrobertson.eu
 executables: []