modulation 0.29 → 0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 933737f36bc12f47d347cb770b7f8d4464cd993b26da4d8d309be64c53dc551a
-  data.tar.gz: 5f385daa43a1ce9312243804be00fc2ddb1a1e728d37d7807d806eae08197ab7
+  metadata.gz: a2fdd479aff209b4cf494c13fc4f7bce1ebc64c058ac6860c2dec80928b46b3b
+  data.tar.gz: 3ffce99915f23b4d1444e50c2c216e4b695f00ffdc5c5d9ff6960beb03f8fb9e
 SHA512:
-  metadata.gz: 8c411047feeb3ca76646b62db47434ff135d8e6645cfaf3b11a5994a65630e2ac13be18a96999410078d05dc68c3a70b108206a7cc8e9afea695d50cbd62851e
-  data.tar.gz: 5aa45a4ba33c41b0f25c73c70e247952b9943783823f47920296d0583fbbc2a357ecb82beac948fe7656eae7829f9c9c1d7e635b3a8e61d327be759b59410e57
+  metadata.gz: 10e1497aa425b14ebabad8247f7898d45f67a255c0b88854c4eeacddaa5ffa36530425d51292f43f478e9043dc15e472a06930b9f9f9d4258e9d9651990eda6e
+  data.tar.gz: d84f11b4c5b206e30462a75307d6399492781cf5009426103e176c48aad65222c6f938468da1453755487559ae08848dc7fd641378d2167fc88f050da0d51977

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+0.31 2019-08-28
+---------------
+
+* Fix error handling when default_export symbol is not found
+
+0.30 2019-08-24
+---------------
+
+* Add symbol_keys option to import_map
+
 0.29 2019-08-23
 ---------------
 

data/lib/modulation/core.rb

@@ -7,6 +7,8 @@ module Modulation
   require_relative './module_mixin'
 
   class << self
+    CALLER_RANGE = (1..1).freeze
+
     # @return [Hash] hash of loaded modules, mapping absolute paths to modules
     attr_reader :loaded_modules
 
@@ -31,7 +33,7 @@ module Modulation
     # @param path [String] unqualified file name
     # @param caller_location [String] caller location
     # @return [Module] loaded module object
-    def import(path, caller_location = caller(1..1).first)
+    def import(path, caller_location = caller(CALLER_RANGE).first)
       abs_path = Paths.process(path, caller_location)
 
       case abs_path
@@ -48,7 +50,7 @@ module Modulation
     # @ param path [String] relative directory path
     # @param caller_location [String] caller location
     # @return [Array] array of module objects
-    def import_all(path, caller_location = caller(1..1).first)
+    def import_all(path, caller_location = caller(CALLER_RANGE).first)
       abs_path = Paths.absolute_dir_path(path, caller_location)
       Dir["#{abs_path}/**/*.rb"].map do |fn|
         @loaded_modules[fn] || create_module_from_file(fn)
@@ -58,19 +60,22 @@ module Modulation
     # Imports all source files in given directory, returning a hash mapping
     # filenames to modules
     # @ param path [String] relative directory path
+    # @ param options [Hash] options
     # @param caller_location [String] caller location
     # @return [Hash] hash mapping filenames to modules
-    def import_map(path, caller_location = caller(1..1).first)
+    def import_map(path, options = {},
+                   caller_location = caller(CALLER_RANGE).first)
       abs_path = Paths.absolute_dir_path(path, caller_location)
+      use_symbols = options[:symbol_keys]
       Dir["#{abs_path}/**/*.rb"].each_with_object({}) do |fn, h|
         mod = @loaded_modules[fn] || create_module_from_file(fn)
         name = File.basename(fn) =~ /^(.+)\.rb$/ && Regexp.last_match(1)
-        name = yield name, mod if block_given?
-        h[name] = mod
+        h[use_symbols ? name.to_sym : name] = mod
       end
     end
 
-    def auto_import_map(path, caller_location = caller(1..1).first)
+    def auto_import_map(path, options = {},
+                        caller_location = caller(CALLER_RANGE).first)
       abs_path = Paths.absolute_dir_path(path, caller_location)
       Hash.new do |h, k|
         fn = Paths.check_path(File.join(abs_path, k.to_s))
@@ -126,7 +131,7 @@ module Modulation
     # @param mod [Module] module
     # @param caller_location [String] caller location
     # @return [void]
-    def mock(path, mod, caller_location = caller(1..1).first)
+    def mock(path, mod, caller_location = caller(CALLER_RANGE).first)
       path = Paths.absolute_path(path, caller_location)
       old_module = @loaded_modules[path]
       @loaded_modules[path] = mod
@@ -136,7 +141,7 @@ module Modulation
     end
 
     def add_tags(tags)
-      Paths.add_tags(tags, caller(1..1).first)
+      Paths.add_tags(tags, caller(CALLER_RANGE).first)
     end
   end
 end

data/lib/modulation/default_export.rb

@@ -24,7 +24,7 @@ module Modulation
 
       def get_module_constant(mod, value)
         unless mod.singleton_class.constants(true).include?(value)
-          raise_exported_symbol_not_found_error(value, mod, :const)
+          Exports.raise_exported_symbol_not_found_error(value, mod, :const)
         end
 
         mod.singleton_class.const_get(value)
@@ -32,22 +32,12 @@ module Modulation
 
       def get_module_method(mod, value)
         unless mod.singleton_class.instance_methods(true).include?(value)
-          raise_exported_symbol_not_found_error(value, mod, :method)
+          Exports.raise_exported_symbol_not_found_error(value, mod, :method)
         end
 
         proc { |*args, &block| mod.send(value, *args, &block) }
       end
 
-      NOT_FOUND_MSG = '%s %s not found in module'
-
-      def raise_exported_symbol_not_found_error(sym, mod, kind)
-        msg = format(
-          NOT_FOUND_MSG, kind == :method ? 'Method' : 'Constant', sym
-        )
-        error = NameError.new(msg)
-        Modulation.raise_error(error, mod.__export_backtrace)
-      end
-
       # Error message to be displayed when trying to set a singleton value as
       # default export
       DEFAULT_VALUE_ERROR_MSG =

data/lib/modulation/exports.rb

@@ -58,6 +58,16 @@ module Modulation
           end
         end
       end
+
+      NOT_FOUND_MSG = '%s %s not found in module'
+
+      def raise_exported_symbol_not_found_error(sym, mod, kind)
+        msg = format(
+          NOT_FOUND_MSG, kind == :method ? 'Method' : 'Constant', sym
+        )
+        error = NameError.new(msg)
+        Modulation.raise_error(error, mod.__export_backtrace)
+      end
     end
   end
 end

data/lib/modulation/ext.rb

@@ -2,11 +2,13 @@
 
 # Kernel extensions
 module Kernel
+  CALLER_RANGE = (1..1).freeze
+
   # Imports a module
   # @param path [String] module file name
   # @param caller_location [String] caller location
   # @return [Module] module object
-  def import(path, caller_location = caller(1..1).first)
+  def import(path, caller_location = caller(CALLER_RANGE).first)
     Modulation.import(path, caller_location)
   end
 
@@ -14,7 +16,7 @@ module Kernel
   # @param path [String] directory path
   # @param caller_location [String] caller location
   # @return [Array] array of module objects
-  def import_all(path, caller_location = caller(1..1).first)
+  def import_all(path, caller_location = caller(CALLER_RANGE).first)
     Modulation.import_all(path, caller_location)
   end
 
@@ -23,12 +25,14 @@ module Kernel
   # @param path [String] directory path
   # @param caller_location [String] caller location
   # @return [Hash] hash mapping filenames to module objects
-  def import_map(path, caller_location = caller(1..1).first, &block)
-    Modulation.import_map(path, caller_location, &block)
+  def import_map(path, options = {},
+                 caller_location = caller(CALLER_RANGE).first)
+    Modulation.import_map(path, options, caller_location)
   end
 
-  def auto_import_map(path, caller_location = caller(1..1).first, &block)
-    Modulation.auto_import_map(path, caller_location, &block)
+  def auto_import_map(path, options = {},
+                      caller_location = caller(CALLER_RANGE).first)
+    Modulation.auto_import_map(path, options, caller_location)
   end
 end
 
@@ -38,7 +42,7 @@ class Module
   # @param sym [Symbol, Hash] constant name or hash mapping names to paths
   # @param path [String] path if sym is Symbol
   # @return [void]
-  def auto_import(sym, path = nil, caller_location = caller(1..1).first)
+  def auto_import(sym, path = nil, caller_location = caller(CALLER_RANGE).first)
     setup_auto_import_registry unless @__auto_import_registry
     if path
       @__auto_import_registry[sym] = [path, caller_location]
@@ -59,7 +63,7 @@ class Module
   # @param path [String] module filename
   # @return [void]
   def extend_from(path)
-    mod = import(path, caller(1..1).first)
+    mod = import(path, caller(CALLER_RANGE).first)
     Modulation::Builder.add_module_methods(mod, self.class)
     Modulation::Builder.add_module_constants(mod, self)
   end
@@ -70,7 +74,7 @@ class Module
   # @param symbols [Array<Symbol>] list of symbols to include
   # @return [void]
   def include_from(path, *symbols)
-    mod = import(path, caller(1..1).first)
+    mod = import(path, caller(CALLER_RANGE).first)
     Modulation::Builder.add_module_methods(mod, self, *symbols)
     Modulation::Builder.add_module_constants(mod, self, *symbols)
   end

data/lib/modulation/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Modulation
-  VERSION = '0.29'
+  VERSION = '0.31'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulation
 version: !ruby/object:Gem::Version
-  version: '0.29'
+  version: '0.31'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-23 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest