metaheader 1.3.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 3bff210852c9274797ff6242ea138f86806fad05
-  data.tar.gz: 0734b967a2fc8997a7f8ed59945bbfedfd2bcdb3
+SHA256:
+  metadata.gz: 12c2b91a83ff05bf044e54acbd9b5143fc72fa5e68b08d2b21c6517054626146
+  data.tar.gz: ad3f13076f50ce44745b8ef87d15b1105f189f6081b52a88e749df11464df9cb
 SHA512:
-  metadata.gz: 20cf4d00d0029c9c7e3ba81d8a5924182b8be576414dd8f1127306d20453ef85d85f9d39cc3ad99e0141d6edd87eb2654780018790598f05a2bf255668f4ad8e
-  data.tar.gz: 6a07446e9cdc3d3cdad714459b3f58874efb32dc06da2b304c65b2f8954f79d004195e44339ae57756503bfdf4f01b019793ffb10f3d59fe56924d706e095f43
+  metadata.gz: 7e94db96de5e751cc89fe3bf6f38d12105c278dd47623f6eee6bbb66d4d061b281219e1d0db3df97af6fda8e29da2c07cae9daa7c59eaafa22f834083d79ba91
+  data.tar.gz: 9455e3d58f9a796f662a5cad16225ce5c114e124110ebbfd9015e5163f21c0c34349aff57ad1dc8f609de76416bee3ac2c6c7266d19a791f43c7bd8379d497a5

data/Gemfile

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

data/README.md

@@ -19,7 +19,8 @@
 @key false
 ```
 
-Any kind of comment syntax or prefix can be used:
+Any kind of comment syntax or prefix can be used (every line of a multiline
+value must begin with the same decoration characters):
 
 ```cpp
 /*
@@ -27,13 +28,14 @@ Any kind of comment syntax or prefix can be used:
  */
 ```
 
-An alternative syntax is also supported:
+An alternative syntax that allows spaces in the key name is also supported:
 
 ```
-Key Name: Value
+Key: Value
 ```
 
-Parsing stops at the first empty line (ignoring white space).
+Parsing stops at the first empty line outside of a multiline value
+(ignoring white space).
 
 ## Usage
 
@@ -41,14 +43,11 @@ Parsing stops at the first empty line (ignoring white space).
 require 'metaheader'
 
 input = '@key value'
-mh = MetaHeader.new input
+mh = MetaHeader.parse input
 
 # alternatively:
 # mh = MetaHeader.from_file path
 
-# mark unknown keys as invalid
-# mh.strict = true
-
 # set @key as mandatory
 errors = mh.validate key: MetaHeader::REQUIRED
 
@@ -65,13 +64,12 @@ value = mh[:key]
 
 ## Documentation
 
-MetaHeader's documentation is hosted at
-[http://rubydoc.info/gems/metaheader/MetaHeader](http://rubydoc.info/gems/metaheader/MetaHeader).
+MetaHeader's documentation is hosted at <https://rubydoc.info/gems/metaheader/MetaHeader>.
 
 ## Contributing
 
 1. [Fork this repository](https://github.com/cfillion/metaheader/fork)
-2. Create your feature branch (`git checkout -b my-new-feature`)
+2. Create your feature branch (`git switch -c my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push -u origin my-new-feature`)
 5. Create a new Pull Request

data/lib/metaheader.rb

@@ -1,84 +1,67 @@
 require 'metaheader/version'
 
+# Parser for metadata header in plain-text files
+# @example
+#   mh = MetaHeader.parse '@hello world'
+#   puts mh[:hello]
 class MetaHeader
-  # @abstract Subclass and override {#parse} to implement a custom parser.
-  class Parser
-    class << self
-      # @api private
-      def inherited(k)
-        @parsers ||= []
-        @parsers << k
-      end
-
-      # @api private
-      def each(&b)
-        @parsers&.each(&b)
-      end
-    end
-
-    # @return [MetaHeader] the current instance
-    def header
-      @mh
-    end
+  # Allow a tag to be omitted when validating in strict mode.
+  OPTIONAL = Object.new.freeze
 
-    # @param raw_input [IO]
-    # @return [void]
-    def parse(raw_input)
-      raise NotImplementedError
-    end
-  end
+  # Ensure a tag exists during validation.
+  REQUIRED = Object.new.freeze
 
+  # The tag cannot hold a value beside true or false during validation.
   BOOLEAN = Object.new.freeze
-  OPTIONAL = Object.new.freeze
-  REQUIRED = Object.new.freeze
-  SINGLELINE = Object.new.freeze
+
+  # The tag must have a string value (non-boolean tag) during validation.
   VALUE = Object.new.freeze
 
-  # Whether to fail validation if unknown tags are encoutered.
-  # @see #validate
-  # @return [Boolean]
-  attr_accessor :strict
+  # Don't allow multiline values during validation.
+  SINGLELINE = Object.new.freeze
 
   # Create a new instance from the contents of a file.
   # @param path [String] path to the file to be read
   # @return [MetaHeader]
   def self.from_file(path)
-    File.open(path) {|file| self.new file }
+    File.open(path) {|file| self.parse file }
   end
 
-  # Construct a new MetaHeader object or return the object untouched
-  # @param input [String, MetaHeader]
+  # Construct a MetaHeader object and parse every tags found in the input up to
+  # the first newline.
+  # @param input [String, IO, StringIO]
   # @return [MetaHeader]
   def self.parse(input)
-    if input.is_a? self
-      input
-    else
-      self.new input
-    end
+    mh = MetaHeader.new
+    mh.parse input
+    mh
   end
 
-  # Parse every tags found in input up to the first newline.
-  # @param input [String, IO]
-  def initialize(input)
-    @strict = false
+  # Construct a blank MetaHeader object
+  def initialize
     @data = {}
+  end
 
-    @last_tag = nil
-    @empty_lines = 0
-
-    unless input.is_a? IO
+  # Parse every tags found in the input up to the first newline.
+  # @param input [String, IO, StringIO]
+  # @return [Integer] Character position of the first content line in the input
+  # data following the header.
+  def parse(input)
+    if input.is_a? String
       input = StringIO.new input.encode universal_newline: true
     end
 
-    input.each_line {|line| break unless parse line }
-
-    Parser.each {|klass|
-      input.rewind
+    @last_tag = nil
+    @empty_lines = 0
 
-      parser = klass.new
-      parser.instance_variable_set :@mh, self
-      parser.parse input
-    }
+    content_offset = 0
+    input.each_line do |line|
+      full_line_size = line.size # parse_line can trim the line
+      continue = parse_line line
+      content_offset += full_line_size if continue || line.empty?
+      break unless continue
+    end
+    content_offset
   end
 
   # Returns the value of a tag by its name, or nil if not found.
@@ -95,7 +78,7 @@ class MetaHeader
 
   # Replaces the value of a tag.
   # @param value the new value
-  # @return value
+  # @return [Object] value
   def []=(key, value)
     raise ArgumentError, 'value cannot be nil' if value.nil?
 
@@ -129,7 +112,7 @@ class MetaHeader
   end
 
   # Make a hash from the parsed data
-  # @return [Hash]
+  # @return [Hash<Symbol, Object>]
   def to_h
     Hash[@data.map {|name, tag| [name, tag.value] }]
   end
@@ -141,22 +124,25 @@ class MetaHeader
   end
 
   # Validates parsed data according to a custom set of rules.
+  # A rule can be one of the predefined constants, a regex, a proc or a
+  # method (returing nil if the tag is valid or an error string otherwise).
   # @example
   #   mh = MetaHeader.new "@hello world\n@chunky bacon"
   #   mh.validate \
   #     hello: [MetaHeader::REQUIRED, MetaHeader::SINGLELINE, /\d/],
   #     chunky: proc {|value| 'not bacon' unless value == 'bacon' }
-  # @param rules [Hash] tag_name => rule or array_of_rules
-  # @return [Array, nil] error list or nil
-  # @see BOOLEAN
+  # @param rules [Hash] :tag_name => rule or [rule1, rule2, ...]
+  # @param strict [Boolean] Whether to report unknown tags as errors
+  # @return [Array<String>] List of error messasges
   # @see OPTIONAL
   # @see REQUIRED
-  # @see SINGLELINE
+  # @see BOOLEAN
   # @see VALUE
-  def validate(rules)
-    errors = Array.new
+  # @see SINGLELINE
+  def validate(rules, strict = false)
+    errors = []
 
-    if @strict
+    if strict
       @data.each {|key, tag|
         errors << "unknown tag '%s'" % tag.name unless rules.has_key? key
       }
@@ -168,27 +154,22 @@ class MetaHeader
       end
     }
 
-    errors unless errors.empty?
+    errors
   end
 
   # Rename one or more tags.
-  # @param old [Symbol, Hash]
-  # @param new [Symbol]
+  # @param old [Symbol, Array<Symbol>, Hash<Symbol, Symbol>]
+  # @param new [Symbol] Ignored if old is a Hash
   # @example
   #   mh.alias :old, :new
-  #   mh.alias :old1, :old2, :new
   #   mh.alias [:old1, :old2], :new
   #   mh.alias old1: :new1, old2: :new2
-  def alias(*args)
-    raise ArgumentError, 'wrong number of arguments' unless args.size.between? 1, 2
-
-    tags, new = args
-
-    if args.size == 1
-      tags.each {|k, v| self.alias k, v }
+  def alias(old, new = nil)
+    if old.is_a? Hash
+      old.each {|k, v| self.alias k, v }
     else
-      Array(tags).each {|old|
-        @data[new] = delete old if has? old
+      Array(old).each {|tag|
+        @data[new] = delete tag if has? tag
       }
     end
   end
@@ -202,7 +183,7 @@ private
     (?:\s*(?<value>[^\n]+))?
     \Z/x.freeze
 
-  def parse(line)
+  def parse_line(line)
     line.chomp!
     line.encode! Encoding::UTF_8, invalid: :replace
 

data/lib/metaheader/version.rb

@@ -1,4 +1,4 @@
 class MetaHeader
   # MetaHeader's version
-  VERSION = '1.3.1'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/metaheader.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.name          = "metaheader"
   spec.version       = MetaHeader::VERSION
   spec.authors       = ["cfillion"]
-  spec.email         = ["metaheader@cfillion.tk"]
+  spec.email         = ["metaheader@cfillion.ca"]
   spec.summary       = %q{Parser for metadata headers in plain-text files}
   spec.homepage      = "https://github.com/cfillion/metaheader"
   spec.license       = "LGPL-3.0+"
@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.3'
 
-  spec.add_development_dependency 'bundler', '~> 1.14'
+  spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'minitest', '~> 5.10'
-  spec.add_development_dependency 'rake', '~> 12.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'simplecov', '~> 0.13'
 end

data/test/test_multiline.rb

@@ -2,7 +2,7 @@ require File.expand_path '../helper', __FILE__
 
 class TestMultiline < MiniTest::Test
   def test_multiline
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test Lorem
       Ipsum
     IN
@@ -12,7 +12,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_variant
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test
       Lorem
       Ipsum
@@ -22,7 +22,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_trailing_space
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @hello\x20
       test\x20
     @world\x20\x20
@@ -34,7 +34,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_prefix
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
 --    @test Lorem
 --      Ipsum
     IN
@@ -44,7 +44,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_no_indent
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test Lorem
     Ipsum
       Test
@@ -55,7 +55,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_lose_indent
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test
       Hello
 
@@ -71,7 +71,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_fewer_indent
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test Lorem
       Ipsum
      Hello
@@ -83,7 +83,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_extra_indent
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test Lorem
       Ipsum
         Hello
@@ -95,7 +95,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_do_not_reuse_indent
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @a
       Lorem
       Ipsum
@@ -110,7 +110,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_sub_alternate_syntax
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test Lorem
       Ipsum:
       Dolor: sit amet
@@ -121,7 +121,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_explicit_boolean
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test true
       test
     IN
@@ -130,7 +130,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_empty_line_prefix
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     --@test
     --  Hello
     --
@@ -145,7 +145,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_empty_line_prefix_with_space
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     -- @test
     --   Hello
     --
@@ -156,7 +156,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_empty_line
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @test
       Hello
 
@@ -172,7 +172,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_break_at_empty_line
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     -- @hello world
 
     @chunky bacon
@@ -183,7 +183,7 @@ class TestMultiline < MiniTest::Test
   end
 
   def test_alternate_syntax
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     -- Hello:
     --   World
     IN

data/test/test_parser.rb

@@ -1,47 +1,15 @@
 require File.expand_path '../helper', __FILE__
 
-class CustomParser < MetaHeader::Parser
-  def self.reset
-    @@called = false
-  end
-
-  def self.called?
-    @@called
-  end
-
-  def self.input
-    @@input
-  end
-
-  def self.instance
-    @@instance
-  end
-
-  def parse(input)
-    return unless header[:run_custom]
-
-    header[:hello] = header[:hello].to_s * 2
-
-    @@input = input.read
-    @@instance = header
-    @@called = true
-  end
-end
-
 class TestParser < MiniTest::Test
-  def setup
-    CustomParser.reset
-  end
-
   def test_basic_parser
-    mh = MetaHeader.new '@hello world'
+    mh = MetaHeader.parse '@hello world'
 
     assert_equal 'world', mh[:hello]
     assert_equal 1, mh.size
   end
 
   def test_set_value
-    mh = MetaHeader.new String.new
+    mh = MetaHeader.parse String.new
 
     assert_empty mh
     mh[:hello] = 'world'
@@ -57,23 +25,23 @@ class TestParser < MiniTest::Test
   end
 
   def test_implicit_boolean
-    mh = MetaHeader.new "@hello"
+    mh = MetaHeader.parse "@hello"
     assert_equal true, mh[:hello]
   end
 
   def test_explicit_boolean
-    mh = MetaHeader.new "@foo true\n@bar false"
+    mh = MetaHeader.parse "@foo true\n@bar false"
     assert_equal true, mh[:foo]
     assert_equal false, mh[:bar]
   end
 
   def test_ignore_prefix
-    mh = MetaHeader.new '-- @chunky bacon'
+    mh = MetaHeader.parse '-- @chunky bacon'
     assert_equal 'bacon', mh[:chunky]
   end
 
   def test_two_tags
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     -- @chunky bacon
     -- @hello world
     IN
@@ -84,7 +52,7 @@ class TestParser < MiniTest::Test
   end
 
   def test_break_at_empty_line
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @hello world
 \x20
     @chunky bacon
@@ -95,7 +63,7 @@ class TestParser < MiniTest::Test
   end
 
   def test_ignore_c_comment_tokens
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
 /*
     -- @hello world
 */
@@ -110,12 +78,12 @@ class TestParser < MiniTest::Test
   end
 
   def test_trailing_whitespace
-    mh = MetaHeader.new '@hello world   '
+    mh = MetaHeader.parse '@hello world   '
     assert_equal 'world', mh[:hello]
   end
 
   def test_empty_prefixed_line
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     -- @first
     --
     -- @second
@@ -124,7 +92,7 @@ class TestParser < MiniTest::Test
     refute_nil mh[:second]
   end
 
-  def test_read_file
+  def test_from_file
     path = File.expand_path '../input/basic_tag', __FILE__
     mh = MetaHeader.from_file path
 
@@ -132,134 +100,137 @@ class TestParser < MiniTest::Test
     assert_equal 1, mh.size
   end
 
+  def test_read_file_stream
+    path = File.expand_path '../input/basic_tag', __FILE__
+    mh = MetaHeader.parse File.open(path)
+
+    assert_equal 'Hello World', mh[:test]
+    assert_equal 1, mh.size
+  end
+
+  def test_read_string_stream
+    stream = StringIO.new '@hello world'
+    MetaHeader.parse stream
+  end
+
   def test_to_hash
-    mh = MetaHeader.new '@key value'
+    mh = MetaHeader.parse '@key value'
     assert_equal Hash[key: 'value'], mh.to_h
   end
 
   def test_alternate_syntax
-    mh = MetaHeader.new 'Key Test: value'
+    mh = MetaHeader.parse 'Key Test: value'
     assert_equal Hash[key_test: 'value'], mh.to_h
   end
 
   def test_alternate_syntax_prefix
-    mh = MetaHeader.new '-- Key Test: Value'
+    mh = MetaHeader.parse '-- Key Test: Value'
     assert_equal Hash[key_test: 'Value'], mh.to_h
   end
 
-  def test_windows_newlines
-    mh = MetaHeader.new "key: value\r\n@run_custom"
+  def test_crlf_newlines
+    mh = MetaHeader.parse "key: value\r\n@run_custom"
     assert_equal 'value', mh[:key]
-    assert_equal "key: value\n@run_custom", CustomParser.input
+    assert_equal true, mh[:run_custom]
   end
 
   def test_alternate_syntax_trailing_space
-    mh = MetaHeader.new ' Key Test : Value'
+    mh = MetaHeader.parse ' Key Test : Value'
     assert_equal Hash[key_test: 'Value'], mh.to_h
   end
 
   def test_alternate_syntax_compact
-    mh = MetaHeader.new 'Key Test:Value'
+    mh = MetaHeader.parse 'Key Test:Value'
     assert_equal Hash[key_test: 'Value'], mh.to_h
   end
 
   def test_alternate_syntax_no_value
-    mh = MetaHeader.new 'Key Test:'
+    mh = MetaHeader.parse 'Key Test:'
     assert_equal Hash.new, mh.to_h
   end
 
   def test_inspect
-    mh = MetaHeader.new '@hello world'
+    mh = MetaHeader.parse '@hello world'
 
     hash = {hello: 'world'}
     assert_equal "#<MetaHeader #{hash.inspect}>", mh.inspect
   end
 
-  def test_default_parser_implementation
-    assert_raises NotImplementedError do
-      MetaHeader::Parser.new.parse String.new
-    end
-  end
-
-  def test_transform_from_text
-    input = "@run_custom\nHello\n\nWorld".freeze
-
-    mh = MetaHeader.new input
-
-    assert CustomParser.called?
-    assert_equal input, CustomParser.input
-    assert_same mh, CustomParser.instance
-  end
-
-  def test_transform_from_file
-    path = File.expand_path '../input/custom_parser', __FILE__
-
-    mh = MetaHeader.from_file path
-    assert_equal 'worldworld', mh[:hello]
-
-    assert CustomParser.called?
-    assert_equal File.read(path), CustomParser.input
-    assert_same mh, CustomParser.instance
-  end
-
   def test_has_tag
-    mh = MetaHeader.new '@hello'
+    mh = MetaHeader.parse '@hello'
     assert_equal true, mh.has?(:hello)
     assert_equal false, mh.has?(:world)
   end
 
   def test_default_value
-    mh = MetaHeader.new String.new
+    mh = MetaHeader.parse String.new
     assert_equal 'world', mh[:hello, 'world']
   end
 
   def test_delete
-    mh = MetaHeader.new '@hello world'
+    mh = MetaHeader.new
+    mh[:hello] = 'world'
     assert mh.has?(:hello)
     mh.delete :hello
     refute mh.has?(:hello)
   end
 
-  def test_construct_from_instance
-    mh = MetaHeader.new '@hello world'
-    assert_same mh, MetaHeader.parse(mh)
-    assert_equal mh.to_h, MetaHeader.parse('@hello world').to_h
-  end
-
   def test_alias
-    mh = MetaHeader.new '@a 1'
+    mh = MetaHeader.new
+    mh[:a] = '1'
     mh.alias :a, :b
     refute mh.has?(:a)
     assert_equal '1', mh[:b]
-
-    mh[:d] = '2'
-    mh.alias :c, :d
-    refute mh.has?(:c)
-    assert_equal '2', mh[:d]
   end
 
   def test_alias_hash
-    mh = MetaHeader.new "@a 1\n@b 2"
+    mh = MetaHeader.new
+    mh[:a] = '1'
+    mh[:b] = '2'
     mh.alias a: :c, b: :d
     assert_equal '1', mh[:c]
     assert_equal '2', mh[:d]
   end
 
   def test_alias_array
-    mh = MetaHeader.new "@a 1\n@b 2"
+    mh = MetaHeader.new
+    mh[:a] = '1'
+    mh[:b] = '2'
     mh.alias [:a, :b, :c], :d
     assert [:a, :b, :c].none? {|t| mh.has? t }
     assert_equal '2', mh[:d]
   end
 
-  def test_alias_invalid_args
-    mh = MetaHeader.new "@a 1\n@b 2"
-    assert_raises(ArgumentError) { mh.alias }
-    assert_raises(ArgumentError) { mh.alias 1, 2, 3 }
-  end
-
   def test_utf16_bom
-    mh = MetaHeader.new "\xff\xfe@a b\n"
+    mh = MetaHeader.parse "\xff\xfe@a b\n"
     assert_equal 'b', mh[:a]
   end
+
+  def test_content_offset
+    mh = MetaHeader.new
+    input = "@hello\n@world s\n\nafter\n"
+    content_offset = mh.parse input
+    assert_equal input.index('after'), content_offset
+  end
+
+  def test_content_offset_decorated
+    mh = MetaHeader.new
+    input = "# @hello\n# @world\n\nafter\n"
+    content_offset = mh.parse input
+    assert_equal input.index('after'), content_offset
+  end
+
+  def test_content_offset_unicode
+    mh = MetaHeader.new
+    input = "@lang русский\n\nafter"
+    content_offset = mh.parse input
+    assert_equal input.index('after'), content_offset
+  end
+
+  def test_content_offset_trailing_space
+    mh = MetaHeader.new
+    input = "@foo\x20\x20\n  bar\n\nafter\n"
+    content_offset = mh.parse input
+    assert_equal input.index('after'), content_offset
+  end
 end

data/test/test_validator.rb

@@ -2,42 +2,38 @@ require File.expand_path '../helper', __FILE__
 
 class TestValidator < MiniTest::Test
   def validate(input, rules)
-    MetaHeader.new(input).validate(rules)
+    MetaHeader.parse(input).validate(rules)
   end
 
   def test_unknown_strict
-    mh = MetaHeader.new "@hello\n@WORLD"
-    mh.strict = true
-
-    actual = mh.validate Hash.new
-    assert_equal ["unknown tag 'hello'", "unknown tag 'WORLD'"], actual
+    mh = MetaHeader.parse "@hello\n@WORLD"
+    errors = mh.validate Hash.new, true
+    assert_equal ["unknown tag 'hello'", "unknown tag 'WORLD'"], errors
   end
 
   def test_unknown_tolerant
-    mh = MetaHeader.new "@hello\n@world"
-    refute mh.strict
-
-    assert_nil mh.validate(Hash.new)
+    mh = MetaHeader.parse "@hello\n@world"
+    assert_empty mh.validate(Hash.new, false)
   end
 
   def test_strict_optional
-    mh = MetaHeader.new "@hello"
-    mh.strict = true
-
-    actual = mh.validate \
+    rules = {
       hello: MetaHeader::OPTIONAL,
-      world: MetaHeader::OPTIONAL
+      world: MetaHeader::OPTIONAL,
+    }
 
-    assert_nil actual
+    mh = MetaHeader.parse "@hello"
+    errors = mh.validate rules, true
+    assert_empty errors
   end
 
   def test_required
-    actual = validate '@foobar', version: MetaHeader::REQUIRED, foobar: []
-    assert_equal ["missing tag 'version'"], actual
+    errors = validate '@foobar', version: MetaHeader::REQUIRED, foobar: []
+    assert_equal ["missing tag 'version'"], errors
   end
 
   def test_singleline
-    mh = MetaHeader.new <<-IN
+    mh = MetaHeader.parse <<-IN
     @hello
       chunky
       bacon
@@ -46,50 +42,50 @@ class TestValidator < MiniTest::Test
       bar
     IN
 
-    actual = mh.validate :hello => MetaHeader::SINGLELINE
-    assert_equal ["tag 'hello' must be singleline"], actual
+    errors = mh.validate :hello => MetaHeader::SINGLELINE
+    assert_equal ["tag 'hello' must be singleline"], errors
   end
 
   def test_has_value
-    mh = MetaHeader.new '@hello'
+    mh = MetaHeader.parse '@hello'
 
-    actual = mh.validate :hello => [MetaHeader::VALUE]
-    assert_equal ["missing value for tag 'hello'"], actual
+    errors = mh.validate :hello => [MetaHeader::VALUE]
+    assert_equal ["missing value for tag 'hello'"], errors
   end
 
   def test_regex
-    actual = validate '@hello world', :hello => /\d+/
-    assert_equal ["invalid value for tag 'hello'"], actual
+    errors = validate '@hello world', :hello => /\d+/
+    assert_equal ["invalid value for tag 'hello'"], errors
   end
 
   def test_regex_no_value
-    mh = MetaHeader.new '@hello'
+    mh = MetaHeader.parse '@hello'
 
-    actual = mh.validate :hello => [/./]
-    assert_equal ["invalid value for tag 'hello'"], actual
+    errors = mh.validate :hello => [/./]
+    assert_equal ["invalid value for tag 'hello'"], errors
   end
 
   def test_custom_validator
-    actual = validate '@hello',
+    errors = validate '@hello',
       hello: Proc.new {|value| assert_equal true, value; nil }
-    assert_nil actual
+    assert_empty errors
 
-    actual = validate '@hello world',
+    errors = validate '@hello world',
       hello: Proc.new {|value| assert_equal 'world', value; nil }
-    assert_nil actual
+    assert_empty errors
 
-    actual = validate '@hello', hello: Proc.new {|value| 'Hello World!' }
-    assert_equal ["invalid value for tag 'hello': Hello World!"], actual
+    errors = validate '@hello', hello: Proc.new {|value| 'Hello World!' }
+    assert_equal ["invalid value for tag 'hello': Hello World!"], errors
   end
 
   def test_error_use_original_case
-    actual = validate 'HeLlO: world', hello: /\d+/
-    assert_equal ["invalid value for tag 'HeLlO'"], actual
+    errors = validate 'HeLlO: world', hello: /\d+/
+    assert_equal ["invalid value for tag 'HeLlO'"], errors
   end
 
   def test_single_error_per_tag
-    actual = validate '@hello', hello: [/\d/, /\d/]
-    assert_equal ["invalid value for tag 'hello'"], actual
+    errors = validate '@hello', hello: [/\d/, /\d/]
+    assert_equal ["invalid value for tag 'hello'"], errors
   end
 
   def test_invalid_rule
@@ -103,13 +99,13 @@ class TestValidator < MiniTest::Test
   end
 
   def test_boolean
-    actual = validate "@hello true\n@hello world",
+    errors = validate "@hello true\n@hello world",
       hello: MetaHeader::BOOLEAN
-    assert_equal ["tag 'hello' cannot have a value"], actual
+    assert_equal ["tag 'hello' cannot have a value"], errors
   end
 
   def test_alias
-    mh = MetaHeader.new "@a"
+    mh = MetaHeader.parse "@a"
     mh.alias :a, :b
     assert_equal ["missing value for tag 'a'"],
       mh.validate(b: [MetaHeader::REQUIRED, MetaHeader::VALUE])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metaheader
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - cfillion
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2020-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.14'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -68,7 +68,7 @@ dependencies:
         version: '0.13'
 description: 
 email:
-- metaheader@cfillion.tk
+- metaheader@cfillion.ca
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -109,8 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Parser for metadata headers in plain-text files