darkmouun 2.2.1 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c05e4d7439212a1ab84821f7327430468c298f7261810909753d867af00248
-  data.tar.gz: ba359e1372a16928ff0a9d0f52481a18b0fc7feaf4a046eff656032cac0d1c51
+  metadata.gz: d3d9e035d4a3908b7121dc1c72746dae3313bbae5e5a89c4bc76f6c31d183939
+  data.tar.gz: a60ed2ee2f3b1874fbb6a8b7bc65b420ee786ab8db241a93ed6cfeb9a19b4eff
 SHA512:
-  metadata.gz: bd6b364c642534d3b62532b64eff97f187f28b54164b41a02e1dc13923b20562d8a0e8d83695dba11777c9dd41e60391e7802c57905319fbaf9c1bf34c9340c6
-  data.tar.gz: f87d68ede3ae5bb0855c1750a64935d2aec86853f3f98b746ff2eb90c3707945059bcd44e43167b29f4b7029fdbb24dde38734b3d7dd2f74fe410a8e38d7dde0
+  metadata.gz: a7b94209ce671c52fdc50eb2a2321a0970358f1f23b6c13f992790b2f6d0b47099cc079623b62158b5674accf86c1677036d9724e6b43a5d821874345da8a4e4
+  data.tar.gz: 6de07da8565e09e33e1126e38783fd8976691d96144b8f2e8e806dfdeeb560282cf5f12544bbf07d864f75f1fb647165b55b53d600c419374c5fb9f672e0ab6e

data/lib/darkmouun/main.rb

@@ -56,10 +56,10 @@ module Darkmouun
     end
 
     def apply_mustache
-      @source = @source.gsub(/<<(.+?)>>\n((?:[# \-]*[\w_][\w\d_]*: *\n?(?: +.+\n)+)+)/) do |s|
+      @source = @source.gsub(/<<(.+?)>>\n((?:\n|.)+?\n\n(?!    ))/) do |s|
         begin
-          obj_spot_template, data = (@templates[$1.to_sym]).new, $2
-          YAML.load_stream(data).compact.reduce(&:merge).each do |k, v|
+          obj_spot_template = (@templates[$~[1].to_sym]).new
+          YAML.load($~[2].strip).compact.each do |k, v|
             obj_spot_template.define_singleton_method(k){ v }
           end
           obj_spot_template.render + "\n"

data/lib/darkmouun/version.rb

@@ -1,3 +1,3 @@
 module Darkmouun
-  VERSION = "2.2.1"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: darkmouun
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.3.0
 platform: ruby
 authors:
 - Akinori Ichigo
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-02-25 00:00:00.000000000 Z
+date: 2023-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler