free_dom 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b25006295cb48501f306a796923819b86162ba2479c3daa84e490bc201d9364
-  data.tar.gz: 87796929372ea091459a75facb1a8d01b94d3368dbe8e99d6e37e4a8614b2149
+  metadata.gz: 40cbd83a7e122bdd21f6d29050f461007647ba5c30bf82bb381fb0631e08b677
+  data.tar.gz: ee9de9c48dd84e74d7a2baf4606c842ffef705be469c92f227931ab6623290c6
 SHA512:
-  metadata.gz: ec3355fdef23b6ff5d9c8c668db1a258dec3f4cd58cdd942e324e587f1b03729ae4f9d91a9df321ba4f2a97eb548da1565b881f5ad53c32d388fc8ad02e6e350
-  data.tar.gz: 850c75e8fa3fc0b91d13cd31d7702d311c9a6635bcbfe89ed6e8ac6ad2cb7a4767853dd0799511a4a550ae37d220ca210660587095b1489aa0c44a711635c7cf
+  metadata.gz: 1e9355485a6b657d33a4db93477ac70d0ba6df4e85cde5bfad9aa6aa4e1b3b240f853af58d11a4bef7d1a695b4c808d1da79cfc24ff804517220a38737c5d218
+  data.tar.gz: 1d2c09f362b8319ad5119d0c1b66ffac47cf8a08f0563c3f9b06d939489badaa1d5ac010104712475b13505dd890d86d16e2559ab330ffa0a73ed1d2fbe0fa08

data/lib/free_dom.rb

@@ -14,7 +14,18 @@ class FreeDom < Domle
     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).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 +37,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 +46,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
             
@@ -97,3 +108,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.2.1
 platform: ruby
 authors:
 - James Robertson