faml 0.2.16 → 0.3.0

data/spec/render/unescape_spec.rb

@@ -35,11 +35,4 @@ HAML
       expect(render_string('%span!~ "<p>hello\n<pre>pre\nworld</pre></p>"')).to eq("<span><p>hello\n<pre>pre&#x000A;world</pre></p></span>\n")
     end
   end
-
-  context 'without Ruby code' do
-    it 'raises error' do
-      expect { render_string('%span!=') }.to raise_error(Faml::SyntaxError)
-      expect { render_string('!=') }.to raise_error(Faml::SyntaxError)
-    end
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faml
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.3.0
 platform: ruby
 authors:
 - Kohei Suzuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-04 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml_parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
@@ -319,10 +333,8 @@ files:
 - incompatibilities/spec/render/silent_script_spec.md
 - incompatibilities/spec/render/unescape_spec.md
 - lib/faml.rb
-- lib/faml/ast.rb
 - lib/faml/cli.rb
 - lib/faml/compiler.rb
-- lib/faml/element_parser.rb
 - lib/faml/engine.rb
 - lib/faml/error.rb
 - lib/faml/filter_compilers.rb
@@ -339,21 +351,13 @@ files:
 - lib/faml/filter_compilers/sass.rb
 - lib/faml/filter_compilers/scss.rb
 - lib/faml/filter_compilers/tilt_base.rb
-- lib/faml/filter_parser.rb
 - lib/faml/helpers.rb
 - lib/faml/html.rb
-- lib/faml/indent_tracker.rb
-- lib/faml/line_parser.rb
 - lib/faml/newline.rb
-- lib/faml/parser.rb
-- lib/faml/parser_utils.rb
 - lib/faml/rails_handler.rb
 - lib/faml/rails_helpers.rb
 - lib/faml/railtie.rb
-- lib/faml/ruby_multiline.rb
-- lib/faml/script_parser.rb
 - lib/faml/static_hash_parser.rb
-- lib/faml/syntax_error.rb
 - lib/faml/text_compiler.rb
 - lib/faml/tilt.rb
 - lib/faml/version.rb
@@ -437,7 +441,6 @@ files:
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
 - spec/render/helpers_spec.rb
-- spec/render/indent_spec.rb
 - spec/render/multiline_spec.rb
 - spec/render/newline_spec.rb
 - spec/render/plain_spec.rb
@@ -469,7 +472,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Faster implementation of Haml template language.
@@ -574,7 +577,6 @@ test_files:
 - spec/render/filters_spec.rb
 - spec/render/haml_comment_spec.rb
 - spec/render/helpers_spec.rb
-- spec/render/indent_spec.rb
 - spec/render/multiline_spec.rb
 - spec/render/newline_spec.rb
 - spec/render/plain_spec.rb

data/lib/faml/ast.rb

@@ -1,116 +0,0 @@
-module Faml
-  module Ast
-    module HasChildren
-      def initialize(*)
-        super
-        self.children ||= []
-      end
-
-      def <<(ast)
-        self.children << ast
-      end
-    end
-
-    class Root < Struct.new(:children)
-      include HasChildren
-    end
-
-    class Doctype < Struct.new(:doctype, :filename, :lineno)
-    end
-
-    class Element < Struct.new(
-      :children,
-      :tag_name,
-      :static_class,
-      :static_id,
-      :attributes,
-      :oneline_child,
-      :self_closing,
-      :nuke_inner_whitespace,
-      :nuke_outer_whitespace,
-      :filename,
-      :lineno,
-    )
-      include HasChildren
-
-      def initialize(*)
-        super
-        self.static_class ||= ''
-        self.static_id ||= ''
-        self.attributes ||= ''
-        self.self_closing ||= false
-        self.nuke_inner_whitespace ||= false
-        self.nuke_outer_whitespace ||= false
-      end
-    end
-
-    class Script < Struct.new(
-      :children,
-      :script,
-      :escape_html,
-      :preserve,
-      :mid_block_keyword,
-      :filename,
-      :lineno,
-    )
-      include HasChildren
-
-      def initialize(*)
-        super
-        if self.escape_html.nil?
-          self.escape_html = true
-        end
-        if self.preserve.nil?
-          self.preserve = false
-        end
-        if self.mid_block_keyword.nil?
-          self.mid_block_keyword = false
-        end
-      end
-    end
-
-    class SilentScript < Struct.new(:children, :script, :mid_block_keyword, :filename, :lineno)
-      include HasChildren
-
-      def initialize(*)
-        super
-        if self.mid_block_keyword.nil?
-          self.mid_block_keyword = false
-        end
-      end
-    end
-
-    class HtmlComment < Struct.new(:children, :comment, :conditional, :filename, :lineno)
-      include HasChildren
-
-      def initialize(*)
-        super
-        self.comment ||= ''
-        self.conditional ||= ''
-      end
-    end
-
-    class HamlComment < Struct.new(:children, :filename, :lineno)
-      include HasChildren
-    end
-
-    class Text < Struct.new(:text, :escape_html, :filename, :lineno)
-      def initialize(*)
-        super
-        if self.escape_html.nil?
-          self.escape_html = true
-        end
-      end
-    end
-
-    class Filter < Struct.new(:name, :texts, :filename, :lineno)
-      def initialize(*)
-        super
-        self.texts ||= []
-      end
-    end
-
-    class Empty < Struct.new(:filename, :lineno)
-    end
-  end
-end

data/lib/faml/element_parser.rb

@@ -1,235 +0,0 @@
-require 'strscan'
-require 'faml/ast'
-require 'faml/parser_utils'
-require 'faml/ruby_multiline'
-require 'faml/script_parser'
-require 'faml/syntax_error'
-
-module Faml
-  class ElementParser
-    def initialize(line_parser)
-      @line_parser = line_parser
-    end
-
-    ELEMENT_REGEXP = /\A%([-:\w]+)([-:\w.#]*)(.+)?\z/o
-
-    def parse(text)
-      m = text.match(ELEMENT_REGEXP)
-      unless m
-        syntax_error!('Invalid element declaration')
-      end
-
-      element = Ast::Element.new
-      element.filename = @line_parser.filename
-      element.lineno = @line_parser.lineno
-      element.tag_name = m[1]
-      element.static_class, element.static_id = parse_class_and_id(m[2])
-      rest = m[3] || ''
-
-      element.attributes, rest = parse_attributes(rest)
-      element.nuke_inner_whitespace, element.nuke_outer_whitespace, rest = parse_nuke_whitespace(rest)
-      element.self_closing, rest = parse_self_closing(rest)
-      element.oneline_child = ScriptParser.new(@line_parser).parse(rest)
-
-      element
-    end
-
-    private
-
-    def parse_class_and_id(class_and_id)
-      classes = []
-      id = ''
-      scanner = StringScanner.new(class_and_id)
-      until scanner.eos?
-        unless scanner.scan(/([#.])([-:_a-zA-Z0-9]+)/)
-          syntax_error!('Illegal element: classes and ids must have values.')
-        end
-        case scanner[1]
-        when '.'
-          classes << scanner[2]
-        when '#'
-          id = scanner[2]
-        end
-      end
-
-      [classes.join(' '), id]
-    end
-
-    OLD_ATTRIBUTE_BEGIN = '{'
-    NEW_ATTRIBUTE_BEGIN = '('
-
-    def parse_attributes(rest)
-      old_attributes = ''
-      new_attributes = ''
-
-      loop do
-        case rest[0]
-        when OLD_ATTRIBUTE_BEGIN
-          unless old_attributes.empty?
-            break
-          end
-          old_attributes, rest = parse_old_attributes(rest)
-        when NEW_ATTRIBUTE_BEGIN
-          unless new_attributes.empty?
-            break
-          end
-          new_attributes, rest = parse_new_attributes(rest)
-        else
-          break
-        end
-      end
-
-      attributes = old_attributes
-      unless new_attributes.empty?
-        if attributes.empty?
-          attributes = new_attributes
-        else
-          attributes << ", " << new_attributes
-        end
-      end
-      [attributes, rest]
-    end
-
-    def parse_old_attributes(text)
-      text = text.dup
-      s = StringScanner.new(text)
-      s.pos = 1
-      depth = 1
-      loop do
-        depth = ParserUtils.balance(s, '{', '}', depth)
-        if depth == 0
-          attr = s.pre_match + s.matched
-          return [attr[1, attr.size-2], s.rest]
-        else
-          if /,\s*\z/ === text && @line_parser.has_next?
-            text << "\n" << @line_parser.next_line
-          else
-            syntax_error!('Unmatched brace')
-          end
-        end
-      end
-    end
-
-    def parse_new_attributes(text)
-      text = text.dup
-      s = StringScanner.new(text)
-      s.pos = 1
-      depth = 1
-      loop do
-        pre_pos = s.pos
-        depth = ParserUtils.balance(s, '(', ')', depth)
-        if depth == 0
-          t = s.string.byteslice(pre_pos ... s.pos-1)
-          return [parse_new_attribute_list(t), s.rest]
-        else
-          if @line_parser.has_next?
-            text << "\n" << @line_parser.next_line
-          else
-            syntax_error!('Unmatched paren')
-          end
-        end
-      end
-    end
-
-    def parse_new_attribute_list(text)
-      s = StringScanner.new(text)
-      attributes = []
-      until s.eos?
-        name = scan_key(s)
-        s.skip(/\s*/)
-
-        if scan_operator(s)
-          s.skip(/\s*/)
-          value = scan_value(s)
-        else
-          value = 'true'
-        end
-        spaces = s.scan(/\s*/)
-        line_count = spaces.count("\n")
-
-        attributes << "#{name.inspect} => #{value},#{"\n" * line_count}"
-      end
-      attributes.join
-    end
-
-    def scan_key(scanner)
-      scanner.scan(/[-:\w]+/).tap do |name|
-        unless name
-          syntax_error!('Invalid attribute list (missing attribute name)')
-        end
-      end
-    end
-
-    def scan_operator(scanner)
-      scanner.skip(/=/)
-    end
-
-    def scan_value(scanner)
-      if quote = scanner.scan(/["']/)
-        scan_quoted_value(scanner, quote)
-      else
-        scan_variable_value(scanner)
-      end
-    end
-
-    def scan_quoted_value(scanner, quote)
-      re = /((?:\\.|\#(?!\{)|[^#{quote}\\#])*)(#{quote}|#\{)/
-      pos = scanner.pos
-      loop do
-        unless scanner.scan(re)
-          syntax_error!('Invalid attribute list (mismatched quotation)')
-        end
-        if scanner[2] == quote
-          break
-        end
-        depth = ParserUtils.balance(scanner, '{', '}')
-        if depth != 0
-          syntax_error!('Invalid attribute list (mismatched interpolation)')
-        end
-      end
-      str = scanner.string.byteslice(pos-1 .. scanner.pos-1)
-
-      # Even if the quote is single, string interpolation is performed in Haml.
-      str[0] = '"'
-      str[-1] = '"'
-      str
-    end
-
-    def scan_variable_value(scanner)
-      scanner.scan(/(@@?|\$)?\w+/).tap do |var|
-        unless var
-          syntax_error!('Invalid attribute list (invalid variable name)')
-        end
-      end
-    end
-
-    def parse_nuke_whitespace(rest)
-      m = rest.match(/\A(><|<>|[><])(.*)\z/)
-      if m
-        nuke_whitespace = m[1]
-        [
-          nuke_whitespace.include?('<'),
-          nuke_whitespace.include?('>'),
-          m[2],
-        ]
-      else
-        [false, false, rest]
-      end
-    end
-
-    def parse_self_closing(rest)
-      if rest[0] == '/'
-        if rest.size > 1
-          syntax_error!("Self-closing tags can't have content")
-        end
-        [true, '']
-      else
-        [false, rest]
-      end
-    end
-
-    def syntax_error!(message)
-      raise SyntaxError.new(message, @line_parser.lineno)
-    end
-  end
-end