remap 2.2.47 → 2.2.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d745b7e030764a548c8cb8b2651e89cf22485154120bab89053743653d0ccd9a
-  data.tar.gz: '04408f1457593d3c2f3fb8fc5d52f275b74e9d3f0eb31a4088d073ee93ddeeb6'
+  metadata.gz: a564dcf130adbf8c40eb089d14f498f993362b74823728ec8ad44b98014034e6
+  data.tar.gz: 3dcac97cd1e4c630ec55ccdbdb6c43922f2ce5367d770e471ebaa77f5ae3fc8c
 SHA512:
-  metadata.gz: 2fb3e7f89ed0dea90a33a33dee5f5a5b358f22de24b24a64e531a7a84196da067e621060ab21045efb810c02cc8af0f53e7ca43d36ddad3124fb1a2212973a81
-  data.tar.gz: ad67a4ec14390748e9df5d77f8093c44143ae63df023a5ea84434ab79f7c5a894f1df0cdf7b3ce38b19fea44668b19ba269b3185d18d6deaa435a4620f1a733f
+  metadata.gz: 237c0305757a4a12e5d3c24358fd9ed6295d0159baf0bb5786a9b019e3b50c98bd163334b35b04bab99ef1f19adeb232aec234a2aed76ad16ade778c3950606e
+  data.tar.gz: 1c6637383207baf0bd32fd6398f34dc935a5237e2fa67eafa2fccaa1db0d1f9d3f569c6f0695f9c148e737b1c4de15a974a09ba193d0af55ffaf3bef21bad07d

data/lib/remap/base.rb

@@ -34,33 +34,33 @@ module Remap
   #   Mapper.call({}) # => { api_key: "ABC-123" }
   #
   # @example Maps ["A", "B", "C"] to ["A", "C"]
-  #   class Mapper < Remap::Base
+  #   class IfNotMapper < Remap::Base
   #     define do
   #       each do
-  #         map?.if_not do
+  #         map?.if_not do |value|
   #           value.include?("B")
   #         end
   #       end
   #     end
   #   end
   #
-  #   Mapper.call(["A", "B", "C"]) # => ["A", "C"]
+  #   IfNotMapper.call(["A", "B", "C"]) # => ["A", "C"]
   #
   # @example Maps ["A", "B", "C"] to ["B"]
-  #   class Mapper < Remap::Base
+  #   class IfMapper < Remap::Base
   #     define do
   #       each do
-  #         map?.if do
+  #         map?.if do |value|
   #           value.include?("B")
   #         end
   #       end
   #     end
   #   end
   #
-  #   Mapper.call(["A", "B", "C"]) # => ["B"]
+  #   IfMapper.call(["A", "B", "C"]) # => ["B"]
   #
   # @example Maps { a: { b: "A" } } to "A"
-  #   class Mapper < Remap::Base
+  #   class EnumMapper < Remap::Base
   #     define do
   #       map(:a, :b).enum do
   #         value "A", "B"
@@ -68,11 +68,11 @@ module Remap
   #     end
   #   end
   #
-  #   Mapper.call({ a: { b: "A" } }) # => "A"
-  #   Mapper.call({ a: { b: "B" } }) # => "B"
+  #   EnumMapper.call({ a: { b: "A" } }) # => "A"
+  #   EnumMapper.call({ a: { b: "B" } }) # => "B"
   #
   # @example Map { people: [{ name: "John" }] } to { names: ["John"] }
-  #   class Mapper < Remap::Base
+  #   class PeopleMapper < Remap::Base
   #     define do
   #       map :people, to: :names do
   #         each do
@@ -82,12 +82,12 @@ module Remap
   #     end
   #   end
   #
-  #   Mapper.call({ people: [{ name: "John" }] }) # => { names: ["John"] }
+  #   PeopleMapper.call({ people: [{ name: "John" }] }) # => { names: ["John"] }
   #
   # @example Map "Hello" to "Hello!"
   #   class HelloMapper < Remap::Base
   #     define do
-  #       map.adjust do
+  #       map.adjust do |value|
   #         "#{value}!"
   #       end
   #     end

data/lib/remap/rule/map.rb

@@ -117,7 +117,7 @@ module Remap
       # Keeps map, only if block is true
       #
       # @example Keep if value contains "A"
-      #   map = Remap::Rule::Map::Optional.call(backtrace: caller).if do
+      #   map = Remap::Rule::Map::Optional.call(backtrace: caller).if do |value|
       #     value.include?("A")
       #   end
       #
@@ -145,7 +145,7 @@ module Remap
       #
 
       # @example Keep unless value contains "A"
-      #   map = Remap::Rule::Map::Optional.new(backtrace: caller).if_not do
+      #   map = Remap::Rule::Map::Optional.new(backtrace: caller).if_not do |value|
       #     value.include?("A")
       #   end
       #

data/lib/remap/state/extension.rb

@@ -292,7 +292,21 @@ module Remap
           bind do |value|
             result = catch :done do
               tail_path = catch :ignore do
-                throw :done, context(value).instance_exec(value, &block)
+                names = block.parameters.reduce([]) do |acc, (type, name)|
+                  case type
+                  in :keyreq
+                    acc + [name]
+                  else
+                    acc
+                  end
+                end
+
+                r = Proc.new(&block).call(value, **only(*names), **options.only(*names)) do |reason|
+                  ignore!(reason)
+                end
+                throw :done, r
+              rescue NameError => e
+                fatal!(e.message)
               rescue KeyError => e
                 [e.key]
               rescue IndexError
@@ -428,27 +442,6 @@ module Remap
 
           throw id, remove_id
         end
-
-        private
-
-        # Creates a context containing {options} and {self}
-        #
-        # @param value [Any]
-        #
-        # @yieldparam reason [T]
-        #
-        # @return [Struct]
-        def context(value, context: self)
-          ::Struct.new(*except(:id).keys, *options.keys, :state, keyword_init: true) do
-            define_method :method_missing do |name, *|
-              context.fatal!("Method [%s] not defined", name)
-            end
-
-            define_method(:skip!) do |message = "Manual skip!"|
-              context.ignore!(message)
-            end
-          end.new(**to_hash, **options, value: value, state: self)
-        end
       end
     end
   end

metadata

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