bade 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d88fecdae76de6653aa57c44576f3ce21bee35ac62eb242a8b57780e5a68af
-  data.tar.gz: 25d7ff84bb953fbd393c0fa2831f768a27e6d6487547c7551e750758170aefee
+  metadata.gz: a8686ad9e6c2c1ef1c752a2dc0e05e12b7e2ee30bfe7d4eb8ffc5256ed8a1594
+  data.tar.gz: 47516ba228a2111cdd8e966e468ba1bd5b02e905f9b0042bb96dd84299f737eb
 SHA512:
-  metadata.gz: 7d03cef22b6ed6fcb6beeb8fbb19c5e0b0ff164f063083e78c7d5e92da5c7777c98b94e32fab62fc12a0bf3326c607e3d127901b18ec3ae502546d39052a5076
-  data.tar.gz: aa449b5351d9adb774b9ed101e1063cbe76bacf4ea82f2718a78547cbc69945ab640bc9c5d6c7044c9bb741eb519075416710aabfab6f197826ca2c28fc01f1d
+  metadata.gz: 1852993735fd0917d23e1fb73922bef6df9263d69f93f3c68109bd29bc6d0c2d94c56e385ed8e8d779b7fb64dd69a0b2631b2d5f3bbbad3602cb41bafa96b2ec
+  data.tar.gz: deea59751038b074cc1f20791b4f8f19cc6b0ed8dad026ceec4c0341d9c34f0526b56f817ebd006943528ed9d8b8580ccf0b86f14ce980d850458f44a6a8dde8

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'benchmark-ips', require: false
+gem 'rake', '~> 13.0'
 
 group :dev, optional: true do
   gem 'debase', require: false

data/lib/bade/generator.rb

@@ -14,7 +14,7 @@ module Bade
 
     DEFAULT_BLOCK_NAME = 'default_block'.freeze
 
-    REQUIRE_RELATIVE_REGEX = /require_relative\s+(['"])(.+)['"]/
+    REQUIRE_RELATIVE_REGEX = /require_relative\s+(['"])(.+)['"]/.freeze
 
     # @param [Document] document
     #
@@ -361,7 +361,9 @@ module Bade
     #
     def visit_block_decl(current_node)
       params = formatted_mixin_params(current_node)
-      buff_code "#{MIXINS_NAME}['#{current_node.name}'] = __create_mixin('#{current_node.name}', #{location_node(current_node)}, &lambda { |#{params}|"
+
+      buff_code "#{MIXINS_NAME}['#{current_node.name}'] = __create_mixin(" \
+                "'#{current_node.name}', #{location_node(current_node)}, &lambda { |#{params}|"
 
       code_indent do
         blocks_name_declaration(current_node)
@@ -386,7 +388,7 @@ module Bade
                     when :code
                       value = node.value.strip
 
-                      %w[end else }].include?(value) || value.match(/^(when|elsif) /) || value.match(/^\./)
+                      value.match(/^(end|else|\}|class)\b/) || value.match(/^(when|elsif) /) || value.match(/^\./)
                     when :newline
                       true
                     else
@@ -438,7 +440,7 @@ module Bade
         quote = Regexp.last_match[1]
         relative_path = Regexp.last_match[2]
 
-        should_not_process = quote === '"' && relative_path.include?('#{')
+        should_not_process = quote == '"' && relative_path.include?('#{')
 
         new_relative_path = relative_path
         unless should_not_process

data/lib/bade/precompiled.rb

@@ -19,11 +19,7 @@ module Bade
     # @param [String, File] file  file instance or path to file
     #
     def self.from_yaml_file(file)
-      file = if file.is_a?(String)
-               File.new(file, 'r')
-             else
-               file
-             end
+      file = File.new(file, 'r') if file.is_a?(String)
 
       hash = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.0')
                Psych.safe_load(file, filename: file.path, permitted_classes: [Symbol])
@@ -48,11 +44,7 @@ module Bade
     # @param [String, File] file  file instance or path to file
     #
     def write_yaml_to_file(file)
-      file = if file.is_a?(String)
-               File.new(file, 'w')
-             else
-               file
-             end
+      file = File.new(file, 'w') if file.is_a?(String)
 
       content = {
         source_file_path: source_file_path,

data/lib/bade/renderer.rb

@@ -40,7 +40,8 @@ module Bade
       attr_accessor :clear_constants
     end
 
-    # @param clear_constants [Boolean] When set to true it will remove all constants that template created. Off by default.
+    # @param clear_constants [Boolean] When set to true it will remove all constants that template created.
+    #                                  Off by default.
     def initialize(clear_constants: Bade::Renderer.clear_constants)
       @optimize = false
       @clear_constants = clear_constants
@@ -231,7 +232,7 @@ module Bade
         end
       rescue Bade::Runtime::RuntimeError => e
         raise e
-      rescue Exception => e
+      rescue Exception => e # rubocop:disable Lint/RescueException
         msg = "Exception raised during execution of template: #{e}"
         raise Bade::Runtime::RuntimeError.wrap_existing_error(msg, e, render_binding.__location_stack)
       ensure
@@ -251,11 +252,7 @@ module Bade
         raise LoadError.new(nil, file_path, "Don't know what to do with nil values for both content and path")
       end
 
-      content = if !file_path.nil? && content.nil?
-                  File.read(file_path)
-                else
-                  content
-                end
+      content = File.read(file_path) if !file_path.nil? && content.nil?
 
       parsed_document = parsed_documents[file_path]
       return parsed_document unless parsed_document.nil?

data/lib/bade/runtime/globals_tracker.rb

@@ -2,16 +2,14 @@
 
 unless Object.respond_to?(:const_source_location)
   class Object
-    def Object.const_source_location(name)
+    def self.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
+      return unless is_meta
+
+      Bade.where_is(konst)
     end
   end
 end
@@ -74,7 +72,7 @@ module Bade
 
       def clear_global_variables
         @caught_variables.each do |name|
-          eval("#{name} = nil", binding, __FILE__, __LINE__)
+          eval("#{name} = nil", binding, __FILE__, __LINE__) # rubocop:disable Security/Eval
         end
       end
 

data/lib/bade/runtime/mixin.rb

@@ -48,11 +48,9 @@ module Bade
                 end
 
           raise Block::MissingBlockDefinitionError.new(e.name, e.context, msg, render_binding.__location_stack)
-
         rescue RuntimeError
           raise
-
-        rescue Exception => e
+        rescue Exception => e # rubocop:disable Lint/RescueException
           msg = "Exception raised during execution of mixin `#{name}`: #{e}"
           raise Bade::Runtime::RuntimeError.wrap_existing_error(msg, e, render_binding.__location_stack)
         end

data/lib/bade/runtime/render_binding.rb

@@ -44,7 +44,9 @@ module Bade
       def __reset
         @__buffs_stack = []
         @__location_stack = []
-        @__mixins = Hash.new { |_hash, key| raise Bade::Runtime::KeyError.new("Undefined mixin '#{key}'", __location_stack) }
+        @__mixins = Hash.new do |_hash, key|
+          raise Bade::Runtime::KeyError.new("Undefined mixin '#{key}'", __location_stack)
+        end
       end
 
       # @return [Binding]
@@ -123,7 +125,10 @@ module Bade
       end
 
       def __tag_render_attribute(name, *values)
-        values = values.compact
+        values = values
+                 .compact
+                 .map(&:to_s)
+                 .map { |value| __html_escaped(value) }
         return if values.empty?
 
         %( #{name}="#{values.join(' ')}")

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

@@ -7,55 +7,53 @@ module Bade
     class << self
       # @param [Proc] proc
       # @return [[String, Integer], String]
-      def is_proc(proc)
+      def proc?(proc)
         source_location(proc)
       end
 
       # @param [Class] klass
       # @param [Symbol, String] method_name
       # @return [[String, Integer], String]
-      def is_method(klass, method_name)
+      def 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)
+      def instance_method?(klass, method_name)
         source_location(klass.instance_method(method_name))
       end
 
-      def are_methods(klass, method_name)
-        are_via_extractor(:method, klass, method_name)
+      def methods?(klass, method_name)
+        via_extractor?(:method, klass, method_name)
       end
 
-      def are_instance_methods(klass, method_name)
-        are_via_extractor(:method, klass, method_name)
+      def instance_methods?(klass, method_name)
+        via_extractor?(:method, klass, method_name)
       end
 
       # @param [Class] klass
       # @return [[String, Integer], String]
-      def is_class(klass)
+      def class?(klass)
         defined_methods(klass)
           .group_by { |sl| sl[0] }
           .map do |file, sls|
             lines = sls.map { |sl| sl[1] }
-            count = lines.size
-            line = lines.min
 
             {
               file: file,
-              count: count,
-              line: line
+              count: lines.size,
+              line: lines.min,
             }
-          end
+          end # rubocop:disable Style/MultilineBlockChain
           .sort_by { |fc| fc[:count] }
           .map { |fc| [fc[:file], fc[:line]] }
       end
 
       # Raises ArgumentError if klass does not have any Ruby methods defined in it.
-      def is_class_primarily(klass)
-        source_locations = is_class(klass)
+      def class_primarily?(klass)
+        source_locations = class?(klass)
         if source_locations.empty?
           methods = defined_methods(klass)
           msg = if methods.empty?
@@ -80,7 +78,7 @@ module Bade
         )
       end
 
-      def are_via_extractor(extractor, klass, method_name)
+      def via_extractor?(extractor, klass, method_name)
         klass.ancestors
              .map do |ancestor|
                method = ancestor.send(extractor, method_name)
@@ -106,12 +104,12 @@ module Bade
   def self.where_is(klass, method = nil)
     if method
       begin
-        Where.is_instance_method(klass, method)
+        Where.instance_method?(klass, method)
       rescue NameError
-        Where.is_method(klass, method)
+        Where.method?(klass, method)
       end
     else
-      Where.is_class_primarily(klass)
+      Where.class_primarily?(klass)
     end
   end
 end

data/lib/bade/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - Roman Kříž
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2024-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: psych
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Minimalistic template engine for Ruby.