ssmd 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ffb94aa873d4d92d8693c8c6144b271619fcc39
-  data.tar.gz: 33d056ee0db82b7b9f865910aabd8eb0e684bf00
+  metadata.gz: 221fb4fbe3144a2331545c9ac3ab79a0dc4933b4
+  data.tar.gz: 508c4b8101fad140db26dc76350e45dc0d324d6d
 SHA512:
-  metadata.gz: 6bd797db0dc2b8c36883a1e46cd42a37e1fc1401832db9bcf19ee6d7036efa281c9c31060316e90fea993370f9b7e6f2a07154c4eaa534f741c1bcbc5efda1a3
-  data.tar.gz: 3ce6c6cb968839fea5a0a2e9c4137b4ca1dc0dff501d9b42961f89e26f8d229760855e7e78b15c4ee08e14858302dbd2c69694fa42f31dae3d43d8a3bbc74821
+  metadata.gz: 511a816ea8a953420f4a7bb7433fed1618c4c68f872add28efc73c38ff2045718fddedd134c5629682e1071d24085e0e484084368db36a1db2d16339ef534725
+  data.tar.gz: 23d2381df4964f49dfb0bf3f377fd2d0a827b6ebcb580a82be145cdf9034008e7a896d3765cf1dc844bef1599e7988c607aa3b98ec4087bb15bcde125a9bd4a9

data/SPECIFICATION.md

@@ -41,12 +41,12 @@ SSML:
 
 SSMD:
 ```
-*word*
+*command* & conquer
 ```
 
 SSML:
 ```html
-<emphasis>word</emphasis>
+<emphasis>command</emphasis> &amp; conquer
 ```
 
 ***

data/lib/ssmd.rb

@@ -14,7 +14,7 @@ module SSMD
   #
   # @return [String]
   def strip_ssmd(ssmd)
-    Converter.new(to_ssml(ssmd)).strip
+    Converter.new(ssmd).strip
   end
 
   def root_dir

data/lib/ssmd/converter.rb

@@ -1,5 +1,4 @@
 require 'ssmd/processors'
-require 'rexml/document'
 
 module SSMD
   class Converter
@@ -10,7 +9,7 @@ module SSMD
     end
 
     def convert
-      result = processors.inject(input) do |text, processor|
+      result = processors.inject(input.encode(xml: :text)) do |text, processor|
         process processor.new, text
       end
 
@@ -18,20 +17,8 @@ module SSMD
     end
 
     def strip
-      doc = ::REXML::Document.new input
-
-      if doc.root
-        xml_text doc.root
-      else
-        input # no XML so we assume it is already stripped
-      end
-    end
-
-    def xml_text(node)
-      if node.is_a? REXML::Text
-        node.to_s
-      else
-        node.children.map { |c| xml_text c }.join
+      processors.inject(input) do |text, processor|
+        process processor.new, text, strip: true
       end
     end
 
@@ -43,9 +30,10 @@ module SSMD
       ]
     end
 
-    def process(processor, input)
+    def process(processor, input, strip: false)
       if processor.matches? input
-        process processor, processor.substitute(input)
+        result = strip ? processor.strip_ssmd(input) : processor.substitute(input)
+        process processor, result, strip: strip
       else
         input
       end

data/lib/ssmd/processors/annotation_processor.rb

@@ -4,10 +4,10 @@ require 'ssmd/annotations'
 
 module SSMD::Processors
   class AnnotationProcessor < Processor
-    attr_reader :text, :annotations
+    attr_reader :annotations
 
     def result
-      @text, annotations_text = match.captures
+      _, annotations_text = match.captures
 
       if annotations_text
         @annotations = combine_annotations parse_annotations(annotations_text)

data/lib/ssmd/processors/emphasis_processor.rb

@@ -3,8 +3,6 @@ require_relative 'processor'
 module SSMD::Processors
   class EmphasisProcessor < Processor
     def result
-      text = match.captures.first
-
       "<emphasis>#{text}</emphasis>"
     end
 

data/lib/ssmd/processors/mark_processor.rb

@@ -3,8 +3,6 @@ require_relative 'processor'
 module SSMD::Processors
   class MarkProcessor < Processor
     def result
-      text = match.captures.first
-
       "<mark name=\"#{text}\"/>"
     end
 

data/lib/ssmd/processors/processor.rb

@@ -14,6 +14,16 @@ module SSMD::Processors
       end
     end
 
+    def strip_ssmd(input)
+      if match
+        match.pre_match + text + match.post_match
+      end
+    end
+
+    def text
+      match.captures.first
+    end
+
     def result
       raise "subclass responsibility"
     end

data/lib/ssmd/version.rb

@@ -1,3 +1,3 @@
 module SSMD
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ssmd
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Markus Kahl