txt2tags 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fecbe0959b04275d7354f5a2d617310e30a0f7e0
-  data.tar.gz: 0937dcbff35c0858a45706680113af8dafd96e5a
+  metadata.gz: a85a49a06442ffef7acdb141f72c3d7b8c79108a
+  data.tar.gz: 5ee6fc7dceff109e6f35cc1fdec4ae25cfcdb491
 SHA512:
-  metadata.gz: 7961821fb564a19e8766a93c25849e65096c5eb7ec5c718afc88649ac4681e0c98d62a798cf6892ccaa9475ccfe1b891723c48d40b508c4ca4c7991c5e00c050
-  data.tar.gz: 3ef986140a6f4103ec696d08e00bf0e95c970a428708a058e8e2f8ea00ada9ce3a3c6893b0e2bec474b0cd9fc79d45a117b2a622adf0346c989f56e3296d5478
+  metadata.gz: 26edd9068601e6931db3d80d2fe6b31399cef94ea9cd13fa0e2b5caba4c1ef15fcd1917cc0a99a09a2dbaa51eaed9db590293d64db8a382ab106250a80e6b2c4
+  data.tar.gz: ea1149f4520d5202a686423cd2705bf6f675b89a7bc277e39a0fe24e8c4a2866cb14c497c6db6d2b84be0b462d6bfbe1db263ad0eb0447caf306fae37cac7be4

data/lib/txt2tags.rb

@@ -10,9 +10,11 @@ class Txt2Tags
   BEAUTIFIERS = {
     monospace: Regexp.new('``(.*?)``'),
     bold: Regexp.new('\*\*(.*?)\*\*'),
-    italic: Regexp.new('//(.*?)//'),
+    italic: Regexp.new('//([^\]\[]*?)//'),
     underline: Regexp.new('__(.*?)__'),
-    strike: Regexp.new('--(.*?)--')
+    strike: Regexp.new('--(.*?)--'),
+    link: Regexp.new('\[([^\]\[]*?)\s+([^\s\[\]]*?)\]'),
+    image: Regexp.new('\[([^\s\]\[]*?)\]')
   }.freeze
 
   # Only one linners transformations
@@ -64,67 +66,44 @@ class Txt2Tags
     block = nil
     ignore_line = false
 
-    Enumerator.new do |y|
-      # We can this multiples times
-      begin
-        @input.rewind
-      rescue Errno::ESPIPE
-      end
+    # We can this multiples times
+    @input.rewind if @input.eof?
 
+    Enumerator.new do |y|
       # Comments are discarded (lines beginnig with %)
       @input.readlines.reject { |l| l.start_with?('%') }.each do |line|
         # right space are discarded (line terminators, tabs and spaces)
         line.rstrip!
 
-        # We are already inside a block?
-        if !block.nil?
-          # We find the end of a block?
-          if BLOCKS[block][:end_re].match line
-            # Send the end mark for this format
-            y.yield format::BLOCKS[block][:end]
-
-            # We can ignore the actual line?
-            if BLOCKS[block][:ignore_match_line]
-              block = nil
-              next
-            end
-          end
-        else
+        if block.nil?
           # Searching for a new block...
-          BLOCKS.keys.each do |m|
-            # No...
-            next unless BLOCKS[m][:begin_re].match line
+          block = BLOCKS.find { |b| b[1][:begin_re].match line }
+
+          # The begin of a block!
+          unless block.nil?
+            block = block[0]
 
-            # Yes!
-            block = m
             # We can ignore the actual line?
             ignore_line = BLOCKS[block][:ignore_match_line]
 
             # Send the begin mark for this format
             y.yield format::BLOCKS[block][:begin]
-
-            # We already figured out what to do, we do not have to keep looking
-            break
           end
-        end
-
-        # Ignore this line? The others we'll find out.
-        if ignore_line
-          # The next line we still do not know if we ignore
-          ignore_line = false
-          next
-        end
-
-        # We can strip spaces from the begin of this line?
-        line.strip! if !block.nil? && BLOCKS[block][:strip]
-
-        # an apply the BEAUTIFIERS and TITLES transformations?
-        if block.nil? || (!block.nil? && BLOCKS[block][:apply_inline])
-          apply_marks!(format, line)
+        elsif BLOCKS[block][:end_re].match line
+          # We find the end of a block!
+          # Send the end mark for this format
+          y.yield format::BLOCKS[block][:end]
+
+          # We can ignore the actual line?
+          if BLOCKS[block][:ignore_match_line]
+            block = nil
+            next
+          end
         end
 
         # More on line!
-        y.yield line
+        y.yield process_line(line, block, format) unless ignore_line
+        ignore_line = false if ignore_line
       end
 
       # There are a close block pending?
@@ -132,14 +111,28 @@ class Txt2Tags
     end
   end
 
-  # Apply the basic conversions (no BLOCKS) to a line
-  def apply_marks!(conversion, line)
-    [:BEAUTIFIERS, :TITLES].each do |type|
-      type_array = Txt2Tags.const_get(type)
-      type_array.keys.each do |rule|
-        line.gsub!(type_array[rule], conversion.const_get(type)[rule])
+  def process_line(line, block, format)
+    # We can strip spaces from the begin of this line?
+    processed = line
+    processed.strip! if !block.nil? && BLOCKS[block][:strip]
+
+    apply(processed, block, format)
+  end
+
+  def apply(line, block, format)
+    processed = line
+
+    # an apply the BEAUTIFIERS and TITLES transformations?
+    if block.nil? || (!block.nil? && BLOCKS[block][:apply_inline])
+      [:BEAUTIFIERS, :TITLES].each do |type|
+        type_array = Txt2Tags.const_get(type)
+        type_array.keys.each do |rule|
+          processed.gsub!(type_array[rule], format.const_get(type)[rule])
+        end
       end
     end
+
+    processed
   end
 
   # Discover available formats

data/lib/txt2tags/html5.rb

@@ -7,7 +7,9 @@ class Html5
     bold: '<strong>\1</strong>',
     italic: '<em>\1</em>',
     underline: '<span style="text-decoration: underline;">\1</span>',
-    strike: '<span style="text-decoration: line-through;">\1</span>'
+    strike: '<span style="text-decoration: line-through;">\1</span>',
+    link: '<a href="\2">\1</a>',
+    image: '<img src="\1">'
   }.freeze
 
   TITLES = {

data/lib/txt2tags/null.rb

@@ -6,14 +6,16 @@ require_relative '../txt2tags'
 # Copy and paste this file for a new format.
 #
 # This contain the replace part of a regexp
-# "\1" is the group from the search part og regexps in main class
+# "\1" and "\2" are the groups from the search part og regexps in main class
 class Null
   BEAUTIFIERS = {
     monospace: 'm_\1_m',
     bold: 'b_\1_b',
     italic: 'i_\1_i',
     underline: 'u_\1_u',
-    strike: 's_\1_s'
+    strike: 's_\1_s',
+    link: 'L_\1||\2_L',
+    image: 'I_\1_I'
   }.freeze
 
   TITLES = {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: txt2tags
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
 platform: ruby
 authors:
 - Paulo Henrique Rodrigues Pinheiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-15 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="