dom_render 0.2.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7b47dc68cc997f50c128a0089c1cf9a242f666b6
-  data.tar.gz: 044f66c0048d94a9f036307781358532fa155bef
+SHA256:
+  metadata.gz: e1b8a550981b1641a8219c576237838a4287a9d359450568bdbafe2a817c0bcb
+  data.tar.gz: 5b38fc7ad769585477c12b8e459e38799899884a386ac4874a4558587f148141
 SHA512:
-  metadata.gz: 257f404542e8bb05dfdd5e19390064f09f51a794bcd4b223cb5b4cedfc6f501a0047e95d6859fa30e55cb9698b84665c480416528aba761e8e14af0da34e458a
-  data.tar.gz: 0b63f32ee3c28b86c790ae15eba6d1dcb794a5ac2c7dd9101d94e245232477c112b33d1e00a46d9bc0f4466c00547d1d2e0908f720a4ca663fc1a6d71bb985fc
+  metadata.gz: 9a62df3febafd99a11dfe1e251645fcfcfb0c481a7768f76bf614547e211d74d52c31b083654d7fe2f3030baa83859f70ac827c13bdba117540c5b2840f4b103
+  data.tar.gz: 0f3d40b15a47651cbf5948e12dcfe469e65f485c876dd1435c5df165258383518b9b81ba6f003dcc6d40b2e720f6a12f4a66603799904efffaf267f637464a9c

data/lib/dom_render.rb

@@ -4,12 +4,54 @@
 
 require 'rexle'
 
+module InspectArray
+      
+  def scan(a, i=0)
+    
+    if a.first.is_a? Symbol
+      
+        puts a.inspect    
+        
+    else
+      
+      puts ('  ' * i) + '['
+
+      a.each.with_index do |row, j|
+
+        if row.is_a? String or row.is_a? Symbol then
+          print ('  ' * (i+1)) + row.inspect
+          print ',' unless a.length - 1 == j
+          puts
+        elsif row.first.is_a? Symbol or row.first.is_a? String
+          puts ('  ' * (i+1)) + '['
+          puts ('  ' * (i+2)) + row.inspect[1..-2]
+          print ('  ' * (i+1)) + ']'
+          print ',' unless a.length - 1 == j
+          puts
+        else
+          scan(row,i+1)
+          print ',' unless a.length - 1 == j
+          puts
+        end
+      end
 
-class DomRender
+      print indent = ('  ' * i) + ']'
+    end
+  end
+  
+end
 
+class DomRender
+  include InspectArray
+  using ColouredText
+  
   attr_reader :to_a
 
-  def initialize(x)
+  def initialize(x, debug: false)
+                           
+    @debug = debug
+    
+    raise "DomRender#initialize: supplied parameter cannot be nil" unless x
     
     doc = if x.kind_of? Rexle then
       x
@@ -17,45 +59,83 @@ class DomRender
       Rexle.new x.gsub(/\n/,'')
     end
     
-    @to_a = render doc.root
+    @a = render doc.root
   end
 
   def render(x)
     
-    style = x.attributes.has_key?(:style) ? fetch_style(x.attributes) : {}
-    args = [x]
-    args.concat([x.attributes, style])
+    puts 'inside render'.info if @debug
     
-    r = method(x.name.to_sym).call(*args)
+    style = x.attributes.has_key?(:style) ? fetch_style(x.attributes) : {}
+    puts 'style: ' + style.inspect if @debug
+    puts 'x.name: ' + x.name.to_sym.inspect if @debug
+    r = method(x.name.to_sym).call(x, x.attributes.merge(style))
+    puts 'r: ' + r.inspect if @debug
     
-    if r.last.empty? then
-      r[0..-2]
-    else
+    return [] unless r and r.length > 0
+
+    # jr051216 the following statement was commented out because it caused a 
+    #      bug when reading style attributes by exploding the coordinates array
+    #if r.last.nil? or r.last.empty? then
+    #  r[0..-2].flatten(1)
+    #else
       r
-    end
+    #end
   end
 
   def render_all(x)
 
+    puts 'x.children: ' + x.children.inspect if @debug
     len = x.children.length - 1
 
-    x.children.map.with_index do |obj,i|
+    r = x.children.map.with_index do |obj,i|
 
       if obj.is_a? String then
-        i == 0 ? obj.lstrip.sub(/\s+$/,' ') : obj.rstrip.sub(/^\s+/,' ')
+        if obj.strip.length > 0 then
+          i == 0 ? obj.lstrip.sub(/\s+$/,' ') : obj.sub(/^\s+/,' ')          
+        else
+          ''
+        end
       elsif obj.is_a? Rexle::Element
-        render obj
+        
+        puts 'obj: ' + obj.inspect
+        a = render obj
+        puts ('_a: ' + a.inspect).debug if @debug
+        
+        a.length > 1 ? a : nil
       end
 
     end
 
+    r.compact
+
+  end
+  
+  def script(e, attributes)
+    []
+  end     
+  
+  def style(e, attributes)
+    []
+  end   
+  
+  def to_a(inspect: false, verbose: false)
+    
+    #if inspect or verbose then
+    #  scan @a
+    #  puts
+    #else
+      @a
+    #end
+
   end
   
   private
   
   def fetch_style(attributes={})
-    
-    attributes[:style].split(';').inject({}) do |r, x| 
+
+    attributes[:style].split(';').inject({}) do |r, x|
+
       k, v = x.split(':',2)
       r.merge(k.to_sym => v)
     end
@@ -66,7 +146,7 @@ class DomRender
   # e.g. "1em 1.5em" #=> ['1em','1.5em','1em','1.5em']
   #
   def expand_shorthand(s)
-
+    puts 'inside expand'
     a = s.scan(/\d+(?:\.\d+)?\s*(?:em|px)?/)
 
     case a.length
@@ -78,6 +158,5 @@ class DomRender
     end
     
   end
-  
-  
-end
+    
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dom_render
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson
@@ -10,28 +10,32 @@ bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
-  MIIDljCCAn6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBIMRIwEAYDVQQDDAlnZW1t
-  YXN0ZXIxHjAcBgoJkiaJk/IsZAEZFg5qYW1lc3JvYmVydHNvbjESMBAGCgmSJomT
-  8ixkARkWAmV1MB4XDTE1MTEwOTE3MTQwOFoXDTE2MTEwODE3MTQwOFowSDESMBAG
-  A1UEAwwJZ2VtbWFzdGVyMR4wHAYKCZImiZPyLGQBGRYOamFtZXNyb2JlcnRzb24x
-  EjAQBgoJkiaJk/IsZAEZFgJldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-  ggEBAN8219P82aeJWwvjgXuq8yGWSEkWwPUbYCHkV9DYGLU6tuKpqdzmLIl5KLbu
-  fZn+j+L8cbbLXNO24mlgBTS8Vzks5JBx0V43PFOOxBwAfOpZceNLt9Ne/YQEC/82
-  bsaQeS+qFP5KsVFGIyDxOiggntN68GInbkG7NFom+qD5i/Y9IvNS4u9mjRPrnJd6
-  9fcb4UDDH69A2KgLA3xEG67+auPs/lUAO6fQCVGMoDwBDE4ecY3sjJaGoqAPcyhU
-  tbh11I/IJo9AtEMCFVMH3YzJt/OocRxnKn3PgM2FShq5sIhnwkrEqUVhyUl0ln1P
-  ONr2uZ188RBN/1+pcZEGuujzaHMCAwEAAaOBijCBhzAJBgNVHRMEAjAAMAsGA1Ud
-  DwQEAwIEsDAdBgNVHQ4EFgQUvDXV2oj31s5fCWjzGc6CTJbfgRswJgYDVR0RBB8w
-  HYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1h
-  c3RlckBqYW1lc3JvYmVydHNvbi5ldTANBgkqhkiG9w0BAQUFAAOCAQEAkdHBmzVP
-  ddAtQgz9Xx8/MJYA/xcg59l9y/56cbMDwAMwSF/wUgv6iyYD8JT4wqhp8+TtLGeN
-  3fGc9XXvQCnpekJjba1Uw/bCEXyvI7wtNocnZLpAUgyizO3sPYJJQotgMl6vfAzd
-  xQ731arNAnFyd5CTJhDvooqlG4Vju6ZQE/rxL8rXHZPH8kGdhdNt/ZyHJgzZjyDy
-  xpeSt8VY27XGo+W5SM+lS56FFZXfoEvaV+ktVm9l7BbUyYPiGJMFU1SVMvqHlt7y
-  ipCgMpSHSTGoxQ/dI853bcb+vPkAqS69GEcZgtvAmCQs5E4KC1seYLuP3qtuatL9
-  dbkCMOVMy0htMQ==
+  MIIEXjCCAsagAwIBAgIBATANBgkqhkiG9w0BAQsFADAsMSowKAYDVQQDDCFnZW1t
+  YXN0ZXIvREM9amFtZXNyb2JlcnRzb24vREM9ZXUwHhcNMjAwNTExMTk1MzQxWhcN
+  MjEwNTExMTk1MzQxWjAsMSowKAYDVQQDDCFnZW1tYXN0ZXIvREM9amFtZXNyb2Jl
+  cnRzb24vREM9ZXUwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDeFZNh
+  CmJd0OmzeW5syFZlmZorbxSife/SDmcpi0lGgqNNU+vuQ86VSeBS5meycpL2Hp8c
+  xG39l6ckjuFSNCOI9+5wF6Cm9sF38mENUZ0jTRjzkWwV/aM7XVajGOPhnsAYD04T
+  UOjQxgtVE9jhy7JJ93n/mXXahh73SiCCoR6ySNu3SYZEgD2PsNxP8epdz8I80jwH
+  apt8dCamDsy0pIDQ97mIVmmbc4W5hPzQGtjPzvnLAHVe+0E7z93mbx7lWzgRKUdA
+  IGdy0lLS/VkKkNhSK/2fFp6gK4/WDtRoWHstTsTaAOzWB4KGblZ74AdSD/QmI/bP
+  h3hqIPgUa/61TYDuh8M+uAnaCkKJoJ0ZvvdfRCTNA6A5KVG+D1J5XjxJ+Kirvj6v
+  vDjDTmOrAw/sv6xHnR1oUrKWTvuSGtDJdJMk3qFJLHkaqcKeJ0QYKzrV8wZSXydR
+  xABhhHoHkpT+00xNelU8G/CHVXvOQS754/RXPRUG/0/lQaa1IMMn3fq1CqECAwEA
+  AaOBijCBhzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQU1Y7wazuZ
+  oTUcjfACjYNJtPXZZ0YwJgYDVR0RBB8wHYEbZ2VtbWFzdGVyQGphbWVzcm9iZXJ0
+  c29uLmV1MCYGA1UdEgQfMB2BG2dlbW1hc3RlckBqYW1lc3JvYmVydHNvbi5ldTAN
+  BgkqhkiG9w0BAQsFAAOCAYEAMhe+HKUvLOt3slpK+U7wQLCGxNN8Vcii+uq2bU/A
+  ponA/f1onQ5YzR1i33UHmiSHJq4rieZ6dhKOOaO70b3Qpd1EFfES93c4vrbMng7I
+  iXZlTPBL98PT9YPs4E48FNdE3Bmrx9vx57faZTebAGIf7hCEkf6vkfoc1npQuX6K
+  P/sn12C1kuOYVXFoQ0wwbRKY4ciam8KCOAV3WC/EGPl1G/JmXsPnLGUrpHvETt4i
+  HL2xlP90Kl77mtfgc4iJCdK+z1rgy7zCMbDKFXrCiUgRCVnlFh8KSf/pXG4Mj6YZ
+  2E5VIkQRRMeV9Iw++OAuZ3ncGyKWO0ZQ+Fv4+o5ecihcAjHnM4FiRB2xdE04nbT4
+  06O3ljtplA/YNiLVSVIxYGEQk03c48zHE0nvQQLvNErl0fw+P+/OeUCp0oygcurZ
+  UOXZAsx7FyG8daWTRpj9raifrl9pxOv/urh3FMd+j0twYVRBesRbBj3LKz7sRI6H
+  dDQhWjwG/xapk9uTGle5FfUF
   -----END CERTIFICATE-----
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2020-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle
@@ -39,22 +43,22 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.5.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.3.9
+        version: 1.5.6
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -79,8 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Designed to render HTML