mumukit-directives 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8a5966b95ea84427cffe98787f81a2c19fb798b39e9716b44118f9588d6147d
-  data.tar.gz: f985b9287e338a688d23ea6a7520f3b8a16f86fcdac147e98943c1a6de0e6809
+  metadata.gz: a96803a6b78cfe143f001aa01776f1c8433f2f175d9bda40bda8e79a052024ef
+  data.tar.gz: 1d3379588b8f0fa1cbd403c4677ea018a2ecf785da2c2b8e584bc15998daac89
 SHA512:
-  metadata.gz: e5427919f12690e7fd33086a61741038a0fc011f42a9a5f102c2452eb7d2bd302fdfe737d58cdac9e1ddd4984eebe5e582203c402d06efaeff80144bddafbbd1
-  data.tar.gz: 8cd06b2fd23f06ff8a24a2db1edb9ed25364544d071e489f7ce1a75bfdd114f5a05957a70338c175a9582efbd3a2fda4ce0f21a881a173054e7d0d9e2210a8c2
+  metadata.gz: bbbf5de2ffe4e812e3439007f9ea6e2154db87db5ef02b32fa1b35bbfdc678ded0a52a3de6d1a0ea063f5386c2aaf8565eb4da380e598a9b1a5c01dbec67d855
+  data.tar.gz: 8ace2a2100ef4da408d3bab91a227c520b759403a167ac70970ce086b1a47e1b431df6f7a367ef91ce71443b70b5da89b5816f7b2c51cb00e401480a107ab47a

data/lib/mumukit/directives/pipeline.rb

@@ -9,7 +9,7 @@ class Mumukit::Directives::Pipeline
     rest = base_sections.slice!('test', 'extra', 'content', 'query')
 
     @directives
-        .inject(base_sections) { |sections, it| it.transform(sections) }
+        .inject(base_sections) { |sections, it| it.transform sections }
         .amend(rest)
         .to_struct
   end

data/lib/mumukit/directives/sections.rb

@@ -1,4 +1,41 @@
+# `Sections` directive allows code to be splitted into
+# zero or more parts, using markup-like delimiter.
+#
+# The transformed result is a hash that replaces the
+# key's content with the included sections. For example, if the `extra`
+# key has two sections `foo` and `bar`...
+#
+# ```
+# # Input
+# { extra: 'foo /*<baz#*/lalala/*#baz>*/ ignored /*<bar#*/lelele/*#bar>*/' }
+# ```
+#
+# ... the resultant hash will contain
+# the `foo` and `bar` keys, and no  `extra` key:
+#
+# ```
+# # Output
+# { baz: 'lalala', bar: 'lelele' }
+# ```
+#
+# Alternatively, if the `nest_sections` option is enabled...
+#
+# ```
+# Mumukit::Directives::Sections.new nest_sections: true
+# ```
+#
+# ...instead of replacing the original parent section, the new child sections are nested into it:
+#
+# ```
+# # Output
+# { extra: { baz: 'lalala', bar: 'lelele' } }
+# ```
+
 class Mumukit::Directives::Sections < Mumukit::Directives::Directive
+  def initialize(options={})
+    @nest_sections = !!options[:nest_sections]
+  end
+
   def regexp
     /<(.+?)##{comment_type.close_comment}(.*?)#{comment_type.open_comment}#(.+?)>/m
   end
@@ -13,13 +50,28 @@ class Mumukit::Directives::Sections < Mumukit::Directives::Directive
   def transform(sections)
     result = {}
     sections.each do |key, code|
-      new_sections = split_sections(code)
-      if new_sections.present?
-        result.merge!(new_sections)
-      else
-        result[key] = code
-      end
+      merge_sections! result, key, code, split_sections(code)
     end
     result
   end
+
+  private
+
+  def merge_sections!(result, key, code, new_sections)
+    if new_sections.blank?
+      result[key] = code
+    elsif @nest_sections
+      merge_parent_key! result, key, new_sections
+    else
+      merge_child_keys! result, key, new_sections
+    end
+  end
+
+  def merge_child_keys!(result, key, new_sections)
+    result.merge! new_sections
+  end
+
+  def merge_parent_key!(result, key, new_sections)
+    result[key] = new_sections
+  end
 end

data/lib/mumukit/directives/version.rb

@@ -1,5 +1,5 @@
 module Mumukit
   module Directives
-    VERSION = '0.3.2'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mumukit-directives
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Franco Leonardo Bulgarelli
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2018-08-16 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.7.3
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Interpolations, sections and flags pipelines for mumuki