dry-types 0.12.3 → 0.13.0

data/lib/dry/types/options.rb

@@ -6,9 +6,9 @@ module Dry
 
       # @see Definition#initialize
       def initialize(*args, meta: EMPTY_HASH, **options)
-        @__args__ = args
-        @options = options
-        @meta = meta
+        @__args__ = args.freeze
+        @options = options.freeze
+        @meta = meta.freeze
       end
 
       # @param [Hash] new_options

data/lib/dry/types/params.rb

@@ -0,0 +1,53 @@
+require 'dry/types/coercions/params'
+
+module Dry
+  module Types
+    register('params.nil') do
+      self['nil'].constructor(Coercions::Params.method(:to_nil))
+    end
+
+    register('params.date') do
+      self['date'].constructor(Coercions::Params.method(:to_date))
+    end
+
+    register('params.date_time') do
+      self['date_time'].constructor(Coercions::Params.method(:to_date_time))
+    end
+
+    register('params.time') do
+      self['time'].constructor(Coercions::Params.method(:to_time))
+    end
+
+    register('params.true') do
+      self['true'].constructor(Coercions::Params.method(:to_true))
+    end
+
+    register('params.false') do
+      self['false'].constructor(Coercions::Params.method(:to_false))
+    end
+
+    register('params.bool') do
+      (self['params.true'] | self['params.false']).safe
+    end
+
+    register('params.integer') do
+      self['integer'].constructor(Coercions::Params.method(:to_int))
+    end
+
+    register('params.float') do
+      self['float'].constructor(Coercions::Params.method(:to_float))
+    end
+
+    register('params.decimal') do
+      self['decimal'].constructor(Coercions::Params.method(:to_decimal))
+    end
+
+    register('params.array') do
+      self['array'].constructor(Coercions::Params.method(:to_ary)).safe
+    end
+
+    register('params.hash') do
+      self['hash'].constructor(Coercions::Params.method(:to_hash)).safe
+    end
+  end
+end

data/lib/dry/types/safe.rb

@@ -4,9 +4,10 @@ module Dry
   module Types
     class Safe
       include Type
-      include Dry::Equalizer(:type, :options)
+      include Dry::Equalizer(:type)
       include Decorator
       include Builder
+      private :options, :meta
 
       # @param [Object] input
       # @return [Object]
@@ -37,7 +38,7 @@ module Dry
       #
       # @see Definition#to_ast
       def to_ast(meta: true)
-        [:safe, [type.to_ast, meta ? self.meta : EMPTY_HASH]]
+        [:safe, [type.to_ast(meta: meta), EMPTY_HASH]]
       end
 
       # @api public

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

@@ -56,6 +56,16 @@ RSpec.shared_examples_for 'Dry::Types::Definition#meta' do
     it 'equalizes on filled meta' do
       expect(type).to_not eql(type.meta(i_am: 'different'))
     end
+
+    it 'is locally immutable' do
+      expect(type.meta).to be_a ::Hash
+      expect(type.meta).to be_frozen
+      expect(type.meta).not_to have_key :immutable_test
+      derived = type.with(meta: {immutable_test: 1})
+      expect(derived.meta).to be_frozen
+      expect(derived.meta).to eql({immutable_test: 1})
+      expect(type.meta).not_to have_key :immutable_test
+    end
   end
 
   describe '#pristine' do

data/lib/dry/types/sum.rb

@@ -55,11 +55,6 @@ module Dry
         false
       end
 
-      # @return [false]
-      def maybe?
-        false
-      end
-
       # @return [false]
       def constrained?
         false
@@ -101,7 +96,7 @@ module Dry
         end
       end
 
-      def failure(input)
+      def failure(input, _error = nil)
         if !left.valid?(input)
           left.failure(input, left.try(input).error)
         else
@@ -128,6 +123,17 @@ module Dry
       def to_ast(meta: true)
         [:sum, [left.to_ast(meta: meta), right.to_ast(meta: meta), meta ? self.meta : EMPTY_HASH]]
       end
+
+      # @param [Hash] options
+      # @return [Constrained,Sum]
+      # @see Builder#constrained
+      def constrained(options)
+        if optional?
+          right.constrained(options).optional
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.12.3'.freeze
+    VERSION = '0.13.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.13.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,62 +30,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.2
 - !ruby/object:Gem::Dependency
-  name: dry-equalizer
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '0.3'
 - !ruby/object:Gem::Dependency
-  name: dry-configurable
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: dry-logic
   requirement: !ruby/object:Gem::Requirement
@@ -106,26 +112,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.2
-- !ruby/object:Gem::Dependency
-  name: inflecto
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.0
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.2
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -224,8 +210,11 @@ files:
 - lib/dry/types/builder.rb
 - lib/dry/types/builder_methods.rb
 - lib/dry/types/coercions.rb
-- lib/dry/types/coercions/form.rb
 - lib/dry/types/coercions/json.rb
+- lib/dry/types/coercions/params.rb
+- lib/dry/types/compat.rb
+- lib/dry/types/compat/form_types.rb
+- lib/dry/types/compat/int.rb
 - lib/dry/types/compiler.rb
 - lib/dry/types/constrained.rb
 - lib/dry/types/constrained/coercible.rb
@@ -241,11 +230,14 @@ files:
 - lib/dry/types/extensions.rb
 - lib/dry/types/extensions/maybe.rb
 - lib/dry/types/fn_container.rb
-- lib/dry/types/form.rb
 - lib/dry/types/hash.rb
 - lib/dry/types/hash/schema.rb
+- lib/dry/types/hash/schema_builder.rb
+- lib/dry/types/inflector.rb
 - lib/dry/types/json.rb
+- lib/dry/types/map.rb
 - lib/dry/types/options.rb
+- lib/dry/types/params.rb
 - lib/dry/types/result.rb
 - lib/dry/types/safe.rb
 - lib/dry/types/spec/types.rb

data/lib/dry/types/form.rb

@@ -1,53 +0,0 @@
-require 'dry/types/coercions/form'
-
-module Dry
-  module Types
-    register('form.nil') do
-      self['nil'].constructor(Coercions::Form.method(:to_nil))
-    end
-
-    register('form.date') do
-      self['date'].constructor(Coercions::Form.method(:to_date))
-    end
-
-    register('form.date_time') do
-      self['date_time'].constructor(Coercions::Form.method(:to_date_time))
-    end
-
-    register('form.time') do
-      self['time'].constructor(Coercions::Form.method(:to_time))
-    end
-
-    register('form.true') do
-      self['true'].constructor(Coercions::Form.method(:to_true))
-    end
-
-    register('form.false') do
-      self['false'].constructor(Coercions::Form.method(:to_false))
-    end
-
-    register('form.bool') do
-      (self['form.true'] | self['form.false']).safe
-    end
-
-    register('form.int') do
-      self['int'].constructor(Coercions::Form.method(:to_int))
-    end
-
-    register('form.float') do
-      self['float'].constructor(Coercions::Form.method(:to_float))
-    end
-
-    register('form.decimal') do
-      self['decimal'].constructor(Coercions::Form.method(:to_decimal))
-    end
-
-    register('form.array') do
-      self['array'].constructor(Coercions::Form.method(:to_ary)).safe
-    end
-
-    register('form.hash') do
-      self['hash'].constructor(Coercions::Form.method(:to_hash)).safe
-    end
-  end
-end