remap 2.2.47 → 2.2.51

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d745b7e030764a548c8cb8b2651e89cf22485154120bab89053743653d0ccd9a
-  data.tar.gz: '04408f1457593d3c2f3fb8fc5d52f275b74e9d3f0eb31a4088d073ee93ddeeb6'
+  metadata.gz: 9d9b65b616274770efbfd7e0cbc0a1267dad1f362c8b00031b389467099fd7dd
+  data.tar.gz: ce414f535c4a5d045b7cda3b3e265ddca8ac100ed2937a55d5e812a033e4beea
 SHA512:
-  metadata.gz: 2fb3e7f89ed0dea90a33a33dee5f5a5b358f22de24b24a64e531a7a84196da067e621060ab21045efb810c02cc8af0f53e7ca43d36ddad3124fb1a2212973a81
-  data.tar.gz: ad67a4ec14390748e9df5d77f8093c44143ae63df023a5ea84434ab79f7c5a894f1df0cdf7b3ce38b19fea44668b19ba269b3185d18d6deaa435a4620f1a733f
+  metadata.gz: be33c29fca4e449ce50e40d25ed31153ac076c6ab4fdbeb56ec911f5e6b66a2502b496899a655619bbd230e303320e5b279730e4e412f3b3ef7f720fd1a709b1
+  data.tar.gz: 69bdec20f5147b7a9def5404c3a00c73a8a15f247d201189d96ee9b5c345795b9fc41ea3b65ba2244154ab0ade712b8b0aeee7d10d3ddf87737e402b761c9c88

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/required.rb

@@ -16,7 +16,7 @@ module Remap
             end
 
             s3 = s2.then(&path.output)
-            s4 = s3.set(path: state.path)
+            s4 = s3.merge(path: state.path)
 
             s4.except(:key)
           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/selector/all.rb

@@ -15,28 +15,28 @@ module Remap
     #   end
     #   result.fetch(:value) # => [Hash, Hash]
     class All < Concrete
-      requirement Types::Enumerable
-
       # Iterates over state and passes each value to block
       #
-      # @param outer_state [State<Enumerable<T>>]
+      # @param state [State<Enumerable<T>>]
       #
       # @yieldparam [State<T>]
       # @yieldreturn [State<U>]
       #
       # @return [State<U>]
-      def call(outer_state, &block)
+      def call(state, &block)
         unless block
           raise ArgumentError, "All selector requires an iteration block"
         end
 
-        outer_state.bind(quantifier: "*") do |enum, state|
-          requirement[enum] do
-            state.fatal!("Expected enumerable")
-          end
+        value = state.fetch(:value) do
+          return state
+        end
 
-          state.map(&block)
+        unless value.is_a?(Enumerable)
+          state.fatal!("Not an enumerator")
         end
+
+        state.map(&block)
       end
     end
   end

data/lib/remap/selector/index.rb

@@ -20,8 +20,6 @@ module Remap
       # @return [Integer]
       attribute :index, Integer
 
-      requirement Types::Array
-
       # Selects the {#index}th element from state and passes it to block
       #
       # @param state [State<Array<T>>]
@@ -35,17 +33,17 @@ module Remap
           raise ArgumentError, "The index selector requires an iteration block"
         end
 
-        state.bind(index: index) do |array, s|
-          requirement[array] do
-            s.fatal!("Expected an array")
-          end
+        array = state.fetch(:value) { return state }
 
-          element = array.fetch(index) do
-            s.ignore!("Index not found")
-          end
+        unless array.is_a?(Array)
+          state.fatal!("Expected an array got %s", array.class)
+        end
 
-          state.set(element, index: index).then(&block)
+        value = array.fetch(index) do
+          state.ignore!("Index [%s] (%s) not found", index, index.class)
         end
+
+        state.set(value, index: index).then(&block)
       end
     end
   end

data/lib/remap/selector/key.rb

@@ -17,8 +17,6 @@ module Remap
       # @return [#hash
       attribute :key, Types::Key
 
-      requirement Types::Hash
-
       # Selects {#key} from state and passes it to block
       #
       # @param state [State<Hash<K, V>>]
@@ -32,17 +30,17 @@ module Remap
           raise ArgumentError, "The key selector requires an iteration block"
         end
 
-        state.bind(key: key) do |hash, s|
-          requirement[hash] do
-            s.fatal!("Expected hash")
-          end
+        hash = state.fetch(:value) { return state }
 
-          value = hash.fetch(key) do
-            s.ignore!("Key not found")
-          end
+        unless hash.is_a?(Hash)
+          state.fatal!("Expected hash got %s", hash.class)
+        end
 
-          state.set(value, key: key).then(&block)
+        value = hash.fetch(key) do
+          state.ignore!("Key [%s] (%s) not found", key, key.class)
         end
+
+        state.set(value, key: key).then(&block)
       end
     end
   end

data/lib/remap/selector.rb

@@ -4,9 +4,6 @@ module Remap
   # Defines how a path element, or selector
   # Specifies how a value is extracted from a state
   class Selector < Dry::Interface
-    defines :requirement, type: Types::Any.constrained(type: Dry::Types::Type)
-    requirement Types::Any
-
     # Selects value from state, package it as a state and passes it to block
     #
     # @param state [State]
@@ -20,12 +17,5 @@ module Remap
     def call(state)
       raise NotImplementedError, "#{self.class}#call not implemented"
     end
-
-    private
-
-    # @return [Dry::Types::Type]
-    def requirement
-      self.class.requirement
-    end
   end
 end

data/lib/remap/state/extension.rb

@@ -223,6 +223,8 @@ module Remap
             state.merge!(notices: notices + [notice])
           in [{value:}, {mapper:}]
             state.merge!(scope: value, mapper: mapper)
+          in [{path: p1}, {path: p2}]
+            state.merge!(path: p1 + p2)
           in [{path:}, {key:, value:}]
             state.merge!(path: path + [key], key: key, value: value)
           in [{path:}, {key:}]
@@ -289,25 +291,33 @@ module Remap
         #
         # @return [State<U>]
         def execute(&block)
-          bind do |value|
-            result = catch :done do
-              tail_path = catch :ignore do
-                throw :done, context(value).instance_exec(value, &block)
-              rescue KeyError => e
-                [e.key]
-              rescue IndexError
-                []
+          value = fetch(:value) { return self }
+
+          path = catch :ignore do
+            names = block.parameters.reduce([]) do |acc, (type, name)|
+              case type
+              in :keyreq
+                acc + [name]
+              else
+                acc
               end
-
-              set(path: path + tail_path).ignore!("Undefined path")
             end
 
-            if result.equal?(Dry::Core::Constants::Undefined)
-              ignore!("Undefined returned, skipping!")
+            n1 = options.only(*names)
+            n2 = only(*names)
+
+            result = block[value, **n2, **n1] do |reason|
+              return ignore!(reason)
             end
 
-            set(result)
+            return set(result)
           end
+
+          set(path: path).ignore!("Undefined path")
+        rescue KeyError => e
+          set(path: [e.key]).ignore!(e.message)
+        rescue IndexError => e
+          ignore!(e.message)
         end
 
         # Passes {#value} to block and returns {self}
@@ -428,27 +438,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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: remap
 version: !ruby/object:Gem::Version
-  version: 2.2.47
+  version: 2.2.51
 platform: ruby
 authors:
 - Linus Oleander
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-16 00:00:00.000000000 Z
+date: 2021-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -150,76 +150,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.5.1
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-collection_matchers
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.23.0
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: |
   Re:map; an expressive and feature-rich data transformation mapper for Ruby 3.
   It gives the developer the expressive power of JSONPath, without the hassle of