dry-struct 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 33a4358e2a11c38b8816778acc5722b6d08a4c4d
-  data.tar.gz: 24bebcf82ec2e1dcb7536216acc397ae9aa6a3c7
+SHA256:
+  metadata.gz: 33cd05dd51a3310d7ede685ae1ce8631a0955d7563afca7633a7625b9b34dd17
+  data.tar.gz: 182c58865ccb3e74595aa22d6c9730ce8ca0e078d1b6ecb5e8b69e026ce6409d
 SHA512:
-  metadata.gz: 332a625be1cde86fefd74efe78e79b375c6c66a15f5ad062f26e736055b9a9e9aef9234299bd0a7ff0272ce2e80218060d0ddb52d0074a5bc7d1ed12a03e1971
-  data.tar.gz: 757d33e5151cf3f30ffbe28798f1c86ab634f12612d4a7603431aae72513eedf088a3cf483603809b10ac6da870da2dc2f39ef1136e6fe99c42b25ee979ea681
+  metadata.gz: 3f5e4f6609b93e80ae775ab556812cc872883eaf423a74ae2e5191d2bef6907152653fa7fe441bb9aab945b7cf9f4ec62dd4d359ffcb88f4e976b8b53fb42ac8
+  data.tar.gz: 4b76e94533ff98f1c1d9d427967a5c19af3d58484a5e785c7eac15d50211d70e4718d35572bb6e89fbafeb9b9f092a73f68e517244676f28d4c7e4854f1a055a

data/.gitignore

@@ -7,5 +7,6 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.log
 
 .DS_Store

data/.travis.yml

@@ -4,13 +4,16 @@ sudo: required
 bundler_args: --without benchmarks tools
 script:
   - bundle exec rake spec
+before_install:
+  - gem update --system
 after_success:
   - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 rvm:
-  - 2.2.7
-  - 2.3.3
-  - 2.4.1
-  - jruby-9.1.10.0
+  - 2.2.10
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
+  - jruby-9.2.0.0
 env:
   global:
     - COVERAGE=true

data/CHANGELOG.md

@@ -1,3 +1,117 @@
+# v0.6.0 2018-10-24
+
+## BREAKING CHANGES
+
+* `Struct.attribute?` in the old sense is deprecated, use `has_attribute?` as a replacement
+
+## Added
+
+* `Struct.attribute?` is an easy way to define omittable attributes (flash-gordon):
+
+  ```ruby
+  class User < Dry::Struct
+    attribute  :name,  Types::Strict::String
+    attribute? :email, Types::Strict::String
+  end
+  # User.new(name: 'John') # => #<User name="John">
+  ```
+
+## Fixed
+
+* `Struct#to_h` recursively converts hash values to hashes, this was done to be consistent with current behavior for arrays (oeoeaio + ZimbiX)
+
+[Compare v0.5.1...v0.6.0](https://github.com/dry-rb/dry-struct/compare/v0.5.1...v0.6.0)
+
+# v0.5.1 2018-08-11
+
+## Fixed
+
+* Constant resolution is now restricted to the current module when structs are automatically defined using the block syntax. This shouldn't break any existing code (piktur)
+
+## Added
+
+* Pretty print extension (ojab)
+  ```ruby
+  Dry::Struct.load_extensions(:pretty_print)
+  PP.pp(user)
+  #<Test::User
+   name="Jane",
+   age=21,
+   address=#<Test::Address city="NYC", zipcode="123">>
+  ```
+
+[Compare v0.5.0...v0.5.1](https://github.com/dry-rb/dry-struct/compare/v0.5.0...v0.5.1)
+
+# v0.5.0 2018-05-03
+
+## BREAKING CHANGES
+
+* `constructor_type` was removed, use `transform_types` and `transform_keys` as a replacement (see below)
+* Default types are evaluated _only_ on missing values. Again, use `tranform_types` as a work around for `nil`s
+* Values are now stored within a single instance variable names `@attributes`, this sped up struct creation and improved support for reserved attribute names such as `hash`, they don't get a getter but still can be read via `#[]`
+* Ruby 2.3 is a minimal supported version
+
+## Added
+
+* `Dry::Struct.transform_types` accepts a block which is yielded on every type to add. Since types are `dry-types`' objects that come with a robust DSL it's rather simple to restore the behavior of `constructor_type`. See https://github.com/dry-rb/dry-struct/pull/64 for details (flash-gordon)
+
+  Example: evaluate defaults on `nil` values
+
+  ```ruby
+  class User < Dry::Struct
+    transform_types do |type|
+      type.constructor { |value| value.nil? ? Undefined : value  }
+    end
+  end
+  ```
+
+* `Data::Struct.transform_keys` accepts a block/proc that transforms keys of input hashes. The most obvious usage is simbolization but arbitrary transformations are allowed (flash-gordon)
+
+* `Dry.Struct` builds a struct by a hash of attribute names and types (citizen428)
+
+  ```ruby
+  User = Dry::Struct(name: 'strict.string') do
+    attribute :email, 'strict.string'
+  end
+  ```
+
+* Support for `Struct.meta`, note that `.meta` returns a _new class_ (flash-gordon)
+
+  ```ruby
+  class User < Dry::Struct
+    attribute :name, Dry::Types['strict.string']
+  end
+
+  UserWithMeta = User.meta(foo: :bar)
+
+  User.new(name: 'Jade').class == UserWithMeta.new(name: 'Jade').class # => false
+  ```
+
+* `Struct.attribute` yields a block with definition for nested structs. It defines a nested constant for the new struct and supports arrays (AMHOL + flash-gordon)
+
+  ```ruby
+    class User < Dry::Struct
+      attribute :name, Types::Strict::String
+      attribute :address do
+        attribute :country, Types::Strict::String
+        attribute :city, Types::Strict::String
+      end
+      attribute :accounts, Types::Strict::Array do
+        attribute :currency, Types::Strict::String
+        attribute :balance, Types::Strict::Decimal
+      end
+    end
+
+    # ^This automatically defines User::Address and User::Account
+  ```
+
+## Fixed
+
+* Adding a new attribute invalidates `attribute_names` (flash-gordon)
+* Struct classes track subclasses and define attributes in them, now it doesn't matter whether you define attributes first and _then_ subclass or vice versa. Note this can lead to memory leaks in Rails environment when struct classes are reloaded (flash-gordon)
+
+[Compare v0.4.0...v0.5.0](https://github.com/dry-rb/dry-struct/compare/v0.4.0...v0.5.0)
+
 # v0.4.0 2017-11-04
 
 ## Changed

data/CONTRIBUTING.md

@@ -6,11 +6,11 @@ If you found a bug, report an issue and describe what's the expected behavior ve
 
 ## Reporting feature requests
 
-Report a feature request **only after discussing it first on [discuss.dry-rb.org](https://discuss.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discussion thread, and instead summarize what was discussed.
+Report a feature request **only after discourseing it first on [discourse.dry-rb.org](https://discourse.dry-rb.org)** where it was accepted. Please provide a concise description of the feature, don't link to a discourseion thread, and instead summarize what was discourseed.
 
 ## Reporting questions, support requests, ideas, concerns etc.
 
-**PLEASE DON'T** - use [discuss.dry-rb.org](http://discuss.dry-rb.org) instead.
+**PLEASE DON'T** - use [discourse.dry-rb.org](https://discourse.dry-rb.org) instead.
 
 # Pull Request Guidelines
 
@@ -26,4 +26,4 @@ Other requirements:
 
 # Asking for help
 
-If these guidelines aren't helpful, and you're stuck, please post a message on [discuss.dry-rb.org](https://discuss.dry-rb.org).
+If these guidelines aren't helpful, and you're stuck, please post a message on [discourse.dry-rb.org](https://discourse.dry-rb.org).

data/Gemfile

@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'dry-types', git: 'https://github.com/dry-rb/dry-types'
+gem 'dry-inflector', git: 'https://github.com/dry-rb/dry-inflector'
 
 group :test do
   gem 'codeclimate-test-reporter', platform: :mri, require: false
@@ -11,7 +12,8 @@ group :test do
 end
 
 group :tools do
-  gem 'byebug', platform: :mri
+  gem 'pry-byebug', platform: :mri
+  gem 'pry', platform: :jruby
   gem 'mutant'
   gem 'mutant-rspec'
 end

data/README.md

@@ -1,6 +1,5 @@
 [gem]: https://rubygems.org/gems/dry-struct
 [travis]: https://travis-ci.org/dry-rb/dry-struct
-[gemnasium]: https://gemnasium.com/dry-rb/dry-struct
 [codeclimate]: https://codeclimate.com/github/dry-rb/dry-struct
 [coveralls]: https://coveralls.io/r/dry-rb/dry-struct
 [inchpages]: http://inch-ci.org/github/dry-rb/dry-struct
@@ -9,7 +8,6 @@
 
 [![Gem Version](https://badge.fury.io/rb/dry-struct.svg)][gem]
 [![Build Status](https://travis-ci.org/dry-rb/dry-struct.svg?branch=master)][travis]
-[![Dependency Status](https://gemnasium.com/dry-rb/dry-struct.svg)][gemnasium]
 [![Code Climate](https://codeclimate.com/github/dry-rb/dry-struct/badges/gpa.svg)][codeclimate]
 [![Test Coverage](https://codeclimate.com/github/dry-rb/dry-struct/badges/coverage.svg)][codeclimate]
 [![Inline docs](http://inch-ci.org/github/dry-rb/dry-struct.svg?branch=master)][inchpages]

data/bin/console

@@ -3,12 +3,10 @@
 require 'bundler/setup'
 require 'dry/struct'
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
+require 'irb'
 
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+module Types
+  include Dry::Types.module
+end
 
-require 'irb'
-IRB.start
+binding.irb

data/dry-struct.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |spec|
   # delete this section to allow pushing this gem to any host.
   if spec.respond_to?(:metadata)
     spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+    spec.metadata['changelog_uri'] = 'https://github.com/dry-rb/dry-struct/blob/master/CHANGELOG.md'
+    spec.metadata['source_code_uri'] = 'https://github.com/dry-rb/dry-struct'
   else
     raise 'RubyGems 2.0 or newer is required to protect against public gem pushes.'
   end
@@ -27,8 +29,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-types', '~> 0.12', '>= 0.12.2'
-  spec.add_runtime_dependency 'dry-core', '~> 0.4', '>= 0.4.1'
+  spec.add_runtime_dependency 'dry-types', '~> 0.13'
+  spec.add_runtime_dependency 'dry-core', '~> 0.4', '>= 0.4.3'
   spec.add_runtime_dependency 'ice_nine', '~> 0.11'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/dry/struct/class_interface.rb

@@ -1,8 +1,10 @@
 require 'dry/core/class_attributes'
-require 'dry/equalizer'
+require 'dry/core/inflector'
+require 'dry/core/descendants_tracker'
 
 require 'dry/struct/errors'
 require 'dry/struct/constructor'
+require 'dry/struct/sum'
 
 module Dry
   class Struct
@@ -17,31 +19,118 @@ module Dry
       def inherited(klass)
         super
 
-        klass.equalizer Equalizer.new(*schema.keys)
-        klass.send(:include, klass.equalizer)
+        base = self
+
+        klass.class_eval do
+          @meta = base.meta
+
+          unless equal?(Value)
+            extend Dry::Core::DescendantsTracker
+          end
+        end
       end
 
       # Adds an attribute for this {Struct} with given `name` and `type`
       # and modifies {.schema} accordingly.
       #
       # @param [Symbol] name name of the defined attribute
-      # @param [Dry::Types::Definition] type
+      # @param [Dry::Types::Definition, nil] type or superclass of nested type
       # @return [Dry::Struct]
+      # @yield
+      #   If a block is given, it will be evaluated in the context of
+      #   a new struct class, and set as a nested type for the given
+      #   attribute. A class with a matching name will also be defined for
+      #   the nested type.
       # @raise [RepeatedAttributeError] when trying to define attribute with the
       #   same name as previously defined one
       #
-      # @example
+      # @example with nested structs
+      #   class Language < Dry::Struct
+      #     attribute :name, Types::String
+      #     attribute :details, Dry::Struct do
+      #       attribute :type, Types::String
+      #     end
+      #   end
+      #
+      #   Language.schema
+      #     #=> {
+      #           :name=>#<Dry::Types::Definition primitive=String options={} meta={}>,
+      #           :details=>Language::Details
+      #         }
+      #
+      #   ruby = Language.new(name: 'Ruby', details: { type: 'OO' })
+      #   ruby.name #=> 'Ruby'
+      #   ruby.details #=> #<Language::Details type="OO">
+      #   ruby.details.type #=> 'OO'
+      #
+      # @example with a nested array of structs
       #   class Language < Dry::Struct
       #     attribute :name, Types::String
+      #     array :versions, Types::String
+      #     array :celebrities, Types::Array.of(Dry::Struct) do
+      #       attribute :name, Types::String
+      #       attribute :pseudonym, Types::String
+      #     end
       #   end
       #
       #   Language.schema
-      #     #=> {name: #<Dry::Types::Definition primitive=String options={}>}
+      #     #=> {
+      #           :name=>#<Dry::Types::Definition primitive=String options={} meta={}>,
+      #           :versions=>#<Dry::Types::Array::Member primitive=Array options={:member=>#<Dry::Types::Definition primitive=String options={} meta={}>} meta={}>,
+      #           :celebrities=>#<Dry::Types::Array::Member primitive=Array options={:member=>Language::Celebrity} meta={}>
+      #         }
       #
-      #   ruby = Language.new(name: 'Ruby')
+      #   ruby = Language.new(
+      #     name: 'Ruby',
+      #     versions: %w(1.8.7 1.9.8 2.0.1),
+      #     celebrities: [
+      #       { name: 'Yukihiro Matsumoto', pseudonym: 'Matz' },
+      #       { name: 'Aaron Patterson', pseudonym: 'tenderlove' }
+      #     ]
+      #   )
       #   ruby.name #=> 'Ruby'
-      def attribute(name, type)
-        attributes(name => type)
+      #   ruby.versions #=> ['1.8.7', '1.9.8', '2.0.1']
+      #   ruby.celebrities
+      #     #=> [
+      #           #<Language::Celebrity name='Yukihiro Matsumoto' pseudonym='Matz'>,
+      #           #<Language::Celebrity name='Aaron Patterson' pseudonym='tenderlove'>
+      #         ]
+      #   ruby.celebrities[0].name #=> 'Yukihiro Matsumoto'
+      #   ruby.celebrities[0].pseudonym #=> 'Matz'
+      #   ruby.celebrities[1].name #=> 'Aaron Patterson'
+      #   ruby.celebrities[1].pseudonym #=> 'tenderlove'
+      def attribute(name, type = nil, &block)
+        attributes(name => build_type(name, type, &block))
+      end
+
+      # Adds an omittable (key is not required on initialization) attribute for this {Struct}
+      #
+      # @example
+      #   class User < Dry::Struct
+      #     attribute  :name,  Types::Strict::String
+      #     attribute? :email, Types::Strict::String
+      #   end
+      #
+      #   User.new(name: 'John') # => #<User name="John">
+      #
+      # @param [Symbol] name name of the defined attribute
+      # @param [Dry::Types::Definition, nil] type or superclass of nested type
+      # @return [Dry::Struct]
+      #
+      def attribute?(*args, &block)
+        if args.size == 1 && block.nil?
+          Dry::Core::Deprecations.warn(
+            'Dry::Struct.attribute? is deprecated for checking attribute presence, '\
+            'use has_attribute? instead',
+            tag: :'dry-struct'
+          )
+
+          has_attribute?(args[0])
+        else
+          name, type = args
+
+          attribute(name, build_type(name, type, &block).meta(omittable: true))
+        end
       end
 
       # @param [Hash{Symbol => Dry::Types::Definition}] new_schema
@@ -50,7 +139,7 @@ module Dry
       #   same name as previously defined one
       # @see #attribute
       # @example
-      #   class Book1 < Dry::Struct
+      #   class Book < Dry::Struct
       #     attributes(
       #       title: Types::String,
       #       author: Types::String
@@ -63,18 +152,60 @@ module Dry
       def attributes(new_schema)
         check_schema_duplication(new_schema)
 
-        schema schema.merge(new_schema)
-        input Types['coercible.hash'].public_send(constructor_type, schema)
+        input input.schema(new_schema)
 
         new_schema.each_key do |key|
-          attr_reader(key) unless instance_methods.include?(key)
+          next if instance_methods.include?(key)
+          class_eval(<<-RUBY)
+            def #{ key }
+              @attributes[#{ key.inspect }]
+            end
+          RUBY
         end
 
-        equalizer.instance_variable_get('@keys').concat(new_schema.keys)
+        @attribute_names = nil
+
+        descendants.
+          select { |d| d.superclass == self }.
+          each { |d| d.attributes(new_schema.reject { |k, _| d.schema.key?(k) }) }
 
         self
       end
 
+      # Add an arbitrary transformation for new attribute types.
+      #
+      # @param [#call,nil] proc
+      # @param [#call,nil] block
+      # @example
+      #   class Book < Dry::Struct
+      #     transform_types { |t| t.meta(struct: :Book) }
+      #
+      #     attribute :title, Types::Strict::String
+      #   end
+      #
+      #   Book.schema[:title].meta # => { struct: :Book }
+      #
+      def transform_types(proc = nil, &block)
+        input input.with_type_transform(proc || block)
+      end
+
+      # Add an arbitrary transformation for input hash keys.
+      #
+      # @param [#call,nil] proc
+      # @param [#call,nil] block
+      # @example
+      #   class Book < Dry::Struct
+      #     transform_keys(&:to_sym)
+      #
+      #     attribute :title, Types::Strict::String
+      #   end
+      #
+      #   Book.new('title' => "The Old Man and the Sea")
+      #   # => #<Book title="The Old Man and the Sea">
+      def transform_keys(proc = nil, &block)
+        input input.with_key_transform(proc || block)
+      end
+
       # @param [Hash{Symbol => Dry::Types::Definition, Dry::Struct}] new_schema
       # @raise [RepeatedAttributeError] when trying to define attribute with the
       #   same name as previously defined one
@@ -87,7 +218,6 @@ module Dry
 
       # @param [Hash{Symbol => Object},Dry::Struct] attributes
       # @raise [Struct::Error] if the given attributes don't conform {#schema}
-      #   with given {#constructor_type}
       def new(attributes = default_attributes)
         if attributes.instance_of?(self)
           attributes
@@ -110,34 +240,14 @@ module Dry
       alias_method :[], :call
 
       # @param [#call,nil] constructor
-      # @param [Hash] options
+      # @param [Hash] _options
       # @param [#call,nil] block
       # @return [Dry::Struct::Constructor]
       def constructor(constructor = nil, **_options, &block)
         Struct::Constructor.new(self, fn: constructor || block)
       end
 
-      # Retrieves default attributes from defined {.schema}.
-      # Used in a {Struct} constructor if no attributes provided to {.new}
-      #
-      # @return [Hash{Symbol => Object}]
-      def default_attributes
-        check_invalid_schema_keys
-        schema.each_with_object({}) { |(name, type), result|
-          result[name] = type.evaluate if type.default?
-        }
-      end
-
-      def check_invalid_schema_keys
-        invalid_keys = schema.select { |name, type|  type.instance_of?(String) }
-        raise ArgumentError, argument_error_msg(invalid_keys.keys) if invalid_keys.any?
-      end
-
-      def argument_error_msg(keys)
-        "Invaild argument for #{keys.join(', ')}"
-      end
-
-      # @param [Hash{Symbol => Object}] input
+      # @param [Hash{Symbol => Object},Dry::Struct] input
       # @yieldparam [Dry::Types::Result::Failure] failure
       # @yieldreturn [Dry::Types::ResultResult]
       # @return [Dry::Types::Result]
@@ -148,6 +258,17 @@ module Dry
         block_given? ? yield(failure) : failure
       end
 
+      # @param [Hash{Symbol => Object},Dry::Struct] input
+      # @return [Dry::Types::Result]
+      # @private
+      def try_struct(input)
+        if input.is_a?(self)
+          Types::Result::Success.new(input)
+        else
+          yield
+        end
+      end
+
       # @param [({Symbol => Object})] args
       # @return [Dry::Types::Result::Success]
       def success(*args)
@@ -157,7 +278,7 @@ module Dry
       # @param [({Symbol => Object})] args
       # @return [Dry::Types::Result::Failure]
       def failure(*args)
-        result(Types::Result::Failure, *args)
+        result(::Dry::Types::Result::Failure, *args)
       end
 
       # @param [Class] klass
@@ -196,16 +317,94 @@ module Dry
       #
       # @param [Symbol] key Attribute name
       # @return [Boolean]
-      def attribute?(key)
+      def has_attribute?(key)
         schema.key?(key)
       end
 
+      # @return [Hash{Symbol => Dry::Types::Definition, Dry::Struct}]
+      def schema
+        input.member_types
+      end
+
       # Gets the list of attribute names
       #
       # @return [Array<Symbol>]
       def attribute_names
         @attribute_names ||= schema.keys
       end
+
+      # @return [{Symbol => Object}]
+      def meta(meta = Undefined)
+        if meta.equal?(Undefined)
+          @meta
+        else
+          Class.new(self) do
+            @meta = @meta.merge(meta) unless meta.empty?
+          end
+        end
+      end
+
+      # Build a sum type
+      # @param [Dry::Types::Type] type
+      # @return [Dry::Types::Sum]
+      def |(type)
+        if type.is_a?(Class) && type <= Struct
+          Struct::Sum.new(self, type)
+        else
+          super
+        end
+      end
+
+      # Stores an object for building nested struct classes
+      # @return [StructBuilder]
+      def struct_builder
+        @struct_builder ||= StructBuilder.new(self).freeze
+      end
+      private :struct_builder
+
+      # Retrieves default attributes from defined {.schema}.
+      # Used in a {Struct} constructor if no attributes provided to {.new}
+      #
+      # @return [Hash{Symbol => Object}]
+      def default_attributes(default_schema = schema)
+        default_schema.each_with_object({}) do |(name, type), result|
+          result[name] = default_attributes(type.schema) if struct?(type)
+        end
+      end
+      private :default_attributes
+
+      # Checks if the given type is a Dry::Struct
+      #
+      # @param [Dry::Types::Definition, Dry::Struct] type
+      # @return [Boolean]
+      def struct?(type)
+        type.is_a?(Class) && type <= Struct
+      end
+      private :struct?
+
+      # Constructs a type
+      #
+      # @return [Dry::Types::Type, Dry::Struct]
+      def build_type(name, type, &block)
+        type_object =
+          if type.is_a?(String)
+            Dry::Types[type]
+          elsif block.nil? && type.nil?
+            raise(
+              ArgumentError,
+              'you must supply a type or a block to `Dry::Struct.attribute`'
+            )
+          else
+            type
+          end
+
+        if block
+          struct_builder.(name, type_object, &block)
+        else
+          type_object
+        end
+      end
+      private :build_type
     end
   end
 end

data/lib/dry/struct/errors.rb

@@ -11,5 +11,12 @@ module Dry
         super("Attribute :#{key} has already been defined")
       end
     end
+
+    # Raised when a struct doesn't have an attribute
+    class MissingAttributeError < KeyError
+      def initialize(key)
+        super("Missing attribute: #{ key.inspect }")
+      end
+    end
   end
 end

data/lib/dry/struct/extensions/pretty_print.rb

@@ -0,0 +1,20 @@
+require 'pp'
+
+module Dry
+  class Struct
+    def pretty_print(pp)
+      klass = self.class
+      pp.group(1, "#<#{ klass.name || klass.inspect }", '>') do
+        pp.seplist(@attributes.keys, proc { pp.text ',' }) do |column_name|
+          column_value = @attributes[column_name]
+          pp.breakable ' '
+          pp.group(1) do
+            pp.text column_name
+            pp.text '='
+            pp.pp column_value
+          end
+        end
+      end
+    end
+  end
+end

data/lib/dry/struct/extensions.rb

@@ -0,0 +1,3 @@
+Dry::Struct.register_extension(:pretty_print) do
+  require 'dry/struct/extensions/pretty_print'
+end

data/lib/dry/struct/hashify.rb

@@ -7,9 +7,13 @@ module Dry
       # @return [Hash, Array]
       def self.[](value)
         if value.respond_to?(:to_hash)
-          value.to_hash
-        elsif value.respond_to?(:map)
-          value.map { |item| self[item] }
+          if RUBY_VERSION >= '2.4'
+            value.to_hash.transform_values { |v| self[v] }
+          else
+            value.to_hash.each_with_object({}) { |(k, v), h| h[k] = self[v] }
+          end
+        elsif value.respond_to?(:to_ary)
+          value.to_ary.map { |item| self[item] }
         else
           value
         end

data/lib/dry/struct/struct_builder.rb

@@ -0,0 +1,86 @@
+require 'dry/types/compiler'
+
+module Dry
+  class Struct
+    # @private
+    class StructBuilder < Dry::Types::Compiler
+      attr_reader :struct
+
+      def initialize(struct)
+        super(Dry::Types)
+        @struct = struct
+      end
+
+      # @param [Symbol|String] attr_name the name of the nested type
+      # @param [Dry::Struct,Dry::Types::Type::Array] type the superclass of the nested struct
+      # @yield the body of the nested struct
+      def call(attr_name, type, &block)
+        const_name = const_name(type, attr_name)
+        check_name(const_name)
+
+        new_type = Class.new(parent(type), &block)
+        struct.const_set(const_name, new_type)
+
+        if array?(type)
+          type.of(new_type)
+        else
+          new_type
+        end
+      end
+
+      private
+
+      def array?(type)
+        type.is_a?(Types::Type) && type.primitive.equal?(Array)
+      end
+
+      def parent(type)
+        if array?(type)
+          visit(type.to_ast)
+        else
+          type || default_superclass
+        end
+      end
+
+      def default_superclass
+        struct < Value ? Value : Struct
+      end
+
+      def const_name(type, attr_name)
+        snake_name = if array?(type)
+                       Dry::Core::Inflector.singularize(attr_name)
+                     else
+                       attr_name
+                     end
+
+        Dry::Core::Inflector.camelize(snake_name)
+      end
+
+      def check_name(name)
+        raise(
+          Struct::Error,
+          "Can't create nested attribute - `#{struct}::#{name}` already defined"
+        ) if struct.const_defined?(name, false)
+      end
+
+      def visit_constrained(node)
+        definition, * = node
+        visit(definition)
+      end
+
+      def visit_array(node)
+        member, * = node
+        member
+      end
+
+      def visit_definition(*)
+        default_superclass
+      end
+
+      def visit_constructor(node)
+        definition, * = node
+        visit(definition)
+      end
+    end
+  end
+end

data/lib/dry/struct/sum.rb

@@ -0,0 +1,42 @@
+require 'dry/types/sum'
+
+module Dry
+  class Struct
+    # A sum type of two or more structs
+    # As opposed to Dry::Types::Sum::Constrained
+    # this type tries no to coerce data first.
+    class Sum < Dry::Types::Sum::Constrained
+      # @param [Hash{Symbol => Object},Dry::Struct] input
+      # @yieldparam [Dry::Types::Result::Failure] failure
+      # @yieldreturn [Dry::Types::ResultResult]
+      # @return [Dry::Types::Result]
+      def try(input)
+        if input.is_a?(Struct)
+          try_struct(input) { super }
+        else
+          super
+        end
+      end
+
+      # Build a new sum type
+      # @param [Dry::Types::Type] type
+      # @return [Dry::Types::Sum]
+      def |(type)
+        if type.is_a?(Class) && type <= Struct || type.is_a?(Sum)
+          self.class.new(self, type)
+        else
+          super
+        end
+      end
+
+      protected
+
+      # @private
+      def try_struct(input)
+        left.try_struct(input) do
+          right.try_struct(input) { yield }
+        end
+      end
+    end
+  end
+end

data/lib/dry/struct/version.rb

@@ -1,5 +1,6 @@
 module Dry
   class Struct
-    VERSION = '0.4.0'.freeze
+    # @private
+    VERSION = '0.6.0'.freeze
   end
 end

data/lib/dry/struct.rb

@@ -1,12 +1,39 @@
-require 'dry/core/constants'
 require 'dry-types'
+require 'dry-equalizer'
+require 'dry/core/extensions'
+require 'dry/core/constants'
 
 require 'dry/struct/version'
 require 'dry/struct/errors'
 require 'dry/struct/class_interface'
 require 'dry/struct/hashify'
+require 'dry/struct/struct_builder'
 
 module Dry
+  # Constructor method for easily creating a {Dry::Struct}.
+  # @return [Dry::Struct]
+  # @example
+  #   require 'dry-struct'
+  #
+  #   module Types
+  #     include Dry::Types.module
+  #   end
+  #
+  #   Person = Dry.Struct(name: Types::Strict::String, age: Types::Strict::Int)
+  #   matz = Person.new(name: "Matz", age: 52)
+  #   matz.name #=> "Matz"
+  #   matz.age #=> 52
+  #
+  #   Test = Dry.Struct(expected: Types::Strict::String) { input(input.strict) }
+  #   Test[expected: "foo", unexpected: "bar"]
+  #   #=> Dry::Struct::Error: [Test.new] unexpected keys [:unexpected] in Hash input
+  def self.Struct(attributes = Dry::Core::Constants::EMPTY_HASH, &block)
+    Class.new(Dry::Struct) do
+      attributes.each { |a, type| attribute a, type }
+      instance_eval(&block) if block
+    end
+  end
+
   # Typed {Struct} with virtus-like DSL for defining schema.
   #
   # ### Differences between dry-struct and virtus
@@ -18,14 +45,12 @@ module Dry
   # * Handling of attribute values is provided by standalone type objects from
   #   [`dry-types`][].
   # * Handling of attribute hashes is provided by standalone hash schemas from
-  #   [`dry-types`][], which means there are different types of constructors in
-  #   {Struct} (see {Dry::Struct::ClassInterface#constructor_type})
+  #   [`dry-types`][].
   # * Struct classes quack like [`dry-types`][], which means you can use them
   #   in hash schemas, as array members or sum them
   #
   # {Struct} class can specify a constructor type, which uses [hash schemas][]
   # to handle attributes in `.new` method.
-  # See {ClassInterface#new} for constructor types descriptions and examples.
   #
   # [`dry-types`]: https://github.com/dry-rb/dry-types
   # [Virtus]: https://github.com/solnic/virtus
@@ -57,130 +82,26 @@ module Dry
   #   refactoring.title #=> 'Refactoring'
   #   refactoring.subtitle #=> 'Improving the Design of Existing Code'
   class Struct
+    extend Dry::Core::Extensions
     include Dry::Core::Constants
     extend ClassInterface
 
-    # {Dry::Types::Hash} subclass with specific behaviour defined for
-    # @return [Dry::Types::Hash]
-    # @see #constructor_type
-    defines :input
-    input Types['coercible.hash']
-
-    # @return [Hash{Symbol => Dry::Types::Definition, Dry::Struct}]
-    defines :schema
-    schema EMPTY_HASH
+    include Dry::Equalizer(:__attributes__)
 
-    CONSTRUCTOR_TYPE = Dry::Types['symbol'].enum(:permissive, :schema, :strict, :strict_with_defaults)
+    # {Dry::Types::Hash::Schema} subclass with specific behaviour defined for
+    # @return [Dry::Types::Hash::Schema]
+    defines :input
+    input Types['coercible.hash'].schema(EMPTY_HASH)
 
-    # Sets or retrieves {#constructor} type as a symbol
-    #
-    # @note All examples below assume that you have defined {Struct} with
-    #   following attributes and explicitly call only {#constructor_type}:
-    #
-    #   ```ruby
-    #   class User < Dry::Struct
-    #     attribute :name, Types::Strict::String.default('John Doe')
-    #     attribute :age, Types::Strict::Int
-    #   end
-    #   ```
-    #
-    # ### Common constructor types include:
-    #
-    # * `:permissive` - the default constructor type, useful for defining
-    #   {Struct}s that are instantiated using data from the database
-    #   (i.e. results of a database query), where you expect *all defined
-    #   attributes to be present* and it's OK to ignore other keys
-    #   (i.e. keys used for joining, that are not relevant from your domain
-    #   {Struct}s point of view). Default values **are not used** otherwise
-    #   you wouldn't notice missing data.
-    # * `:schema` - missing keys will result in setting them using default
-    #   values, unexpected keys will be ignored.
-    # * `:strict` - useful when you *do not expect keys other than the ones
-    #   you specified as attributes* in the input hash
-    # * `:strict_with_defaults` - same as `:strict` but you are OK that some
-    #   values may be nil and you want defaults to be set
-    #
-    # To feel the difference between constructor types, look into examples.
-    # Each of them provide the same attributes' definitions,
-    # different constructor type, and 4 cases of given input:
-    #
-    # 1. Input omits a key for a value that does not have a default
-    # 2. Input omits a key for a value that has a default
-    # 3. Input contains nil for a value that specifies a default
-    # 4. Input includes a key that was not specified in the schema
-    #
-    # @example `:permissive` constructor
-    #   class User < Dry::Struct
-    #     constructor_type :permissive
-    #   end
-    #
-    #   User.new(name: "Jane")
-    #     #=> Dry::Struct::Error: [User.new] :age is missing in Hash input
-    #   User.new(age: 31)
-    #     #=> Dry::Struct::Error: [User.new] :name is missing in Hash input
-    #   User.new(name: nil, age: 31)
-    #     #=> #<User name="John Doe" age=31>
-    #   User.new(name: "Jane", age: 31, unexpected: "attribute")
-    #     #=> #<User name="Jane" age=31>
-    #
-    # @example `:schema` constructor
-    #   class User < Dry::Struct
-    #     constructor_type :schema
-    #   end
-    #
-    #   User.new(name: "Jane")        #=> #<User name="Jane" age=nil>
-    #   User.new(age: 31)             #=> #<User name="John Doe" age=31>
-    #   User.new(name: nil, age: 31)  #=> #<User name="John Doe" age=31>
-    #   User.new(name: "Jane", age: 31, unexpected: "attribute")
-    #     #=> #<User name="Jane" age=31>
-    #
-    # @example `:strict` constructor
-    #   class User < Dry::Struct
-    #     constructor_type :strict
-    #   end
-    #
-    #   User.new(name: "Jane")
-    #     #=> Dry::Struct::Error: [User.new] :age is missing in Hash input
-    #   User.new(age: 31)
-    #     #=> Dry::Struct::Error: [User.new] :name is missing in Hash input
-    #   User.new(name: nil, age: 31)
-    #     #=> Dry::Struct::Error: [User.new] nil (NilClass) has invalid type for :name
-    #   User.new(name: "Jane", age: 31, unexpected: "attribute")
-    #     #=> Dry::Struct::Error: [User.new] unexpected keys [:unexpected] in Hash input
-    #
-    # @example `:strict_with_defaults` constructor
-    #   class User < Dry::Struct
-    #     constructor_type :strict_with_defaults
-    #   end
-    #
-    #   User.new(name: "Jane")
-    #     #=> Dry::Struct::Error: [User.new] :age is missing in Hash input
-    #   User.new(age: 31)
-    #     #=> #<User name="John Doe" age=31>
-    #   User.new(name: nil, age: 31)
-    #     #=> Dry::Struct::Error: [User.new] nil (NilClass) has invalid type for :name
-    #   User.new(name: "Jane", age: 31, unexpected: "attribute")
-    #     #=> Dry::Struct::Error: [User.new] unexpected keys [:unexpected] in Hash input
-    #
-    # @see http://dry-rb.org/gems/dry-types/hash-schemas
-    #
-    # @overload constructor_type(type)
-    #   Sets the constructor type for {Struct}
-    #   @param [Symbol] type one of constructor types, see above
-    #   @return [Symbol]
-    #
-    # @overload constructor_type
-    #   Returns the constructor type for {Struct}
-    #   @return [Symbol] (:strict)
-    defines :constructor_type, type: CONSTRUCTOR_TYPE
-    constructor_type :permissive
+    @meta = EMPTY_HASH
 
-    # @return [Dry::Equalizer]
-    defines :equalizer
+    # @!attribute [Hash{Symbol => Object}] attributes
+    attr_reader :attributes
+    alias_method :__attributes__, :attributes
 
     # @param [Hash, #each] attributes
     def initialize(attributes)
-      attributes.each { |key, value| instance_variable_set("@#{key}", value) }
+      @attributes = attributes
     end
 
     # Retrieves value of previously defined attribute by its' `name`
@@ -201,7 +122,7 @@ module Dry
     #   rom_n_roda[:title] #=> 'Web Development with ROM and Roda'
     #   rom_n_roda[:subtitle] #=> nil
     def [](name)
-      public_send(name)
+      @attributes.fetch(name) { raise MissingAttributeError.new(name) }
     end
 
     # Converts the {Dry::Struct} to a hash with keys representing
@@ -223,7 +144,7 @@ module Dry
     #     #=> {title: 'Web Development with ROM and Roda', subtitle: nil}
     def to_hash
       self.class.schema.keys.each_with_object({}) do |key, result|
-        result[key] = Hashify[self[key]]
+        result[key] = Hashify[self[key]] if attributes.key?(key)
       end
     end
     alias_method :to_h, :to_hash
@@ -246,21 +167,21 @@ module Dry
     #   )
     #     #=> #<Book title="Web Development with ROM and Roda" subtitle="2nd edition">
     #
-    #   rom_n_roda.new(subtitle: '3nd edition')
-    #     #=> #<Book title="Web Development with ROM and Roda" subtitle="3nd edition">
+    #   rom_n_roda.new(subtitle: '3rd edition')
+    #     #=> #<Book title="Web Development with ROM and Roda" subtitle="3rd edition">
     def new(changeset)
       self.class[__attributes__.merge(changeset)]
     end
     alias_method :__new__, :new
 
-    # @return[Hash{Symbol => Object}]
-    # @api private
-    def __attributes__
-      self.class.attribute_names.each_with_object({}) do |key, h|
-        h[key] = instance_variable_get(:"@#{ key }")
-      end
+    # @return [String]
+    def inspect
+      klass = self.class
+      attrs = klass.attribute_names.map { |key| " #{key}=#{@attributes[key].inspect}" }.join
+      "#<#{ klass.name || klass.inspect }#{ attrs }>"
     end
   end
 end
 
 require 'dry/struct/value'
+require 'dry/struct/extensions'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-struct
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-04 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
@@ -30,20 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.12'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +47,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -63,7 +57,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: 0.4.3
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -161,14 +155,21 @@ files:
 - lib/dry/struct/class_interface.rb
 - lib/dry/struct/constructor.rb
 - lib/dry/struct/errors.rb
+- lib/dry/struct/extensions.rb
+- lib/dry/struct/extensions/pretty_print.rb
 - lib/dry/struct/hashify.rb
+- lib/dry/struct/struct_builder.rb
+- lib/dry/struct/sum.rb
 - lib/dry/struct/value.rb
 - lib/dry/struct/version.rb
+- log/.gitkeep
 homepage: https://github.com/dry-rb/dry-struct
 licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
+  changelog_uri: https://github.com/dry-rb/dry-struct/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/dry-rb/dry-struct
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -185,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Typed structs and value objects.