bade 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9363fa63bbc18e9d9cb2af336438820127d766ef7e5b18306ddc37cdd608adfd
-  data.tar.gz: 6a6c86dea0211e852507fa26e7ec2d6d35b5b03469f5c6919455749134f102bd
+  metadata.gz: 5a90545fdee8d531bb87e12dd7943c0486daf3eac68f1d0c69ba216c7595f452
+  data.tar.gz: cdbf2cbc427cb9dd590768d493f99c91f22ac51a0a3caa172abb0b6c96b81b57
 SHA512:
-  metadata.gz: 37b06b4ef4aa918a88e96c5bfd164ef5d41b9bc0e22949d857b3af143e6dcb462d41f8c10e880f29f4a201e0ca115309e4734e46268f0b1c6fc9f0c7c50802d2
-  data.tar.gz: a828c7d9c09450235b719c37381add83dcd0980d256f97b755dd6b5ceb287a1f6baca4f43a04c00523cf45a1d692aac6d7b7abd79f8b5694fe713f3686ceefa0
+  metadata.gz: 88708cad2d3145bfe33fb2ca65acbd795b3f8b3074da64f53e8d053d09925a3f750627893c303c2000fe4e9e8328abf4b9fe60a8e1c925a4ccb8966f37887fff
+  data.tar.gz: 8b21e240977c4f4c0c0387c244dcfb215141e453e04fde9f47762cb59ec22f43ee8056a17c39f41037d52b2a3d2bde8f66ad2b7623d8f8819f9444eebb075741

data/Bade.gemspec

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)

data/lib/bade/generator.rb

@@ -41,6 +41,7 @@ module Bade
       code_indent do
         buff_code "self.#{NEW_LINE_NAME} = #{NEW_LINE_NAME}"
         buff_code "self.#{BASE_INDENT_NAME} = #{BASE_INDENT_NAME}"
+        buff_code "__buffs_push(#{location(filename: document.file_path, lineno: 0, label: '<top>')})"
 
         visit_document(document)
 
@@ -86,7 +87,6 @@ module Bade
       end
 
       buff_code("# ----- start file #{document.file_path}") unless document.file_path.nil?
-      buff_code "__buffs_push(#{location(filename: document.file_path, lineno: 0, label: '<top>')})"
 
       new_root = if @optimize
                    Optimizer.new(document.root).optimize
@@ -381,12 +381,13 @@ module Bade
                     when :code
                       value = node.value.strip
 
-                      %w[end else }].include?(value) || value.match(/^when /)
+                      %w[end else }].include?(value) || value.match(/^(when|elsif) /)
                     when :newline
                       true
                     else
                       false
                     end
+
       return if should_skip
       return if node.lineno.nil?
 

data/lib/bade/parser.rb

@@ -29,7 +29,7 @@ module Bade
       def to_s
         line = @line.lstrip
         column = @column + line.size - @line.size
-        <<-MSG.strip_heredoc
+        <<~MSG
           #{error}
             #{file}, Line #{lineno}, Column #{@column}
             #{line}

data/lib/bade/ruby_extensions/string.rb

@@ -95,13 +95,4 @@ 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&.size || 0
-    gsub(/^[ \t]{#{indent}}/, '')
-  end
 end

data/lib/bade/runtime/mixin.rb

@@ -49,6 +49,9 @@ module Bade
 
           raise Block::MissingBlockDefinitionError.new(e.name, e.context, msg, render_binding.__location_stack)
 
+        rescue RuntimeError
+          raise
+
         rescue Exception => e
           msg = "Exception raised during execution of mixin `#{name}`: #{e}"
           raise Bade::Runtime::RuntimeError.wrap_existing_error(msg, e, render_binding.__location_stack)

data/lib/bade/runtime.rb

@@ -3,6 +3,10 @@
 module Bade
   module Runtime
     Location = Struct.new(:path, :lineno, :label, keyword_init: true) do
+      def template?
+        path == TEMPLATE_FILE_NAME || path&.include?('.bade')
+      end
+
       def to_s
         "#{path || TEMPLATE_FILE_NAME}:#{lineno}:in `#{label}'"
       end
@@ -13,23 +17,41 @@ module Bade
       #
       attr_reader :template_backtrace
 
+      # @return [Boolean]
+      #
+      attr_reader :print_locations_warning
+
       # @param [String] msg
       # @param [Array<Location>] template_backtrace
       # @param [Exception, nil] original
-      def initialize(msg, template_backtrace = [], original: nil)
+      def initialize(msg, template_backtrace = [], original: nil, print_locations_warning: false)
         super(msg)
         @template_backtrace = template_backtrace
         @original = original
+        @print_locations_warning = print_locations_warning
       end
 
       def message
         if @template_backtrace.empty?
           super
         else
+          warning = if print_locations_warning
+                      <<~TEXT
+
+                        !!! WARNING !!!, filenames and line numbers of functions can be misleading due to using Ruby
+                        functions in different Bade file. Trust only functions names. Mixins are fine.
+
+                        This will be fixed in https://github.com/epuber-io/bade/issues/32
+                      TEXT
+                    else
+                      ''
+                    end
+
           <<~MSG.rstrip
             #{super}
             template backtrace:
             #{__formatted_backtrace.join("\n")}
+            #{warning}
           MSG
         end
       end
@@ -53,14 +75,20 @@ module Bade
       def self.process_locations(locations)
         return [] if locations.nil?
 
-        index = locations&.find_index { |loc| loc.path == TEMPLATE_FILE_NAME || loc.path&.include?('.bade') }
+        # map to Bade's Location
+        new_locations = locations.map { |loc| Location.new(path: loc.path, lineno: loc.lineno, label: loc.label) }
+
+        # find location to use or drop
+        index = new_locations.rindex(&:template?)
         return [] if index.nil?
 
-        new_locations = locations[0...index] || []
+        # get only locations inside template
+        new_locations = new_locations[0...index] || []
 
-        new_locations.map do |loc|
-          Location.new(path: loc.path, lineno: loc.lineno, label: loc.label)
-        end
+        # filter out not interested locations 
+        new_locations
+          .reject { |loc| loc.path.start_with?(__dir__) }
+          .reject { |loc| loc.template? && loc.label.include?('lambda_instance') }
       end
 
       # @param [String] msg
@@ -68,8 +96,9 @@ module Bade
       # @param [Array<Location>] template_backtrace
       # @return [RuntimeError]
       def self.wrap_existing_error(msg, error, template_backtrace)
-        locs = Bade::Runtime::RuntimeError.process_locations(error.backtrace_locations) + template_backtrace
-        Bade::Runtime::RuntimeError.new(msg, locs, original: error)
+        ruby_locs = Bade::Runtime::RuntimeError.process_locations(error.backtrace_locations)
+        locs = ruby_locs + template_backtrace
+        Bade::Runtime::RuntimeError.new(msg, locs, original: error, print_locations_warning: !ruby_locs.empty?)
       end
     end
 

data/lib/bade/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bade
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Roman Kříž
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2022-03-22 00:00:00.000000000 Z
@@ -72,7 +72,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.14'
-description:
+description: 
 email:
 - samnung@gmail.com
 executables: []
@@ -119,7 +119,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -135,7 +135,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.9
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Minimalistic template engine for Ruby.
 test_files: []