evt-constant 2.1.1.0 → 2.2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e34b89c8c9aec6ef54da871a992f086616ceee7f411ee1b43bf070cc9b80de
-  data.tar.gz: 34e6bf8e3b33b7fd2260e75400a9eed3ac82ebe8e3d86ff7b94b82877c3ec7ad
+  metadata.gz: ff234cd73757812512933c025d3b6145ec09d50c86638db927ca5000feee1f6c
+  data.tar.gz: 89749a6d6d39f569b37e3a9ed092565c516a76c0e1fe34431b8efd551f4db096
 SHA512:
-  metadata.gz: 52f10483f068718f662c3471ab19b397dc33deaf477bd741b5359b7d8e71e8daff8df05a014c0cd5e6f04a427aa0fdc95b835f03dfafd2f06152fb7596041ac8
-  data.tar.gz: 86d07e6c53ec8cdbda773639f61e0a82ed9f7b20375fa966f1289a3f7e48c23147b2911c55ac703c2106becf7f4ed424ccfbeded5cb622b77b7d1c6974f50392
+  metadata.gz: f92b015b8fcbe17dd1ea04aa55f2855754882a1d951a95f3939728b76946a684de6236a35d45caed723247f2475aa9d4b0d131f6de464c225b17277d7937edef
+  data.tar.gz: 10ffaabb126ff50093b231337ff3e77b0295b028e1ca40a9bd6a4282c8768a386adf019b2644d0e2d0aa43cd268bb56531920574b1f27cf4f49a5dce6bcf8a99

data/lib/constant/controls/script.rb

@@ -3,8 +3,8 @@ require "open3"
 module Constant
   module Controls
     module Script
-      def self.top_level_import(origin_name: nil, inner_constants: nil)
-        origin_name ||= "SomeOrigin"
+      def self.top_level_import(source_name: nil, inner_constants: nil)
+        source_name ||= "SomeSource"
         inner_constants ||= ["SomeInnerConstant"]
 
         inner_constant_definitions = inner_constants.map do |inner_constant_name|
@@ -21,13 +21,45 @@ module Constant
         source = <<~RUBY
           require "constant"
 
-          module #{origin_name}
+          module #{source_name}
           #{definitions}
           end
 
           include Constant::Import
 
-          import #{origin_name}
+          import #{source_name}
+
+          #{resolutions}
+        RUBY
+
+        Example.new(source)
+      end
+
+      def self.top_level_refinement_import(source_name: nil, inner_constants: nil)
+        source_name ||= "SomeSource"
+        inner_constants ||= ["SomeInnerConstant"]
+
+        inner_constant_definitions = inner_constants.map do |inner_constant_name|
+          "#{inner_constant_name} = ::Module.new"
+        end
+
+        inner_constant_resolutions = inner_constants.map do |inner_constant_name|
+          "puts #{inner_constant_name}.name"
+        end
+
+        definitions = inner_constant_definitions.join("\n")
+        resolutions = inner_constant_resolutions.join("\n")
+
+        source = <<~RUBY
+          require "constant"
+
+          module #{source_name}
+          #{definitions}
+          end
+
+          using Constant::Import
+
+          import #{source_name}
 
           #{resolutions}
         RUBY
@@ -41,13 +73,7 @@ module Constant
         initializer :source
 
         def run
-          load_path_options = $LOAD_PATH.map do |load_path_entry|
-            "-I#{load_path_entry}"
-          end
-
-          command = ["ruby", *load_path_options, "-e", source]
-
-          output, error_output, status = Open3.capture3(*command)
+          output, error_output, status = execute
 
           if not status.success?
             raise "Script failed\n\n#{source}\n#{error_output}"
@@ -55,6 +81,26 @@ module Constant
 
           output.split("\n")
         end
+
+        def error
+          _, error_output, status = execute
+
+          if status.success?
+            raise "Script succeeded\n\n#{source}"
+          end
+
+          error_output
+        end
+
+        def execute
+          load_path_options = $LOAD_PATH.map do |load_path_entry|
+            "-I#{load_path_entry}"
+          end
+
+          command = ["ruby", *load_path_options, "-e", source]
+
+          Open3.capture3(*command)
+        end
       end
     end
   end

data/lib/constant/import/macro.rb

@@ -2,16 +2,12 @@ module Constant
   module Import
     module Macro
       def __import_constant(origin_constant, **kwargs)
-        destination = self
-
-        if not destination.is_a?(::Module)
-          destination = destination.class
-        end
-
-        Import.(origin_constant, destination, **kwargs)
+        Import.(origin_constant, self, **kwargs)
       end
 
       alias import __import_constant
     end
+
+    private_constant :Macro
   end
 end

data/lib/constant/import.rb

@@ -1,14 +1,28 @@
 module Constant
   module Import
     def self.included(base)
+      if base.equal?(::Object)
+        raise Constant::Error, "Constant::Import cannot be included at the top level, where the destination is Object. Activate the refinement instead: using Constant::Import"
+      end
+
       base.extend(Macro)
+    end
 
-      if base.equal?(::Object)
-        TOPLEVEL_BINDING.receiver.extend(Macro)
+    refine ::Object do
+      def __import_constant(origin_constant, **kwargs)
+        Import.(origin_constant, self, **kwargs)
       end
+
+      alias import __import_constant
     end
 
-    def self.call(origin_constant, destination_constant, **kwargs)
+    def self.call(origin_constant, destination_constant, only: nil, except: nil, override_ancestor: nil, **kwargs)
+      override_ancestor ||= false
+
+      if not destination_constant.is_a?(::Module)
+        destination_constant = destination_constant.class
+      end
+
       alias_name = kwargs[:alias]
 
       if alias_name.nil? && destination_constant.ancestors.include?(origin_constant)
@@ -25,6 +39,54 @@ module Constant
 
       import_constant_names = origin_constant.constants(inherit)
 
+      only_constant_names = Array(only)
+      only_constant_names = only_constant_names.map { |only_constant_name| only_constant_name.to_sym }
+
+      except_constant_names = Array(except)
+      except_constant_names = except_constant_names.map { |except_constant_name| except_constant_name.to_sym }
+
+      conflicting_constant_names = only_constant_names & except_constant_names
+
+      if conflicting_constant_names.any?
+        conflicting_constant_name = conflicting_constant_names.first
+        raise Constant::Error, "#{conflicting_constant_name} is named in both only: and except:"
+      end
+
+      if only_constant_names.any?
+        undefined_constant_names = only_constant_names - import_constant_names
+
+        if undefined_constant_names.any?
+          undefined_constant_name = undefined_constant_names.first
+          raise Constant::Error, "#{undefined_constant_name} is not defined on #{origin_constant}"
+        end
+
+        import_constant_names = import_constant_names & only_constant_names
+      end
+
+      import_constant_names = import_constant_names - except_constant_names
+
+      if override_ancestor
+        collision_constants = [target]
+      else
+        collision_constants = target.ancestors
+      end
+
+      import_constant_names.each do |import_constant_name|
+        defining_constant = collision_constants.find do |collision_constant|
+          collision_constant.const_defined?(import_constant_name, false)
+        end
+
+        if defining_constant.nil?
+          next
+        end
+
+        if defining_constant.equal?(target)
+          raise Constant::Error, "#{import_constant_name} is already defined on #{target} (imported from #{origin_constant})"
+        end
+
+        raise Constant::Error, "#{import_constant_name} is inherited by #{target} from #{defining_constant} (imported from #{origin_constant})"
+      end
+
       imported_constants = import_constant_names.map do |import_constant_name|
         import_constant = origin_constant.const_get(import_constant_name, inherit)
         target.const_set(import_constant_name, import_constant)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evt-constant
 version: !ruby/object:Gem::Version
-  version: 2.1.1.0
+  version: 2.2.1.0
 platform: ruby
 authors:
 - The Eventide Project