martile 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57fb8dcb688e8dacc6aa9201a11e27a8677e00d5e8fd6f77faff1cf6b3932bc1
-  data.tar.gz: 2d1f43f87a9f167f77d41d8876b8dc2b4f93cf353b598fb5c2bfdd49dce4f42d
+  metadata.gz: 450c3cddaa71a522b6551384f4fbfd707da1dffaf532da70ca0773f30ff062b8
+  data.tar.gz: f5610f7fc911b7b5ae8223155639c8181b593a56f7e2e04d32797b71039e612d
 SHA512:
-  metadata.gz: 4d8fbdb4e965ae5cbb26e001d40cb19b84e5046f95b0a9d3a62646a71e3a676373eb60c4a47a48301d156b09c45443e2ea264b0e9438cf89c728fb12a5a6b271
-  data.tar.gz: 7545ab60ade0306951aa45905511a9fd56a23af9904c58f4b2f81ea471a6caabc03454ed0a55171aeeb2e412db2c7c0881fd55654247cc2ecfb84bbb07e3874f
+  metadata.gz: df4792095069d5a9b49c1aadf82ec4e593c85f33dbb96d752d3796341243fd6b7b28d6d02c9f6582dcd0d9b29f8943650c485f281f447f3de7dd8a50d923df62
+  data.tar.gz: 2c6389e40f1f74987a79da2c431c41504ff8b951c7cc4c5a59cc748fdda9ca5fa525ad7136820fa5d6cd759be417350e1ff2b2f6715deb579350822ed7e5489c

data/lib/martile.rb

@@ -15,6 +15,7 @@ require 'jsmenubuilder'
 require 'htmlcom'
 
 
+# feature:  01-Mar-2020 A src attribute can now be used in the sidenav tag
 # feature:  29-Feb-2020 The sidenav tag can now contain a raw hierachical list
 # feature:  22-Jan-2020 An HtmlCom::Accordion component can now be generated
 #                       using the tag <accordion>
@@ -786,8 +787,16 @@ class Martile
       
         s.sub!(content,'')
         doc2 = Rexle.new(content)
-        target = doc2.root.attributes[:target] || 'pgview'
-        txt = doc2.root.text
+        
+        h = doc2.root.attributes
+        target = h[:target] || 'pgview'
+        
+        txt = if h[:src] then
+          RXFHelper.read(h[:src]).first.sub(/<\?links[^>]+>\n/,'')
+        else
+          doc2.root.text
+        end
+    
         puts 'txt: ' + txt.inspect if @debug
         
         html = HtmlCom::Tree.new(txt).to_webpage

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   g0+rPDPUCWKVNHo7BG5zGRDcLsJO0QeIILy/AQaSAE3lQiHmC47nhsiBK0qNehWa
   47XiKvz0ZVCGgrz4GEb723WC
   -----END CERTIFICATE-----
-date: 2020-02-29 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yatoc
@@ -117,46 +117,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.6
-- !ruby/object:Gem::Dependency
-  name: jsmenubuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.10
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.10
-- !ruby/object:Gem::Dependency
-  name: jstreebuilder
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: htmlcom
   requirement: !ruby/object:Gem::Requirement