core-loader 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5a9a91c437fb1cf4033d6fc70b98d4f9ab1784360838ce84e83ad6b10ad62ee
-  data.tar.gz: 28995fde28e2505ca1072b26e5bbeb8333c55fd7f9a32cd176b78ac198166e79
+  metadata.gz: 9650cdc4cda182f6e2603097b50e055c24d46701d899293b67408fd86cd61f04
+  data.tar.gz: 121fab36735f4e8b8ddd5b1709b0a1b34f7a6fc314a356dbe49a448b44f331a9
 SHA512:
-  metadata.gz: b3f580e3494670b72240c3be121bc9cb82da7e9d51a729d8c5c788e20d8a8adc5cfa96fd15dc2b93604d0db3cb40b6b4dce8231c2775060ad4df8d4d8b1a7463
-  data.tar.gz: 8968a6d6a4622db48d41008f1df346fe9fb1cd2780ecfd56a883a0bed3a15474080a8c6ceb74cac000cd9e66d17e59ec69d1150a87cbbbb688ecb1bdfa3c7d26
+  metadata.gz: 2350e78fa80a8002d3a514a459520d2aeaad1fc16cd51bc34e2554cb4a01916df64c157553065448307f51196fe9386a42ecf81eb7681e5e0caefd5106fe336b
+  data.tar.gz: 1152ea9b2baf7d991dd1bdbb9380ee6b22d408b64268f15318de0d62336553bcda683114b2f255c9f895f8e86f90a5c96ba890fb257de7952b55e84db45fab11

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## [v0.1.1](https://github.com/metabahn/corerb/releases/tag/2022-01-08)
+
+*released on 2022-01-08*
+
+  * `fix` [#117](https://github.com/metabahn/corerb/pull/117) Explicitly define makeables in loader, resolving some context issues ([bryanp](https://github.com/bryanp))
+
 ## [v0.1.0](https://github.com/metabahn/corerb/releases/tag/2022-01-07)
 
 *released on 2022-01-07*

data/lib/core/loader/context.rb

@@ -8,7 +8,7 @@ module Core
   module Loader
     # [public]
     #
-    class Context < BasicObject
+    class Context
       class << self
         def load(path:, root:, type:, target:, strict:)
           new(path: path, root: root, type: type, target: target, strict: strict).load
@@ -16,75 +16,66 @@ module Core
       end
 
       def initialize(path:, root:, type:, target:, strict:)
-        @path = ::Kernel.Pathname(path)
-        @root = ::Kernel.Pathname(root)
+        @path = Pathname(path)
+        @root = Pathname(root)
         @type = type.to_sym
         @target = target
         @strict = strict
+        prepare_to_load!
       end
 
       # [public]
       #
       def load
-        ::Kernel.eval(@path.read, ::Kernel.binding, @path.to_s)
+        eval(@path.read, binding, @path.to_s)
       end
 
-      def self.const_missing(name)
-        ::Object.const_get(name)
-      end
+      private def prepare_to_load!
+        @target.makeables.each do |makeable|
+          define_singleton_method(makeable) do |*name, **kwargs, &block|
+            if @strict && makeable != @type
+              raise "expected to define an object of type `#{@type}` but was `#{makeable}` (#{@path})"
+            end
 
-      def method_missing(definable, *name, **kwargs, &block)
-        if @target.makes?(definable)
-          if @strict && definable != @type
-            ::Kernel.raise "expected to define an object of type `#{@type}` but was `#{definable}` (#{@path})"
-          end
+            definable_path = Pathname(@path.to_s.gsub(@root.to_s, ""))
+            expected_name = definable_path.dirname.join(
+              definable_path.basename(definable_path.extname)
+            ).to_s.split("/").reject(&:empty?).compact.map(&:to_sym)
 
-          definable_path = ::Kernel.Pathname(@path.to_s.gsub(@root.to_s, ""))
-          expected_name = definable_path.dirname.join(
-            definable_path.basename(definable_path.extname)
-          ).to_s.split("/").reject(&:empty?).compact.map(&:to_sym)
+            if name.empty?
+              name = expected_name
+            elsif @strict && name != expected_name
+              raise "expected to define an object named `#{expected_name.join(", ")}` but was `#{name.join(", ")}` (#{@path})"
+            end
 
-          if name.empty?
-            name = expected_name
-          elsif @strict && name != expected_name
-            ::Kernel.raise "expected to define an object named `#{expected_name.join(", ")}` but was `#{name.join(", ")}` (#{@path})"
-          end
+            path, line = caller(1..1).first.split(":", 3)
+            location = Core::Define::Location.new(path: path, line: line)
+            defined = @target.make(makeable, *name, __location__: location, **kwargs)
 
-          path, line = ::Kernel.caller(1..1).first.split(":", 3)
-          location = ::Core::Define::Location.new(path: path, line: line)
-          defined = @target.make(definable, *name, __location__: location, **kwargs)
+            if block
+              header = @path.read.each_line.take(block.source_location[1] - 1).join
+              source = extract_block_inner_source(block, @path)
 
-          # TODO: Validate that definition name matches the expectation, and that it's the expected type.
+              type = case defined
+              when ::Class
+                "class"
+              when ::Module
+                "module"
+              end
 
-          if block
-            header = @path.read.each_line.take(block.source_location[1] - 1).join
-            source = extract_block_inner_source(block, @path)
+              eval_source = <<~SOURCE
+                #{header}#{type} #{defined}#{source}
+                end
+              SOURCE
 
-            type = case defined
-            when ::Class
-              "class"
-            when ::Module
-              "module"
+              eval(eval_source, TOPLEVEL_BINDING, @path.to_s)
             end
 
-            eval_source = <<~SOURCE
-              #{header}#{type} #{defined}#{source}
-              end
-            SOURCE
-
-            ::Kernel.eval(eval_source, ::Kernel.const_get(:TOPLEVEL_BINDING), @path.to_s)
+            defined
           end
-
-          defined
-        else
-          ::Kernel.public_send(definable, *name, **kwargs, &block)
         end
       end
 
-      def respond_to_missing?(definable, include_private = false)
-        @target.makes?(definable) || ::Kernel.respond_to?(definable, include_private)
-      end
-
       private def extract_block_inner_source(block, path)
         source = extract_block_source(block, path).strip
 
@@ -95,7 +86,7 @@ module Core
         else
           # We should never get here, but raise an error just to be clear.
           #
-          ::Kernel.raise "could not parse inner source of `#{path}`"
+          raise "could not parse inner source of `#{path}`"
         end
       end
 
@@ -113,7 +104,7 @@ module Core
 
         # We should never get here, but raise an error just to be clear.
         #
-        ::Kernel.raise "could not find a complete expression in `#{path}`"
+        raise "could not find a complete expression in `#{path}`"
       end
 
       private def scan_to_complete_expression(source, matcher, ending_offset, path)
@@ -129,7 +120,7 @@ module Core
 
         # We should never get here, but raise an error just to be clear.
         #
-        ::Kernel.raise "could not find a complete expression for `#{matcher}` in `#{path}`"
+        raise "could not find a complete expression for `#{matcher}` in `#{path}`"
       end
 
       # Based on https://github.com/banister/method_source.
@@ -138,8 +129,8 @@ module Core
         original_verbose = $VERBOSE
         $VERBOSE = nil
 
-        ::Kernel.catch :valid do
-          ::Kernel.eval "BEGIN{throw :valid}\n#{string}" # standard:disable Style/EvalWithLocation
+        catch :valid do
+          eval "BEGIN{throw :valid}\n#{string}"
         end
 
         true

data/lib/core/loader/version.rb

@@ -2,7 +2,7 @@
 
 module Core
   module Loader
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
 
     # [public]
     #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: core-loader
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Bryan Powell
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2022-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: core-extension