metaheader 1.3beta2 → 1.3beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3eb042274d2edc78769525062d7cd315fad33275
-  data.tar.gz: feb8ef5aff9a4c9829363319b3ab7df601bae43b
+  metadata.gz: e4da8975afe832f43e402d8055e6d0b5ffd116b8
+  data.tar.gz: 8370402e66dd19c47c31959a1104492b38b680b2
 SHA512:
-  metadata.gz: b53340aa50e7f0468e55a217a29eeb6089b39fadc01327836fd3fc214688507d0e8a57c9c061d2a884c8a720661253381421bdd0a46ee84793d65c48823da775
-  data.tar.gz: a7c9be01c42161999999ecf46b33343c7314ec6116a6719d87843dc298e29443d3f0412c5bb655be266808f0a05e75356d43e4b01a6429a4da651a25d3083a4d
+  metadata.gz: 61ed6799668cbd4fea43f71cca2318dfb2f8ec1b9d39bcd4fd02762c63c118d9792eadc4e33ca542e4bdcdd85dafda35af69238719a73c702fe188655472f638
+  data.tar.gz: 77fb389959db93f0aa8ceeba8ca188210e18cca144c5bbf8712dd4067a253a86f14e5728de607a11c54a9af6c8873adeef0b935b80dac1b9c81e0b9b3d16840f

data/lib/metaheader/version.rb

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

data/lib/metaheader.rb

@@ -21,7 +21,7 @@ class MetaHeader
       @mh
     end
 
-    # @param raw_input [String]
+    # @param raw_input [IO]
     # @return [void]
     def parse(raw_input)
       raise NotImplementedError
@@ -63,7 +63,7 @@ class MetaHeader
     @strict = false
     @data = {}
 
-    @last_key = nil
+    @last_tag = nil
     @empty_lines = 0
 
     unless input.is_a? IO
@@ -206,11 +206,11 @@ private
     line.chomp!
 
     # multiline value must have the same line prefix as the key
-    if @last_key && line.start_with?(@last_prefix.rstrip)
+    if @last_tag && line.start_with?(@last_prefix.rstrip)
       if append line
         return true
       else
-        @last_key = nil
+        @last_tag = nil
       end
     end
 
@@ -218,18 +218,26 @@ private
 
     return false if @empty_lines > 0
     return !line.empty? unless match = REGEX.match(line)
-    return true if match[:alt] && match[:value].nil?
 
     # single line
     @last_prefix = match[:prefix]
-    key = match[:key].downcase.gsub(/[^\w]/, '_')
 
     @raw_value = match[:value]
-    key, value = parse_value key, @raw_value
+    value = parse_value @raw_value
 
-    @last_key = key.to_sym
-    @data[@last_key] = Tag.new match[:key].freeze, value
+    @last_tag = Tag.new match[:key].freeze, value
     @line_breaks = 0
+
+    # disable implicit values with the alternate syntax
+    register @last_tag unless match[:alt] && match[:value].nil?
+
+    # ok, give me another line!
+    true
+  end
+
+  def register(tag)
+    key = tag.name.downcase.gsub(/[^\w]/, '_').to_sym
+    @data[key] = tag
   end
 
   def append(line)
@@ -247,18 +255,19 @@ private
       return
     end
 
-    tag = @data[@last_key]
-    tag.value = @raw_value.to_s unless tag.value.is_a? String
+    # add the tag if it uses the alternate syntax and has no value
+    register @last_tag
+
+    @last_tag.value = @raw_value.to_s unless @last_tag.value.is_a? String
 
-    @line_breaks += 1 unless tag.value.empty?
-    tag.value += "\n" * @line_breaks
+    @line_breaks += 1 unless @last_tag.value.empty?
+    @last_tag.value += "\n" * @line_breaks
     @line_breaks = @empty_lines = 0
 
-    tag.value += stripped
-    stripped
+    @last_tag.value += stripped
   end
 
-  def parse_value(key, value)
+  def parse_value(value)
     case value
     when 'true'
       value = true
@@ -270,7 +279,7 @@ private
       value = nil if value.empty?
     end
 
-    [key, value]
+    value
   end
 
   def validate_key(key, rules)

data/test/test_parser.rb

@@ -250,6 +250,15 @@ class TestParser < MiniTest::Test
     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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaheader
 version: !ruby/object:Gem::Version
-  version: 1.3beta2
+  version: 1.3beta3
 platform: ruby
 authors:
 - cfillion
@@ -133,4 +133,3 @@ test_files:
 - test/input/custom_parser
 - test/test_parser.rb
 - test/test_validator.rb
-has_rdoc: