remap 2.2.49 → 2.2.50

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08b87634002b0cae7bb2cd048e0ec99cfcec6769fdd583f9aabed3f350bdec4
-  data.tar.gz: de61b4d83778f29f4580a41a4e6eda80f5817ade7fbda0dddd7a6192034270e9
+  metadata.gz: a036948beb3769bca586002c771569e54639a3a60314bac615a8f2dbb25a546b
+  data.tar.gz: 966315eb1929aa681d95d477e72a4545bdc435a4a4e3583d1cec875e8061d479
 SHA512:
-  metadata.gz: e52d7bca5b4304ce6dd05fc7d868c49af4a0db0ccd9616a851c0ed0daa66425807f50baa6fbba9fcd4b1a8f5fcb177895c0b9bcb87fc3d1f34fee051c07fc172
-  data.tar.gz: 100f753a963b91ae5b8eca6ef7c480b19704e848efab92de313ffbd7c9048daf9db30a1422b4a65e7029c905def26b0690dd12c7279f4dd23c0eb8b4784ae805
+  metadata.gz: f9afa516dd3d8248b714744598c847d04525f1d2d0e0f320128c6b785281b0a40e93d1b444cca6b4d1b6199bdb85dffa5fe4cda1c1d9ef97ec58f348a4994271
+  data.tar.gz: 72c2bfaaecc2553b3097f5b464cb03772314dab2127b5154d64b6e99e7e0c028ccba987c94acda788c7fa9229f48a626c895d558a6a974d8cbf95ae16b2d7ea5

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

metadata

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