dry-types 0.11.1 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f665eeb69ceba9c2fd336bc2a489c1b4004c40c
-  data.tar.gz: 155884224930392bcc2db1640b88ae2cdaa10fe3
+  metadata.gz: 336c6e4da78c6b66a32a43671d7961b5a9e26e78
+  data.tar.gz: 282770ba63247f594e89071ad36677689fe7ddc7
 SHA512:
-  metadata.gz: '08136001e7fe28fd14260861a37b91ee9ca276e480990b6ac741f39a3ee9e4603b26d20077c9984a50bd21536c4247acbffc9cba6050587b3c23c6e1be61846f'
-  data.tar.gz: 3fb2af20a9f42b4b025ff3ad1f460d4fbde466a3c459d1f894d09cc4266c62e7003058b6a931c8614e94c6173ecf5ae9a6a56c0ca7f82fcc2479366d63bfb7b4
+  metadata.gz: af9f5770f1ae7e750589b016bba706eb874cacb8d282b013493ec81c2344af35abde95eb3609c6f80fb907ca17abc7c964f25a9c290ee0fe9992f3cd131885e6
+  data.tar.gz: 9a7711e6c22eb5889448ce10adbcbb48cb02e1d6a9ee91c43707556e68b6e57e048507382a13d28a00940befca06d88329ec99ce7132dcefd4857a3435b92b8c

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+log/

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.12.0 2017-09-15
+
+## Added
+
+* A bunch of shortcut methods for constructing types to the autogenerated module, e.g. `Types.Constructor(String, &:to_s)` (flash-gordon)
+
+## Deprecated
+
+* `Types::Array#member` was deprecated in favor of `Types::Array#of` (flash-gordon)
+
+[Compare v0.11.1...v0.12.0](https://github.com/dry-rb/dry-types/compare/v0.11.1...v0.12.0)
+
 # v0.11.1 2017-08-14
 
 ## Changed

data/Gemfile

@@ -21,3 +21,5 @@ group :benchmarks do
   gem 'fast_attributes'
   gem 'attrio'
 end
+
+gem 'dry-logic', git: 'https://github.com/dry-rb/dry-logic'

data/dry-types.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'dry/types/version'
@@ -12,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = 'Type system for Ruby supporting coercions, constraints and complex types like structs, value objects, enums etc.'
   spec.description   = spec.summary
-  spec.homepage      = "https://github.com/dryrb/dry-types"
+  spec.homepage      = "https://github.com/dry-rb/dry-types"
 
   # Prevent pushing this gem to RubyGems.org by setting 'allowed_push_host', or
   # delete this section to allow pushing this gem to any host.
@@ -33,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'dry-container', '~> 0.3'
   spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
-  spec.add_runtime_dependency 'dry-logic', '~> 0.4', '>= 0.4.0'
+  spec.add_runtime_dependency 'dry-logic', '~> 0.4', '>= 0.4.2'
   spec.add_runtime_dependency 'inflecto', '~> 0.0.0', '>= 0.0.2'
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/dry/types.rb

@@ -16,6 +16,7 @@ require 'dry/types/type'
 require 'dry/types/definition'
 require 'dry/types/constructor'
 require 'dry/types/fn_container'
+require 'dry/types/builder_methods'
 
 require 'dry/types/errors'
 
@@ -35,6 +36,7 @@ module Dry
     def self.module
       namespace = Module.new
       define_constants(namespace, type_keys)
+      namespace.extend(BuilderMethods)
       namespace
     end
 
@@ -84,7 +86,7 @@ module Dry
 
           if result
             type_id, member_id = result[1..2]
-            container[type_id].member(self[member_id])
+            container[type_id].of(self[member_id])
           else
             container[name]
           end
@@ -132,7 +134,23 @@ module Dry
     # List of type keys defined in {Dry::Types.container}
     # @return [<String>]
     def self.type_keys
-      container._container.keys
+      container.keys
+    end
+
+    private
+
+    # @api private
+    def self.const_missing(const)
+      underscored = Inflecto.underscore(const)
+
+      if type_keys.any? { |key| key.split('.')[0] == underscored }
+        raise NameError,
+              'dry-types does not define constants for default types. '\
+              'You can access the predefined types with [], e.g. Dry::Types["strict.int"] '\
+              'or generate a module with types using Dry::Types.module'
+      else
+        super
+      end
     end
   end
 end

data/lib/dry/types/array.rb

@@ -1,21 +1,24 @@
 require 'dry/types/array/member'
+require 'dry/core/deprecations'
 
 module Dry
   module Types
     class Array < Definition
+      extend Dry::Core::Deprecations[:'dry-types']
+
       # @param [Type] type
       # @return [Array::Member]
-      def member(type)
+      def of(type)
         member =
           case type
           when String, Class then Types[type]
           else type
           end
 
-        Array::Member.new(primitive, options.merge(member: member))
+        Array::Member.new(primitive, **options, member: member)
       end
 
-      alias_method :of, :member
+      deprecate :member, :of
     end
   end
 end

data/lib/dry/types/builder_methods.rb

@@ -0,0 +1,91 @@
+module Dry
+  module Types
+    module BuilderMethods
+      # @api private
+      def included(base)
+        super
+        base.extend(BuilderMethods)
+      end
+
+      # Build an array type.
+      # It is a shortcut for Array.of
+      #
+      # @example
+      #   Types::Strings = Types.Array(Types::String)
+      #
+      # @param [Dry::Types::Type] type
+      #
+      # @return [Dry::Types::Array]
+      def Array(type)
+        self::Array.of(type)
+      end
+
+      # Build a hash schema
+      #
+      # @param [Symbol] schema Schema type
+      # @param [Hash{Symbol => Dry::Types::Type}] type_map
+      #
+      # @return [Dry::Types::Array]
+      # @api public
+      def Hash(schema, type_map)
+        self::Hash.public_send(schema, type_map)
+      end
+
+      # Build a type which values are instances of a given class
+      # Values are checked using `is_a?` call
+      #
+      # @param [Class,Module] klass Class or module
+      #
+      # @return [Dry::Types::Type]
+      # @api public
+      def Instance(klass)
+        Definition.new(klass).constrained(type: klass)
+      end
+
+      # Build a type with a single value
+      # The equality check done with `eql?`
+      #
+      # @param [Object] value
+      #
+      # @return [Dry::Types::Type]
+      # @api public
+      def Value(value)
+        Definition.new(value.class).constrained(eql: value)
+      end
+
+      # Build a type with a single value
+      # The equality check done with `equal?`
+      #
+      # @param [Object] object
+      #
+      # @return [Dry::Types::Type]
+      # @api public
+      def Constant(object)
+        Definition.new(object.class).constrained(is: object)
+      end
+
+      # Build a constructor type
+      # If no constructor block given it uses .new method
+      #
+      # @param [Class] klass
+      # @param [#call,nil] cons Value constructor
+      # @param [#call,nil] block Value constructor
+      #
+      # @return [Dry::Types::Type]
+      # @api public
+      def Constructor(klass, cons = nil, &block)
+        Definition.new(klass).constructor(cons || block || klass.method(:new))
+      end
+
+      # Build a definiton type
+      #
+      # @param [Class] klass
+      #
+      # @return [Dry::Types::Type]
+      # @api public
+      def Definition(klass)
+        Definition.new(klass)
+      end
+    end
+  end
+end

data/lib/dry/types/compiler.rb

@@ -45,7 +45,7 @@ module Dry
 
       def visit_array(node)
         member, meta = node
-        registry['array'].member(visit(member)).meta(meta)
+        registry['array'].of(visit(member)).meta(meta)
       end
 
       def visit_hash(node)
@@ -60,7 +60,7 @@ module Dry
 
       def visit_json_array(node)
         member, meta = node
-        registry['json.array'].member(visit(member)).meta(meta)
+        registry['json.array'].of(visit(member)).meta(meta)
       end
 
       def visit_form_hash(node)
@@ -70,7 +70,7 @@ module Dry
 
       def visit_form_array(node)
         member, meta = node
-        registry['form.array'].member(visit(member)).meta(meta)
+        registry['form.array'].of(visit(member)).meta(meta)
       end
 
       def visit_member(node)

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.11.1'.freeze
+    VERSION = '0.12.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.12.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-14 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -95,7 +95,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -105,7 +105,7 @@ dependencies:
         version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -222,6 +222,7 @@ files:
 - lib/dry/types/array.rb
 - lib/dry/types/array/member.rb
 - 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
@@ -251,7 +252,8 @@ files:
 - lib/dry/types/type.rb
 - lib/dry/types/version.rb
 - lib/spec/dry/types.rb
-homepage: https://github.com/dryrb/dry-types
+- log/.gitkeep
+homepage: https://github.com/dry-rb/dry-types
 licenses:
 - MIT
 metadata: