message_set.rb in dry-schema-0.2.0

- old
+ new

@@ -6,33 +6,21 @@
     #
     # @api public
     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, :placeholders, :options
 
-      attr_reader :messages, :failures, :hints, :paths, :placeholders, :options
-
       # @api private
       def self.[](messages, options = EMPTY_HASH)
         new(messages.flatten, options)
       end
 
       # @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
 
       # @api public
       def each(&block)
@@ -40,72 +28,44 @@
         messages.each(&block)
       end
 
       # @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?
       end
 
       private
 
       # @api private
-      def messages_map
-        failures.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|
             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)|
-          node = path.reduce(hash) { |a, e| a[e] }
-
-          msgs.each do |msg|
-            node << msg
-          end
-
-          node.map!(&:to_s)
-
-          hash
-        end
+      def paths
+        @paths ||= messages.map(&:path).uniq
       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) }
-      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
 
           while curr_idx <= last_idx do