metaheader 1.3beta1 → 1.3beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2785ed7e70b818e49c72e9f8d8dfa868f382936
-  data.tar.gz: 69186b6be145a432dc9dc81efbc1d86f9c6b8c1c
+  metadata.gz: 3eb042274d2edc78769525062d7cd315fad33275
+  data.tar.gz: feb8ef5aff9a4c9829363319b3ab7df601bae43b
 SHA512:
-  metadata.gz: 5cda458f1ad6a0a11c97018655aae2b66656b497316c35826d3f6567eabf7f84482f12a3591f8bd163ce80c40c332db3c211849f57e98afb7d7e8e901305e61b
-  data.tar.gz: 0bfe9167f00907300ceccadcc662287081036e70b251f637209c11048932f10fbe99fe09eaf7852c66a7bb5f67862a86400f72dd5b0f0dbecdb8380f7154aed1
+  metadata.gz: b53340aa50e7f0468e55a217a29eeb6089b39fadc01327836fd3fc214688507d0e8a57c9c061d2a884c8a720661253381421bdd0a46ee84793d65c48823da775
+  data.tar.gz: a7c9be01c42161999999ecf46b33343c7314ec6116a6719d87843dc298e29443d3f0412c5bb655be266808f0a05e75356d43e4b01a6429a4da651a25d3083a4d

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
+gem 'pry'
+
 gemspec

data/lib/metaheader/version.rb

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

data/lib/metaheader.rb

@@ -43,7 +43,7 @@ class MetaHeader
   # @param path [String] path to the file to be read
   # @return [MetaHeader]
   def self.from_file(path)
-    self.new File.read(path)
+    File.open(path) {|file| self.new file }
   end
 
   # Construct a new MetaHeader object or return the object untouched
@@ -58,23 +58,23 @@ class MetaHeader
   end
 
   # Parse every tags found in input up to the first newline.
-  # @param input [String]
+  # @param input [String, IO]
   def initialize(input)
     @strict = false
     @data = {}
 
     @last_key = nil
+    @empty_lines = 0
 
-    input = input.encode universal_newline: true
-    input.each_line {|line|
-      if line.strip.empty?
-        break
-      else
-        parse line
-      end
-    }
+    unless input.is_a? IO
+      input = StringIO.new input.encode universal_newline: true
+    end
+
+    input.each_line {|line| break unless parse line }
 
     Parser.each {|klass|
+      input.rewind
+
       parser = klass.new
       parser.instance_variable_set :@mh, self
       parser.parse input
@@ -198,8 +198,8 @@ private
   Tag = Struct.new :name, :value
 
   REGEX = /\A(?<prefix>.*?)
-    (?:@(?<key>\w+)|(?<key>[\w][\w\s]*?)\s*:)
-    (?:\s+(?<value>[^\n]+))?
+    (?:@(?<key>\w+)|(?<key>[\w][\w\s]*?)\s*(?<alt>:))
+    (?:\s*(?<value>[^\n]+))?
     \Z/x.freeze
 
   def parse(line)
@@ -208,7 +208,7 @@ private
     # multiline value must have the same line prefix as the key
     if @last_key && line.start_with?(@last_prefix.rstrip)
       if append line
-        return
+        return true
       else
         @last_key = nil
       end
@@ -216,7 +216,9 @@ private
 
     line.rstrip!
 
-    return unless match = REGEX.match(line)
+    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]
@@ -231,8 +233,10 @@ private
   end
 
   def append(line)
-    if line.rstrip == @last_prefix.rstrip
+    prefix = line.rstrip
+    if prefix == @last_prefix.rstrip
       @line_breaks += 1
+      @empty_lines += 1 if prefix.empty?
       return true # add the line break later
     elsif line.start_with? @last_prefix
       mline = line[@last_prefix.size..-1]
@@ -248,7 +252,7 @@ private
 
     @line_breaks += 1 unless tag.value.empty?
     tag.value += "\n" * @line_breaks
-    @line_breaks = 0
+    @line_breaks = @empty_lines = 0
 
     tag.value += stripped
     stripped

data/test/test_parser.rb

@@ -22,7 +22,7 @@ class CustomParser < MetaHeader::Parser
 
     header[:hello] = header[:hello].to_s * 2
 
-    @@input = input
+    @@input = input.read
     @@instance = header
     @@called = true
   end
@@ -85,8 +85,8 @@ class TestParser < MiniTest::Test
 
   def test_break_at_empty_line
     mh = MetaHeader.new <<-IN
-    -- @hello world
-
+    @hello world
+\x20
     @chunky bacon
     IN
 
@@ -114,6 +114,16 @@ class TestParser < MiniTest::Test
     assert_equal 'world', mh[:hello]
   end
 
+  def test_empty_prefixed_line
+    mh = MetaHeader.new <<-IN
+    -- @first
+    --
+    -- @second
+    IN
+
+    refute_nil mh[:second]
+  end
+
   def test_multiline
     mh = MetaHeader.new <<-IN
     @test Lorem
@@ -187,7 +197,7 @@ class TestParser < MiniTest::Test
     assert_equal "true\ntest", mh[:test]
   end
 
-  def test_multiline_empty_line
+  def test_multiline_empty_line_prefix
     mh = MetaHeader.new <<-IN
     --@test
     --  Hello
@@ -199,7 +209,7 @@ class TestParser < MiniTest::Test
     IN
 
     assert_equal "Hello\n\nWorld", mh[:test]
-    assert_equal 'bacon', mh[:chunky] # no leading newline
+    assert_equal 'bacon', mh[:chunky]
   end
 
   def test_multiline_empty_line_space_prefix
@@ -213,6 +223,33 @@ class TestParser < MiniTest::Test
     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_read_file
     path = File.expand_path '../input/basic_tag', __FILE__
     mh = MetaHeader.from_file path
@@ -247,6 +284,16 @@ class TestParser < MiniTest::Test
     assert_equal Hash[key_test: 'Value'], mh.to_h
   end
 
+  def test_alternate_syntax_compact
+    mh = MetaHeader.new 'Key Test:Value'
+    assert_equal Hash[key_test: 'Value'], mh.to_h
+  end
+
+  def test_alternate_syntax_no_value
+    mh = MetaHeader.new 'Key Test:'
+    assert_equal Hash.new, mh.to_h
+  end
+
   def test_inspect
     mh = MetaHeader.new '@hello world'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaheader
 version: !ruby/object:Gem::Version
-  version: 1.3beta1
+  version: 1.3beta2
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler