remap 2.1.14 → 2.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 88204af4f42ce85893ec029d953e2e6c417bbacba673522eedadca9561f8f749
-  data.tar.gz: 9e3e6040baf0426590b4c920d33f0979e74a084a19bbd87079d474a9e251663a
+  metadata.gz: e3439c23b054b2470688ec55cedb4dc0d7c0f77544c45f8f47c82b5d8d9b954a
+  data.tar.gz: 515558fee642db02bd30e5194846a4486f6b59c67830c46581b9b3d3c529532e
 SHA512:
-  metadata.gz: 612cf547b8207f305cf9b1f4788d3b36c0d487f0c42bdbf657336c04982060f6dd46a0cfc2a57c39588cef15287ede98205ab5beb46c9245b3270a99b586934d
-  data.tar.gz: a11492555b465f2d9f2db0611ed8d6457579dc6546805a9a867fc7b951061572f0faae84caec4be50907efa99e15647a8ae52aefd0de14362d29d6fea45cb166
+  metadata.gz: 599b8f2de0d62e5d4ab8ded2d303243fe11292f0cc621b7cdf66bb9e70ac712bb3fe4811cd926e9929a06f110445e283b2b8c3134a68cec5c810c53f572f720c
+  data.tar.gz: 6cf4704750445ac8dfdac08cfe2beec2bff5ac34db4c61557f9239b49857c3a1423978d6cc38342917753d48b4edeeff397d012c8b91d32a3ee49ec96ab62fa4

data/lib/remap/base.rb

@@ -143,7 +143,7 @@ module Remap
     #
     # @return [void]
     def self.contract(&context)
-      self.contract = Dry::Schema.JSON(&context)
+      self.contract = Dry::Schema.define(&context)
     end
 
     # Defines a rule for the mapper
@@ -236,14 +236,12 @@ module Remap
     #
     # @return [void]
     def self.define(target = Nothing, method: :new, strategy: :argument, &context)
-      unless context
-        raise ArgumentError, "Missing block"
+      unless block_given?
+        raise ArgumentError, "#{self}.define requires a block"
       end
 
-      self.context = Compiler.call(&context)
       self.constructor = Constructor.call(method: method, strategy: strategy, target: target)
-    rescue Dry::Struct::Error => e
-      raise ArgumentError, e.message
+      self.context = Compiler.call(&context)
     end
 
     # Similar to {::call}, but takes a state
@@ -269,7 +267,7 @@ module Remap
     #
     # @private
     def call(state, &error)
-      unless error
+      unless block_given?
         raise ArgumentError, "Base#call(state, &error) requires block"
       end
 

data/lib/remap/compiler.rb

@@ -30,7 +30,7 @@ module Remap
     #
     # @return [Rule]
     def self.call(&block)
-      unless block
+      unless block_given?
         return Rule::VOID
       end
 
@@ -38,10 +38,6 @@ module Remap
         compiler.instance_exec(&block)
       end.rules
 
-      if rules.empty?
-        return Rule::VOID
-      end
-
       Rule::Block.new(rules)
     end
 
@@ -66,7 +62,7 @@ module Remap
     #   output.fetch(:value) # => { nickname: "John" }
     #
     # @return [Rule::Map::Required]
-    def map(*path, to: EMPTY_ARRAY, backtrace: Kernel.caller, &block)
+    def map(*path, to: EMPTY_ARRAY, backtrace: caller, &block)
       add rule(*path, to: to, backtrace: backtrace, &block)
     end
 
@@ -93,7 +89,7 @@ module Remap
     # @see #map
     #
     # @return [Rule::Map::Optional]
-    def map?(*path, to: EMPTY_ARRAY, backtrace: Kernel.caller, &block)
+    def map?(*path, to: EMPTY_ARRAY, backtrace: caller, &block)
       add rule?(*path, to: to, backtrace: backtrace, &block)
     end
 
@@ -117,7 +113,7 @@ module Remap
     #   output.fetch(:value) # => { name: "John" }
     #
     # @return [Rule::Map::Required]
-    def get(*path, backtrace: Kernel.caller, &block)
+    def get(*path, backtrace: caller, &block)
       add rule(path, to: path, backtrace: backtrace, &block)
     end
 
@@ -142,7 +138,7 @@ module Remap
     # @see #get
     #
     # @return [Rule::Map::Optional]
-    def get?(*path, backtrace: Kernel.caller, &block)
+    def get?(*path, backtrace: caller, &block)
       add rule?(path, to: path, backtrace: backtrace, &block)
     end
 
@@ -180,12 +176,12 @@ module Remap
     #   output.fetch(:value) # => { car: "Volvo" }
     #
     # @return [Rule::Embed]
-    def embed(mapper, &block)
-      if block
+    def embed(mapper)
+      if block_given?
         raise ArgumentError, "#embed does not take a block"
       end
 
-      embeding = rule(&block).add do |state, &error|
+      embeding = rule.add do |state, &error|
         mapper.call!(state.set(mapper: mapper)) do |failure|
           next error[failure]
         end.except(:mapper, :scope)
@@ -229,8 +225,8 @@ module Remap
     # @raise [ArgumentError]
     #   if no path given
     #   if path is not a Symbol or Array<Symbol>
-    def set(*path, to:, &block)
-      if block
+    def set(*path, to:)
+      if block_given?
         raise ArgumentError, "#set does not take a block"
       end
 
@@ -258,7 +254,7 @@ module Remap
     #   output.fetch(:value) # => { nickname: "John" }
     #
     # @return [Rule::Map]
-    def to(*path, map: EMPTY_ARRAY, backtrace: Kernel.caller, &block)
+    def to(*path, map: EMPTY_ARRAY, backtrace: caller, &block)
       add rule(*map, to: path, backtrace: backtrace, &block)
     end
 
@@ -313,7 +309,7 @@ module Remap
     # @return [Rule::Each]]
     # @raise [ArgumentError] if no block given
     def each(&block)
-      unless block
+      unless block_given?
         raise ArgumentError, "#each requires a block"
       end
 
@@ -346,7 +342,7 @@ module Remap
     # @return [Rule::Wrap]
     # @raise [ArgumentError] if type is not :array
     def wrap(type, &block)
-      unless block
+      unless block_given?
         raise ArgumentError, "#wrap requires a block"
       end
 
@@ -372,8 +368,8 @@ module Remap
     #   output.fetch(:value) # => { names: ["John", "Jane"] }
     #
     # @return [Rule::Path::Segment::Quantifier::All]
-    def all(&block)
-      if block
+    def all
+      if block_given?
         raise ArgumentError, "all selector does not take a block"
       end
 
@@ -398,8 +394,8 @@ module Remap
     #   output.fetch(:value) # => { api_key: "<SECRET>" }
     #
     # @return [Rule::Static::Fixed]
-    def value(value, &block)
-      if block
+    def value(value)
+      if block_given?
         raise ArgumentError, "option selector does not take a block"
       end
 
@@ -424,8 +420,8 @@ module Remap
     # @param id [Symbol]
     #
     # @return [Rule::Static::Option]
-    def option(id, backtrace: Kernel.caller, &block)
-      if block
+    def option(id, backtrace: caller)
+      if block_given?
         raise ArgumentError, "option selector does not take a block"
       end
 
@@ -453,8 +449,8 @@ module Remap
     #
     # @return [Path::Segment::Key]
     # @raise [ArgumentError] if index is not an Integer
-    def at(index, &block)
-      if block
+    def at(index)
+      if block_given?
         raise ArgumentError, "first selector does not take a block"
       end
 
@@ -482,8 +478,8 @@ module Remap
     #   output.fetch(:value) # => { name: "John" }
     #
     # @return [Path::Segment::Key]]
-    def first(&block)
-      if block
+    def first
+      if block_given?
         raise ArgumentError, "first selector does not take a block"
       end
 
@@ -509,8 +505,8 @@ module Remap
     #   output.fetch(:value) # => { name: "Linus" }
     #
     # @return [Path::Segment::Key]
-    def last(&block)
-      if block
+    def last
+      if block_given?
         raise ArgumentError, "last selector does not take a block"
       end
 
@@ -523,7 +519,7 @@ module Remap
       rule.tap { rules << rule }
     end
 
-    def rule(*path, to: EMPTY_ARRAY, backtrace: Kernel.caller, &block)
+    def rule(*path, to: EMPTY_ARRAY, backtrace: caller, &block)
       Rule::Map::Required.call({
         path: {
           output: [to].flatten,
@@ -534,7 +530,7 @@ module Remap
       })
     end
 
-    def rule?(*path, to: EMPTY_ARRAY, backtrace: Kernel.caller, &block)
+    def rule?(*path, to: EMPTY_ARRAY, backtrace: caller, &block)
       Rule::Map::Optional.call({
         path: {
           output: [to].flatten,

data/lib/remap/extensions/enumerable.rb

@@ -28,21 +28,20 @@ module Remap
         # @return [Any]
         #
         # @raise When path cannot be found
-        def get(*path, &error)
-          _, result = path.reduce([
-            EMPTY_ARRAY,
-            self
-          ]) do |(current_path, element), key|
-            value = element.fetch(key) do
-              raise PathError, current_path + [key]
-            end
+        def get(*path, trace: [], &fallback)
+          return self if path.empty?
+
+          key = path.first
 
-            [current_path + [key], value]
-          rescue TypeError
-            raise PathError, current_path + [key]
+          unless block_given?
+            get(*path, trace: trace) do
+              raise PathError, trace + [key]
+            end
           end
 
-          result
+          fetch(key, &fallback).get(*path[1..], trace: trace + [key], &fallback)
+        rescue TypeError
+          raise PathError, trace + [key]
         end
       end
     end

data/lib/remap/extensions/object.rb

@@ -17,14 +17,29 @@ module Remap
           block["Expected a state, got [#{self}] (#{self.class})"]
         end
 
+        # @return [Array]
+        #
+        # @see Extension::Paths::Hash
+        def paths
+          []
+        end
+
         # Fallback method used when #get is called on an object that does not respond to #get
         #
         # Block is invoked, if provided
         # Otherwise a symbol is thrown
         #
         # @param path [Array<Key>]
-        def get(*path, &block)
-          raise PathError, []
+        def get(*path, trace: [], &fallback)
+          return self if path.empty?
+
+          unless block_given?
+            get(*path, trace: trace) do
+              raise PathError, trace
+            end
+          end
+
+          yield
         end
         alias_method :fetch, :get
 

data/lib/remap/failure.rb

@@ -14,22 +14,21 @@ module Remap
     # @return [Failure]
     def merge(other)
       unless other.is_a?(self.class)
-        raise ArgumentError, "can't merge #{self.class} with #{other.class}"
+        raise ArgumentError, "Cannot merge %s (%s) with %s (%s)" % [
+          self, self.class, other, other.class
+        ]
       end
 
-      failure = attributes.deep_merge(other.attributes) do |_, value1, value2|
-        case [value1, value2]
-        in [Array, Array]
+      failure = attributes.deep_merge(other.attributes) do |key, value1, value2|
+        case [key, value1, value2]
+        in [:failures | :notices, Array, Array]
           value1 + value2
-        else
-          raise ArgumentError, "can't merge #{self.class} with #{other.class}"
         end
       end
 
       new(failure)
     end
 
-    # @return [String]
     def exception
       Error.new(attributes.formated)
     end

data/lib/remap/proxy.rb

@@ -8,6 +8,7 @@ module Remap
 
     include Dry::Core::Constants
     extend Dry::Initializer
+    include Kernel
 
     # See Object#tap
     def tap(&block)

data/lib/remap/selector/index.rb

@@ -11,11 +11,10 @@ module Remap
     #   index = Remap::Selector::Index.new(1)
     #
     #   result = index.call(state) do |element|
-    #     element.fmap do |value|
-    #       value.upcase
-    #     end
+    #     value = element.fetch(:value)
+    #     element.merge(value: value.upcase)
     #   end
-
+    #
     #   result.fetch(:value) # => :TWO
     class Index < Unit
       # @return [Integer]

data/lib/remap/state/extension.rb

@@ -7,13 +7,6 @@ module Remap
       using Extensions::Object
       using Extensions::Hash
 
-      refine Object do
-        # @see Extension::Paths::Hash
-        def paths
-          EMPTY_ARRAY
-        end
-      end
-
       refine Hash do
         # Returns a list of all key paths
         #
@@ -23,7 +16,7 @@ module Remap
         #       b: :c
         #     },
         #     d: :e
-        #   }.hur_paths # => [[:a, :b], [:d]]
+        #   }.paths # => [[:a, :b], [:d]]
         #
         # @return [Array<Array<Symbol>>] a list of key paths
         def paths
@@ -47,7 +40,7 @@ module Remap
         #       b: :c
         #     },
         #     d: :e
-        #   }.hur_only(:a, :b) # => { a: { b: :c } }
+        #   }.only(:a, :b) # => { a: { b: :c } }
         #
         # @returns [Hash] a hash containing the given path
         # @raise Europace::Error when path doesn't exist
@@ -117,11 +110,7 @@ module Remap
         def map(&block)
           bind do |value, state|
             Iteration.call(state: state, value: value).call do |other, **options|
-              state.set(other, **options).then do |inner_state|
-                block[inner_state] do |failure|
-                  throw :failure, failure
-                end
-              end
+              state.set(other, **options).then(&block)
             end.except(:index, :element, :key)
           end
         end
@@ -275,10 +264,6 @@ module Remap
             end
 
             set(result)._
-          rescue NoMethodError => e
-            e.name == :fetch ? error["Fetch not defined on value: #{e}"] : raise
-          rescue NameError => e
-            e.name == :Undefined ? error["Undefined returned, skipping!: #{e}"] : raise
           rescue KeyError, IndexError => e
             error[e.message]
           rescue PathError => e

metadata

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