remap 2.2.36 → 2.2.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62a912d9cf05fe7e0a31a96dbfb4e9a2fde2b9b041a4d904a86567700c9915f3
-  data.tar.gz: 821fc290ea247af377338c4aa36c29b10dd1297d15073ea6a16404948fe15ce9
+  metadata.gz: 5237c926e4f9d2101746dedf0c6287cf81e1e757000f45ff80a346852474ca1c
+  data.tar.gz: 18e5bde7388e9cf14a518153f0d47271bf6d09ad9b09a6dd4da98a2a61169668
 SHA512:
-  metadata.gz: 4935da680f0b328fae7c51abd9c7db2bf9d02805ffc28c1e611a4dede05306a1b6d094f434fda224888f6800e004b87b6f740d7807f56515594e27316cfd7dbe
-  data.tar.gz: 4ce8a85d17fbcdcad1f9bb6d8225732f52b8b0af58602e9fb357110da6b711390663ce79e4f332f29123c877d9e1ae174eb31ca4fbba2149b43a189533232921
+  metadata.gz: 1f9b976bca1187592db2ae0370e8ef33064ace68e15353d55c8e1bf16ea3d4c30afdac56e487ce663dc0d12241329a4484e9ea72ec0b8700c93654678e70b465
+  data.tar.gz: d8b580437f7c42ab3578fdf14b8f902d27c084438668f8dfdc67f9fbc74a73e16b0712bca50450f62212650955b9f5f53a59edda15243acb130a0e77e9ee2417

data/lib/remap/compiler.rb

@@ -176,12 +176,12 @@ module Remap
     #   output.fetch(:value) # => { car: "Volvo" }
     #
     # @return [Rule::Embed]
-    def embed(mapper)
+    def embed(mapper, backtrace: caller)
       if block_given?
         raise ArgumentError, "#embed does not take a block"
       end
 
-      embeding = rule.add do |state, &error|
+      embeding = rule(backtrace: backtrace).add do |state, &error|
         mapper.call!(state.set(mapper: mapper)) do |failure|
           next error[failure]
         end.except(:mapper, :scope)
@@ -225,12 +225,12 @@ module Remap
     # @raise [ArgumentError]
     #   if no path given
     #   if path is not a Symbol or Array<Symbol>
-    def set(*path, to:)
+    def set(*path, to:, backtrace: caller)
       if block_given?
         raise ArgumentError, "#set does not take a block"
       end
 
-      add rule(to: path).add { to.call(_1) }
+      add rule(to: path, backtrace: backtrace).add { to.call(_1) }
     end
 
     # Maps to path from map with block in between
@@ -280,8 +280,8 @@ module Remap
     # @see #to
     #
     # @return [Rule::Map::Optional]
-    def to?(*path, map: EMPTY_ARRAY, &block)
-      add rule?(*map, to: path, &block)
+    def to?(*path, map: EMPTY_ARRAY, backtrace: caller, &block)
+      add rule?(*map, to: path, backtrace: backtrace, &block)
     end
 
     # Iterates over the input value, passes each value
@@ -308,12 +308,12 @@ module Remap
     #
     # @return [Rule::Each]]
     # @raise [ArgumentError] if no block given
-    def each(&block)
+    def each(backtrace: caller, &block)
       unless block_given?
         raise ArgumentError, "#each requires a block"
       end
 
-      add rule(all, &block)
+      add rule(all, backtrace: backtrace, &block)
     end
 
     # Wraps output in type
@@ -341,12 +341,12 @@ module Remap
     #
     # @return [Rule::Wrap]
     # @raise [ArgumentError] if type is not :array
-    def wrap(type, &block)
+    def wrap(type, backtrace: caller, &block)
       unless block_given?
         raise ArgumentError, "#wrap requires a block"
       end
 
-      add rule(&block).then { Array.wrap(_1) }
+      add rule(backtrace: backtrace, &block).then { Array.wrap(_1) }
     end
 
     # Selects all elements
@@ -394,12 +394,12 @@ module Remap
     #   output.fetch(:value) # => { api_key: "<SECRET>" }
     #
     # @return [Rule::Static::Fixed]
-    def value(value)
+    def value(value, backtrace: caller)
       if block_given?
         raise ArgumentError, "option selector does not take a block"
       end
 
-      Static::Fixed.new(value: value)
+      Static::Fixed.new(value: value, backtrace: backtrace)
     end
 
     # Static option to be selected

data/lib/remap/notice/error.rb

@@ -25,8 +25,13 @@ module Remap
       end
 
       def traced(backtrace)
-        tap { _1.set_backtrace(backtrace) }
+        e = Traced.new(notice: notice)
+        e.set_backtrace(backtrace)
+        e
       end
     end
+
+    class Traced < Error
+    end
   end
 end

data/lib/remap/rule/block.rb

@@ -23,11 +23,15 @@ module Remap
           return state.except(:value)
         end
 
-        rules.map do |rule|
-          rule.call(state) do |failure|
+        rules.reduce(state.except(:value)) do |s1, rule|
+          result = rule.call(state) do |failure|
             return error[failure]
           end
-        end.reduce(&:combine)
+
+          s1.combine(result)
+        rescue Notice::Fatal => e
+          raise e.traced(rule.backtrace)
+        end
       end
     end
   end

data/lib/remap/rule/map/optional.rb

@@ -39,17 +39,6 @@ module Remap
         rescue Notice::Ignore => e
           e.undefined(state)
         end
-
-        private
-
-        # Catches :ignore exceptions and re-package them as a state
-        #
-        # @param state [State]
-        #
-        # @return [State]
-        def ignore(state, &block)
-          state.set(notice: catch(:ignore, &block).traced(backtrace)).except(:value)
-        end
       end
     end
   end

data/lib/remap/rule/map.rb

@@ -209,30 +209,6 @@ module Remap
           end
         end
       end
-
-      # Catches :fatal and raises {Notice::Error}
-      #
-      # @param state [State]
-      # @param id (:fatal) [:fatal, :notice, :ignore]
-      #
-      # raise [Notice::Error]
-      def fatal(state, id: :fatal, &block)
-        raise catch(id, &block).traced(backtrace).exception
-      end
-
-      # Catches :notice exceptions and repackages them as a state
-      #
-      # @param state [State]
-      #
-      # @return [State]
-      def notice(state, &block)
-        state.set(notice: catch(:notice, &block).traced(backtrace)).except(:value)
-      end
-
-      # @abstract
-      def ignore(...)
-        raise NotImplementedError, "#{self.class}#ignore"
-      end
     end
   end
 end

data/lib/remap/selector/index.rb

@@ -41,7 +41,7 @@ module Remap
           end
 
           element = array.fetch(index) do
-            s.ignore!("Index %s not found", index)
+            s.ignore!("Index not found")
           end
 
           state.set(element, index: index).then(&block)

data/lib/remap/state/extension.rb

@@ -132,7 +132,7 @@ module Remap
               list1 + list2
             in [:value, left, right]
               fatal!(
-                "Could not merge [%p] (%s) with [%p] (%s)",
+                "Could not merge [%s] (%s) with [%s] (%s)",
                 left.formatted,
                 left.class,
                 right.formatted,

data/lib/remap/static/option.rb

@@ -26,11 +26,11 @@ module Remap
       #
       # @return [State]
       def call(state)
-        state.set(state.options.fetch(name))
-      rescue KeyError => e
-        raise ArgumentError, e.exception("Option [%s] not found in input [%p]" % [
-          name, state.options
-        ])
+        value = state.options.fetch(name) do
+          raise ArgumentError, "Option [%s] not found" % [name], backtrace
+        end
+
+        state.set(value)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: remap
 version: !ruby/object:Gem::Version
-  version: 2.2.36
+  version: 2.2.40
 platform: ruby
 authors:
 - Linus Oleander