ssmd 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca958be00bb04e7af41269615ad89353790aff56
-  data.tar.gz: f97eaddda402d1ab60c1e5b30b72495d7cdfbc61
+  metadata.gz: 7bf70e02b121cec8728e59ae56a22e8a96024336
+  data.tar.gz: '00582115495e3b0ccc088f5c268cd367e0602630'
 SHA512:
-  metadata.gz: 9a59de6e3c716e227e08b1c5804c57f149ef320dad4b4cc00582bc65a7a1642ec3ad93e9642e1289bac8723a92151c984a433ed43c74ac285ae85e71d43e361b
-  data.tar.gz: a368ceb07a06342ffa5a92b3d44ed77d078d943064dc51a825ff3064d32f2b4b123a46000033711a7822a70b0d9ac9dc64ffe0670dac6b42065cd4cca745d23f
+  metadata.gz: f8cfcf7f8f4c809a980970b2e5c9380d7ec798263352896fa27203be998eb4d1cd4a3c57891d7c5e8e257ae76251d29bce00658896cf6df274aa261d03786f33
+  data.tar.gz: 65aadce5e10d597d1d1c14eca36bd843ad6092f3342910915d5bcf10faca47d751c0f9c0da5763f2e105d4a5c8e0a10ca3c0451f91a6c47d9162d95e89efaf25

data/README.md

@@ -48,6 +48,8 @@ described in the specification are implemented:
 * Mark
 * Language
 * Phoneme
+* Prosody
+* Paragraph
 
 ## Development
 

data/SPECIFICATION.md

@@ -133,12 +133,14 @@ First prepare the ingredients.
 Don't forget to wash them first.
 
 Lastly mix them all together.
+
+Don't forget to do the dishes after!
 ```
 
 SSML:
 ```html
-<p>First prepare the ingredients. Don't forget to wash them first.</p>
-<p>Lastly mix them all together.</p>
+<p>First prepare the ingredients.
+Don't forget to wash them first.</p><p>Lastly mix them all together.</p><p>Don't forget to do the dishes after!</p>
 ```
 
 ***

data/lib/ssmd/converter.rb

@@ -4,8 +4,12 @@ module SSMD
   class Converter
     attr_reader :input
 
-    def initialize(input)
+    def initialize(input, skip: [])
       @input = input
+
+      processors.delete_if do |processor|
+        Array(skip).any? { |name| processor.name =~ /\ASSMD::Processors::#{name}Processor\Z/i }
+      end
     end
 
     def convert
@@ -23,12 +27,14 @@ module SSMD
     end
 
     def processors
-      p = SSMD::Processors
+      @processors ||= begin
+        p = SSMD::Processors
 
-      [
-        p::EmphasisProcessor, p::AnnotationProcessor, p::MarkProcessor,
-        p::ProsodyProcessor
-      ]
+        [
+          p::EmphasisProcessor, p::AnnotationProcessor, p::MarkProcessor,
+          p::ProsodyProcessor, p::ParagraphProcessor
+        ]
+      end
     end
 
     def process(processor, input, strip: false)

data/lib/ssmd/processors/paragraph_processor.rb

@@ -0,0 +1,21 @@
+require_relative 'processor'
+
+module SSMD::Processors
+  class ParagraphProcessor < Processor
+    def result
+      "<p>" + match.string.gsub(regex, "</p><p>") + "</p>"
+    end
+
+    def regex
+      /\n\n+/
+    end
+
+    def substitute(input)
+      result if match
+    end
+
+    def strip_ssmd(input)
+      input.gsub(regex, "\n") if match
+    end
+  end
+end

data/lib/ssmd/processors/prosody_processor.rb

@@ -7,7 +7,7 @@ module SSMD::Processors
     end
 
     def regex
-      Regex.prosody
+      @regex ||= Regex.prosody
     end
 
     private

data/lib/ssmd/processors.rb

@@ -7,3 +7,4 @@ require 'ssmd/processors/annotation_processor'
 require 'ssmd/processors/emphasis_processor'
 require 'ssmd/processors/mark_processor'
 require 'ssmd/processors/prosody_processor'
+require 'ssmd/processors/paragraph_processor'

data/lib/ssmd/version.rb

@@ -1,3 +1,3 @@
 module SSMD
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/lib/ssmd.rb

@@ -4,17 +4,27 @@ require "ssmd/converter"
 module SSMD
   module_function
 
-  def to_ssml(ssmd)
-    Converter.new(ssmd).convert
+  ##
+  # Translates the given SSMD text to SSML.
+  #
+  # @param ssmd [String] The SSMD markup to be converted to SSML
+  # @param skip [Array<Symbol>] Formats (e.g. `:paragraph`, `:prosody`) to skip.
+  #
+  # @return [String] Resulting SSML
+  def to_ssml(ssmd, skip: [])
+    Converter.new(ssmd, skip: skip).convert
   end
 
   ##
   # Returns the given string without any SSMD annotations.
   # For instance for `hello *world*` would return `hello world`.
   #
+  # @param ssmd [String] The SSMD markup to strip from SSMD annotations.
+  # @param skip [Array<Symbol>] Formats (e.g. `:paragraph`, `:prosody`) to skip.
+  #
   # @return [String]
-  def strip_ssmd(ssmd)
-    Converter.new(ssmd).strip
+  def strip_ssmd(ssmd, skip: [])
+    Converter.new(ssmd, skip: skip).strip
   end
 
   def root_dir

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ssmd
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Markus Kahl
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-15 00:00:00.000000000 Z
+date: 2017-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -116,6 +116,7 @@ files:
 - lib/ssmd/processors/annotation_processor.rb
 - lib/ssmd/processors/emphasis_processor.rb
 - lib/ssmd/processors/mark_processor.rb
+- lib/ssmd/processors/paragraph_processor.rb
 - lib/ssmd/processors/processor.rb
 - lib/ssmd/processors/prosody_processor.rb
 - lib/ssmd/version.rb