d-mark 1.0.0a4 → 1.0.0b1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: bd186ea6e5e8fb14c4c424b8a58793026a0a650b
-  data.tar.gz: cd847b7b9029f0098b3e10b3a7ba74f3b97aaad3
+SHA256:
+  metadata.gz: 30e167e90d0b60c800ba346d0f605a6d18410266f3ef5346b9d0e5433b9f41a3
+  data.tar.gz: 7c91d1faf7e6031e39e1178bdb83a2f20e47abb8323069f84439f85cbd2a68f7
 SHA512:
-  metadata.gz: 19198cab18de6924374fddeb55f0bec8e4db2e78b62caa7417ec9d6dec5189d9b5c275ab1bc58712fa39db00ef66993aa2e1b5c85cd10222492746655dff5d1f
-  data.tar.gz: 5256a0b8ac59bdf95891d4135a5ee2f6b9002e5bd5975aa1c9561f7def7a9453e90e00c007cbb4f14c45be2bf2f08e229ec0ed36602232e67ad67448fcbae631
+  metadata.gz: c0708a7a4a2d7be5f117f11b2f6e573131211642eb072163c8aeaa14628ee843f0feae89c4a05138e0b0ab66b9956627231727c61843e419337544a962a75768
+  data.tar.gz: f04d93d9b19243c8a641ecee84bfb181a6a4313a82e6a3a087bd9ae8b6c259a86518433e2bf169813dea2d69e2de02df29045c0ad488bbd0a90716d56aa6285e

data/Gemfile.lock

@@ -1,25 +1,25 @@
 PATH
   remote: .
   specs:
-    d-mark (1.0.0a3)
+    d-mark (1.0.0b1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.3.0)
+    ast (2.4.0)
     codecov (0.1.10)
       json
       simplecov
       url
-    coderay (1.1.1)
+    coderay (1.1.2)
     diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.18)
+    ffi (1.9.23)
     formatador (0.2.5)
-    guard (2.14.1)
+    guard (2.14.2)
       formatador (>= 0.2.4)
       listen (>= 2.7, < 4.0)
-      lumberjack (~> 1.0)
+      lumberjack (>= 1.0.12, < 2.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
       pry (>= 0.9.12)
@@ -34,54 +34,51 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
     lumberjack (1.0.12)
-    method_source (0.8.2)
+    method_source (0.9.0)
     nenv (0.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parallel (1.12.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    parallel (1.12.1)
+    parser (2.5.0.2)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
+      method_source (~> 0.9.0)
+    rainbow (3.0.0)
+    rake (12.3.0)
     rb-fsevent (0.10.2)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.49.1)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.52.1)
       parallel (~> 1.10)
-      parser (>= 2.3.3.1, < 3.0)
+      parser (>= 2.4.0.2, < 3.0)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.8.1)
+    ruby-progressbar (1.9.0)
     ruby_dep (1.5.0)
     shellany (0.0.1)
-    simplecov (0.15.0)
+    simplecov (0.15.1)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    slop (3.6.0)
     thor (0.20.0)
     unicode-display_width (1.3.0)
     url (0.3.2)
@@ -90,7 +87,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (>= 1.11.2, < 2.0)
   codecov
   d-mark!
   guard
@@ -99,4 +95,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/NEWS.md

@@ -1,5 +1,11 @@
 # D★Mark news
 
+## 1.0.0b1 (2018-02-26)
+
+Enhancements:
+
+* Added `ParserError#fancy_message`
+
 ## 1.0.0a4 (2017-08-19)
 
 Changes:

data/README.md

@@ -0,0 +1,20 @@
+# D★Mark
+
+[![Gem version](http://img.shields.io/gem/v/d-mark.svg)](http://rubygems.org/gems/d-mark)
+[![Build status](http://img.shields.io/travis/ddfreyne/d-mark.svg)](https://travis-ci.org/ddfreyne/d-mark)
+[![Code Climate](http://img.shields.io/codeclimate/github/ddfreyne/d-mark.svg)](https://codeclimate.com/github/ddfreyne/d-mark)
+[![Code Coverage](http://img.shields.io/codecov/c/github/ddfreyne/d-mark.svg)](https://codecov.io/github/ddfreyne/d-mark)
+
+_D★Mark_ is a language for marking up prose. It facilitates writing semantically meaningful text, without limiting itself to the semantics provided by HTML or Markdown.
+
+If you’re a technical writer looking for a flexible markup language, D★Mark might be a good fit.
+
+Here’s an example of D★Mark:
+
+```
+#para This a paragraph; an element in block form containing some text.
+
+#note[only=web] This is a note that will %em{only} show up on web.
+```
+
+For details, see the [D★Mark web page](http://ddfreyne.github.io/d-mark/).

data/d-mark.gemspec

@@ -17,10 +17,8 @@ Gem::Specification.new do |s|
     ['d-mark.gemspec']
   s.require_paths = ['lib']
 
-  s.rdoc_options     = ['--main', 'README.adoc']
-  s.extra_rdoc_files = ['LICENSE', 'README.adoc', 'NEWS.md']
+  s.rdoc_options     = ['--main', 'README.md']
+  s.extra_rdoc_files = ['LICENSE', 'README.md', 'NEWS.md']
 
-  s.required_ruby_version = '>= 2.2.0'
-
-  s.add_development_dependency('bundler', '>= 1.11.2', '< 2.0')
+  s.required_ruby_version = '~> 2.3'
 end

data/lib/d-mark/parser.rb

@@ -4,18 +4,33 @@ module DMark
       attr_reader :line_nr
       attr_reader :col_nr
 
-      def initialize(line_nr, col_nr, msg)
+      def initialize(line_nr, col_nr, msg, content)
         @line_nr = line_nr
         @col_nr = col_nr
         @msg = msg
+        @content = content
 
         super("parse error at line #{@line_nr + 1}, col #{@col_nr + 1}: #{@msg}")
       end
+
+      def fancy_message
+        line = @content.lines[line_nr]
+
+        lines = [
+          message,
+          '',
+          line.rstrip,
+          "\e[31m" + ' ' * [col_nr, 0].max + '↑' + "\e[0m"
+        ]
+
+        lines.join("\n")
+      end
     end
 
     attr_reader :pos
 
     def initialize(input)
+      @input = input
       @input_chars = input.chars
       @length = @input_chars.size
 
@@ -368,7 +383,7 @@ module DMark
     end
 
     def raise_parse_error(msg)
-      raise ParserError.new(@line_nr, @col_nr, msg)
+      raise ParserError.new(@line_nr, @col_nr, msg, @input)
     end
   end
 end

data/lib/d-mark/version.rb

@@ -1,3 +1,3 @@
 module DMark
-  VERSION = '1.0.0a4'.freeze
+  VERSION = '1.0.0b1'.freeze
 end

data/spec/d-mark/parser_spec.rb

@@ -6,6 +6,32 @@ def element(name, attributes, children)
   DMark::ElementNode.new(name, attributes, children)
 end
 
+describe DMark::Parser::ParserError do
+  subject(:error) do
+    begin
+      DMark::Parser.new(content).parse
+    rescue described_class => e
+      break e
+    end
+  end
+
+  let(:content) do
+    "#p Stuff\n\n#p More stuff }"
+  end
+
+  describe '#message' do
+    subject { error.message }
+
+    it { is_expected.to eq('parse error at line 3, col 15: unexpected } -- try escaping it as "%}"') }
+  end
+
+  describe '#fancy_message' do
+    subject { error.fancy_message }
+
+    it { is_expected.to eq("parse error at line 3, col 15: unexpected } -- try escaping it as \"%}\"\n\n#p More stuff }\n\e[31m              ↑\e[0m") }
+  end
+end
+
 describe 'DMark::Parser#parser' do
   it 'parses' do
     expect(parse('')).to eq []

metadata

@@ -1,35 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: d-mark
 version: !ruby/object:Gem::Version
-  version: 1.0.0a4
+  version: 1.0.0b1
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-19 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.11.2
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
+date: 2018-02-26 00:00:00.000000000 Z
+dependencies: []
 description: D★Mark is a markup language aimed at being able to write semantically
   meaningful text without limiting itself to the semantics provided by HTML or Markdown.
 email: denis.defreyne@stoneship.org
@@ -37,7 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files:
 - LICENSE
-- README.adoc
+- README.md
 - NEWS.md
 files:
 - Gemfile
@@ -45,7 +25,7 @@ files:
 - Guardfile
 - LICENSE
 - NEWS.md
-- README.adoc
+- README.md
 - Rakefile
 - d-mark.gemspec
 - lib/d-mark.rb
@@ -66,14 +46,14 @@ metadata: {}
 post_install_message: 
 rdoc_options:
 - "--main"
-- README.adoc
+- README.md
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"
@@ -81,7 +61,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: markup language for writing text

data/README.adoc

@@ -1,22 +0,0 @@
-= D★Mark
-Denis Defreyne <denis@stoneship.org>
-
-image:http://img.shields.io/gem/v/d-mark.svg[Gem version, link="http://rubygems.org/gems/d-mark"]
-image:http://img.shields.io/travis/ddfreyne/d-mark.svg[Build status, link="https://travis-ci.org/ddfreyne/d-mark"]
-image:http://img.shields.io/codeclimate/github/ddfreyne/d-mark.svg[Code Climate, link="https://codeclimate.com/github/ddfreyne/d-mark"]
-image:http://img.shields.io/codecov/c/github/ddfreyne/d-mark.svg[Code Coverage, link="https://codecov.io/github/ddfreyne/d-mark"]
-
-_D★Mark_ is a language for marking up prose. It facilitates writing semantically meaningful text, without limiting itself to the semantics provided by HTML or Markdown.
-
-If you’re a technical writer looking for a flexible markup language, D★Mark might be a good fit.
-
-Here’s an example of D★Mark:
-
-[source]
-----
-para. This a paragraph; an element in block form containing some text.
-
-note[only=web]. This is a note that will %em{only} show up on web.
-----
-
-For details, see the http://ddfreyne.github.io/d-mark/[D★Mark web page].