dry-schema 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 130427870a9d2f124a3fbd39a55f700c2c905c34a6ffab9b5e12946321f647aa
-  data.tar.gz: 71514ff28540db733a7d280656931c2e0f54b4f73b4a94b21e3a092234bfdfae
+  metadata.gz: ebd83b8cd1025c9f732f593b47d52583455bac56def9866901a374cd9f24dc11
+  data.tar.gz: def7d4f585ab856a055667474bc6cb59e7f012e13dcf0a4a9d17daa9b0ea53d1
 SHA512:
-  metadata.gz: 42ed8a3c94600c20c2a1e843c76b2a945d9ef0b46bfa8379acf5369016899642525a9f3f6b574cc4e71b211ee690845abb0d164c07b681d19dfce474abd9ef92
-  data.tar.gz: c0485078b33e945a2174c3ceb349c7e46c40ada2007c8a6e6f671c8e31c57e25e4142902e0ff9638f118179169162c8225292bde042dc2e2082b4dd078bfc36f
+  metadata.gz: 77a2481151c16aa91e1a29a32e640adadfcefcbceacbd5e1e8cdfcd63c29d186dbc17640d9da0974c37a2e152440da723fd516cac7362cd195b24630011905d0
+  data.tar.gz: c5cf256d2b61a3dc7b832f68d6ce64c735f00a7885f42a05f53f67a07ec6108322d996ea243387dc91b5acfbb57765129e8d25bfecbb2c151a5e18ac3c709c50

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 1.4.2 2019-12-19
+
+### Fixed
+
+* `I18n` messages backend supports procs as text properly (issue #208) (@robhanlon22)
+* `I18n` messages backend supports message meta-data (issue #210) (@robhanlon22)
+* Fixed keyword warnings from MRI 2.7.0 (@flash-gordon)
+* Array with a member works correctly with `maybe` (issue #206) (@solnic)
+
+[Compare v1.4.1...v1.4.2](https://github.com/dry-rb/dry-schema/compare/v1.4.1...v1.4.2)
+
 # 1.4.1 2019-10-08
 
 ### Fixed

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 dry-rb team
+Copyright (c) 2015-2019 dry-rb team
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/README.md

@@ -1,5 +1,4 @@
 [gem]: https://rubygems.org/gems/dry-schema
-[travis]: https://travis-ci.com/dry-rb/dry-schema
 [actions]: https://github.com/dry-rb/dry-schema/actions
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-schema
 [chat]: https://dry-rb.zulipchat.com
@@ -8,7 +7,6 @@
 # dry-schema [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-schema.svg)][gem]
-[![Travis Status](https://travis-ci.com/dry-rb/dry-schema.svg?branch=master)][travis]
 [![CI Status](https://github.com/dry-rb/dry-schema/workflows/ci/badge.svg)][actions]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-schema/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-schema/badges/coverage.svg)][codeclimate]

data/lib/dry/schema.rb

@@ -30,7 +30,7 @@ module Dry
     #
     # @api public
     def self.define(**options, &block)
-      DSL.new(options, &block).call
+      DSL.new(**options, &block).call
     end
 
     # Define a schema suitable for HTTP params

data/lib/dry/schema/dsl.rb

@@ -51,8 +51,6 @@ module Dry
 
       extend Dry::Initializer
 
-      include ::Dry::Equalizer(:options)
-
       # @return [Compiler] The rule compiler object
       option :compiler, default: -> { Compiler.new }
 
@@ -275,8 +273,8 @@ module Dry
       # @return [Dry::Types::Safe]
       #
       # @api private
-      def new(options = EMPTY_HASH, &block)
-        self.class.new(options.merge(processor_type: processor_type, config: config), &block)
+      def new(**options, &block)
+        self.class.new(**options, processor_type: processor_type, config: config, &block)
       end
 
       # Set a type for the given key name

data/lib/dry/schema/extensions/hints/message_compiler_methods.rb

@@ -19,7 +19,7 @@ module Dry
           attr_reader :hints
 
           # @api private
-          def initialize(*args)
+          def initialize(*, **)
             super
             @hints = @options.fetch(:hints, true)
           end

data/lib/dry/schema/key.rb

@@ -27,8 +27,8 @@ module Dry
       end
 
       # @api private
-      def self.new(*args)
-        fetch_or_store(*args) { super }
+      def self.new(*args, **kwargs)
+        fetch_or_store(args, kwargs) { super }
       end
 
       # @api private
@@ -65,8 +65,8 @@ module Dry
       end
 
       # @api private
-      def new(new_opts = EMPTY_HASH)
-        self.class.new(id, { name: name, coercer: coercer }.merge(new_opts))
+      def new(**new_opts)
+        self.class.new(id, name: name, coercer: coercer, **new_opts)
       end
 
       # @api private

data/lib/dry/schema/macros/core.rb

@@ -28,8 +28,8 @@ module Dry
         option :schema_dsl, optional: true
 
         # @api private
-        def new(options = EMPTY_HASH)
-          self.class.new({ name: name, compiler: compiler, schema_dsl: schema_dsl }.merge(options))
+        def new(**options)
+          self.class.new(name: name, compiler: compiler, schema_dsl: schema_dsl, **options)
         end
 
         # @api private

data/lib/dry/schema/macros/dsl.rb

@@ -57,11 +57,12 @@ module Dry
         # @return [Macros::Core]
         #
         # @api public
-        def value(*predicates, **opts, &block)
+        def value(*predicates, &block)
           append_macro(Macros::Value) do |macro|
-            macro.call(*predicates, **opts, &block)
+            macro.call(*predicates, &block)
           end
         end
+        ruby2_keywords :value if respond_to?(:ruby2_keywords, true)
 
         # Prepends `:filled?` predicate
         #
@@ -74,11 +75,12 @@ module Dry
         # @return [Macros::Core]
         #
         # @api public
-        def filled(*args, **opts, &block)
+        def filled(*args, &block)
           append_macro(Macros::Filled) do |macro|
-            macro.call(*args, **opts, &block)
+            macro.call(*args, &block)
           end
         end
+        ruby2_keywords :filled if respond_to?(:ruby2_keywords, true)
 
         # Specify a nested hash without enforced `hash?` type-check
         #
@@ -99,6 +101,7 @@ module Dry
             macro.call(*args, &block)
           end
         end
+        ruby2_keywords :schema if respond_to?(:ruby2_keywords, true)
 
         # Specify a nested hash with enforced `hash?` type-check
         #
@@ -113,6 +116,7 @@ module Dry
             macro.call(*args, &block)
           end
         end
+        ruby2_keywords :hash if respond_to?(:ruby2_keywords, true)
 
         # Specify predicates that should be applied to each element of an array
         #
@@ -136,6 +140,7 @@ module Dry
             macro.value(*args, &block)
           end
         end
+        ruby2_keywords :each if respond_to?(:ruby2_keywords, true)
 
         # Like `each` but sets `array?` type-check
         #
@@ -155,6 +160,7 @@ module Dry
             macro.value(*args, &block)
           end
         end
+        ruby2_keywords :array if respond_to?(:ruby2_keywords, true)
 
         # Set type spec
         #

data/lib/dry/schema/macros/key.rb

@@ -30,6 +30,7 @@ module Dry
           (filter_schema_dsl[name] || filter_schema_dsl.optional(name)).value(*args, &block)
           self
         end
+        ruby2_keywords(:filter) if respond_to?(:ruby2_keywords, true)
 
         # @overload value(type_spec, *predicates, **predicate_opts)
         #   Set type specification and predicates
@@ -87,7 +88,7 @@ module Dry
         def maybe(*args, **opts, &block)
           extract_type_spec(*args, nullable: true) do |*predicates, type_spec:|
             append_macro(Macros::Maybe) do |macro|
-              macro.call(*predicates, **opts, &block)
+              macro.call(*predicates, type_spec: type_spec, **opts, &block)
             end
           end
         end

data/lib/dry/schema/message_compiler.rb

@@ -41,7 +41,7 @@ module Dry
       attr_reader :default_lookup_options
 
       # @api private
-      def initialize(messages, options = EMPTY_HASH)
+      def initialize(messages, **options)
         super
         @options = options
         @default_lookup_options = options[:locale] ? { locale: locale } : EMPTY_HASH
@@ -55,7 +55,7 @@ module Dry
 
         return self if updated_opts.eql?(options)
 
-        self.class.new(messages, updated_opts)
+        self.class.new(messages, **updated_opts)
       end
 
       # @api private
@@ -105,7 +105,7 @@ module Dry
         left, right = node.map { |n| visit(n, opts) }
 
         if [left, right].flatten.map(&:path).uniq.size == 1
-          Message::Or.new(left, right, proc { |k| messages.translate(k, default_lookup_options) })
+          Message::Or.new(left, right, proc { |k| messages.translate(k, **default_lookup_options) })
         elsif right.is_a?(Array)
           right
         else
@@ -116,7 +116,7 @@ module Dry
       # @api private
       def visit_namespace(node, opts)
         ns, rest = node
-        self.class.new(messages.namespaced(ns), options).visit(rest, opts)
+        self.class.new(messages.namespaced(ns), **options).visit(rest, opts)
       end
 
       # @api private

data/lib/dry/schema/messages/abstract.rb

@@ -123,13 +123,7 @@ module Dry
 
           return unless path
 
-          text = get(path, opts)
-
-          if text.is_a?(Hash)
-            text.values_at(:text, :meta)
-          else
-            [text, EMPTY_HASH]
-          end
+          get(path, opts).values_at(:text, :meta)
         end
         # rubocop:enable Metrics/AbcSize
 

data/lib/dry/schema/messages/i18n.rb

@@ -29,7 +29,24 @@ module Dry
       #
       # @api public
       def get(key, options = EMPTY_HASH)
-        t.(key, locale: options.fetch(:locale, default_locale)) if key
+        return unless key
+
+        opts = { locale: options.fetch(:locale, default_locale) }
+
+        translation = t.(key, opts)
+        text_key = "#{key}.text"
+
+        if !translation.is_a?(Hash) || !key?(text_key, opts)
+          return {
+            text: translation,
+            meta: EMPTY_HASH
+          }
+        end
+
+        {
+          text: t.(text_key, opts),
+          meta: extract_meta(key, translation, opts)
+        }
       end
 
       # Check if given key is defined
@@ -100,6 +117,13 @@ module Dry
           I18n.backend.store_translations(locale, data[locale.to_s])
         end
       end
+
+      def extract_meta(parent_key, translation, options)
+        translation.keys.each_with_object({}) do |k, meta|
+          meta_key = "#{parent_key}.#{k}"
+          meta[k] = t.(meta_key, options) if k != :text && key?(meta_key, options)
+        end
+      end
     end
   end
 end

data/lib/dry/schema/messages/template.rb

@@ -59,7 +59,7 @@ module Dry
 
         # @api private
         def call(data = EMPTY_HASH)
-          data.empty? ? evaluator.() : evaluator.(data)
+          data.empty? ? evaluator.() : evaluator.(**data)
         end
         alias_method :[], :call
       end

data/lib/dry/schema/processor.rb

@@ -62,7 +62,7 @@ module Dry
         # @api public
         def new(options = nil, &block)
           if options || block
-            processor = super
+            processor = super(**(options || EMPTY_HASH))
             yield(processor) if block
             processor
           elsif definition

data/lib/dry/schema/result.rb

@@ -32,7 +32,7 @@ module Dry
       option :message_compiler
 
       # @api private
-      def self.new(*args)
+      def self.new(*, **)
         result = super
         yield(result)
         result.freeze

data/lib/dry/schema/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Schema
-    VERSION = '1.4.1'
+    VERSION = '1.4.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby