remap 2.2.35 → 2.2.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38765a313ed6b492d7f898519fe1303dcad63ec19e266b2192e94a9f96813a87
-  data.tar.gz: 8a1fee97a5ea6a1f9d8e8d296e71e5b5dd1881580683870e9824f40158eb0e97
+  metadata.gz: 63e86ddbef0fd288ba558768cd947639c566f4db3789b19163c0ead17782635f
+  data.tar.gz: 2e3359e5d2ca7f78e1c2540c9289d489d132be91456493eaf2e4c6f8542b9b4a
 SHA512:
-  metadata.gz: 3542fc58722ff987b0307c83e339659af0bfcd358dabfbbec338c582f66cb78d10c0e325ca4ba319bb925001c14cc8f6174e189a7435abece4aff0e9276b716c
-  data.tar.gz: 1b82a610fd18d8583ff6f26098e733cbea67a92381af7bcd20cc0a15e41fc025e3a8642678fdd40a3e8224ecbd2abd5d0b6c29f19163302224bf670e452d000b
+  metadata.gz: 8f2f4134ae97e0e00e9e346e271a2d07e4ded2e4e4e1c8b2a80efdbfd0a41d39c615bee75e61c582d9fa5cda514f74fb164a197f136ea7b1bf170b618b2b383d
+  data.tar.gz: e88fe7b9c0c8aef4a03f630315b9813ec1bbe5cda5851cadda400b9ea110903cb62732ccf6b89e3b0d35aebe982280c34d49558259e1b40de2d385d599e0565c

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/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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remap
 version: !ruby/object:Gem::Version
-  version: 2.2.35
+  version: 2.2.39
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport