d-mark 1.0.0a3 → 1.0.0a4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1542c550fe7394de16bd088b2b0adc7bc369419
-  data.tar.gz: 6601aacc0e5d8c9b5aae40309b8802acef9652dc
+  metadata.gz: bd186ea6e5e8fb14c4c424b8a58793026a0a650b
+  data.tar.gz: cd847b7b9029f0098b3e10b3a7ba74f3b97aaad3
 SHA512:
-  metadata.gz: f5775a149e72d08f1ca5f24b3a2fd9f1ce78084fc790d6aa562db07912d0d19d62de09b1e1c3ff66636465bcf657ffb063345ddb6fa52a5bbce3ac1e989a0a55
-  data.tar.gz: c91e5b502cb9950561c257ba6f765d04d5b125c6f7ce965b336f843561a864050fcd217adb2b658b37f05c5ffbb70a56f8ca410159eabc72811f2639d34f5e1e
+  metadata.gz: 19198cab18de6924374fddeb55f0bec8e4db2e78b62caa7417ec9d6dec5189d9b5c275ab1bc58712fa39db00ef66993aa2e1b5c85cd10222492746655dff5d1f
+  data.tar.gz: 5256a0b8ac59bdf95891d4135a5ee2f6b9002e5bd5975aa1c9561f7def7a9453e90e00c007cbb4f14c45be2bf2f08e229ec0ed36602232e67ad67448fcbae631

data/Gemfile.lock

@@ -6,19 +6,19 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.2.0)
-    codecov (0.1.4)
+    ast (2.3.0)
+    codecov (0.1.10)
       json
       simplecov
       url
     coderay (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    ffi (1.9.10)
+    ffi (1.9.18)
     formatador (0.2.5)
-    guard (2.13.0)
+    guard (2.14.1)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -28,57 +28,62 @@ GEM
     guard-rake (1.0.0)
       guard
       rake
-    json (1.8.3)
-    listen (3.0.6)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9.7)
-    lumberjack (1.0.10)
+    json (2.1.0)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.12)
     method_source (0.8.2)
     nenv (0.3.0)
-    notiffany (0.0.8)
+    notiffany (0.1.1)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    parser (2.3.0.6)
+    parallel (1.12.0)
+    parser (2.4.0.0)
       ast (~> 2.2)
     powerpack (0.1.1)
-    pry (0.10.3)
+    pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rainbow (2.1.0)
-    rake (11.1.0)
-    rb-fsevent (0.9.7)
-    rb-inotify (0.9.7)
-      ffi (>= 0.5.0)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    rainbow (2.2.2)
+      rake
+    rake (12.0.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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubocop (0.38.0)
-      parser (>= 2.3.0.6, < 3.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    rubocop (0.49.1)
+      parallel (~> 1.10)
+      parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.7.5)
+    ruby-progressbar (1.8.1)
+    ruby_dep (1.5.0)
     shellany (0.0.1)
-    simplecov (0.11.2)
+    simplecov (0.15.0)
       docile (~> 1.1.0)
-      json (~> 1.8)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.2)
     slop (3.6.0)
-    thor (0.19.1)
-    unicode-display_width (1.0.2)
+    thor (0.20.0)
+    unicode-display_width (1.3.0)
     url (0.3.2)
 
 PLATFORMS
@@ -94,4 +99,4 @@ DEPENDENCIES
   rubocop
 
 BUNDLED WITH
-   1.12.5
+   1.15.3

data/NEWS.md

@@ -1,5 +1,15 @@
 # D★Mark news
 
+## 1.0.0a4 (2017-08-19)
+
+Changes:
+
+* Relaxed identifier restrictions (#16, #17)
+
+Enhancements:
+
+* Made various speed improvements
+
 ## 1.0.0a3 (2016-07-03)
 
 Changes:

data/Rakefile

@@ -7,8 +7,8 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 RuboCop::RakeTask.new(:rubocop) do |task|
-  task.options  = %w( --display-cop-names --format simple )
-  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb']
+  task.options  = %w[--display-cop-names --format simple]
+  task.patterns = ['lib/**/*.rb', 'spec/**/*.rb', 'Gemfile*', '*.gemspec', 'Rakefile']
 end
 
-task default: [:spec, :rubocop]
+task default: %i[spec rubocop]

data/lib/d-mark/parser.rb

@@ -16,8 +16,8 @@ module DMark
     attr_reader :pos
 
     def initialize(input)
-      @input = input
-      @input_chars = @input.chars
+      @input_chars = input.chars
+      @length = @input_chars.size
 
       @pos = 0
       @col_nr = 0
@@ -48,20 +48,12 @@ module DMark
 
     ##########
 
-    def peek_char(pos = @pos)
-      if eof?
-        nil
-      else
-        @input_chars[pos]
-      end
-    end
-
     def eof?(pos = @pos)
-      pos >= @input_chars.size
+      pos >= @length
     end
 
     def advance
-      if !eof? && @input_chars[@pos] == "\n"
+      if @input_chars[@pos] == "\n"
         @line_nr += 1
         @col_nr = 0
       end
@@ -71,7 +63,7 @@ module DMark
     end
 
     def read_char(c)
-      char = peek_char
+      char = @input_chars[@pos]
       if char != c
         raise_parse_error("expected #{c.inspect}, but got #{char.nil? ? 'EOF' : char.inspect}")
       else
@@ -118,7 +110,7 @@ module DMark
       pos = @pos
 
       loop do
-        case peek_char(pos)
+        case @input_chars[pos]
         when ' '
           pos += 1
         when nil
@@ -133,8 +125,8 @@ module DMark
 
     # FIXME: ugly and duplicated
     def try_read_block_start
-      if peek_char == '#'
-        next_char = peek_char(@pos + 1)
+      if @input_chars[@pos] == '#'
+        next_char = @input_chars[@pos + 1]
         ('a'..'z').cover?(next_char)
       else
         false
@@ -146,7 +138,7 @@ module DMark
       pos = @pos
 
       loop do
-        case peek_char(pos)
+        case @input_chars[pos]
         when ' '
           pos += 1
           indentation_chars += 1
@@ -170,13 +162,13 @@ module DMark
       identifier = read_identifier
 
       attributes =
-        if peek_char == '['
+        if @input_chars[@pos] == '['
           read_attributes
         else
           {}
         end
 
-      case peek_char
+      case @input_chars[@pos]
       when nil, "\n"
         advance
         ElementNode.new(identifier, attributes, [])
@@ -189,7 +181,7 @@ module DMark
     end
 
     def read_end_of_inline_content
-      char = peek_char
+      char = @input_chars[@pos]
       case char
       when "\n", nil
         advance
@@ -207,9 +199,9 @@ module DMark
     end
 
     def read_identifier_head
-      char = peek_char
+      char = @input_chars[@pos]
       case char
-      when 'a'..'z'
+      when 'a'..'z', 'A'..'Z'
         advance
         char
       else
@@ -217,18 +209,16 @@ module DMark
       end
     end
 
+    IDENTIFIER_CHARS = Set.new(['a'..'z', 'A'..'Z', ['-', '_'], '0'..'9'].map(&:to_a).flatten)
+
     def read_identifier_tail
       res = ''
 
       loop do
-        char = peek_char
-        case char
-        when 'a'..'z', '-', '0'..'9'
-          advance
-          res << char
-        else
-          break
-        end
+        char = @input_chars[@pos]
+        break unless IDENTIFIER_CHARS.include?(char)
+        advance
+        res << char
       end
 
       res.to_s
@@ -241,7 +231,7 @@ module DMark
 
       at_start = true
       loop do
-        char = peek_char
+        char = @input_chars[@pos]
         case char
         when ']'
           advance
@@ -250,7 +240,7 @@ module DMark
           read_char(',') unless at_start
 
           key = read_attribute_key
-          if peek_char == '='
+          if @input_chars[@pos] == '='
             read_char('=')
             value = read_attribute_value
           else
@@ -275,7 +265,7 @@ module DMark
 
       is_escaping = false
       loop do
-        char = peek_char
+        char = @input_chars[@pos]
 
         if is_escaping
           case char
@@ -315,7 +305,7 @@ module DMark
       res = []
 
       loop do
-        char = peek_char
+        char = @input_chars[@pos]
         case char
         when "\n", nil
           break
@@ -336,7 +326,7 @@ module DMark
       res = ''
 
       loop do
-        char = peek_char
+        char = @input_chars[@pos]
         case char
         when nil, "\n", '%', '}'
           break
@@ -346,15 +336,15 @@ module DMark
         end
       end
 
-      res.to_s
+      res
     end
 
     def read_percent_body
-      char = peek_char
+      char = @input_chars[@pos]
       case char
       when '%', '}', '#'
         advance
-        char.to_s
+        char
       when nil, "\n"
         raise_parse_error('expected something after %')
       else
@@ -365,7 +355,7 @@ module DMark
     def read_inline_element
       name = read_identifier
       attributes =
-        if peek_char == '['
+        if @input_chars[@pos] == '['
           read_attributes
         else
           {}

data/lib/d-mark/version.rb

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

data/spec/d-mark/parser_spec.rb

@@ -15,6 +15,36 @@ describe 'DMark::Parser#parser' do
     expect(parse('#p hi %}')).to eq [element('p', {}, ['hi ', '}'])]
   end
 
+  it 'parses element with name containing dash' do
+    expect(parse('#intro-para hi')).to eq [
+      element('intro-para', {}, ['hi'])
+    ]
+  end
+
+  it 'parses element with name containing underscore' do
+    expect(parse('#intro_para hi')).to eq [
+      element('intro_para', {}, ['hi'])
+    ]
+  end
+
+  it 'parses element with name containing uppercase letters' do
+    expect(parse('#IntroPara hi')).to eq [
+      element('IntroPara', {}, ['hi'])
+    ]
+  end
+
+  it 'does not parse element with name starting with a dash' do
+    expect { parse('#-intro hi there') }.to raise_error(DMark::Parser::ParserError)
+  end
+
+  it 'does not parse element with name starting with an underscore' do
+    expect { parse('#_intro hi there') }.to raise_error(DMark::Parser::ParserError)
+  end
+
+  it 'does not parse element with name starting with a digit' do
+    expect { parse('#4ever best friends') }.to raise_error(DMark::Parser::ParserError)
+  end
+
   it 'parses escaped % in block' do
     expect(parse('#p %%')).to eq [
       element('p', {}, ['%'])
@@ -133,7 +163,7 @@ describe 'DMark::Parser#parser' do
 
   it 'includes raw content' do
     expect(parse("#p foo\n  donkey")).to eq [
-      element('p', {}, %W(foo \n donkey))
+      element('p', {}, %W[foo \n donkey])
     ]
   end
 
@@ -179,6 +209,42 @@ describe 'DMark::Parser#parser' do
     ]
   end
 
+  it 'parses attribute with dash' do
+    expect(parse('#p[intended-audience=learner] hi')).to eq [
+      element('p', { 'intended-audience' => 'learner' }, ['hi'])
+    ]
+  end
+
+  it 'parses attribute with numbers' do
+    expect(parse('#p[is-over-9000=yup] hi')).to eq [
+      element('p', { 'is-over-9000' => 'yup' }, ['hi'])
+    ]
+  end
+
+  it 'parses attribute with underscore' do
+    expect(parse('#p[intended_audience=learner] hi')).to eq [
+      element('p', { 'intended_audience' => 'learner' }, ['hi'])
+    ]
+  end
+
+  it 'parses attribute with uppercase letters' do
+    expect(parse('#p[IntendedAudience=learner] hi')).to eq [
+      element('p', { 'IntendedAudience' => 'learner' }, ['hi'])
+    ]
+  end
+
+  it 'does not parse atttributes starting with -' do
+    expect { parse('#p[-this=is dog] hello yes') }.to raise_error(DMark::Parser::ParserError)
+  end
+
+  it 'does not parse atttributes starting with _' do
+    expect { parse('#p[_this=is dog] hello yes') }.to raise_error(DMark::Parser::ParserError)
+  end
+
+  it 'does not parse atttributes starting with a digit' do
+    expect { parse('#p[4this=is dog] hello yes') }.to raise_error(DMark::Parser::ParserError)
+  end
+
   it 'parses single value-less attribute' do
     expect(parse('#p[foo] hi')).to eq [
       element('p', { 'foo' => 'foo' }, ['hi'])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: d-mark
 version: !ruby/object:Gem::Version
-  version: 1.0.0a3
+  version: 1.0.0a4
 platform: ruby
 authors:
 - Denis Defreyne
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2017-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,6 @@ files:
 - lib/d-mark/parser.rb
 - lib/d-mark/translator.rb
 - lib/d-mark/version.rb
-- samples/test.rb
 - samples/trivial.dmark
 - samples/trivial.rb
 - spec/d-mark/element_node_spec.rb
@@ -82,9 +81,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: markup language for writing text
 test_files: []
-has_rdoc: 

data/samples/test.rb

@@ -1,65 +0,0 @@
-require 'd-mark'
-
-module DMarkBook
-  module Translators
-    class HTML < DMark::Translator
-      def handle_string(node)
-        [html_escape(node)]
-      end
-
-      def handle_element(node, path)
-        case node.name
-        when 'p', 'dl', 'dt', 'dd', 'ol', 'ul', 'li', 'code', 'kbd', 'blockquote'
-          wrap(node.name) { handle_children(node, path) }
-        when 'h'
-          depth = path.count { |node| node.name == 'section' } + 1
-          wrap("h#{depth}") { handle_children(node, path) }
-        when 'section'
-          wrap('section', id: id_for_section(node)) { handle_children(node, path) }
-        when 'em'
-          wrap('em') { handle_children(node, path) }
-        when 'link'
-          wrap('a', href: node.attributes['target']) { handle_children(node, path) }
-        when 'listing'
-          wrap('pre') { wrap('code') { handle_children(node, path) } }
-        else
-          raise DMark::Translator::UnhandledNode.new(node)
-        end
-      end
-
-      def wrap(name, params = {})
-        params_string = params.map { |k, v| " #{k}=\"#{html_escape(v)}\"" }.join('')
-        ["<#{name}#{params_string}>", yield, "</#{name}>"]
-      end
-
-      def html_escape(s)
-        s.gsub('&', '&amp;').gsub('<', '&lt;')
-      end
-
-      def id_for_section(node)
-        header = node.children.find { |c| c.name == 'h' }
-        text = header.children.join('')
-        text.downcase.gsub(/[^a-zA-Z-]/, '-')
-      end
-    end
-  end
-end
-
-class SpecialHTML < DMarkBook::Translators::HTML
-  def handle_element(node, depths)
-    case node.name
-    when 'firstterm', 'prompt', 'filename'
-      wrap('span', class: node.name) { handle_children(node, depths) }
-    when 'note', 'todo'
-      wrap('div', class: node.name) { handle_children(node, depths) }
-    else
-      super
-    end
-  end
-end
-
-content = File.readlines('site/content/index.dmark').drop(4).join
-parser = DMark::Parser.new(content)
-tree = parser.parse
-
-puts SpecialHTML.new.translate(tree)