bade 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9363fa63bbc18e9d9cb2af336438820127d766ef7e5b18306ddc37cdd608adfd
-  data.tar.gz: 6a6c86dea0211e852507fa26e7ec2d6d35b5b03469f5c6919455749134f102bd
+  metadata.gz: 7a51d23b5cdbf2a6555552edd39164fc3b39b99f381cf454872cce827d5cae77
+  data.tar.gz: b7a98aaee99316d20f22d45c36430d8ba1c785e9d316615343bbb539e86c8891
 SHA512:
-  metadata.gz: 37b06b4ef4aa918a88e96c5bfd164ef5d41b9bc0e22949d857b3af143e6dcb462d41f8c10e880f29f4a201e0ca115309e4734e46268f0b1c6fc9f0c7c50802d2
-  data.tar.gz: a828c7d9c09450235b719c37381add83dcd0980d256f97b755dd6b5ceb287a1f6baca4f43a04c00523cf45a1d692aac6d7b7abd79f8b5694fe713f3686ceefa0
+  metadata.gz: 83a93a132f7b957b6d5cd18b4a83c955fa4cd5c68a68d057fa1fec9643ca1c4b2a965c56f7692a0ee3760fafb4732817697d44ca76d35fefdf421204565fe8c0
+  data.tar.gz: d59fc4be093b3a2f40f0999e3718f2a0f7bed68956860163cc6920b1cb2afb46459ef155af63fdb8496b9b772055e1d8ffdb956dba173347ab531bb7ca002705

data/Bade.gemspec

@@ -1,3 +1,4 @@
+# coding: utf-8
 # frozen_string_literal: true
 
 lib = File.expand_path('lib', __dir__)
@@ -16,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.metadata    = { 'rubygems_mfa_required' => 'true' }
   spec.required_ruby_version = '>= 2.5'
 
-  spec.files         = Dir['bin/**/*'] + Dir['lib/**/*'] + %w[Bade.gemspec Gemfile README.md]
+  spec.files         = Dir['lib/**/*'] + %w[Bade.gemspec Gemfile README.md]
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

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/globals_tracker.rb

@@ -1,6 +1,20 @@
 # frozen_string_literal: true
 
-require_relative 'utils/where'
+unless Object.respond_to?(:const_source_location)
+  class Object
+    def Object.const_source_location(name)
+      require_relative 'utils/where'
+
+      konst = const_get(name)
+      is_meta = konst.is_a?(Module) || konst.is_a?(Class)
+      if is_meta
+        Bade.where_is(konst)
+      else
+        nil
+      end
+    end
+  end
+end
 
 module Bade
   module Runtime
@@ -9,7 +23,7 @@ module Bade
       # @return [Array<Symbol>]
       attr_accessor :caught_variables
 
-      # @return [Array<[Object, :Symbol]>]
+      # @return [Array<[Object, Symbol]>]
       attr_accessor :caught_constants
 
       # @return [Array<String>, nil]
@@ -66,20 +80,24 @@ module Bade
 
       # Filteres caught constants by location prefixes and returns ones that should be removed.
       #
-      # @return [Array<[Object, :Symbol]>]
+      # @return [Array<[Object, Symbol]>]
       def _filtered_constants
         @caught_constants.select do |(obj, name)|
           next unless obj.const_defined?(name)
-          next true if constants_location_prefixes.nil?
 
-          konst = obj.const_get(name)
           begin
-            location = Bade.where_is(konst)
+            location = obj.const_source_location(name)
           rescue ::ArgumentError
             next
           end
 
+          next true if location.nil?
+
           path = location.first
+          next false if $LOADED_FEATURES.include?(path)
+
+          next true if constants_location_prefixes.nil?
+
           constants_location_prefixes&.any? { |prefix| path.start_with?(prefix) }
         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/render_binding.rb

@@ -85,14 +85,10 @@ module Bade
 
       # @param [String] filename
       def __load(filename)
-        # FakeFS does not fake `load` method
-        if Object.const_defined?(:FakeFS) && Object.const_get(:FakeFS).activated?
-          # rubocop:disable Security/Eval
-          eval(File.read(filename), __get_binding, filename)
-          # rubocop:enable Security/Eval
-        else
-          load(filename)
-        end
+        # Universal way to load Ruby file (production or during tests)
+        # rubocop:disable Security/Eval
+        eval(File.read(filename), __get_binding, filename)
+        # rubocop:enable Security/Eval
       end
 
       # @param [String] filename

data/lib/bade/runtime/utils/where.rb

@@ -5,14 +5,22 @@
 module Bade
   module Where
     class << self
+      # @param [Proc] proc
+      # @return [[String, Integer], String]
       def is_proc(proc)
         source_location(proc)
       end
 
+      # @param [Class] klass
+      # @param [Symbol, String] method_name
+      # @return [[String, Integer], String]
       def is_method(klass, method_name)
         source_location(klass.method(method_name))
       end
 
+      # @param [Object] klass
+      # @param [Symbol, String] method_name
+      # @return [[String, Integer], String]
       def is_instance_method(klass, method_name)
         source_location(klass.instance_method(method_name))
       end
@@ -25,6 +33,8 @@ module Bade
         are_via_extractor(:method, klass, method_name)
       end
 
+      # @param [Class] klass
+      # @return [[String, Integer], String]
       def is_class(klass)
         defined_methods(klass)
           .group_by { |sl| sl[0] }
@@ -61,6 +71,8 @@ module Bade
 
       private
 
+      # @param [Method] method
+      # @return [[String, Integer], String]
       def source_location(method)
         method.source_location || (
           method.to_s =~ /: (.*)>/
@@ -77,6 +89,7 @@ module Bade
              .compact
       end
 
+      # @return [Array<Method>]
       def defined_methods(klass)
         methods = klass.methods(false).map { |m| klass.method(m) } +
                   klass.instance_methods(false).map { |m| klass.instance_method(m) }
@@ -87,6 +100,9 @@ module Bade
     end
   end
 
+  # @param [Object, Class] klass
+  # @param [String, Symbol] method
+  # @return [[String, Integer], String]
   def self.where_is(klass, method = nil)
     if method
       begin

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
+      def to_s
         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.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.4
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.9
+rubygems_version: 3.3.10
 signing_key:
 specification_version: 4
 summary: Minimalistic template engine for Ruby.