martile 0.8.3 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4797b3a31fa2b1beab44d952feb4f0b3b74739f8
-  data.tar.gz: ac208315ae49bca5276bd43e09a0e44d8d6de4e8
+  metadata.gz: 57637649c3072e471cb8d293c282f29037ac14dd
+  data.tar.gz: '0718b4d00db1429b7816034f08a7c06c537a06af'
 SHA512:
-  metadata.gz: 0d2c04a5c429645628b880fcfb20fca0599df93699c74b231f45bcbed70531250a5ee927923eb7e9c583506021aeca77f95efb297de594e07c7825f42f1e8639
-  data.tar.gz: bde57563c71a3b291c0082ccc6423de2388cbbba971b1bbe61b362e6784b4029e4080306dc40821a796e6a851869cd2d3b7da7fc6f0be4377c6003a87df68d22
+  metadata.gz: '039685ca2a2afe7d052da5785431293778aa884cd99f43896d47326aee7898539f1307063a5c7e62311a36af2754c95a01c932826968b8e238d3df02e2cfe9cb'
+  data.tar.gz: fdb183d1c62180f4e99a2a8d6ba1e3151f36bea401ef9e3260a4533099eb4ba3e8fc8cb6f93ba99f9d0f42c94411d136a876d09c3ad9179835dce4e17c72ff23

data.tar.gz.sig

@@ -1 +1,2 @@
-��fh��<�J
/F~�B�a�U�Q�cD�����[�6�Ȏ��0�6:ӂ�P��0h��D{Ws=��g`�~Di��(���6% �ᕂ��v(��>)�iIGdSQ�>�SnM
+�9v��)^��
'�O���d���]����B�������X�m��/{�/
规{����	߂J��g�/I*����4x�|�>4��������:�B8�nn�Ǭ+�<C�U�g;��5���z�j����ڼ��冿N��S�8
:q�ɌeN7&�$��e�t���.?n!���_v?7�[�����F���T��n%�"H5	/\H�^����&�)�j��
+����?�+D��W��x�=@��

data/lib/martile.rb

@@ -4,14 +4,16 @@
 
 #require 'rexle-builder'
 #require 'rexle'
-require 'kvx'
+#require 'kvx'
 require 'rqrcode'
-require 'dynarex'
-require 'rdiscount'
-require 'mindmapviz'
+#require 'dynarex'
+#require 'rdiscount'
+require 'mindmapdoc'
 require 'flowchartviz'
 
 
+# feature:  12-Feb-2018 Transforms <mindmap> tags into a 
+#                       mindmap + related headings
 # feature:   8-Feb-2018 A section attribute id can now include a dash (-).
 #                       Markdown inside a section element is no longer 
 #                       rendered by RDiscount
@@ -53,7 +55,7 @@ class Martile
 
   attr_reader :to_s, :data_source
 
-  def initialize(raw_s, ignore_domainlabel: nil)
+  def initialize(raw_s, ignore_domainlabel: nil, debug: false)
     
     @data_source = {}
     
@@ -61,16 +63,21 @@ class Martile
 
     raw_s.gsub!("\r",'')
     
+    
     s0 = raw_s =~ /^__DATA__$/ ? parse__data__(raw_s) : raw_s
-    #puts 's0: ' + s0.inspect
-    s1 = apply_filter(s0) {|x| slashpre x }
+    puts 's0: ' + s0.inspect if debug
+    
+    s1 = MindmapDoc.new(debug: debug).transform(s0)
+    puts 's1: ' + s1.inspect if debug
+    
+    s2 = apply_filter(s1) {|x| slashpre x }
     #puts 's1 : ' + s1.inspect
-    s2 = apply_filter(s1) {|x| code_block_to_html(x.strip + "\n") }
+    s3 = apply_filter(s2) {|x| code_block_to_html(x.strip + "\n") }
 
     #puts 's2 : ' + s2.inspect
     #s3 = apply_filter(s2, %w(ol ul)) {|x| explicit_list_to_html x }
     #puts 's3 : ' + s3.inspect
-    s4 = apply_filter(s2) {|x| ordered_list_to_html x }
+    s4 = apply_filter(s3) {|x| ordered_list_to_html x }
     #puts 's4 : ' + s4.inspect
 
     s5 = apply_filter(s4) {|x| unordered_list_to_html x }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.9.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,28 +31,8 @@ cert_chain:
   ta+wi0WcePPmMfSbCGQcYixXdM6qZvflWMz0AK44eQcm6OymMXgMQG6GvHPAl6s2
   ASPGReskINIIrA==
   -----END CERTIFICATE-----
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: kvx
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.4
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.6.4
 - !ruby/object:Gem::Dependency
   name: rqrcode
   requirement: !ruby/object:Gem::Requirement
@@ -74,65 +54,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.10.1
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: mindmapdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0.1
-- !ruby/object:Gem::Dependency
-  name: dynarex
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.28
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.7.28
-- !ruby/object:Gem::Dependency
-  name: mindmapviz
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: flowchartviz
   requirement: !ruby/object:Gem::Requirement