domle 0.4.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1603ab1131e919539aca6ca3ea4bc45088d811a09fdf623f4ce587c00998205
-  data.tar.gz: 9d05226c9c07646e789c4194ca77091a06cd718861ac117bf27db4f98180a4b7
+  metadata.gz: 2d512c1472aa41ac55fe92d96e214fa1445fb3a98ae0744756c81557440e63e6
+  data.tar.gz: c5208b775e3158e858dfc38b6a6d1c352224b300979bdf5bac6d50ea872b4e1e
 SHA512:
-  metadata.gz: 51433b3b698d31a7e40133f2155624fa1d92825d79f8b401a1cf90d7d540850022ae1e288bee39065415980685309bdb24589bf8b27e62d2cef2a087ce5f1500
-  data.tar.gz: 9ce9647e9fa15e1de9939fae49208a6bf7aebc11f5dad2a07b69606fd4e4a224746e528af79cc1331701a8702146739e9e8ab496b08dcb14809b387d71f2e1f9
+  metadata.gz: 7fb4ab6bf36510479f860dfa4c242e605a1a14312147a5932bfcd5c66f00a1a77921152d40ff182daa348d06c45d23a3c8aa52baa8016beb81ee874122fa66b0
+  data.tar.gz: dca8f1a4803c9a6364c6f26b64d4a895abffc0b6b0bba5ec9ca8703fefbe5af76cd3dd7d261c2e1b2bb73e2aa1411100b136e9b9dbf4f37be93d9d1ed896302d

data/lib/domle.rb

@@ -20,7 +20,10 @@ class Style < Hash
 
     super(k,v)
     @parent[:style] = self.map{|x| x.join(':') }.join(';')
-    @parent.callback.refresh if @parent.callback
+    
+    if @parent.callback and @parent.callback.respond_to? :refresh then
+      @parent.callback.refresh 
+    end
     
   end
 end
@@ -54,12 +57,30 @@ class VisualAttributes < Attributes
 end
 
 class Domle < Rexle
+  using ColouredText
   
   class Element < Rexle::Element
+    
+
+    class ClassList
+      
+      def initialize(a, rexle, node)
+        @a, @rexle, @node = a, rexle, node
+      end
+      
+      def toggle(name)
+        @a.include?(name) ? @a.delete(name) : @a << name
+        puts '@rexle?: ' + @rexle.inspect if @debug
+        @rexle.refresh_css(@node) if @rexle
+      end        
+    end    
 
     @default = {}
+    @attr_map = {}
+    attr_reader :attr_map
+    
     def initialize(name=self.class.to_s.downcase[/\w+$/], value: nil, \
-                          attributes: VisualAttributes.new(parent: self), rexle: nil)
+                          attributes: {}, rexle: nil)
       
       attributes.merge!(style: '') unless attributes.has_key? :style
       super(name, value: value, attributes: VisualAttributes.new(attributes), rexle: rexle)
@@ -83,12 +104,26 @@ class Domle < Rexle
 
           define_method (attribute.to_s + '=').to_sym do |val|
             attributes[attribute] = val
-            @rexle.refresh if @rexle
+            rexle().refresh if rexle?
+            attr_update(attribute, val)
             val
           end
 
         end
       end
+      
+      def rexle?()
+        not @rexle.nil?
+      end
+      
+      def rexle()
+        @rexle
+      end
+            
+    end
+    
+    def self.attr_mapper(h)
+      @attr_map = h
     end
     
     def active?()
@@ -102,12 +137,12 @@ class Domle < Rexle
     def classlist()
       
       a = attributes[:class]
+      cl = ClassList.new(a, @rexle, self)
       
-      def a.toggle(name)
-        self.include?(name) ? self.delete(name) : self << name
-      end
+
       
-      return a
+      
+      return cl
     end
     
     def style()
@@ -122,6 +157,24 @@ class Domle < Rexle
         (x1..x2).include? x and (y1..y2).include? y
       end
     end    
+    
+    def obj=(v)
+      @obj = v
+    end
+
+    def obj()
+      @obj
+    end
+    
+    
+    private
+    
+    def attr_update(name, val)
+      return unless @attr_map
+      puts 'inside attr_update, @attr_map: ' + @attr_map.inspect if @debug
+      name = (@attr_map[name].to_s + '=').to_sym      
+      @obj.method(name).call(val) if @obj.respond_to? name
+    end
   end
   
   class Script < Element
@@ -135,32 +188,56 @@ class Domle < Rexle
   
   attr_reader :event
 
-  def initialize(x='<svg/>', callback: nil, rexle: self, debug: false)
+  def initialize(src='<svg/>', callback: nil, rexle: nil, debug: false)
+
+    @callback, @debug, @rexle = callback, debug, rexle
+    puts 'inside Domle initialize'.info if @debug
+    puts 'src:' + src.inspect if @debug
+    
+    super(RXFHelper.read(src).first, rexle: self)
+    @debug = debug
+    
+    puts 'before find add_css' if @debug
+    find_add_css() if src
 
-    super RXFHelper.read(x).first, rexle: rexle
-    find_add_css() if x
-    @callback, @debug = callback, debug
     
     @event = {
-      keydown: []
+      keydown: [],
+      keyup: [],
+      mousemove: [],
+      mousedown: [],
+      mouseenter: [],
+      mouseleave: [],
+      scroll: []
     }
     
   end  
   
   def addevent_listener(event, method_name)
         
-    @event[:keydown] << method_name
+    @event[event.to_sym] << method_name
     
   end
     
   
   def element_by_id(id)
     @doc.root.element("//*[@id='#{id}']")
-  end        
+  end
   
+  def elements_by_name(name)
+    @doc.root.xpath("//*[@name='#{name}']")
+  end  
+    
+  def elements_by_tagname(name)
+    @doc.root.xpath("//#{name}")
+  end    
    
   def refresh()
-    @callback.refresh if @callback
+    @callback.refresh if @callback and @callback.respond_to? :refresh
+  end
+  
+  def refresh_css(node)
+    find_add_css(node.parent)
   end
   
   protected
@@ -168,7 +245,7 @@ class Domle < Rexle
   def add_default_css()
   end
   
-  def add_external_css()
+  def add_external_css(node=nil)
     
     # check for an external CSS file
     if @instructions and @instructions.any? then
@@ -183,29 +260,35 @@ class Domle < Rexle
         end
       end
       
-      add_css hrefs.map{|x| RXFHelper.read(x).first}.join
+      add_css hrefs.map{|x| RXFHelper.read(x).first}.join, node
       
     end
     
   end
   
-  def add_inline_css()
-    @doc.root.xpath('//style').each {|e|  add_css e.text } 
+  def add_inline_css(node=nil)
+    puts 'inside add_inline_css' if @debug
+    @doc.root.xpath('//style').each {|e|  add_css e.text.to_s, node } 
   end
   
-  def find_add_css()
-    add_default_css()
-    add_inline_css()
-    add_external_css()
-  end
+  def find_add_css(node=nil)
+    
+    puts 'inside find_add_css' if @debug
+    add_default_css() unless node
+    add_inline_css(node)
+    add_external_css(node)
+  end    
   
   private
   
-  def add_css(s, override: true)
-
-    css = CSSLite.new s
-    css.propagate self.root    
-    
+  def add_css(s, node=@doc, override: true)
+
+    puts 'add_css s: ' + s.inspect if @debug
+    css = CSSLite.new s, debug: @debug
+    node ||= @doc
+    puts 'before propagate node: ' + node.inspect if @debug
+    css.propagate node
+    puts node.xml if @debug
   end
 
   # override this method in your own class

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domle
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   ewt0cFO7UqEB/yC8KNeXJjd19INo+w98LYjFZQEzLAg15Sz7ca5bUbr/LuYQUk4y
   Lvi3w1KUp4YuUbhbhnEQXuPH
   -----END CERTIFICATE-----
-date: 2020-05-01 00:00:00.000000000 Z
+date: 2020-08-31 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.15
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,47 +56,47 @@ dependencies:
         version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.15
+        version: 1.5.6
 - !ruby/object:Gem::Dependency
   name: csslite
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.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.3
+        version: 0.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rxfhelper
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        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: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.4
+        version: 1.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: james@jamesrobertson.eu
 executables: []