bade 0.2.0 → 0.2.1

data/lib/bade/parser/parser_tag.rb

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+
+module Bade
+  require_relative '../parser'
+
+  class Parser
+    module TagRegexps
+      BLOCK_EXPANSION = /\A:\s+/
+      OUTPUT_CODE = LineIndicatorRegexps::OUTPUT_BLOCK
+      TEXT_START = /\A /
+
+      PARAMS_ARGS_DELIMITER = /\A\s*,/
+      PARAMS_END = /\A\s*\)/
+    end
+
+    # @param [String] tag  tag name
+    #
+    def parse_tag(tag)
+      tag = fixed_trailing_colon(tag)
+
+      if tag.is_a?(AST::Node)
+        tag_node = tag
+      else
+        tag_node = append_node(:tag, add: true)
+        tag_node.name = tag
+      end
+
+      parse_tag_attributes
+
+      case @line
+      when TagRegexps::BLOCK_EXPANSION
+        # Block expansion
+        @line = $'
+        parse_line_indicators(add_newline: false)
+
+      when TagRegexps::OUTPUT_CODE
+        # Handle output code
+        parse_line_indicators(add_newline: false)
+
+      when CLASS_TAG_RE
+        # Class name
+        @line = $'
+
+        attr_node = append_node(:tag_attr)
+        attr_node.name = 'class'
+        attr_node.value = fixed_trailing_colon($1).single_quote
+
+        parse_tag tag_node
+
+      when ID_TAG_RE
+        # Id name
+        @line = $'
+
+        attr_node = append_node(:tag_attr)
+        attr_node.name = 'id'
+        attr_node.value = fixed_trailing_colon($1).single_quote
+
+        parse_tag tag_node
+
+      when TagRegexps::TEXT_START
+        # Text content
+        @line = $'
+        parse_text
+
+      when ''
+        # nothing
+
+      else
+        syntax_error "Unknown symbol after tag definition #{@line}"
+      end
+    end
+
+    def parse_tag_attributes
+      # Check to see if there is a delimiter right after the tag name
+
+      # between tag name and attribute must not be space
+      # and skip when is nothing other
+      return unless @line.start_with?('(')
+
+      # remove starting bracket
+      @line.remove_first!
+
+      loop do
+        case @line
+        when CODE_ATTR_RE
+          # Value ruby code
+          @line = $'
+          attr_node = append_node(:tag_attr)
+          attr_node.name = $1
+          attr_node.value = parse_ruby_code(ParseRubyCodeRegexps::END_PARAMS_ARG)
+
+        when TagRegexps::PARAMS_ARGS_DELIMITER
+          # args delimiter
+          @line = $'
+          next
+
+        when TagRegexps::PARAMS_END
+          # Find ending delimiter
+          @line = $'
+          break
+
+        else
+          # Found something where an attribute should be
+          @line.lstrip!
+          syntax_error('Expected attribute') unless @line.empty?
+
+          # Attributes span multiple lines
+          append_node(:newline)
+          syntax_error('Expected closing tag attributes delimiter `)`') if @lines.empty?
+          next_line
+        end
+      end
+    end
+  end
+end

data/lib/bade/parser/parser_text.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+
+module Bade
+  require_relative '../parser'
+
+  class Parser
+    module TextRegexps
+      INTERPOLATION_START = /(\\)?(&|#)\{/
+      INTERPOLATION_END = /\A\}/
+    end
+
+    def parse_text
+      new_index = @line.index(TextRegexps::INTERPOLATION_START)
+
+      # the interpolation sequence is not in text, mark whole text as static
+      if new_index.nil?
+        append_node(:static_text, value: @line)
+        return
+      end
+
+      unparsed_part = String.new
+
+      while (new_index = @line.index(TextRegexps::INTERPOLATION_START))
+        if $1.nil?
+          static_part = unparsed_part + @line.remove_first!(new_index)
+          append_node(:static_text, value: static_part)
+
+          @line.remove_first!(2) # #{ or &{
+
+          dynamic_part = parse_ruby_code(TextRegexps::INTERPOLATION_END)
+          node = append_node(:output, value: dynamic_part)
+          node.escaped = $2 == '&'
+
+          @line.remove_first! # ending }
+
+          unparsed_part = String.new
+        else
+          unparsed_part << @line.remove_first!(new_index)
+          @line.remove_first! # symbol \
+          unparsed_part << @line.remove_first!(2) # #{ or &{
+        end
+      end
+
+      # add the rest of line
+      append_node(:static_text, value: unparsed_part + @line) unless @line.empty?
+    end
+
+    def parse_text_block(first_line, text_indent = nil)
+      if !first_line || first_line.empty?
+        text_indent = nil
+      else
+        @line = first_line
+        parse_text
+      end
+
+      until @lines.empty?
+        if @lines.first.blank?
+          next_line
+          append_node(:newline)
+        else
+          indent = get_indent(@lines.first)
+          break if indent <= @indents.last
+
+          next_line
+
+          @line.remove_indent!(text_indent ? text_indent : indent, @tabsize)
+
+          parse_text
+
+          # The indentation of first line of the text block
+          # determines the text base indentation.
+          text_indent ||= indent
+        end
+      end
+    end
+  end
+end

data/lib/bade/precompiled.rb

@@ -50,8 +50,8 @@ module Bade
              end
 
       content = {
-          source_file_path: source_file_path,
-          code_string: code_string,
+        source_file_path: source_file_path,
+        code_string: code_string,
       }.to_yaml
 
       file.write(content)

data/lib/bade/renderer.rb

@@ -22,14 +22,14 @@ module Bade
       # @param [String] reference_path  reference file from which is load performed
       # @param [String] msg  standard message
       #
-      def initialize(loading_path, reference_path, msg=nil)
+      def initialize(loading_path, reference_path, msg = nil)
         super(msg)
         @loading_path = loading_path
         @reference_path = reference_path
       end
     end
 
-    TEMPLATE_FILE_NAME = '(__template__)'
+    TEMPLATE_FILE_NAME = '(__template__)'.freeze
 
     # @return [String]
     #
@@ -167,7 +167,8 @@ module Bade
     # ----------------------------------------------------------------------------- #
     # Render
 
-    # @param [Binding] binding  custom binding for evaluating the template, but it is not recommended to use, use :locals and #with_locals instead
+    # @param [Binding] binding  custom binding for evaluating the template, but it is not recommended to use,
+    #                           use :locals and #with_locals instead
     # @param [String] new_line  newline string, default is \n
     # @param [String] indent  indent string, default is two spaces
     #
@@ -177,8 +178,8 @@ module Bade
       self.lambda_binding = binding unless binding.nil? # backward compatibility
 
       run_vars = {
-          Generator::NEW_LINE_NAME.to_sym => new_line,
-          Generator::BASE_INDENT_NAME.to_sym => indent,
+        Generator::NEW_LINE_NAME.to_sym => new_line,
+        Generator::BASE_INDENT_NAME.to_sym => indent,
       }
       run_vars.reject! { |_key, value| value.nil? } # remove nil values
 
@@ -219,7 +220,8 @@ module Bade
       document
     end
 
-    # Tries to find file with name, if no file could be found or there are multiple files matching the name error is raised
+    # Tries to find file with name, if no file could be found or there are multiple files matching the name error is
+    # raised
     #
     # @param [String] name  name of the file that should be found
     # @param [String] reference_path  path to file from which is loading/finding
@@ -229,25 +231,28 @@ module Bade
     def _find_file!(name, reference_path)
       sub_path = File.expand_path(name, File.dirname(reference_path))
 
-      if File.exists?(sub_path)
+      if File.exist?(sub_path)
         return if sub_path.end_with?('.rb') # handled in Generator
         sub_path
       else
         bade_path = "#{sub_path}.bade"
         rb_path = "#{sub_path}.rb"
 
-        bade_exist = File.exists?(bade_path)
-        rb_exist = File.exists?(rb_path)
-        relative = Pathname.new(reference_path).relative_path_from(Pathname.new(File.dirname(self.file_path))).to_s
+        bade_exist = File.exist?(bade_path)
+        rb_exist = File.exist?(rb_path)
+        relative = Pathname.new(reference_path).relative_path_from(Pathname.new(File.dirname(file_path))).to_s
 
         if bade_exist && rb_exist
-          raise LoadError.new(name, reference_path, "Found both .bade and .rb files for `#{name}` in file #{relative}, change the import path so it references uniq file.")
+          message = "Found both .bade and .rb files for `#{name}` in file #{relative}, "\
+                    'change the import path so it references uniq file.'
+          raise LoadError.new(name, reference_path, message)
         elsif bade_exist
           return bade_path
         elsif rb_exist
           return # handled in Generator
         else
-          raise LoadError.new(name, reference_path, "Can't find file matching name `#{name}` referenced from file #{relative}")
+          message = "Can't find file matching name `#{name}` referenced from file #{relative}"
+          raise LoadError.new(name, reference_path, message)
         end
       end
     end

data/lib/bade/ruby_extensions/array.rb

@@ -7,19 +7,17 @@ class Array
   #
   # @return [Fixnum]
   #
-  def rindex_last_matching(&block)
+  def rindex_last_matching
     return nil if empty?
 
     index = nil
 
     current_index = count - 1
     reverse_each do |item|
-      if block.call(item)
-        index = current_index
-        current_index -= 1
-      else
-        break
-      end
+      break unless yield item
+
+      index = current_index
+      current_index -= 1
     end
 
     index
@@ -29,15 +27,13 @@ class Array
   #
   # @return [Fixnum] count of items
   #
-  def rcount_matching(&block)
+  def rcount_matching
     count = 0
 
     reverse_each do |item|
-      if block.call(item)
-        count += 1
-      else
-        break
-      end
+      break unless yield item
+
+      count += 1
     end
 
     count

data/lib/bade/ruby_extensions/string.rb

@@ -1,8 +1,9 @@
 # frozen_string_literal: true
 
+# :nodoc:
 class String
-  SPACE_CHAR = ' '
-  TAB_CHAR = "\t"
+  SPACE_CHAR = ' '.freeze
+  TAB_CHAR = "\t".freeze
 
   # Creates new string surrounded by single quotes
   #
@@ -14,7 +15,7 @@ class String
 
 
   def blank?
-    strip.length == 0
+    strip.empty?
   end
 
 
@@ -37,16 +38,14 @@ class String
 
   def __chars_count_for_indent(indent, tabsize)
     count = 0
-    self.each_char do |char|
+    each_char do |char|
       break if indent <= 0
 
       case char
       when SPACE_CHAR
         indent -= 1
       when TAB_CHAR
-        if indent - tabsize < 0
-          raise StandardError, 'malformed tabs'
-        end
+        raise StandardError, 'malformed tabs' if indent - tabsize < 0
 
         indent -= tabsize
       else
@@ -88,7 +87,7 @@ class String
   def get_indent(tabsize)
     count = 0
 
-    self.each_char do |char|
+    each_char do |char|
       if char == SPACE_CHAR
         count += 1
       elsif char == TAB_CHAR
@@ -101,4 +100,12 @@ class String
     count
   end
 
+  # source: http://apidock.com/rails/String/strip_heredoc
+  # @return [String]
+  #
+  def strip_heredoc
+    min_val = scan(/^[ \t]*(?=\S)/).min
+    indent = (min_val && min_val.size) || 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
 end

data/lib/bade/runtime/block.rb

@@ -57,11 +57,9 @@ module Bade
       end
 
       def call!(*args)
-        if @block.nil?
-          raise MissingBlockDefinitionError.new(name, :call)
-        else
-          render_binding.__buff.concat(@block.call(*args))
-        end
+        raise MissingBlockDefinitionError.new(name, :call) if @block.nil?
+
+        render_binding.__buff.concat(@block.call(*args))
       end
 
       # --- Rendering methods
@@ -75,11 +73,9 @@ module Bade
       end
 
       def render!(*args)
-        if @block.nil?
-          raise MissingBlockDefinitionError.new(name, :render)
-        else
-          @block.call(*args).join
-        end
+        raise MissingBlockDefinitionError.new(name, :render) if @block.nil?
+
+        @block.call(*args).join
       end
     end
   end

data/lib/bade/runtime/mixin.rb

@@ -9,7 +9,8 @@ module Bade
         block.call(blocks, *args)
       rescue ArgumentError => e
         case e.message
-        when /\Awrong number of arguments \(given ([0-9]+), expected ([0-9]+)\)\Z/, /\Awrong number of arguments \(([0-9]+) for ([0-9]+)\)\Z/
+        when /\Awrong number of arguments \(given ([0-9]+), expected ([0-9]+)\)\Z/,
+             /\Awrong number of arguments \(([0-9]+) for ([0-9]+)\)\Z/
           # handle incorrect parameters count
 
           # minus one, because first argument is always hash of blocks

data/lib/bade/runtime/render_binding.rb

@@ -80,17 +80,17 @@ module Bade
       # @return [String]
       #
       def __html_escaped(text)
-        text.sub('&', '&')
-            .sub('<', '&lt;')
-            .sub('>', '&gt;')
-            .sub('"', '&quot;')
+        text.gsub('&', '&amp;')
+            .gsub('<', '&lt;')
+            .gsub('>', '&gt;')
+            .gsub('"', '&quot;')
       end
 
       def __tag_render_attribute(name, *values)
         values = values.compact
         return if values.empty?
 
-        %Q{ #{name}="#{values.join(' ')}"}
+        %( #{name}="#{values.join(' ')}")
       end
     end
   end