front_matter_parser 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13c37dbe3e0903b91a2e77bfbbd1c9f9688dcbc9
-  data.tar.gz: 9eabdd6757046433de4737ffd79d1b228e75093e
+  metadata.gz: 5d5e6ab289e911c8eef0b4890f1dd8ff48f9d21a
+  data.tar.gz: 29aac6299a32dcfcc18bd770f3b078b440767455
 SHA512:
-  metadata.gz: b0b6dfc6756089ac5740a5f55429c83189219dbabc9e07ab05a25dd666765a57d9fba55c6d34e65da5148ce5c7761aaec5e6666d5892a119b7952f5892e19f71
-  data.tar.gz: 8d8461da5eb3bb983ec19e1ec7e11b59d4028b6484e6fcb574bf0e30a7d4c2c52bf56898371cf93bb2d4ada80bd78aa572890daa1b87a85d721e4939677bdca3
+  metadata.gz: cf889dea7373a1441d733deb02812fe0894aa1b549f53ddbad3229cb4ebeae1a108debc562e4bc7b0d6eb949ef6b8afcda9d7399c3cab6bca0979a30fed71954
+  data.tar.gz: 81803add1d8eea7140d4e9c8a3cd559ce8b2f2ab191e9bec3e98def6c28fb5780471b341cc476712aaf763a53801414c6a6eea5b334374ab35634c4702e14e27

data/CHANGELOG.md

@@ -0,0 +1,9 @@
+# Change Log
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](http://keepachangelog.com/) 
+and this project adheres to [Semantic Versioning](http://semver.org/).
+
+## [0.1.1] - 2017-07-19
+### Fixed
+- Don't be greedy with front matter end delimiters 

data/README.md

@@ -95,7 +95,7 @@ You can as well parse a string providing manually the syntax:
 
 ```ruby
 string = File.read('example.slim')
-FrontMatterParser::Parser.new(:slim).parse(string)
+FrontMatterParser::Parser.new(:slim).call(string)
 ```
 
 ### Custom parsers
@@ -117,7 +117,7 @@ slim_parser = SlimParser.new
 FrontMatterParser::Parser.parse_file('example.slim', syntax_parser: slim_parser)
 
 # For a string
-FrontMatterParser::Parser.new(slim_parser).parse(string)
+FrontMatterParser::Parser.new(slim_parser).call(string)
 ```
 
 For more complex scenarios, a parser can be anything responding to a method `call(string)` which returns a hash interface with `:front_matter` and `:content` keys, or `nil` if no front matter is found.
@@ -133,7 +133,7 @@ json_loader = ->(string) { JSON.load(string) }
 FrontMatterParser::Parser.parse_file('example.md', loader: json_loader)
 
 # For a string
-FrontMatterParser::Parser.new(:md, loader: json_loader).parse(string)
+FrontMatterParser::Parser.new(:md, loader: json_loader).call(string)
 ```
 
 ## Development

data/lib/front_matter_parser/syntax_parser/indentation_comment.rb

@@ -36,7 +36,7 @@ module FrontMatterParser
         #{delimiter}
         [[:space:]]*
         ---
-        (?<front_matter>.*)
+        (?<front_matter>.*?)
         ---
         [[:blank:]]*$[\n\r]
         (?<content>.*)

data/lib/front_matter_parser/syntax_parser/multi_line_comment.rb

@@ -35,7 +35,7 @@ module FrontMatterParser
         #{start_delimiter}
         [[:space:]]*
         ---
-        (?<front_matter>.*)
+        (?<front_matter>.*?)
         ---
         [[:space:]]*
         #{end_delimiter}

data/lib/front_matter_parser/syntax_parser/single_line_comment.rb

@@ -50,7 +50,7 @@ module FrontMatterParser
         [[:space:]]*
         #{delimiter}[[:blank:]]*
         ---
-        (?<front_matter>.*)
+        (?<front_matter>.*?)
         ^[[:blank:]]*#{delimiter}[[:blank:]]*
         ---
         [[:blank:]]*$[\n\r]

data/lib/front_matter_parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FrontMatterParser
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/front_matter_parser/loader/yaml_spec.rb

@@ -5,7 +5,7 @@ require 'spec_helper'
 describe FrontMatterParser::Loader::Yaml do
   describe '::call' do
     it 'loads using yaml parser' do
-      string = "{title: 'hello'}"
+      string = "title: 'hello'"
 
       expect(described_class.call(string)).to eq(
         'title' => 'hello'

data/spec/front_matter_parser/syntax_parser/indentation_comment_spec.rb

@@ -138,6 +138,26 @@ describe FrontMatterParser::SyntaxParser::IndentationComment do
     end
   end
 
+  context 'with front matter delimiter chars in the content' do
+    let(:syntax) { :slim }
+    let(:string) do
+      <<~eos
+        /
+         ---
+         title: hello
+         ---
+        Content
+        ---
+      eos
+    end
+
+    it 'is not greedy' do
+      front_matter = { 'title' => 'hello' }
+
+      expect(parsed).to be_parsed_result_with(front_matter, "Content\n---\n")
+    end
+  end
+
   it 'returns nil if no front matter is found' do
     string = 'Content'
 

data/spec/front_matter_parser/syntax_parser/multi_line_comment_spec.rb

@@ -241,6 +241,24 @@ describe FrontMatterParser::SyntaxParser::MultiLineComment do
     end
   end
 
+  context 'with front matter delimiter chars in the content' do
+    let(:syntax) { :md }
+    let(:string) do
+      <<~eos
+        ---
+        title: hello
+        ---
+        Content---
+      eos
+    end
+
+    it 'is not greedy' do
+      front_matter = { 'title' => 'hello' }
+
+      expect(parsed).to be_parsed_result_with(front_matter, "Content---\n")
+    end
+  end
+
   it 'returns nil if no front matter is found' do
     string = 'Content'
 

data/spec/front_matter_parser/syntax_parser/single_line_comment_spec.rb

@@ -148,6 +148,25 @@ describe FrontMatterParser::SyntaxParser::SingleLineComment do
     end
   end
 
+  context 'with front matter delimiter chars in the content' do
+    let(:syntax) { :sass }
+    let(:string) do
+      <<~eos
+        //---
+        //title: hello
+        //---
+        //---
+        Content
+      eos
+    end
+
+    it 'is not greedy' do
+      front_matter = { 'title' => 'hello' }
+
+      expect(parsed).to be_parsed_result_with(front_matter, "//---\nContent\n")
+    end
+  end
+
   it 'returns nil if no front matter is found' do
     string = 'Content'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: front_matter_parser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - marc
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-30 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - ".ruby-version"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - COPYING.LESSER
 - COPYING.txt
 - Dockerfile