realm-core 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8388b271b94435bba6f9cdc441ce02ce96d7bdd9814fc46c682e01e9809fd22
-  data.tar.gz: 140b5a6019cf16b4190d7c08280c2d674c708b1df8f299e26a572a2f77fba404
+  metadata.gz: 8e6f3990f8dc36366899e3a8bbf1835bf6cf0bb880bcf13333f394b40d1075e3
+  data.tar.gz: a03e2bb0fa656cfaada1364db1d8af4c222cbaff8cec5ffd0223629b40e11bc2
 SHA512:
-  metadata.gz: 1fece35f80d41bd49dae18befac98c67b57a342c010d91fd6b5999daf433bd112cf65eaf22b352a924b82a2f87fbd129394fddde8c7700cdbe79f31aa5274e89
-  data.tar.gz: fde494ec4d17db0a0001a27db0ec2c2ebb428fef7e791aff597436b59298cef3a64f235bee9d33701e866ea9cae673e0ebaf2954c347ec33b622420a815eb8bf
+  metadata.gz: 627b95689b8a4d51fb15a8665dd65be88974380c00a168f1121ae5248738140eadd82f3735ccaa0391fb33274952a9e1fe83819813b7312921b9adeb85956816
+  data.tar.gz: ed1a34e594acb1e7f3ef3d644aecad58af6b9fdc1b436fb3ba793cdbdc131affdecf26e832b9d2997ab45501dba91bda950735e3e85bbd518cf5e7eaaea2ce7e

data/lib/realm.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'active_support/all'
+require 'dry/core/constants'
 
 module Realm
   class << self
@@ -16,5 +17,13 @@ module Realm
         root_module.define_singleton_method(:realm) { builder.runtime }
       end
     end
+
+    # port the construction method from Dry::Struct as it's not inherited
+    def Struct(attributes = Dry::Core::Constants::EMPTY_HASH, &block) # rubocop:disable Naming/MethodName
+      Class.new(Struct) do
+        attributes.each { |a, type| attribute a, type }
+        module_eval(&block) if block
+      end
+    end
   end
 end

data/lib/realm/action_handler.rb

@@ -1,12 +1,6 @@
 # frozen_string_literal: true
 
 require 'dry-validation'
-require 'active_support/core_ext/module/delegation'
-require 'realm/error'
-require 'realm/mixins/context_injection'
-require 'realm/mixins/repository_helper'
-require 'realm/mixins/aggregate_member'
-require_relative 'action_handler/result'
 
 module Realm
   class ActionHandler
@@ -28,21 +22,25 @@ module Realm
       end
 
       def contract(&block)
-        @method_contract = Class.new(Dry::Validation::Contract, &block).new
+        @method_contract = Class.new(Realm::Contract, &block).new
       end
 
-      def contract_schema(&block)
-        contract { schema(&block) }
+      def contract_schema(...)
+        contract { schema(...) }
       end
 
-      def contract_params(&block)
-        contract { params(&block) }
+      def contract_params(...)
+        contract { params(...) }
       end
 
-      def contract_json(&block)
-        contract { json(&block) }
+      def contract_json(...)
+        contract { json(...) }
       end
 
+      alias schema_contract contract_schema
+      alias params_contract contract_params
+      alias json_contract contract_json
+
       def method_added(method_name)
         super
         return unless defined?(@method_contract)

data/lib/realm/contract.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+require 'dry-validation'
+
+module Realm
+  class Contract < Dry::Validation::Contract
+    class NotConvertibleToSchema < Realm::Error
+      def initialize(thing)
+        super("Not convertible to schema: #{thing}")
+      end
+    end
+
+    class << self
+      def schema(*external_schemas, **attributes, &block)
+        super(*sanitize_schemas(external_schemas, attributes), &block)
+      end
+
+      def params(*external_schemas, **attributes, &block)
+        super(*sanitize_schemas(external_schemas, attributes), &block)
+      end
+
+      def json(*external_schemas, **attributes, &block)
+        super(*sanitize_schemas(external_schemas, attributes), &block)
+      end
+
+      private
+
+      def sanitize_schemas(things, attributes, type = :schema)
+        things << Realm.Struct(attributes) if attributes.present?
+        things.map { |thing| convert_to_schema(thing, type) }
+      end
+
+      def convert_to_schema(thing, type)
+        return thing if thing.is_a? Dry::Schema::Processor # already a schema
+
+        raise NotConvertibleToSchema, thing unless thing.respond_to?(:to_dry_schema)
+
+        thing.to_dry_schema(type: type)
+      end
+    end
+  end
+end

data/lib/realm/struct.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'dry-struct'
+require 'dry-schema'
+
+module Realm
+  class Struct < Dry::Struct
+    class << self
+      def to_dry_schema(type: :schema) # rubocop:disable Metrics/AbcSize
+        keys = schema.type.keys
+
+        Dry::Schema.send(schema_type_to_method(type)) do
+          keys.each do |key|
+            param = key.required? ? required(key.name) : optional(key.name)
+
+            if key.type.constructor_type == Dry::Types::Array::Constructor # array type
+              member = key.type.member
+              param.array(member.respond_to?(:to_dry_schema) ? member.to_dry_schema(type: type) : member)
+            elsif key.respond_to?(:to_dry_schema) # realm struct
+              param.hash(key.to_dry_schema(type: type))
+            else
+              param.send(key.required? ? :filled : :maybe, key.type)
+            end
+          end
+        end
+      end
+
+      def merge(attributes)
+        clone.attributes(attributes)
+      end
+
+      private
+
+      def schema_type_to_method(type)
+        case type
+        when :schema
+          :define
+        when :params
+          :Params
+        when :json
+          :JSON
+        else
+          raise "Not supported schema type #{type}"
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: realm-core
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - developers@reevoo.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-12 00:00:00.000000000 Z
+date: 2021-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -179,6 +179,7 @@ files:
 - lib/realm/config.rb
 - lib/realm/container.rb
 - lib/realm/context.rb
+- lib/realm/contract.rb
 - lib/realm/dependency.rb
 - lib/realm/dispatcher.rb
 - lib/realm/domain_resolver.rb
@@ -204,6 +205,7 @@ files:
 - lib/realm/query_handler.rb
 - lib/realm/runtime.rb
 - lib/realm/runtime/session.rb
+- lib/realm/struct.rb
 - lib/realm/types.rb
 homepage:
 licenses: