metaheader 1.3beta3 → 1.3beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4da8975afe832f43e402d8055e6d0b5ffd116b8
-  data.tar.gz: 8370402e66dd19c47c31959a1104492b38b680b2
+  metadata.gz: 1b110cd1fab31d12091a47b6d9b77cdb001b5c14
+  data.tar.gz: 483baa10662faaf8ccd83c93a5fae63e9ce83ab7
 SHA512:
-  metadata.gz: 61ed6799668cbd4fea43f71cca2318dfb2f8ec1b9d39bcd4fd02762c63c118d9792eadc4e33ca542e4bdcdd85dafda35af69238719a73c702fe188655472f638
-  data.tar.gz: 77fb389959db93f0aa8ceeba8ca188210e18cca144c5bbf8712dd4067a253a86f14e5728de607a11c54a9af6c8873adeef0b935b80dac1b9c81e0b9b3d16840f
+  metadata.gz: a9b0cbfc3b61abd41cc545a0825d56995f5362c701170c6b709911a44d56c4c2205b4e849712207dabb2e9de8f1d5ab4d50592b1982c95a5aa5853c7a54c523b
+  data.tar.gz: cc5133876cdeb62d1ebce9808411e7e43883c084bc6645d6ae4836622cf5b875d5243a17fa0009eda156e29970d75e6e80bec899965cd45556820093401211cf

data/lib/metaheader.rb

@@ -227,6 +227,7 @@ private
 
     @last_tag = Tag.new match[:key].freeze, value
     @line_breaks = 0
+    @block_indent = nil
 
     # disable implicit values with the alternate syntax
     register @last_tag unless match[:alt] && match[:value].nil?
@@ -236,10 +237,12 @@ private
   end
 
   def register(tag)
+    return if has? tag
     key = tag.name.downcase.gsub(/[^\w]/, '_').to_sym
     @data[key] = tag
   end
 
+  # handle multiline tags
   def append(line)
     prefix = line.rstrip
     if prefix == @last_prefix.rstrip
@@ -248,9 +251,19 @@ private
       return true # add the line break later
     elsif line.start_with? @last_prefix
       mline = line[@last_prefix.size..-1]
-      stripped = mline.lstrip
-      indent_level = mline.index stripped
-      return if indent_level < 1
+
+      if @block_indent
+        if mline.start_with? @block_indent
+          stripped = mline[@block_indent.size..-1]
+        else
+          return
+        end
+      else
+        stripped = mline.lstrip
+        indent_level = mline.index stripped
+        return if indent_level < 1
+        @block_indent = mline[0, indent_level]
+      end
     else
       return
     end

data/lib/metaheader/version.rb

@@ -1,4 +1,4 @@
 class MetaHeader
   # MetaHeader's version
-  VERSION = '1.3beta3'.freeze
+  VERSION = '1.3beta4'.freeze
 end

data/test/test_multiline.rb

@@ -0,0 +1,193 @@
+require File.expand_path '../helper', __FILE__
+
+class TestMultiline < MiniTest::Test
+  def test_multiline
+    mh = MetaHeader.new <<-IN
+    @test Lorem
+      Ipsum
+    IN
+
+    assert_equal "Lorem\nIpsum", mh[:test]
+    assert_equal 1, mh.size
+  end
+
+  def test_variant
+    mh = MetaHeader.new <<-IN
+    @test
+      Lorem
+      Ipsum
+    IN
+
+    assert_equal "Lorem\nIpsum", mh[:test]
+  end
+
+  def test_trailing_space
+    mh = MetaHeader.new <<-IN
+    @hello\x20
+      test\x20
+    @world\x20\x20
+      test\x20
+    IN
+
+    assert_equal 'test ', mh[:hello]
+    assert_equal 'test ', mh[:world]
+  end
+
+  def test_prefix
+    mh = MetaHeader.new <<-IN
+--    @test Lorem
+--      Ipsum
+    IN
+
+    assert_equal "Lorem\nIpsum", mh[:test]
+    assert_equal 1, mh.size
+  end
+
+  def test_no_indent
+    mh = MetaHeader.new <<-IN
+    @test Lorem
+    Ipsum
+      Test
+    IN
+
+    assert_equal 1, mh.size
+    assert_equal "Lorem", mh[:test]
+  end
+
+  def test_lose_indent
+    mh = MetaHeader.new <<-IN
+    @test
+      Hello
+
+      World
+    @chunky bacon
+
+    @foo
+    IN
+
+    assert_equal "Hello\n\nWorld", mh[:test]
+    assert_equal 'bacon', mh[:chunky]
+    assert_nil mh[:foo]
+  end
+
+  def test_fewer_indent
+    mh = MetaHeader.new <<-IN
+    @test Lorem
+      Ipsum
+     Hello
+      World
+    IN
+
+    assert_equal 1, mh.size
+    assert_equal "Lorem\nIpsum", mh[:test]
+  end
+
+  def test_extra_indent
+    mh = MetaHeader.new <<-IN
+    @test Lorem
+      Ipsum
+        Hello
+      World
+    IN
+
+    assert_equal 1, mh.size
+    assert_equal "Lorem\nIpsum\n  Hello\nWorld", mh[:test]
+  end
+
+  def test_do_not_reuse_indent
+    mh = MetaHeader.new <<-IN
+    @a
+      Lorem
+      Ipsum
+    @b
+    \tHello
+    \tWorld
+    IN
+
+    assert_equal 2, mh.size
+    assert_equal "Lorem\nIpsum", mh[:a]
+    assert_equal "Hello\nWorld", mh[:b]
+  end
+
+  def test_sub_alternate_syntax
+    mh = MetaHeader.new <<-IN
+    @test Lorem
+      Ipsum:
+      Dolor: sit amet
+    IN
+
+    assert_equal "Lorem\nIpsum:\nDolor: sit amet", mh[:test]
+    assert_equal 1, mh.size
+  end
+
+  def test_explicit_boolean
+    mh = MetaHeader.new <<-IN
+    @test true
+      test
+    IN
+
+    assert_equal "true\ntest", mh[:test]
+  end
+
+  def test_empty_line_prefix
+    mh = MetaHeader.new <<-IN
+    --@test
+    --  Hello
+    --
+    --  World
+    --
+    --@chunky
+    --  bacon
+    IN
+
+    assert_equal "Hello\n\nWorld", mh[:test]
+    assert_equal 'bacon', mh[:chunky]
+  end
+
+  def test_empty_line_prefix_with_space
+    mh = MetaHeader.new <<-IN
+    -- @test
+    --   Hello
+    --
+    --   World
+    IN
+
+    assert_equal "Hello\n\nWorld", mh[:test]
+  end
+
+  def test_empty_line
+    mh = MetaHeader.new <<-IN
+    @test
+      Hello
+
+      World
+    @chunky bacon
+
+    @foo
+    IN
+
+    assert_equal "Hello\n\nWorld", mh[:test]
+    assert_equal 'bacon', mh[:chunky]
+    assert_nil mh[:foo]
+  end
+
+  def test_break_at_empty_line
+    mh = MetaHeader.new <<-IN
+    -- @hello world
+
+    @chunky bacon
+    IN
+
+    assert_equal 'world', mh[:hello]
+    assert_nil mh[:chunky]
+  end
+
+  def test_alternate_syntax
+    mh = MetaHeader.new <<-IN
+    -- Hello:
+    --   World
+    IN
+
+    assert_equal 'World', mh[:hello]
+  end
+end

data/test/test_parser.rb

@@ -124,141 +124,6 @@ class TestParser < MiniTest::Test
     refute_nil mh[:second]
   end
 
-  def test_multiline
-    mh = MetaHeader.new <<-IN
-    @test Lorem
-      Ipsum
-    IN
-
-    assert_equal "Lorem\nIpsum", mh[:test]
-    assert_equal 1, mh.size
-  end
-
-  def test_multiline_variant
-    mh = MetaHeader.new <<-IN
-    @test
-      Lorem
-      Ipsum
-    IN
-
-    assert_equal "Lorem\nIpsum", mh[:test]
-  end
-
-  def test_multiline_trailing_space
-    mh = MetaHeader.new <<-IN
-    @hello\x20
-      test\x20
-    @world\x20\x20
-      test\x20
-    IN
-
-    assert_equal 'test ', mh[:hello]
-    assert_equal 'test ', mh[:world]
-  end
-
-  def test_multiline_prefix
-    mh = MetaHeader.new <<-IN
---    @test Lorem
---      Ipsum
-    IN
-
-    assert_equal "Lorem\nIpsum", mh[:test]
-    assert_equal 1, mh.size
-  end
-
-  def test_multiline_wrong_indent
-    mh = MetaHeader.new <<-IN
-    @test Lorem
-    Ipsum
-      Test
-    IN
-
-    assert_equal 1, mh.size
-    assert_equal "Lorem", mh[:test]
-  end
-
-  def test_multiline_sub_alternate_syntax
-    mh = MetaHeader.new <<-IN
-    @test Lorem
-      Ipsum:
-      Dolor: sit amet
-    IN
-
-    assert_equal "Lorem\nIpsum:\nDolor: sit amet", mh[:test]
-    assert_equal 1, mh.size
-  end
-
-  def test_multiline_explicit_boolean
-    mh = MetaHeader.new <<-IN
-    @test true
-      test
-    IN
-
-    assert_equal "true\ntest", mh[:test]
-  end
-
-  def test_multiline_empty_line_prefix
-    mh = MetaHeader.new <<-IN
-    --@test
-    --  Hello
-    --
-    --  World
-    --
-    --@chunky
-    --  bacon
-    IN
-
-    assert_equal "Hello\n\nWorld", mh[:test]
-    assert_equal 'bacon', mh[:chunky]
-  end
-
-  def test_multiline_empty_line_space_prefix
-    mh = MetaHeader.new <<-IN
-    -- @test
-    --   Hello
-    --
-    --   World
-    IN
-
-    assert_equal "Hello\n\nWorld", mh[:test]
-  end
-
-  def test_multiline_empty_line
-    mh = MetaHeader.new <<-IN
-    @test
-      Hello
-
-      World
-    @chunky bacon
-
-    @foo
-    IN
-
-    assert_equal "Hello\n\nWorld", mh[:test]
-    assert_equal 'bacon', mh[:chunky]
-    assert_nil mh[:foo]
-  end
-
-  def test_multiline_break_at_empty_line
-    mh = MetaHeader.new <<-IN
-    -- @hello world
-
-    @chunky bacon
-    IN
-
-    assert_equal 'world', mh[:hello]
-    assert_nil mh[:chunky]
-  end
-
-  def test_multiline_alternate_syntax
-    mh = MetaHeader.new <<-IN
-    -- Hello:
-    --   World
-    IN
-
-    assert_equal 'World', mh[:hello]
-  end
-
   def test_read_file
     path = File.expand_path '../input/basic_tag', __FILE__
     mh = MetaHeader.from_file path

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaheader
 version: !ruby/object:Gem::Version
-  version: 1.3beta3
+  version: 1.3beta4
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-28 00:00:00.000000000 Z
+date: 2016-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - test/helper.rb
 - test/input/basic_tag
 - test/input/custom_parser
+- test/test_multiline.rb
 - test/test_parser.rb
 - test/test_validator.rb
 homepage: https://github.com/cfillion/metaheader
@@ -131,5 +132,6 @@ test_files:
 - test/helper.rb
 - test/input/basic_tag
 - test/input/custom_parser
+- test/test_multiline.rb
 - test/test_parser.rb
 - test/test_validator.rb