martile 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc3aa70713cdb6ddbcaced04f0aae2cceb9d03dc
-  data.tar.gz: 3a2500985fe8fbfdb29ff9ed85044fb9c0e2286c
+  metadata.gz: 1eb1343e216876841f720a759c80c515d3d31caf
+  data.tar.gz: 3089b41e29ff067736133a8e0ef12a550a040e1d
 SHA512:
-  metadata.gz: 633b92c9f66bba8c7dea9c4cb041985a4fc80c357b7f75ad53bf241d51c2260d6d1600dfadc2c6aa50a5197bfd7030aa1916b0e7b3ff08584e4e02ffcb9f6fe0
-  data.tar.gz: 5fab9e33fe8c9142d6cb40bb7927980b49295115c013431af547ad9da2069896d1a75e46cce78a2c6ae071d4eacedadb921b9ff350043d705dd3e9429b89ebeb
+  metadata.gz: c6a3f65b3ca6ab982ed94ded7c44e04229a878811501494346fe80ba6d1c174d365be2e4dd4b805ad1f158a175e58c03f1c34d5f3053c8cbb217f758575dd3a4
+  data.tar.gz: 0db9a920deced5a775593883f09ac4174aaacc6f5e9960d9fada11fd3fcab4e3090465ca936ba831d899086e868833e7ec8363ecd255c33d26268cb7f9926803

data.tar.gz.sig

@@ -1 +1,3 @@
-N���p�f�^j������g���dDF��D|!��b��\��B:5�9	Q�‰&��	���"z�[��y�'��#�HN;�9!��uމ�4�]��U	��[Wao7�	��+���(9��yV�7��,��y2��crH4Nq�(�ӄ+�/�\�x��D_�L�r4JGڐ���Ǵ�X�7q
+m��x�U�2�%��<<)�Ik����>
+���(#69�Ua|�u[r���N���,����C�5��#ǪC�-��6�O�漙'��F3�{�$�N�^��׶�p�\�<��ݖ��x�D�3L�����>��R�0�X��e;C�T�l�ݟ�B���?ɂ���i��X�rD
wM�%~r	�pq��
+��f�w⸜s~kmt{�?� oj�4�������F�&\��x\K�_X�L��M�

data/lib/martile.rb

@@ -8,6 +8,8 @@ require 'dynarex'
 require 'rdiscount'
 
 
+# feature:  24-Sep-2014: A kind of markdown list can now be created inside 
+#                        of <ol> or <ul> tags
 # bug fix:  16-Apr-2014: Words containing an underscore should no longer be 
 #                        transformed to an underline tag
 # bug fix:  03-Apr-2014: XML or HTML elements should now be filtered out 
@@ -39,8 +41,7 @@ class Martile
 
   def initialize(s)
 
-    raw_s2 = apply_filter(s) {|x| code_block_to_html x }
-    #puts 'raw_s2: ' + raw_s2.inspect
+    raw_s2 = apply_filter(s.strip) {|x| code_block_to_html x }
 
     # ensure all angle brackets within <pre><code> is escaped
     s2 = raw_s2.split(/(?=<pre><code>)/m).map { |y|
@@ -61,23 +62,23 @@ class Martile
     end
 
     #puts 's2 : ' + s2.inspect
-
-    s3 = apply_filter(s2) {|x| ordered_list_to_html x }
-    #puts 's3 : ' + s3.inspect
-
-    s4 = apply_filter(s3) {|x| unordered_list_to_html x }
+    s3 = apply_filter(s2, %w(ol ul)) {|x| explicit_list_to_html x }
+    s4 = apply_filter(s3) {|x| ordered_list_to_html x }
     #puts 's4 : ' + s4.inspect
 
-    s5 = apply_filter(s4) {|x| dynarex_to_table x }
-    #puts 's5 :' + s5.inspect
+    s5 = apply_filter(s4) {|x| unordered_list_to_html x }
+    #puts 's5 : ' + s5.inspect
 
-    s6 = apply_filter(s5) {|x| table_to_html x }
-    #puts 's6 : ' + s6.inspect
+    s6 = apply_filter(s5) {|x| dynarex_to_table x }
+    #puts 's6 :' + s6.inspect
 
-    s7 = apply_filter(s6) {|x| underline x }
+    s7 = apply_filter(s6) {|x| table_to_html x }
     #puts 's7 : ' + s7.inspect
 
-    @to_html = s7
+    s8 = apply_filter(s7) {|x| underline x }
+    #puts 's8 : ' + s8.inspect
+
+    @to_html = s8
   end
 
   private
@@ -148,11 +149,49 @@ class Martile
 
   end  
 
-  def apply_filter(s, &block)
+  def apply_filter(s, names=[], &block)
 
-    Rexle.new("<root>#{s}</root>").root\
-            .map {|x|  x.is_a?(String) ? block.call(x) : x}.join
-  end  
+    Rexle.new("<root>#{s}</root>").root.map do |x|  
+
+      if x.is_a?(String) then
+        block.call(x)
+      else
+        
+        if names.grep  x.name then
+          block.call(x.xml)
+        else
+          x
+        end   
+        
+      end      
+    end.join
+  end
+  
+  def explicit_list_to_html(s)
+
+    match = s.match(/<([ou]l)>([\*#])/m)
+
+    if match then
+
+      type, symbol = match.captures
+      symbol = ('\\' + symbol) if symbol == '*'
+
+      a3 = s.split(/(?=<#{type}>)/).map do |x|
+       # puts 'x' + x.inspect
+        if x =~ /<ol>/ then
+          "<%s>%s</%s>" % \
+              [type, x[/<#{type}>[#{symbol}]\s*(.*)<\/#{type}>/m,1]\
+               .split(/\n#{symbol}\s*/).map {|y| "<li>%s</li>" % y}.join, type]
+        else
+          x
+        end
+      end
+
+    else
+      s
+    end
+    
+  end
   
   def ordered_list_to_html(s)
     list_to_html s, '#'
@@ -193,4 +232,4 @@ class Martile
 
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: martile
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - James Robertson
@@ -31,64 +31,88 @@ cert_chain:
   YF3JmVOebtMx3b9sXkLX1YyX0fsg59FXvg9CVfAoaG6qjG2Y/okBwMSqqMLQiiao
   aRfEuwOkM9Z+zA==
   -----END CERTIFICATE-----
-date: 2014-04-16 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rexle-builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.9
 - !ruby/object:Gem::Dependency
   name: rexle
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.11
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.1.7.1
 - !ruby/object:Gem::Dependency
   name: dynarex
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.90
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.90
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -108,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -116,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Converts a martile string to html