yamlt 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc684bcffe8a3d42c3139420c6234d1bc89677cd
-  data.tar.gz: 20d65a153c816821ea297a7a7481c65843dcdc81
+  metadata.gz: 736707264f61e3efa8e47dc97679cf31c6212901
+  data.tar.gz: ffebd17ae4f1fc94fe0d7800d8ba3e196718c7b0
 SHA512:
-  metadata.gz: aaf7176fcf4f2be1e5790340ec4921ec688f8ce532f4ce8ea32f4957a6981e262a131fc31ccbe04a07660c0002e046337637008070e31e703f9a019cd4b637bd
-  data.tar.gz: 754a240b704694b1cb3e210af063069be31fa64c6ff27598843abaf1430bf15043330ee245b00582afbd1ac5b1c7fcdf507de6c78f3b479db36be99039fc1999
+  metadata.gz: 1f7810b4c8bea3e38bf769bef673e0c7be935449823cb31880d728e8724412a6b69120f6b1864a0474a3ac3bc0b680dd93e4b957b1507d9c5b5f634a8b2fcf57
+  data.tar.gz: 830c7639022326bc46e0f145207d774b09115be0bc0f02ad918f54f87cc8961c424882f052d4d79d36ce58461b0b3841a3aa127b82dcb659cf8203dd0bfa4f16

data/lib/yamlt/loader.rb

@@ -34,7 +34,7 @@ module Yamlt
     def path0(key)
       keys = values.keys
 
-      raise ::Yamlt::LoaderException "Locale file should have only one root key" if keys.size != 1
+      raise ::Yamlt::LoaderException "Locale file should have only one root key" if keys.size > 1
 
       key.split(".").tap do |path|
         path[0] = keys.first

data/lib/yamlt/parser/line.rb

@@ -13,7 +13,7 @@ module Yamlt
         parse
       end
 
-      attr_reader :comment, :prefix, :fragment, :level, :multiline
+      attr_reader :comment, :prefix, :fragment, :level, :multiline, :clean
       attr_accessor :full_path, :value
 
       def as_text(opts={})
@@ -34,7 +34,7 @@ module Yamlt
       def parse
         case @text
         when /^\s*$/
-          # do nothing
+          @clean = true
         when /^(\s*)#(.*)$/; @comment = $~[2]; @prefix = $~[1]
         when /^(\s*)(\w+):(\s*)(#(.*))?$/
           if $~[1].length % 2 == 0

data/lib/yamlt/parser/state.rb

@@ -16,19 +16,27 @@ module Yamlt
       attr_reader :path, :level, :multiline, :line, :lines, :values, :language
 
       def apply(line)
-        pass_through(line)   if line.empty?
+        pass_through(line)   if line.empty? && !should_apply_value?(line)
         apply_fragment(line) if line.fragment
-        apply_value(line)    if !line.fragment && line.value
+        apply_value(line)    if should_apply_value?(line)
       end
 
       def flush
         if @line && @line.multiline && !@multiline.empty?
           add_value
         end
+
+        if @lines.last && @lines.last.clean
+          @lines.pop
+        end
       end
 
       private
 
+      def should_apply_value?(line)
+        !line.fragment && (line.value || line.clean)
+      end
+
       def pass_through(line)
         @lines.push(line)
       end
@@ -65,7 +73,7 @@ module Yamlt
       end
 
       def apply_value(line)
-        if line.level != @level
+        if line.level != @level && !line.clean
           raise Yamlt::Parser::StateException, "Wrong identation in multiline value\n#{line.as_text}"
         end
         @multiline.push(line.value)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yamlt
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Tangerine Cat