remap 2.0.3 → 2.1.6

data/lib/remap/struct.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 module Remap
+  # Base class used throughout the library
   class Struct < Dry::Struct
     schema schema.strict(true)
   end

data/lib/remap/types.rb

@@ -5,43 +5,28 @@ require "dry/logic/operations/negation"
 require "dry/logic"
 
 module Remap
+  # Defines callable types used throughout the application
   module Types
     include Dry::Types()
-    include Dry::Logic::Operations
-
     using State::Extension
+    using Extensions::Hash
 
+    Backtrace  = Array(Interface(:to_s) | String)
     Enumerable = Any.constrained(type: Enumerable)
-    Mapper     = Interface(:call!) # Class.constrained(lt: Remap::Mapper) | Instance(Remap::Mapper).constructor { |v, &e| Instance(Remap::Mapper::Binary).call(v, &e) }
     Nothing    = Constant(Remap::Nothing)
-    Maybe      = Instance(Dry::Monads::Maybe).fallback(&Dry::Monads::Maybe)
-    # Remap      = Class.constrained(lt: Remap)
-    Proc       = Instance(Proc)
-    Key        = Interface(:hash) | Integer
-    Value = Any # .constrained(not_eql: nil)
-
-    State = Hash.constructor do |value, type, &error|
-      type[value, &error]._(&error)
-    end
-
-    Selectors = Array.of(Remap::Selector)
-
-    Dry::Types.define_builder(:not) do |type, owner = Object|
-      type.constrained_type.new(Instance(owner), rule: Negation.new(type.rule))
-    end
-
-    module Report
-      include Dry.Types()
-
-      Problem = Hash.schema(value?: Any, reason: String)
+    Mapper     = Interface(:call!)
+    Rule       = Interface(:call)
+    Key        = Interface(:hash)
 
-      Key = String | Symbol | Integer
+    # Validates a state according to State::Schema
+    State = Hash.constructor do |input, type, &error|
+      input = type.call(input, &error)
+      result = Remap::State::Schema.call(input)
+      error ||= -> { raise _1 }
 
-      Value = Any.constructor do |value, &error|
-        (Array(Problem) | Self).call(value, &error)
-      end
+      next input if result.success?
 
-      Self = Hash.map(Key, Value) | Hash.schema(base: Array(Problem))
+      error[result.errors.to_h.formated]
     end
   end
 end

data/lib/remap.rb

@@ -1,28 +1,24 @@
 # frozen_string_literal: true
 
-require "dry/struct"
-require "dry/validation"
-
 require "active_support/core_ext/module/delegation"
-require "dry/core/class_builder"
-require "dry/core/memoizable"
-require "dry/core/deprecations"
-require "dry/logic/builder"
-require "dry-configurable"
+require "active_support/core_ext/enumerable"
+require "active_support/core_ext/array/wrap"
+require "active_support/proxy_object"
+
+require "dry/validation"
+require "dry/interface"
 require "dry/schema"
-require "dry/types"
+require "dry/struct"
 require "dry/monads"
-require "dry/logic"
-require "zeitwerk"
-require "dry/interface"
-
-Dry::Types.load_extensions(:maybe)
+require "dry/types"
 
-loader = Zeitwerk::Loader.for_gem
-loader.collapse("#{__dir__}/remap/rule/support")
-loader.setup
+require "neatjson"
+require "zeitwerk"
 
 module Remap
+  loader = Zeitwerk::Loader.for_gem
+  loader.collapse("#{__dir__}/remap/rule/support")
+  loader.collapse("#{__dir__}/remap/mapper/support")
+  loader.setup
+  loader.eager_load
 end
-
-loader.eager_load

metadata

@@ -1,177 +1,177 @@
 --- !ruby/object:Gem::Specification
 name: remap
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.6
 platform: ruby
 authors:
 - Linus Oleander
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-26 00:00:00.000000000 Z
+date: 2021-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.1.4.1
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 3.0.4
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: dry-interface
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
-  name: dry-interface
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: dry-logic
+  name: dry-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: dry-struct
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
-  name: dry-schema
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: dry-validation
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
-  name: dry-struct
+  name: neatjson
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -179,13 +179,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec-collection_matchers
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -193,49 +193,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.17'
-- !ruby/object:Gem::Dependency
-  name: rake
+  name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.23.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 1.23.0
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-github
+  name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -248,7 +234,11 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
+description: |
+  Re:map; an expressive and feature-complete data mapper with an intuitive syntax designed as a domain-specific language using Ruby 3.0.
+  It gives the developer the expressive power of JSONPath, without the hassle of using strings.
+  Its compiler is written on top of an immutable, primitive data structure utilizing Rubys
+  refinements & pattern matching capabilities – making it blazingly fast
 email:
 - oleander@users.noreply.github.com
 executables: []
@@ -262,7 +252,11 @@ files:
 - lib/remap/constructor/argument.rb
 - lib/remap/constructor/keyword.rb
 - lib/remap/constructor/none.rb
+- lib/remap/contract.rb
 - lib/remap/error.rb
+- lib/remap/extensions/enumerable.rb
+- lib/remap/extensions/hash.rb
+- lib/remap/extensions/object.rb
 - lib/remap/failure.rb
 - lib/remap/iteration.rb
 - lib/remap/iteration/array.rb
@@ -272,20 +266,29 @@ files:
 - lib/remap/mapper/and.rb
 - lib/remap/mapper/binary.rb
 - lib/remap/mapper/or.rb
+- lib/remap/mapper/support/operations.rb
 - lib/remap/mapper/xor.rb
 - lib/remap/nothing.rb
+- lib/remap/notice.rb
+- lib/remap/notice/traced.rb
+- lib/remap/notice/untraced.rb
 - lib/remap/operation.rb
-- lib/remap/result.rb
+- lib/remap/path.rb
+- lib/remap/path/input.rb
+- lib/remap/path/output.rb
+- lib/remap/path_error.rb
+- lib/remap/proxy.rb
 - lib/remap/rule.rb
 - lib/remap/rule/each.rb
 - lib/remap/rule/embed.rb
 - lib/remap/rule/map.rb
+- lib/remap/rule/map/optional.rb
+- lib/remap/rule/map/required.rb
 - lib/remap/rule/set.rb
 - lib/remap/rule/support/collection.rb
 - lib/remap/rule/support/collection/empty.rb
 - lib/remap/rule/support/collection/filled.rb
 - lib/remap/rule/support/enum.rb
-- lib/remap/rule/support/path.rb
 - lib/remap/rule/void.rb
 - lib/remap/rule/wrap.rb
 - lib/remap/selector.rb
@@ -295,18 +298,16 @@ files:
 - lib/remap/state.rb
 - lib/remap/state/extension.rb
 - lib/remap/state/schema.rb
-- lib/remap/state/types.rb
 - lib/remap/static.rb
 - lib/remap/static/fixed.rb
 - lib/remap/static/option.rb
 - lib/remap/struct.rb
-- lib/remap/success.rb
 - lib/remap/types.rb
-- lib/remap/version.rb
 homepage: https://github.com/oleander/remap
 licenses:
 - MIT
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -325,5 +326,6 @@ requirements: []
 rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
-summary: Makes mapping easy
+summary: An expressive and feature-complete data mapper with intuitive syntax thanks
+  to its DSL
 test_files: []

data/lib/remap/result.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Remap
-  class Result < Dry::Struct
-    attribute :problems, Types::Hash
-
-    def has_problem?
-      !problems.blank?
-    end
-  end
-end

data/lib/remap/rule/support/path.rb

@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-module Remap
-  class Rule
-    class Path < Struct
-      using State::Extension
-
-      # @example [:a, :b, :c]
-      attribute :to, Types.Array(Types::Key)
-
-      # @example [:a, 0, :b, ALL]
-      attribute :map, Types.Array(Selector)
-
-      # Maps {state} from {map} to {block} to {to}
-      #
-      # @param state [State]
-      #
-      # @yieldparam [State]
-      # @yieldreturn [State<T>]
-      #
-      # @return [State<T>]
-      def call(state, &block)
-        unless block
-          raise ArgumentError, "block required"
-        end
-
-        selector(state).then(&block).fmap do |value|
-          to.reverse.reduce(value) do |val, key|
-            { key => val }
-          end
-        end._
-      end
-
-      private
-
-      def selector(state)
-        stack = map.reverse.reduce(IDENTITY) do |fn, selector|
-          ->(st) { selector.call(st, &fn) }
-        end
-
-        stack.call(state)
-      end
-    end
-  end
-end

data/lib/remap/state/types.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Remap
-  module State
-    module Types
-      include Dry.Types()
-
-      Key = String | Symbol | Integer
-    end
-  end
-end

data/lib/remap/success.rb

@@ -1,29 +0,0 @@
-# frozen_string_literal: true
-
-module Remap
-  class Success < Result
-    attribute :result, Types::Any
-
-    def inspect
-      format("Success<[%<result>s]>", result: JSON.pretty_generate(to_h))
-    end
-
-    def to_hash
-      { success: result, problems: problems }
-    end
-
-    def failure?
-      false
-    end
-
-    def success?(value = Undefined)
-      return true if value.equal?(Undefined)
-
-      result == value
-    end
-
-    def fmap(&block)
-      block[result]
-    end
-  end
-end

data/lib/remap/version.rb

@@ -1,5 +0,0 @@
-# frozen_string_literal: true
-
-module Remap
-  VERSION = "0.1.0"
-end