free_dom 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b25006295cb48501f306a796923819b86162ba2479c3daa84e490bc201d9364
-  data.tar.gz: 87796929372ea091459a75facb1a8d01b94d3368dbe8e99d6e37e4a8614b2149
+  metadata.gz: 88b95a4ba4045392455d872d4712a352429857a011e1523831343950df79e90a
+  data.tar.gz: 97b82962f4be6578dbc7aece6c92427b7b33603935b71eab2979dfd1fe6489b0
 SHA512:
-  metadata.gz: ec3355fdef23b6ff5d9c8c668db1a258dec3f4cd58cdd942e324e587f1b03729ae4f9d91a9df321ba4f2a97eb548da1565b881f5ad53c32d388fc8ad02e6e350
-  data.tar.gz: 850c75e8fa3fc0b91d13cd31d7702d311c9a6635bcbfe89ed6e8ac6ad2cb7a4767853dd0799511a4a550ae37d220ca210660587095b1489aa0c44a711635c7cf
+  metadata.gz: 3280a2d8e1f6021ee730e06727a721d645e1904d8dc82a74740b04d4111088eceff36119895e0e0462f3d9cab10a5c497de7d4605b3f5b8dc1f2134a32531ddf
+  data.tar.gz: 48240b2b70abcf810d710e2bfbace2e3711e34c76675a46b30648c8084e6b9d755648db7f5808883f5fec2ead58a35d98d56fb996da266be5ad8bbb728f20f78

data/lib/free_dom.rb

@@ -3,18 +3,42 @@
 # file: free_dom.rb
 
 require 'domle'
+require 'xml_to_sliml'
 
 
+class Rexle::Element
+  def to_sliml()
+
+    xml = self.xml(pretty: true)
+    XmlToSliml.new(xml.gsub(/ style=''/,"")).to_s
+    
+  end
+end
+
 class FreeDom < Domle
 
-  def initialize(xml, debug: false)
+  def initialize(s, debug: false)
 
-    @doc, @debug = Rexle.new(xml), debug
+    @debug = debug
+
+    xml = s =~ /^</ ? s : LineTree.new(s).to_xml
+    @doc = Rexle.new(xml)
 
     h = {}
 
     @doc.root.each_recursive do |e|
+      
       h[e.name.to_sym] ||= {}
+
+      # if there's a custom attribute, add a default trigger called trigger_change
+      a = e.attributes.keys.reject {|x| %i(id name class style).include? x }
+      e.attributes.merge!({trigger_change: a.first}) if a.any?
+      
+      # add a trigger attribute for each *on* event attribute
+      events = e.attributes.keys.select {|x| x =~ /^on/}\
+          .map {|x| 'trigger_' + x.to_s[/(?<=^on)\w+/]}
+      e.attributes.merge! events.zip(['']*events.length).to_h
+
       h[e.name.to_sym].merge!(e.attributes)
     end
 
@@ -26,9 +50,8 @@ class FreeDom < Domle
 
         a = attributelist.keys
         
-        triggers = a.select {|x| x =~ /^trigger_/ }                
-        
-        attr2_accessor *(a - triggers)
+        triggers = a.select {|x| x =~ /^trigger_/ }                  
+        attr2_accessor *((a - triggers) + %i(onchange)).uniq
         
         triggers.each do |x|
 
@@ -36,21 +59,22 @@ class FreeDom < Domle
           puts 'trigger: ' + trigger.inspect if @debug
           
           define_method(trigger)  do
-            eval method(('on' + trigger.to_s).to_sym).call, $env
+            statement = method(('on' + trigger.to_s).to_sym).call
+            eval statement, $env if statement
           end
 
-          if trigger == :change then
-            
-            #puts 'change found'
+          if trigger == :change then            
             
             attribute = attributelist[x].to_sym
             
             define_method((attribute.to_s + '=').to_sym) do |val|
+
               oldval = attributes[attribute]
               attributes[attribute] = val
-              #puts 'inside change='
+
               @rexle.refresh if @rexle
               change() unless val == oldval
+
               val
             end
             
@@ -71,7 +95,7 @@ class FreeDom < Domle
           .each {|x| e.attributes.delete x }
     end
 
-    super(@doc.root.xml)        
+    super(@doc.root.xml, debug: @debug)        
     script()
                                      
   end
@@ -88,6 +112,14 @@ class FreeDom < Domle
     eval s
     $env = binding
   end                                      
+  
+  def to_sliml()
+
+    xml = @doc.root.element('*').xml(pretty: true)
+    puts 'xml: ' + xml.inspect if @debug
+    XmlToSliml.new(xml.gsub(/ style=''/,"")).to_s
+    
+  end
                                     
 
   private
@@ -97,3 +129,4 @@ class FreeDom < Domle
   end
 
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: free_dom
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   VxSuuHhAXplX7wWmd1FzAAH5bk4OPlKGt5fxQbax+FSoEzTsnoDcLTY2i0WOxwRo
   76nAi+UZoU87S6brj88/rtOL
   -----END CERTIFICATE-----
-date: 2020-04-30 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domle
@@ -43,20 +43,60 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: line-tree
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.9'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: xml_to_sliml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 description: 
 email: james@jamesrobertson.eu
 executables: []