mumukit-directives 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9a280f1e9058510755e7d158fa3613f0981d8360
-  data.tar.gz: 11a593e18b61e6018fa914f12b04ffa4bacf6838
+SHA256:
+  metadata.gz: 9d404944c578e7a56d745cbdf8adf110599ef29c07954aff201f36469694c092
+  data.tar.gz: dc3ce9797fbd0923b3726760d1800afa119260e28d96051dd1af67b288d022cf
 SHA512:
-  metadata.gz: cd74c24ad653451b3fc67df9dd1df9102ab4cc7eff25cfd3367890549cbeb083f119dfb86b281733334922fd521ee0c05f119ce84e820d59e7943d6c18bb6106
-  data.tar.gz: 9858d10a4a2587159aaf8e0abe4525e72cd71bee56cde189c29ce8380d539a5a7f1546386c5e883727393d2f678064dc769c957532f7084cc614c4a65ce917a5
+  metadata.gz: 9ab936fc6db1450368d3f1230a71d96ba400bd085287f6b0f3efc00ee723b5e75bdc7681a030a1eb2e81dd8a4e2d5a8a95f7d352826c569699a8f3fe30c5cc30
+  data.tar.gz: d044ed922a7ffe9dc8c3198d30b3aed7c277e535ad39cec94509721e844cdc617953d2c2d717f199778985f4d1f146e004c357494c291f0884a89f6a964a513b

data/lib/mumukit/directives/comment_type.rb

@@ -2,21 +2,38 @@ module Mumukit::Directives::CommentType
   def self.parse(string)
     case string
       when 'ruby' then
-        Mumukit::Directives::Ruby
+        Ruby
       when 'haskell' then
-        Mumukit::Directives::Haskell
+        Haskell
       else
-        Mumukit::Directives::Cpp
+        Cpp
     end
   end
 
+  module Comment
+    def comment(code)
+      "#{open}#{code}#{close}"
+    end
+
+    def open_comment
+      Regexp.new Regexp.escape(open)
+    end
+
+    def close_comment
+      Regexp.new Regexp.escape(close)
+    end
+
+  end
+
   module Cpp
-    def self.open_comment
-      /\/\*/
+    extend Comment
+
+    def self.open
+      '/*'
     end
 
-    def self.close_comment
-      /\*\//
+    def self.close
+      '*/'
     end
 
     def self.to_s
@@ -25,12 +42,14 @@ module Mumukit::Directives::CommentType
   end
 
   module Ruby
-    def self.open_comment
-      /#/
+    extend Comment
+
+    def self.open
+      '#'
     end
 
-    def self.close_comment
-      /#/
+    def self.close
+      '#'
     end
 
     def self.to_s
@@ -39,12 +58,14 @@ module Mumukit::Directives::CommentType
   end
 
   module Haskell
-    def self.open_comment
-      /\{-/
+    extend Comment
+
+    def self.open
+      '{-'
     end
 
-    def self.close_comment
-      /-\}/
+    def self.close
+      '-}'
     end
 
     def self.to_s

data/lib/mumukit/directives/directive.rb

@@ -9,4 +9,4 @@ class Mumukit::Directives::Directive
     @comment_type ||= Mumukit::Directives::CommentType::Cpp
   end
 
-end
+end

data/lib/mumukit/directives/interpolations.rb

@@ -1,5 +1,5 @@
 class Mumukit::Directives::Interpolations < Mumukit::Directives::Directive
-  def initialize(key)
+  def initialize(key=nil)
     @key = key
   end
 
@@ -15,14 +15,20 @@ class Mumukit::Directives::Interpolations < Mumukit::Directives::Directive
     interpolated = []
 
     var = code.captures(comment_regexp) do
-      interpolated << $1
-      sections[$1]
+      substitution = sections[$1]
+      if substitution
+        interpolated << $1
+        substitution
+      else
+        $&
+      end
     end
 
     [var, interpolated.uniq]
   end
 
   def transform(sections)
+    raise 'Missing key. Build the interpolations with a key in order to use this method' unless @key
     code = sections[@key]
     if interpolations? code
       interpolation, interpolated = interpolate code, sections.except(@key)

data/lib/mumukit/directives/sections.rb

@@ -1,6 +1,6 @@
 class Mumukit::Directives::Sections < Mumukit::Directives::Directive
   def regexp
-    /<(.+?)##{comment_type.close_comment}(.+?)#{comment_type.open_comment}#(.+?)>/
+    /<(.+?)##{comment_type.close_comment}(.+?)#{comment_type.open_comment}#(.+?)>/m
   end
 
   def split_sections(code)

data/lib/mumukit/directives/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Directives
-    VERSION = '0.3.0'
+    VERSION = '0.3.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-directives
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Interpolations, sections and flags pipelines for mumuki