bade 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a90545fdee8d531bb87e12dd7943c0486daf3eac68f1d0c69ba216c7595f452
-  data.tar.gz: cdbf2cbc427cb9dd590768d493f99c91f22ac51a0a3caa172abb0b6c96b81b57
+  metadata.gz: 6f328f0e5c63c627084b539186d88cf638e1f74a04b0176e21b50fa9e44744cd
+  data.tar.gz: fea38cc7b66f3a5104b3f981d2194d60131cc111240767b67ac5bcd225add4e5
 SHA512:
-  metadata.gz: 88708cad2d3145bfe33fb2ca65acbd795b3f8b3074da64f53e8d053d09925a3f750627893c303c2000fe4e9e8328abf4b9fe60a8e1c925a4ccb8966f37887fff
-  data.tar.gz: 8b21e240977c4f4c0c0387c244dcfb215141e453e04fde9f47762cb59ec22f43ee8056a17c39f41037d52b2a3d2bde8f66ad2b7623d8f8819f9444eebb075741
+  metadata.gz: c79cbb86a9d154c1df45d0aabca8131e62051c2cac257f533e13e1866291fa78d655d4fd6a894d36e042ac4f690f2e74082c3868022c8e4607156be0abdcfab8
+  data.tar.gz: 4c411d64a549987eba7fc04b72f110025fd5ccccf6b05bcbed79ba8526f177faaf2c3661184f02b9b91f8bf5a1d04044758067050cdc348ddd027e95f6e625dd

data/Bade.gemspec

@@ -17,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

@@ -381,7 +381,7 @@ module Bade
                     when :code
                       value = node.value.strip
 
-                      %w[end else }].include?(value) || value.match(/^(when|elsif) /)
+                      %w[end else }].include?(value) || value.match(/^(when|elsif) /) || value.match(/^\./)
                     when :newline
                       true
                     else

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/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

@@ -31,7 +31,7 @@ module Bade
         @print_locations_warning = print_locations_warning
       end
 
-      def message
+      def to_s
         if @template_backtrace.empty?
           super
         else
@@ -85,7 +85,7 @@ module Bade
         # get only locations inside template
         new_locations = new_locations[0...index] || []
 
-        # filter out not interested locations 
+        # filter out not interested locations
         new_locations
           .reject { |loc| loc.path.start_with?(__dir__) }
           .reject { |loc| loc.template? && loc.label.include?('lambda_instance') }

data/lib/bade/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bade
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Roman Kříž
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-22 00:00:00.000000000 Z
+date: 2022-05-04 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.5
 signing_key: 
 specification_version: 4
 summary: Minimalistic template engine for Ruby.