bade 0.2.3 → 0.3.0

data/lib/bade/runtime/render_binding.rb

@@ -5,12 +5,15 @@ require_relative 'block'
 module Bade
   module Runtime
     class RenderBinding
-      class KeyError < ::StandardError; end
+      Location = Bade::Runtime::Location
 
       # @return [Array<Array<String>>]
       #
       attr_accessor :__buffs_stack
 
+      # @return [Array<Location>]
+      attr_accessor :__location_stack
+
       # @return [Hash<String, Mixin>]
       #
       attr_accessor :__mixins
@@ -34,13 +37,14 @@ module Bade
         end
       end
 
-      # Resets this binding to default state, this method should be envoked after running the template lambda
+      # Resets this binding to default state, this method should be evoked after running the template lambda
       #
       # @return [nil]
       #
       def __reset
-        @__buffs_stack = [[]]
-        @__mixins = Hash.new { |_hash, key| raise "Undefined mixin '#{key}'" }
+        @__buffs_stack = []
+        @__location_stack = []
+        @__mixins = Hash.new { |_hash, key| raise Bade::Runtime::KeyError.new("Undefined mixin '#{key}'", __location_stack) }
       end
 
       # @return [Binding]
@@ -51,26 +55,56 @@ module Bade
 
       # Shortcut for creating blocks
       #
-      def __create_block(name, &block)
-        Bade::Runtime::Block.new(name, self, &block)
+      def __create_block(name, location = nil, &block)
+        Bade::Runtime::Block.new(name, location, self, &block)
       end
 
-      def __create_mixin(name, &block)
-        Bade::Runtime::Mixin.new(name, self, &block)
+      def __create_mixin(name, location, &block)
+        Bade::Runtime::Mixin.new(name, location, self, &block)
       end
 
-      # --- Methods for dealing with pushing and poping buffers in stack
+      # --- Methods for dealing with pushing and popping buffers in stack
 
       def __buff
-        __buffs_stack.last
+        __buffs_stack.first
       end
 
-      def __buffs_push
-        __buffs_stack.push([])
+      # @param [RenderBinding::Location, nil] location
+      def __buffs_push(location)
+        __buffs_stack.unshift([])
+        __location_stack.unshift(location) unless location.nil?
       end
 
+      # @return [Array<String>, nil]
       def __buffs_pop
-        __buffs_stack.pop
+        __location_stack.shift
+        __buffs_stack.shift
+      end
+
+      # --- Other internal methods
+
+      # @param [String] filename
+      def __load(filename)
+        # FakeFS does not fake `load` method
+        if defined?(:FakeFS) && FakeFS.activated?
+          # rubocop:disable Security/Eval
+          eval(File.read(filename), __get_binding, filename)
+          # rubocop:enable Security/Eval
+        else
+          load(filename)
+        end
+      end
+
+      # @param [String] filename
+      def require_relative(filename)
+        # FakeFS does not fake `require_relative` method
+        if defined?(:FakeFS) && FakeFS.activated?
+          # rubocop:disable Security/Eval
+          eval(File.read(filename), __get_binding, filename)
+          # rubocop:enable Security/Eval
+        else
+          Kernel.require_relative(filename)
+        end
       end
 
       # Escape input text with html escapes
@@ -94,6 +128,15 @@ module Bade
 
         %( #{name}="#{values.join(' ')}")
       end
+
+      def __update_lineno(number)
+        __location_stack.first&.lineno = number
+      end
+
+      # @return [Location, nil]
+      def __current_location
+        __location_stack.first
+      end
     end
   end
 end

data/lib/bade/runtime.rb

@@ -1,9 +1,87 @@
 # frozen_string_literal: true
 
-module Epuber
+module Bade
   module Runtime
+    Location = Struct.new(:path, :lineno, :label, keyword_init: true) do
+      def to_s
+        "#{path || TEMPLATE_FILE_NAME}:#{lineno}:in `#{label}'"
+      end
+    end
+
+    class RuntimeError < ::StandardError
+      # @return [Array<Location>]
+      #
+      attr_reader :template_backtrace
+
+      # @param [String] msg
+      # @param [Array<Location>] template_backtrace
+      # @param [Exception, nil] original
+      def initialize(msg, template_backtrace = [], original: nil)
+        super(msg)
+        @template_backtrace = template_backtrace
+        @original = original
+      end
+
+      def message
+        if @template_backtrace.empty?
+          super
+        else
+          <<~MSG.rstrip
+            #{super}
+            template backtrace:
+            #{__formatted_backtrace.join("\n")}
+          MSG
+        end
+      end
+
+      def cause
+        @original
+      end
+
+      # @return [Array<String>]
+      def __formatted_backtrace
+        bt = @template_backtrace
+
+        # delete first location if is same as second (can happen when arguments are incorrect)
+        last = bt.first
+        bt.delete_at(0) if last && bt.length > 1 && last == bt[1]
+
+        bt.map { |loc| "  #{loc}" }
+      end
+
+      # @param [Array<Thread::Backtrace::Location>, nil] locations
+      def self.process_locations(locations)
+        return [] if locations.nil?
+
+        index = locations&.find_index { |loc| loc.path == TEMPLATE_FILE_NAME || loc.path&.include?('.bade') }
+        return [] if index.nil?
+
+        new_locations = locations[0...index] || []
+
+        new_locations.map do |loc|
+          Location.new(path: loc.path, lineno: loc.lineno, label: loc.label)
+        end
+      end
+
+      # @param [String] msg
+      # @param [Exception] error
+      # @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)
+      end
+    end
+
+    class KeyError < RuntimeError; end
+
+    class ArgumentError < RuntimeError; end
+
+    TEMPLATE_FILE_NAME = '(__template__)'.freeze
+
     require_relative 'runtime/block'
     require_relative 'runtime/mixin'
     require_relative 'runtime/render_binding'
+    require_relative 'runtime/globals_tracker'
   end
 end

data/lib/bade/version.rb

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

data/lib/bade.rb

@@ -7,4 +7,5 @@ module Bade
   require_relative 'bade/generator'
   require_relative 'bade/renderer'
   require_relative 'bade/optimizer'
+  require_relative 'bade/precompiled'
 end

metadata

@@ -1,72 +1,78 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Roman Kříž
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-10-29 00:00:00.000000000 Z
+date: 2022-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
+        version: '2.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2.2'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: '1.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
-description: 
+        version: '1.14'
+description:
 email:
 - samnung@gmail.com
 executables: []
@@ -98,18 +104,21 @@ files:
 - lib/bade/parser/parser_text.rb
 - lib/bade/precompiled.rb
 - lib/bade/renderer.rb
+- lib/bade/ruby2_keywords.rb
 - lib/bade/ruby_extensions/array.rb
 - lib/bade/ruby_extensions/string.rb
 - lib/bade/runtime.rb
 - lib/bade/runtime/block.rb
+- lib/bade/runtime/globals_tracker.rb
 - lib/bade/runtime/mixin.rb
 - lib/bade/runtime/render_binding.rb
 - lib/bade/version.rb
 homepage: https://github.com/epuber-io/bade
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  rubygems_mfa_required: 'true'
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -117,16 +126,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.7
-signing_key: 
+rubygems_version: 3.3.8
+signing_key:
 specification_version: 4
 summary: Minimalistic template engine for Ruby.
 test_files: []