dry-struct 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 223d319c97aced13759a063d7d19d0afc7eeff56
-  data.tar.gz: '09b4aecf6acb6981e71e9e98a8f3049e9e5b4ff6'
+  metadata.gz: 33a4358e2a11c38b8816778acc5722b6d08a4c4d
+  data.tar.gz: 24bebcf82ec2e1dcb7536216acc397ae9aa6a3c7
 SHA512:
-  metadata.gz: 52ef521bf80136eb363dc53adb98e21f1b379fa7697edadf9e4f882e32a2334948beb316f997fa5c11fabb871674b40f86fd373b254253bb879e6a0db516e63e
-  data.tar.gz: f2fac5903962ee469f009a566fabd77fc8c0e9470222ef9a78fd63db6916a1b0e36958e34c0c083e5e146e11398dfdf567c7dfbefd18f82bfd03338cba8822bd
+  metadata.gz: 332a625be1cde86fefd74efe78e79b375c6c66a15f5ad062f26e736055b9a9e9aef9234299bd0a7ff0272ce2e80218060d0ddb52d0074a5bc7d1ed12a03e1971
+  data.tar.gz: 757d33e5151cf3f30ffbe28798f1c86ab634f12612d4a7603431aae72513eedf088a3cf483603809b10ac6da870da2dc2f39ef1136e6fe99c42b25ee979ea681

data/.travis.yml

@@ -7,7 +7,6 @@ script:
 after_success:
   - '[ -d coverage ] && bundle exec codeclimate-test-reporter'
 rvm:
-  - 2.1.10
   - 2.2.7
   - 2.3.3
   - 2.4.1

data/CHANGELOG.md

@@ -1,4 +1,18 @@
-# v0.3.1 to-be-released
+# v0.4.0 2017-11-04
+
+## Changed
+
+* Attribute readers don't override existing instance methods (solnic)
+* `Struct#new` uses raw attributes instead of method calls, this makes the behavior consistent with the change above (flash-gordon)
+* `constructor_type` now actively rejects `:weak` and `:symbolized` values (GustavoCaso)
+
+## Fixed
+
+* `Struct#new` doesn't call `.to_hash` recursively (flash-gordon)
+
+[Compare v0.3.1...v0.4.0](https://github.com/dry-rb/dry-struct/compare/v0.3.1...v0.4.0)
+
+# v0.3.1 2017-06-30
 
 ## Added
 
@@ -6,7 +20,7 @@
 * `Struct.attribute?` and `Struct.attribute_names` for introspecting struct attributes (flash-gordon)
 * `Struct#__new__` is a safe-to-use-in-gems alias for `Struct#new` (flash-gordon)
 
-[Compare v0.3.0...master](https://github.com/dry-rb/dry-struct/compare/v0.3.0...master)
+[Compare v0.3.0...v0.3.1](https://github.com/dry-rb/dry-struct/compare/v0.3.0...v0.3.1)
 
 # v0.3.0 2017-05-05
 

data/Gemfile

@@ -2,9 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'dry-types', git: 'https://github.com/dry-rb/dry-types'
+
 group :test do
   gem 'codeclimate-test-reporter', platform: :mri, require: false
   gem 'simplecov', require: false
+  gem 'warning' if RUBY_VERSION >= '2.4.0'
 end
 
 group :tools do

data/dry-struct.gemspec

@@ -27,9 +27,8 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
-  spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
-  spec.add_runtime_dependency 'dry-types', '~> 0.9', '>= 0.9.0'
-  spec.add_runtime_dependency 'dry-core', '~> 0.3'
+  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 'ice_nine', '~> 0.11'
 
   spec.add_development_dependency 'bundler', '~> 1.6'

data/lib/dry/struct.rb

@@ -70,6 +70,8 @@ module Dry
     defines :schema
     schema EMPTY_HASH
 
+    CONSTRUCTOR_TYPE = Dry::Types['symbol'].enum(:permissive, :schema, :strict, :strict_with_defaults)
+
     # Sets or retrieves {#constructor} type as a symbol
     #
     # @note All examples below assume that you have defined {Struct} with
@@ -107,13 +109,6 @@ module Dry
     # 3. Input contains nil for a value that specifies a default
     # 4. Input includes a key that was not specified in the schema
     #
-    # @note Don’t use `:weak` and `:symbolized` as {#constructor_type},
-    #   and instead use [`dry-validation`][] to process and validate
-    #   attributes, otherwise your struct will behave as a data validator
-    #   which raises exceptions on invalid input (assuming your attributes
-    #   types are strict)
-    #   [`dry-validation`]: https://github.com/dry-rb/dry-validation
-    #
     # @example `:permissive` constructor
     #   class User < Dry::Struct
     #     constructor_type :permissive
@@ -177,7 +172,7 @@ module Dry
     # @overload constructor_type
     #   Returns the constructor type for {Struct}
     #   @return [Symbol] (:strict)
-    defines :constructor_type
+    defines :constructor_type, type: CONSTRUCTOR_TYPE
     constructor_type :permissive
 
     # @return [Dry::Equalizer]
@@ -254,9 +249,17 @@ module Dry
     #   rom_n_roda.new(subtitle: '3nd edition')
     #     #=> #<Book title="Web Development with ROM and Roda" subtitle="3nd edition">
     def new(changeset)
-      self.class[to_hash.merge(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
+    end
   end
 end
 

data/lib/dry/struct/class_interface.rb

@@ -10,6 +10,7 @@ module Dry
     module ClassInterface
       include Core::ClassAttributes
 
+      include Dry::Types::Type
       include Dry::Types::Builder
 
       # @param [Class] klass
@@ -65,7 +66,10 @@ module Dry
         schema schema.merge(new_schema)
         input Types['coercible.hash'].public_send(constructor_type, schema)
 
-        attr_reader(*new_schema.keys)
+        new_schema.each_key do |key|
+          attr_reader(key) unless instance_methods.include?(key)
+        end
+
         equalizer.instance_variable_get('@keys').concat(new_schema.keys)
 
         self
@@ -200,7 +204,7 @@ module Dry
       #
       # @return [Array<Symbol>]
       def attribute_names
-        schema.keys
+        @attribute_names ||= schema.keys
       end
     end
   end

data/lib/dry/struct/constructor.rb

@@ -2,6 +2,7 @@ module Dry
   class Struct
     class Constructor
       include Dry::Equalizer(:type)
+      include Dry::Types::Type
 
       # @return [#call]
       attr_reader :fn

data/lib/dry/struct/errors.rb

@@ -1,9 +1,5 @@
 module Dry
   class Struct
-    extend Dry::Configurable
-
-    setting :namespace, self
-
     # Raised when given input doesn't conform schema and constructor type
     Error = Class.new(TypeError)
 

data/lib/dry/struct/version.rb

@@ -1,5 +1,5 @@
 module Dry
   class Struct
-    VERSION = '0.3.1'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-struct
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-equalizer
@@ -24,54 +24,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
-- !ruby/object:Gem::Dependency
-  name: dry-configurable
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.12'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: ice_nine
   requirement: !ruby/object:Gem::Requirement