dry-struct 1.0.0 → 1.4.0

data/lib/dry/struct/compiler.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+require "weakref"
+require "dry/types/compiler"
+
+module Dry
+  class Struct
+    class Compiler < Types::Compiler
+      def visit_struct(node)
+        struct, _ = node
+
+        struct.__getobj__
+      rescue ::WeakRef::RefError
+        if struct.weakref_alive?
+          raise
+        else
+          raise RecycledStructError
+        end
+      end
+    end
+  end
+end

data/lib/dry/struct/constructor.rb

@@ -1,29 +1,9 @@
+# frozen_string_literal: true
+
 module Dry
   class Struct
-    class Constructor
-      include Dry::Equalizer(:type)
-      include Dry::Types::Type
-
-      # @return [#call]
-      attr_reader :fn
-
-      # @return [#call]
-      attr_reader :type
-
-      # @param [Struct] type
-      # @param [Hash] options
-      # @param [#call, nil] block
-      def initialize(type, options = {}, &block)
-        @type = type
-        @fn = options.fetch(:fn, block)
-      end
-
-      # @param [Object] input
-      # @return [Object]
-      def call(input)
-        type[fn[input]]
-      end
-      alias_method :[], :call
+    class Constructor < Types::Constructor
+      alias_method :primitive, :type
     end
   end
 end

data/lib/dry/struct/errors.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 module Dry
   class Struct
     # Raised when given input doesn't conform schema and constructor type
     Error = Class.new(TypeError)
 
     # Raised when defining duplicate attributes
-    class RepeatedAttributeError < ArgumentError
+    class RepeatedAttributeError < ::ArgumentError
       # @param [Symbol] key
       #   attribute name that is the same as previously defined one
       def initialize(key)
@@ -13,9 +15,17 @@ module Dry
     end
 
     # Raised when a struct doesn't have an attribute
-    class MissingAttributeError < KeyError
+    class MissingAttributeError < ::KeyError
       def initialize(key)
-        super("Missing attribute: #{ key.inspect }")
+        super("Missing attribute: #{key.inspect}")
+      end
+    end
+
+    # When struct class stored in ast was garbage collected because no alive objects exists
+    # This shouldn't happen in a working application
+    class RecycledStructError < ::RuntimeError
+      def initialize
+        super("Reference to struct class was garbage collected")
       end
     end
   end

data/lib/dry/struct/extensions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dry::Struct.register_extension(:pretty_print) do
-  require 'dry/struct/extensions/pretty_print'
+  require "dry/struct/extensions/pretty_print"
 end

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

@@ -1,16 +1,18 @@
-require 'pp'
+# frozen_string_literal: true
+
+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|
+      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.breakable " "
           pp.group(1) do
             pp.text column_name
-            pp.text '='
+            pp.text "="
             pp.pp column_value
           end
         end

data/lib/dry/struct/hashify.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Dry
   class Struct
     # Helper for {Struct#to_hash} implementation
@@ -6,12 +8,10 @@ module Dry
       # @param [#to_hash, #map, Object] value
       # @return [Hash, Array]
       def self.[](value)
-        if value.respond_to?(:to_hash)
-          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
+        if value.is_a?(Struct)
+          value.to_h.transform_values { |current| self[current] }
+        elsif value.respond_to?(:to_hash)
+          value.to_hash.transform_values { |current| self[current] }
         elsif value.respond_to?(:to_ary)
           value.to_ary.map { |item| self[item] }
         else

data/lib/dry/struct/printer.rb

@@ -1,10 +1,13 @@
-require 'dry/types/printer'
+# frozen_string_literal: true
+
+require "dry/types/printer"
 
 module Dry
   module Types
     # @api private
     class Printer
       MAPPING[Struct::Sum] = :visit_struct_sum
+      MAPPING[Struct::Constructor] = :visit_struct_constructor
 
       def visit_struct_sum(sum)
         visit_sum_constructors(sum) do |constructors|
@@ -13,6 +16,8 @@ module Dry
           end
         end
       end
+
+      alias_method :visit_struct_constructor, :visit_constructor
     end
   end
 end

data/lib/dry/struct/struct_builder.rb

@@ -1,28 +1,42 @@
-require 'dry/types/compiler'
+# frozen_string_literal: true
+
+require "dry/struct/compiler"
 
 module Dry
   class Struct
     # @private
-    class StructBuilder < Dry::Types::Compiler
+    class StructBuilder < Compiler
       attr_reader :struct
 
       def initialize(struct)
-        super(Dry::Types)
+        super(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
+      # @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)
         check_name(const_name)
 
-        new_type = Class.new(parent(type), &block)
+        builder = self
+        parent = parent(type)
+
+        new_type = ::Class.new(Undefined.default(parent, struct.abstract_class)) do
+          if Undefined.equal?(parent)
+            schema builder.struct.schema.clear
+          end
+
+          class_exec(&block)
+        end
+
         struct.const_set(const_name, new_type)
 
         if array?(type)
           type.of(new_type)
+        elsif optional?(type)
+          new_type.optional
         else
           new_type
         end
@@ -30,37 +44,46 @@ module Dry
 
       private
 
+      def type?(type)
+        type.is_a?(Types::Type)
+      end
+
       def array?(type)
-        type.is_a?(Types::Type) && type.primitive.equal?(Array)
+        type?(type) && !type.optional? && type.primitive.equal?(::Array)
+      end
+
+      def optional?(type)
+        type?(type) && type.optional?
       end
 
       def parent(type)
         if array?(type)
           visit(type.to_ast)
+        elsif optional?(type)
+          type.right
         else
-          type || default_superclass
+          type
         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)
+        snake_name =
+          if array?(type)
+            Core::Inflector.singularize(attr_name)
+          else
+            attr_name
+          end
+
+        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)
+        if struct.const_defined?(name, false)
+          raise(
+            Error,
+            "Can't create nested attribute - `#{struct}::#{name}` already defined"
+          )
+        end
       end
 
       def visit_constrained(node)
@@ -70,11 +93,11 @@ module Dry
 
       def visit_array(node)
         member, * = node
-        member
+        visit(member)
       end
 
       def visit_nominal(*)
-        default_superclass
+        Undefined
       end
 
       def visit_constructor(node)

data/lib/dry/struct/sum.rb

@@ -1,5 +1,7 @@
-require 'dry/types/sum'
-require 'dry/types/printer'
+# frozen_string_literal: true
+
+require "dry/types/sum"
+require "dry/types/printer"
 
 module Dry
   class Struct
@@ -12,6 +14,7 @@ module Dry
           right.try_struct(input) { super }
         end
       end
+
       # @param [Hash{Symbol => Object},Dry::Struct] input
       # @yieldparam [Dry::Types::Result::Failure] failure
       # @yieldreturn [Dry::Types::ResultResult]

data/lib/dry/struct/value.rb

@@ -1,14 +1,19 @@
-require 'ice_nine'
+# frozen_string_literal: true
+
+require "ice_nine"
+require "dry/core/deprecations"
 
 module Dry
   class Struct
+    extend Core::Deprecations[:'dry-struct']
+
     # {Value} objects behave like {Struct}s but *deeply frozen*
     # using [`ice_nine`](https://github.com/dkubb/ice_nine)
     #
     # @example
     #   class Location < Dry::Struct::Value
-    #     attribute :lat, Types::Strict::Float
-    #     attribute :lng, Types::Strict::Float
+    #     attribute :lat, Types::Float
+    #     attribute :lng, Types::Float
     #   end
     #
     #   loc1 = Location.new(lat: 1.23, lng: 4.56)
@@ -20,12 +25,16 @@ module Dry
     #
     # @see https://github.com/dkubb/ice_nine
     class Value < self
+      abstract
+
       # @param (see ClassInterface#new)
       # @return [Value]
       # @see https://github.com/dkubb/ice_nine
       def self.new(*)
-        IceNine.deep_freeze(super)
+        ::IceNine.deep_freeze(super)
       end
     end
+
+    deprecate_constant :Value
   end
 end

data/lib/dry/struct/version.rb

@@ -1,6 +1,8 @@
+# frozen_string_literal: true
+
 module Dry
   class Struct
     # @private
-    VERSION = '1.0.0'.freeze
+    VERSION = "1.4.0"
   end
 end

metadata

@@ -1,63 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: dry-struct
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
-bindir: exe
+bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2021-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: dry-core
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.3
+        version: '1.5'
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement
@@ -90,71 +76,59 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.5
-description: Typed structs and value objects.
+        version: '0'
+description: Typed structs and value objects
 email:
 - piotr.solnica@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
-- ".yardopts"
 - CHANGELOG.md
-- CONTRIBUTING.md
-- Gemfile
 - LICENSE
 - README.md
-- Rakefile
-- benchmarks/basic.rb
-- benchmarks/constrained.rb
-- benchmarks/profile_instantiation.rb
-- benchmarks/setup.rb
-- bin/console
-- bin/setup
 - dry-struct.gemspec
 - lib/dry-struct.rb
 - lib/dry/struct.rb
 - lib/dry/struct/class_interface.rb
+- lib/dry/struct/compiler.rb
 - lib/dry/struct/constructor.rb
 - lib/dry/struct/errors.rb
 - lib/dry/struct/extensions.rb
@@ -165,14 +139,14 @@ files:
 - 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
+homepage: https://dry-rb.org/gems/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
+  bug_tracker_uri: https://github.com/dry-rb/dry-struct/issues
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -181,15 +155,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
-summary: Typed structs and value objects.
+summary: Typed structs and value objects
 test_files: []