dry-types 1.0.1 → 1.1.0

data/lib/dry/types/schema.rb

@@ -156,8 +156,8 @@ module Dry
         [
           :schema,
           [keys.map { |key| key.to_ast(meta: meta) },
-            opts,
-            meta ? self.meta : EMPTY_HASH]
+           opts,
+           meta ? self.meta : EMPTY_HASH]
         ]
       end
 
@@ -190,9 +190,7 @@ module Dry
       def with_key_transform(proc = nil, &block)
         fn = proc || block
 
-        if fn.nil?
-          raise ArgumentError, "a block or callable argument is required"
-        end
+        raise ArgumentError, 'a block or callable argument is required' if fn.nil?
 
         handle = Dry::Types::FnContainer.register(fn)
         with(key_transform_fn: handle)
@@ -203,7 +201,7 @@ module Dry
       # @return [Boolean]
       #
       # @api public
-      def trasform_keys?
+      def transform_keys?
         !options[:key_transform_fn].nil?
       end
 
@@ -294,10 +292,10 @@ module Dry
       #
       # @api private
       def merge_keys(*keys)
-        keys.
-          flatten(1).
-          each_with_object({}) { |key, merged| merged[key.name] = key }.
-          values
+        keys
+          .flatten(1)
+          .each_with_object({}) { |key, merged| merged[key.name] = key }
+          .values
       end
 
       # Validate and coerce a hash. Raise an exception on any error
@@ -315,19 +313,17 @@ module Dry
           if type
             begin
               result[k] = type.call_unsafe(value)
-            rescue ConstraintError => error
-              raise SchemaError.new(type.name, value, error.result)
-            rescue CoercionError => error
-              raise SchemaError.new(type.name, value, error.message)
+            rescue ConstraintError => e
+              raise SchemaError.new(type.name, value, e.result)
+            rescue CoercionError => e
+              raise SchemaError.new(type.name, value, e.message)
             end
           elsif strict?
             raise unexpected_keys(hash.keys)
           end
         end
 
-        if result.size < keys.size
-          resolve_missing_keys(result, options)
-        end
+        resolve_missing_keys(result, options) if result.size < keys.size
 
         result
       end
@@ -351,9 +347,7 @@ module Dry
           end
         end
 
-        if result.size < keys.size
-          resolve_missing_keys(result, options, &block)
-        end
+        resolve_missing_keys(result, options, &block) if result.size < keys.size
 
         result
       end

data/lib/dry/types/schema/key.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/equalizer'
+require 'dry/core/deprecations'
 
 module Dry
   module Types
@@ -14,6 +15,7 @@ module Dry
       #
       # @see Dry::Types::Schema
       class Key
+        extend ::Dry::Core::Deprecations[:'dry-types']
         include Type
         include Dry::Equalizer(:name, :type, :options, inspect: false)
         include Decorator
@@ -94,7 +96,7 @@ module Dry
         #
         # @api public
         def lax
-          super.required(false)
+          __new__(type.lax).required(false)
         end
 
         # Dump to internal AST representation
@@ -113,6 +115,22 @@ module Dry
           ]
         end
 
+        # @see Dry::Types::Meta#meta
+        #
+        # @api public
+        def meta(data = nil)
+          if data.nil? || !data.key?(:omittable)
+            super
+          else
+            self.class.warn(
+              'Using meta for making schema keys is deprecated, ' \
+              'please use .omittable or .required(false) instead' \
+              "\n" + Core::Deprecations::STACK.()
+            )
+            super.required(!data[:omittable])
+          end
+        end
+
         private
 
         # @api private

data/lib/dry/types/spec/types.rb

@@ -2,7 +2,7 @@
 
 RSpec.shared_examples_for 'Dry::Types::Nominal without primitive' do
   def be_boolean
-    satisfy { |x| x == true || x == false  }
+    satisfy { |x| x == true || x == false }
   end
 
   describe '#constrained?' do
@@ -43,9 +43,7 @@ RSpec.shared_examples_for 'Dry::Types::Nominal without primitive' do
 
   describe '#to_s' do
     it 'returns a custom string representation' do
-      if type.class.name.start_with?('Dry::Types')
-        expect(type.to_s).to start_with('#<Dry::Types')
-      end
+      expect(type.to_s).to start_with('#<Dry::Types') if type.class.name.start_with?('Dry::Types')
     end
   end
 
@@ -81,7 +79,7 @@ RSpec.shared_examples_for 'Dry::Types::Nominal#meta' do
       expect(type.meta).not_to have_key :immutable_test
       derived = type.meta(immutable_test: 1)
       expect(derived.meta).to be_frozen
-      expect(derived.meta).to eql({immutable_test: 1})
+      expect(derived.meta).to eql(immutable_test: 1)
       expect(type.meta).not_to have_key :immutable_test
     end
   end
@@ -139,4 +137,3 @@ RSpec.shared_examples_for 'a nominal type' do |inputs: Object.new|
     end
   end
 end
-

data/lib/dry/types/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Types
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,79 +25,79 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.4.4
+        version: '0.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.4
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
@@ -105,6 +105,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -112,6 +115,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -127,47 +133,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: dry-monads
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +220,7 @@ files:
 - lib/dry/types.rb
 - lib/dry/types/any.rb
 - lib/dry/types/array.rb
+- lib/dry/types/array/constructor.rb
 - lib/dry/types/array/member.rb
 - lib/dry/types/builder.rb
 - lib/dry/types/builder_methods.rb