dry-struct 1.4.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bf0892469a434b85578e7350f52039b85203dbd251ca5c4bd6b038373edc703e
-  data.tar.gz: 263e3d2d4ce824be64210a27d074fb42126dde12d94e56290307d9ff08c0efad
+  metadata.gz: 4875bdb8501964e23c1a10b3074e4e271fb3313c626f1142fcd357e6946be19d
+  data.tar.gz: 1c73644bf0a068cb5c55e4dbb2ada2071446a83563f63e50fd3adb5043cac87d
 SHA512:
-  metadata.gz: '08ea5f7780bac10495f93a5043c5e100fc9386688920e4e7fd1b2304ceaeb8f37853f6ed70f5d5a69b1d7a30c0340450f8ce41fba91e812e00cf6a008f9c2de0'
-  data.tar.gz: da176db2c5d8127ea7ef6a088edf7f8f4d18c74e65d96e7f6a80dd9822c0baefdfa1dd7eb6d607ac077c033d64dcddb0ca6c1498eb411c4cd94ea96e23c701b4
+  metadata.gz: 0eab727ee4057dc0c22864cae090cf968cf726d5670b853edac1fcd5f3ba3e9411994e94b6e333de1a3f55c2cc50a9dcaa266a6e704e63e365289280d04f46d4
+  data.tar.gz: 0e906ceeec35489db1b5884b45f137019a687ae8fbd1a7c22451350b742ab914c7cf46c1dad5e852994dac9acafb314b32d6118b59cd4bb9f097596f1e112187

data/CHANGELOG.md

@@ -1,5 +1,24 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.5.1 2022-10-17
+
+
+### Fixed
+
+- Fixed issues with auto-loading `Extensions` module (issue #183 fixed via #184) (@solnic)
+
+
+[Compare v1.5.0...v1.5.1](https://github.com/dry-rb/dry-struct/compare/v1.5.0...v1.5.1)
+
+## 1.5.0 2022-10-15
+
+
+### Changed
+
+- Use zeitwerk for auto-loading (@flash-gordon)
+
+[Compare v1.4.0...v1.5.0](https://github.com/dry-rb/dry-struct/compare/v1.4.0...v1.5.0)
+
 ## 1.4.0 2021-01-21
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 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,3 +1,4 @@
+<!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-struct
 [actions]: https://github.com/dry-rb/dry-struct/actions
 [codacy]: https://www.codacy.com/gh/dry-rb/dry-struct
@@ -10,19 +11,19 @@
 [![CI Status](https://github.com/dry-rb/dry-struct/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/961f5c776f1d49218b2cede3745e059c)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/961f5c776f1d49218b2cede3745e059c)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-struct.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-struct.svg?branch=main)][inchpages]
 
 ## Links
 
-* [User documentation](http://dry-rb.org/gems/dry-struct)
+* [User documentation](https://dry-rb.org/gems/dry-struct)
 * [API documentation](http://rubydoc.info/gems/dry-struct)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI >= `2.5`
-* jruby >= `9.2`
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-struct.gemspec

@@ -1,36 +1,38 @@
 # frozen_string_literal: true
-# this file is managed by dry-rb/devtools project
 
-lib = File.expand_path('lib', __dir__)
+# this file is synced from dry-rb/template-gem project
+
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'dry/struct/version'
+require "dry/struct/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'dry-struct'
+  spec.name          = "dry-struct"
   spec.authors       = ["Piotr Solnica"]
   spec.email         = ["piotr.solnica@gmail.com"]
-  spec.license       = 'MIT'
+  spec.license       = "MIT"
   spec.version       = Dry::Struct::VERSION.dup
 
   spec.summary       = "Typed structs and value objects"
   spec.description   = spec.summary
-  spec.homepage      = 'https://dry-rb.org/gems/dry-struct'
+  spec.homepage      = "https://dry-rb.org/gems/dry-struct"
   spec.files         = Dir["CHANGELOG.md", "LICENSE", "README.md", "dry-struct.gemspec", "lib/**/*"]
-  spec.bindir        = 'bin'
+  spec.bindir        = "bin"
   spec.executables   = []
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  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'
-  spec.metadata['bug_tracker_uri']   = 'https://github.com/dry-rb/dry-struct/issues'
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-struct/blob/main/CHANGELOG.md"
+  spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-struct"
+  spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-struct/issues"
 
-  spec.required_ruby_version = ">= 2.5.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
-  spec.add_runtime_dependency "dry-core", "~> 0.5", ">= 0.5"
-  spec.add_runtime_dependency "dry-types", "~> 1.5"
+  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
+  spec.add_runtime_dependency "dry-types", "~> 1.6"
   spec.add_runtime_dependency "ice_nine", "~> 0.11"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/struct/class_interface.rb

@@ -1,18 +1,11 @@
 # frozen_string_literal: true
 
 require "weakref"
-require "dry/core/class_attributes"
-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
     # Class-level interface of {Struct} and {Value}
-    module ClassInterface
+    module ClassInterface # rubocop:disable Metrics/ModuleLength
       include Core::ClassAttributes
 
       include Types::Type
@@ -49,8 +42,12 @@ module Dry
       #     end
       #   end
       #
-      #   Language.schema
-      #   # => #<Dry::Types[Constructor<Schema<keys={name: Constrained<Nominal<String> rule=[type?(String)]> details: Language::Details}> fn=Kernel.Hash>]>
+      #   Language.schema # new lines for readability
+      #   # => #<Dry::Types[
+      #           Constructor<Schema<keys={
+      #             name: Constrained<Nominal<String> rule=[type?(String)]>
+      #             details: Language::Details
+      #           }> fn=Kernel.Hash>]>
       #
       #   ruby = Language.new(name: 'Ruby', details: { type: 'OO' })
       #   ruby.name #=> 'Ruby'
@@ -67,10 +64,12 @@ module Dry
       #     end
       #   end
       #
-      #   Language.schema
+      #   Language.schema # new lines for readability
       #   => #<Dry::Types[Constructor<Schema<keys={
       #         name: Constrained<Nominal<String> rule=[type?(String)]>
-      #         versions: Constrained<Array<Constrained<Nominal<String> rule=[type?(String)]>> rule=[type?(Array)]>
+      #         versions: Constrained<
+      #                     Array<Constrained<Nominal<String> rule=[type?(String)]>
+      #                   > rule=[type?(Array)]>
       #         celebrities: Constrained<Array<Language::Celebrity> rule=[type?(Array)]>
       #      }> fn=Kernel.Hash>]>
       #
@@ -151,7 +150,7 @@ module Dry
           Core::Deprecations.warn(
             "Dry::Struct.attribute? is deprecated for checking attribute presence, "\
             "use has_attribute? instead",
-            tag: :'dry-struct'
+            tag: :"dry-struct"
           )
 
           has_attribute?(args[0])
@@ -247,7 +246,7 @@ module Dry
 
       # @param [Hash{Symbol => Object},Dry::Struct] attributes
       # @raise [Struct::Error] if the given attributes don't conform {#schema}
-      def new(attributes = default_attributes, safe = false, &block)
+      def new(attributes = default_attributes, safe = false, &block) # rubocop:disable Style/OptionalBooleanParameter
         if attributes.is_a?(Struct)
           if equal?(attributes.class)
             attributes
@@ -481,10 +480,10 @@ module Dry
         keys.each do |key|
           next if instance_methods.include?(key)
 
-          class_eval(<<-RUBY)
-            def #{key}
-              @attributes[#{key.inspect}]
-            end
+          class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
+            def #{key}                      # def email
+              @attributes[#{key.inspect}]   #   @attributes[:email]
+            end                             # end
           RUBY
         end
       end

data/lib/dry/struct/compiler.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "weakref"
-require "dry/types/compiler"
-
 module Dry
   class Struct
     class Compiler < Types::Compiler

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

@@ -11,7 +11,7 @@ module Dry
           column_value = @attributes[column_name]
           pp.breakable " "
           pp.group(1) do
-            pp.text column_name
+            pp.text column_name.to_s
             pp.text "="
             pp.pp column_value
           end

data/lib/dry/struct/struct_builder.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/struct/compiler"
-
 module Dry
   class Struct
     # @private
@@ -14,7 +12,8 @@ module Dry
       end
 
       # @param [Symbol|String] attr_name the name of the nested type
-      # @param [Dry::Struct,Dry::Types::Type::Array,Undefined] type the superclass of the nested struct
+      # @param [Dry::Struct,Dry::Types::Type::Array,Undefined] 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)

data/lib/dry/struct/sum.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/types/sum"
-require "dry/types/printer"
-
 module Dry
   class Struct
     # A sum type of two or more structs
@@ -46,9 +43,9 @@ module Dry
       protected
 
       # @private
-      def try_struct(input)
+      def try_struct(input, &block)
         left.try_struct(input) do
-          right.try_struct(input) { yield }
+          right.try_struct(input, &block)
         end
       end
     end

data/lib/dry/struct/value.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require "ice_nine"
-require "dry/core/deprecations"
 
 module Dry
   class Struct
-    extend Core::Deprecations[:'dry-struct']
+    extend Core::Deprecations[:"dry-struct"]
 
     # {Value} objects behave like {Struct}s but *deeply frozen*
     # using [`ice_nine`](https://github.com/dkubb/ice_nine)

data/lib/dry/struct/version.rb

@@ -3,6 +3,6 @@
 module Dry
   class Struct
     # @private
-    VERSION = "1.4.0"
+    VERSION = "1.5.1"
   end
 end

data/lib/dry/struct.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
+require "weakref"
+
+require "dry/core"
 require "dry/types"
-require "dry/core/equalizer"
-require "dry/core/extensions"
-require "dry/core/constants"
-require "dry/core/deprecations"
 
-require "dry/struct/version"
-require "dry/struct/errors"
 require "dry/struct/class_interface"
-require "dry/struct/hashify"
-require "dry/struct/struct_builder"
+require "dry/struct/errors"
+require "dry/struct/version"
 
 module Dry
   # Constructor method for easily creating a {Dry::Struct}.
@@ -88,14 +85,28 @@ module Dry
     extend Core::Extensions
     include Core::Constants
     extend ClassInterface
-    extend Core::Deprecations[:'dry-struct']
+    extend Core::Deprecations[:"dry-struct"]
 
     class << self
       # override `Dry::Types::Builder#prepend`
       define_method(:prepend, ::Module.method(:prepend))
+
+      def loader
+        @loader ||= ::Zeitwerk::Loader.new.tap do |loader|
+          root = ::File.expand_path("..", __dir__)
+          loader.tag = "dry-struct"
+          loader.inflector = ::Zeitwerk::GemInflector.new("#{root}/dry-struct.rb")
+          loader.push_dir(root)
+          loader.ignore(
+            "#{root}/dry-struct.rb",
+            "#{root}/dry/struct/{class_interface,errors,extensions,printer,value,version}.rb",
+            "#{root}/dry/struct/extensions"
+          )
+        end
+      end
     end
 
-    autoload :Value, "dry/struct/value"
+    loader.setup
 
     include ::Dry::Equalizer(:__attributes__, inspect: false, immutable: true)
 
@@ -159,8 +170,8 @@ module Dry
         result[key.name] = Hashify[self[key.name]] if attributes.key?(key.name)
       end
     end
+    # TODO: remove in 2.0
     alias_method :to_hash, :to_h
-    # deprecate :to_hash, :to_h, message: "Implicit convertion structs to hashes is deprecated. Use .to_h"
 
     # Create a copy of {Dry::Struct} with overriden attributes
     #
@@ -183,7 +194,11 @@ module Dry
     #   rom_n_roda.new(subtitle: '3rd edition')
     #     #=> #<Book title="Web Development with ROM and Roda" subtitle="3rd edition">
     def new(changeset)
-      new_attributes = self.class.schema.apply(changeset, skip_missing: true, resolve_defaults: false)
+      new_attributes = self.class.schema.apply(
+        changeset,
+        skip_missing: true,
+        resolve_defaults: false
+      )
       self.class.load(__attributes__.merge(new_attributes))
     rescue Types::SchemaError, Types::MissingKeyError, Types::UnknownKeysError => e
       raise Error, "[#{self}.new] #{e}"
@@ -197,16 +212,15 @@ module Dry
       "#<#{klass.name || klass.inspect}#{attrs}>"
     end
 
-    if RUBY_VERSION >= "2.7"
-      # Pattern matching support
-      #
-      # @api private
-      def deconstruct_keys(_keys)
-        attributes
-      end
+    # Pattern matching support
+    #
+    # @api private
+    def deconstruct_keys(_keys)
+      attributes
     end
   end
 end
 
 require "dry/struct/extensions"
 require "dry/struct/printer"
+require "dry/struct/value"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-struct
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-21 00:00:00.000000000 Z
+date: 2022-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-core
@@ -16,34 +16,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -58,6 +58,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.11'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,7 +158,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-struct/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-struct/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-struct
   bug_tracker_uri: https://github.com/dry-rb/dry-struct/issues
 post_install_message: 
@@ -155,14 +169,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Typed structs and value objects