modulation 0.21 → 0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d5bf725c036d3db2d9604cd161f6742c669c392ed09bdeb315a39fd343d4887
-  data.tar.gz: 655000532ad754fd550b913a38cc92adc790761d5b98b6b64a91ad9d1ec61664
+  metadata.gz: 2c3934a1afb8521b3ec5868ea4b7d1b80448b77c928ac00c6959a20a9d992c90
+  data.tar.gz: 1ff3b5b77a1add4bd03225557106127f154de4ec17d4f94cbe15dba29d9ef701
 SHA512:
-  metadata.gz: f50f8030beb0e9f009735763c183623f20869ff78f10ac592b2ce1d5de11f1168d8f64576801d117e7337f1cdc8d80845db70ede5f090480437f06a42d328e54
-  data.tar.gz: 437c524656fc62ee887ddf69e2a011b5984cd796bfeb0568afdd31296392930525a3752f200d2175deec41b6bbeceef308f0a8bd50609a8ef562f118e2296e1f
+  metadata.gz: ba5b255f4a4d704f9a24aa40eea62bd8d78ea10a822928dd3d7e134cc21b28ff370f1a58be8f0f19d8d22c9cd897db36757f669c9d12393f6bf6774bc2e5c6e9
+  data.tar.gz: a3063a6bd099b11e5cfe00ef120e868d72cc348e2426064add023c5c0e67dbdd7f12183f6568ba0714f2088e8b3c5415ea6cfb9daec7e461066add9cb637e13e

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+0.22 2019-05-15
+---------------
+
+* Export_default of a method now exportsa proc calling that method
+* Raise error on export of undefined symbols
+
 0.21 2019-02-19
 ---------------
 

data/lib/modulation/builder.rb

@@ -53,7 +53,7 @@ module Modulation
         mod.__module_info[:exported_symbols] = symbols
         singleton = mod.singleton_class
         
-        privatize_non_exported_methods(singleton, symbols)
+        privatize_non_exported_methods(mod, singleton, symbols)
         expose_exported_constants(mod, singleton, symbols)
       end
 
@@ -61,7 +61,13 @@ module Modulation
       # @param singleton [Class] sinleton for module
       # @param symbols [Array] array of exported symbols
       # @return [void]
-      def privatize_non_exported_methods(singleton, symbols)
+      def privatize_non_exported_methods(mod, singleton, symbols)
+        defined_methods = singleton.instance_methods(true)
+        difference = symbols.select { |s| s=~ /^[a-z]/} - defined_methods
+        unless difference.empty?
+          raise_exported_symbol_not_found_error(difference.first, mod, :method)
+        end
+
         singleton.instance_methods(false).each do |sym|
           next if symbols.include?(sym)
           singleton.send(:private, sym)
@@ -74,8 +80,14 @@ module Modulation
       # @param symbols [Array] array of exported symbols
       # @return [void]
       def expose_exported_constants(mod, singleton, symbols)
+        defined_constants = singleton.constants(false)
+        difference = symbols.select { |s| s=~ /^[A-Z]/} - defined_constants
+        unless difference.empty?
+          raise_exported_symbol_not_found_error(difference.first, mod, :const)
+        end
+
         private_constants = mod.__module_info[:private_constants] = []
-        singleton.constants(false).each do |sym|
+        defined_constants.each do |sym|
           if symbols.include?(sym)
             mod.const_set(sym, singleton.const_get(sym))
           else
@@ -84,6 +96,16 @@ module Modulation
         end
       end
 
+      NOT_FOUND_MSG = "%s %s not found in module"
+
+      def raise_exported_symbol_not_found_error(sym, mod, kind)
+        error = NameError.new(NOT_FOUND_MSG % [
+          kind == :method ? 'Method' : 'Constant',
+          sym
+        ])
+        Modulation.raise_error(error, mod.__export_backtrace)
+      end
+
       # Returns exported value for a default export
       # If the given value is a symbol, returns the value of the corresponding
       # constant.
@@ -91,8 +113,20 @@ module Modulation
       # @param mod [Module] module
       # @return [any] exported value
       def transform_export_default_value(value, mod)
-        value.is_a?(Symbol) ? mod.singleton_class.const_get(value) : value
-      rescue NameError
+        if value.is_a?(Symbol)
+          case value
+          when /^[A-Z]/
+            unless mod.singleton_class.constants(true).include?(Symbol)
+              raise_exported_symbol_not_found_error(value, mod, :const)
+            end                    
+          else
+            if mod.singleton_class.instance_methods(true).include?(value)
+              return proc { |*args, &block| mod.send(value, *args, &block) }
+            else
+              raise_exported_symbol_not_found_error(value, mod, :method)
+            end
+          end
+        end
         value
       end
 

data/lib/modulation/core.rb

@@ -123,11 +123,12 @@ module Modulation
     # @param error [Error] raised error
     # @param caller [Array] error backtrace
     # @return [void]
-    def raise_error(error, caller = error.backtrace)
-      if @full_backtrace
-        error.set_backtrace(caller)
-      else
-        error.set_backtrace(caller.reject { |l| l =~ /^#{Modulation::DIR}/ })
+    def raise_error(error, backtrace = nil)
+      if backtrace
+        unless @full_backtrace
+          backtrace = backtrace.reject { |l| l =~ /^#{Modulation::DIR}/ }
+        end
+        error.set_backtrace(backtrace)
       end
       raise error
     end

data/lib/modulation/module_mixin.rb

@@ -11,7 +11,8 @@ module Modulation
     # @return [void]
     def export(*symbols)
       symbols = symbols.first if symbols.first.is_a?(Array)
-      __exported_symbols.concat(symbols)
+      self.__exported_symbols.concat(symbols)
+      self.__export_backtrace = caller
     end
 
     # Sets a module's value, so when imported it will represent the given value,
@@ -19,6 +20,7 @@ module Modulation
     # @param value [Symbol, any] symbol or value
     # @return [void]
     def export_default(value)
+      self.__export_backtrace = caller
       @__export_default_block&.call(value: value, caller: caller)
     end
 
@@ -74,6 +76,14 @@ module Modulation
       @__exported_symbols ||= []
     end
 
+    def __export_backtrace
+      @__export_backtrace
+    end
+
+    def __export_backtrace=(o)
+      @__export_backtrace = o
+    end
+
     # Allow modules to use attr_accessor/reader/writer and include methods by
     # forwarding calls to singleton_class
     %i[attr_accessor attr_reader attr_writer include].each do |sym|

data/lib/modulation/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: modulation
 version: !ruby/object:Gem::Version
-  version: '0.21'
+  version: '0.22'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-20 00:00:00.000000000 Z
+date: 2019-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest