dry-schema 0.1.1 → 0.2.0

data/lib/dry/schema/message_set.rb

@@ -8,14 +8,7 @@ module Dry
     class MessageSet
       include Enumerable
 
-      HINT_EXCLUSION = %i(
-        key? filled? nil? bool?
-        str? int? float? decimal?
-        date? date_time? time? hash?
-        array? format?
-      ).freeze
-
-      attr_reader :messages, :failures, :hints, :paths, :placeholders, :options
+      attr_reader :messages, :placeholders, :options
 
       # @api private
       def self.[](messages, options = EMPTY_HASH)
@@ -25,12 +18,7 @@ module Dry
       # @api private
       def initialize(messages, options = EMPTY_HASH)
         @messages = messages
-        @hints = messages.select(&:hint?)
-        @failures = messages - hints
-        @paths = failures.map(&:path).uniq
         @options = options
-
-        initialize_hints!
         initialize_placeholders!
       end
 
@@ -42,16 +30,11 @@ module Dry
 
       # @api public
       def to_h
-        failures? ? messages_map : hints_map
+        messages_map
       end
       alias_method :to_hash, :to_h
       alias_method :dump, :to_h
 
-      # @api private
-      def failures?
-        options[:failures].equal?(true)
-      end
-
       # @api private
       def empty?
         messages.empty?
@@ -60,26 +43,8 @@ module Dry
       private
 
       # @api private
-      def messages_map
-        failures.group_by(&:path).reduce(placeholders) do |hash, (path, msgs)|
-          node = path.reduce(hash) { |a, e| a[e] }
-
-          msgs.each do |msg|
-            node << msg
-          end
-
-          msg_hints = hint_groups[path]
-          node.concat(msg_hints) if msg_hints
-
-          node.map!(&:to_s)
-
-          hash
-        end
-      end
-
-      # @api private
-      def hints_map
-        hints.group_by(&:path).reduce(placeholders) do |hash, (path, msgs)|
+      def messages_map(messages = self.messages)
+        messages.group_by(&:path).reduce(placeholders) do |hash, (path, msgs)|
           node = path.reduce(hash) { |a, e| a[e] }
 
           msgs.each do |msg|
@@ -93,18 +58,13 @@ module Dry
       end
 
       # @api private
-      def hint_groups
-        @hint_groups ||= hints.group_by(&:path)
-      end
-
-      # @api private
-      def initialize_hints!
-        hints.reject! { |hint| HINT_EXCLUSION.include?(hint.predicate) }
+      def paths
+        @paths ||= messages.map(&:path).uniq
       end
 
       # @api private
       def initialize_placeholders!
-        @placeholders = paths.reduce({}) do |hash, path|
+        @placeholders = messages.map(&:path).uniq.reduce({}) do |hash, path|
           curr_idx = 0
           last_idx = path.size - 1
           node = hash

data/lib/dry/schema/messages.rb

@@ -20,17 +20,19 @@ module Dry
 
       # @api private
       def self.build(config)
-        case config.messages
+        klass = case config.messages
         when :yaml then default
-        when :i18n then Messages::I18n.new
+        when :i18n then Messages::I18n
         else
           raise "+#{config.messages}+ is not a valid messages identifier"
         end
+
+        klass.build
       end
 
       # @api private
       def self.default
-        Messages::YAML.load
+        Messages::YAML
       end
     end
   end

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

@@ -34,6 +34,10 @@ module Dry
           %{root}.%{predicate}
         ).freeze
 
+        setting :rule_lookup_paths, %w(
+          rules.%{name}
+        ).freeze
+
         setting :arg_type_default, 'default'.freeze
         setting :val_type_default, 'default'.freeze
 
@@ -66,8 +70,10 @@ module Dry
 
         # @api private
         def rule(name, options = {})
-          path = "%{locale}.rules.#{name}"
-          get(path, options) if key?(path, options)
+          tokens = { name: name, locale: options.fetch(:locale, default_locale) }
+          path = rule_lookup_paths(tokens).detect { |key| key?(key, options) }
+
+          get(path, options) if path
         end
 
         # Retrieve a message template
@@ -95,7 +101,7 @@ module Dry
             message_type: options[:message_type] || :failure
           )
 
-          tokens[:path] = options[:rule] || Array(options[:path]).join(DOT)
+          tokens[:path] = options[:rule] || Array(options[:path]).last
 
           opts = options.select { |k, _| !config.lookup_options.include?(k) }
 
@@ -111,6 +117,11 @@ module Dry
           config.lookup_paths.map { |path| path % tokens }
         end
 
+        # @api private
+        def rule_lookup_paths(tokens)
+          config.rule_lookup_paths.map { |key| key % tokens }
+        end
+
         # Return a new message backend that will look for messages under provided namespace
         #
         # @param [Symbol,String] namespace

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

@@ -9,7 +9,21 @@ module Dry
     class Messages::I18n < Messages::Abstract
       attr_reader :t
 
-      ::I18n.load_path.concat(config.paths)
+      configure do |config|
+        config.root = 'dry_schema.errors'.freeze
+        config.rule_lookup_paths = config.rule_lookup_paths.map { |path| "dry_schema.#{path}" }
+      end
+
+      # @api private
+      def self.build(paths = config.paths)
+        set_load_paths(paths)
+        new
+      end
+
+      # @api private
+      def self.set_load_paths(paths)
+        ::I18n.load_path.concat(paths)
+      end
 
       # @api private
       def initialize

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

@@ -14,12 +14,16 @@ module Dry
         # @api private
         attr_reader :root
 
+        # @api private
+        attr_reader :call_opts
+
         # @api private
         def initialize(namespace, messages)
           super()
           @namespace = namespace
           @messages = messages
           @root = messages.root
+          @call_opts = { namespace: namespace }.freeze
         end
 
         # Get a message for the given key and its options
@@ -34,6 +38,12 @@ module Dry
           messages.get(key, options)
         end
 
+        # @api public
+        def call(key, options = {})
+          super(key, options.empty? ? call_opts : options.merge(call_opts))
+        end
+        alias_method :[], :call
+
         # Check if given key is defined
         #
         # @return [Boolean]
@@ -45,7 +55,12 @@ module Dry
 
         # @api private
         def lookup_paths(tokens)
-          super(tokens.merge(root: "#{root}.rules.#{namespace}")) + super
+          super(tokens.merge(root: "#{tokens[:root]}.#{namespace}")) + super
+        end
+
+        def rule_lookup_paths(tokens)
+          base_paths = messages.rule_lookup_paths(tokens)
+          base_paths.map { |key| key.gsub("dry_schema", "dry_schema.#{namespace}") } + base_paths
         end
       end
     end

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

@@ -16,11 +16,12 @@ module Dry
 
       # @api private
       configure do |config|
-        config.root = '%{locale}.errors'.freeze
+        config.root = '%{locale}.dry_schema.errors'.freeze
+        config.rule_lookup_paths = config.rule_lookup_paths.map { |path| "%{locale}.dry_schema.#{path}" }
       end
 
       # @api private
-      def self.load(paths = config.paths)
+      def self.build(paths = config.paths)
         new(paths.map { |path| load_file(path) }.reduce(:merge))
       end
 
@@ -51,7 +52,11 @@ module Dry
       #
       # @api public
       def get(key, options = {})
-        data[key % { locale: options.fetch(:locale, default_locale) }]
+        evaluated_key = key.include?('%{locale}') ?
+          key % { locale: options.fetch(:locale, default_locale) } :
+          key
+
+        data[evaluated_key]
       end
 
       # Check if given key is defined
@@ -60,7 +65,11 @@ module Dry
       #
       # @api public
       def key?(key, options = {})
-        data.key?(key % { locale: options.fetch(:locale, default_locale) })
+        evaluated_key = key.include?('%{locale}') ?
+          key % { locale: options.fetch(:locale, default_locale) } :
+          key
+
+        data.key?(evaluated_key)
       end
 
       # Merge messages from an additional path

data/lib/dry/schema/namespaced_rule.rb

@@ -0,0 +1,23 @@
+module Dry
+  module Schema
+    class NamespacedRule
+      attr_reader :rule
+
+      attr_reader :namespace
+
+      def initialize(namespace, rule)
+        @namespace = namespace
+        @rule = rule
+      end
+
+      def call(input)
+        result = rule.call(input)
+        Logic::Result.new(result.success?) { [:namespace, [namespace, result.to_ast]] }
+      end
+
+      def ast(input=Undefined)
+        [:namespace, [namespace, rule.ast(input)]]
+      end
+    end
+  end
+end

data/lib/dry/schema/result.rb

@@ -105,29 +105,7 @@ module Dry
       #
       # @api public
       def errors(options = EMPTY_HASH)
-        message_set(options.merge(hints: false)).dump
-      end
-
-      # Get all messages including hints
-      #
-      # @see #message_set
-      #
-      # @return [Hash<Symbol=>Array>]
-      #
-      # @api public
-      def messages(options = EMPTY_HASH)
-        message_set(options.merge(hints: true)).dump
-      end
-
-      # Get hints exclusively without errors
-      #
-      # @see #message_set
-      #
-      # @return [Hash<Symbol=>Array>]
-      #
-      # @api public
-      def hints(options = EMPTY_HASH)
-        message_set(options.merge(failures: false)).dump
+        message_set(options).dump
       end
 
       # Return the message set

data/lib/dry/schema/rule_applier.rb

@@ -38,7 +38,11 @@ module Dry
 
       # @api private
       def to_ast
-        [:set, rules.values.map(&:to_ast)]
+        if config.namespace
+          [:namespace, [config.namespace, [:set, rules.values.map(&:to_ast)]]]
+        else
+          [:set, rules.values.map(&:to_ast)]
+        end
       end
     end
   end

data/lib/dry/schema/trace.rb

@@ -28,6 +28,9 @@ module Dry
 
       # @api private
       def evaluate(*predicates, **opts, &block)
+        pred_opts = opts.dup
+        pred_opts.delete(:type_spec)
+
         predicates.each do |predicate|
           if predicate.respond_to?(:call)
             append(predicate)
@@ -38,7 +41,7 @@ module Dry
           end
         end
 
-        opts.each do |predicate, *args|
+        pred_opts.each do |predicate, *args|
           append(__send__(predicate, *args))
         end
 

data/lib/dry/schema/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Schema
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-schema
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-17 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -192,6 +192,10 @@ files:
 - lib/dry/schema/constants.rb
 - lib/dry/schema/dsl.rb
 - lib/dry/schema/extensions.rb
+- lib/dry/schema/extensions/hints.rb
+- lib/dry/schema/extensions/hints/message_compiler_methods.rb
+- lib/dry/schema/extensions/hints/message_set_methods.rb
+- lib/dry/schema/extensions/hints/result_methods.rb
 - lib/dry/schema/extensions/monads.rb
 - lib/dry/schema/json.rb
 - lib/dry/schema/key.rb
@@ -207,6 +211,7 @@ files:
 - lib/dry/schema/macros/maybe.rb
 - lib/dry/schema/macros/optional.rb
 - lib/dry/schema/macros/required.rb
+- lib/dry/schema/macros/schema.rb
 - lib/dry/schema/macros/value.rb
 - lib/dry/schema/message.rb
 - lib/dry/schema/message_compiler.rb
@@ -218,6 +223,7 @@ files:
 - lib/dry/schema/messages/namespaced.rb
 - lib/dry/schema/messages/template.rb
 - lib/dry/schema/messages/yaml.rb
+- lib/dry/schema/namespaced_rule.rb
 - lib/dry/schema/params.rb
 - lib/dry/schema/path.rb
 - lib/dry/schema/predicate.rb
@@ -243,7 +249,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="