dry-data 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 11440d87987301e5ab00e881aca9769d10ca46b6
-  data.tar.gz: 10aac35f319d13a0f42875976005c32f8feb08f4
+  metadata.gz: f8204add8315ec4efed8923ffb753d5e670e56b3
+  data.tar.gz: 1a9bd0c932aa43bbdeba519cc00b5bae7ccfdfbd
 SHA512:
-  metadata.gz: 7b992fddcabd0940aec06466dff1fc804161183fb579619ea53fb4b38f4ca7229812677001b718f6af8d91e2c99603ae808e5c253e2e9bde93f2dec797b77b99
-  data.tar.gz: fa2e28003cf3ca3bffbb6f2953a5d8860c312e9fbf5135249432f5f7ecd358f94e8a64938f2e7add69618b66c4c947c84c215338e111d9cc61e73fa94a8dd806
+  metadata.gz: 5d0dea2a50e1b8a212c43eec8cd10ca463c53fa1cb8982db307f29fdf397c006fd7febe9c0fbabd2f146f94112f0a1bfcfdde627a94e80ce82a53548b4674876
+  data.tar.gz: a364d893f9d2bf9a4aba61970020ded68f136ca3bc8877a06783aa37e7ffcc0e4436acd629ad165cb1448a29460b3dd0b0290df747d1928a1228e7afbfad7646

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.4.0 2015-12-11
+
+## Added
+
+* Support for sum-types with constraint type (solnic)
+* `Dry::Data::Type#optional` for defining optional types (solnic)
+
+## Changed
+
+* `Dry::Data['optional']` was **removed** in favor of `Dry::Data::Type#optional` (solnic)
+
+[Compare v0.3.2...v0.4.0](https://github.com/dryrb/dry-data/compare/v0.3.2...v0.4.0)
+
 # v0.3.2 2015-12-10
 
 ## Added

data/README.md

@@ -146,7 +146,7 @@ maybe_int['12.3'] # Some(12.3)
 You can define your own optional types too:
 
 ``` ruby
-maybe_string = Dry::Data["optional"] | Dry::Data["string"]
+maybe_string = Dry::Data["string"].optional
 
 maybe_string[nil]
 # => None
@@ -164,6 +164,24 @@ maybe_string['something'].fmap(&:upcase).value
 # => "SOMETHING"
 ```
 
+### Sum-types
+
+You can specify sum types using `|` operator, it is an explicit way of defining
+what are the valid types of a value.
+
+In example `dry-data` defines `bool` type which is a sum-type consisting of `true`
+and `false` types which is expressed as `Dry::Data['true'] | Dry::Data['false']`
+(and it has its strict version, too).
+
+Another common case is defining that something can be either `nil` or something else:
+
+``` ruby
+nil_or_string = Dry::Data['strict.nil'] | Dry::Data['strict.string']
+
+nil_or_string[nil] # => nil
+nil_or_string["hello"] # => "hello"
+```
+
 ### Constrained Types
 
 You can create constrained types that will use validation rules to check if the
@@ -173,7 +191,7 @@ a lower level guarantee that you're not instantiating objects that are broken.
 All types support constraints API, but not all constraints are suitable for a
 particular primitive, it's up to you to set up constraints that make sense.
 
-Under the hood it uses `dry-validation`[https://github.com/dryrb/dry-validation]
+Under the hood it uses [`dry-validation`](https://github.com/dryrb/dry-validation)
 and all of its predicates are supported.
 
 IMPORTANT: `dry-data` does not have a runtime dependency on `dry-validation` so

data/lib/dry/data.rb

@@ -3,7 +3,7 @@ require 'date'
 require 'set'
 
 require 'inflecto'
-require 'thread_safe/cache'
+require 'thread_safe'
 
 require 'dry-container'
 require 'dry-equalizer'
@@ -59,17 +59,23 @@ module Dry
 
     def self.[](name)
       type_map.fetch_or_store(name) do
-        result = name.match(TYPE_SPEC_REGEX)
-
         type =
-          if result
-            type_id, member_id = result[1..2]
-            container[type_id].member(self[member_id])
-          else
-            container[name]
+          case name
+          when String
+            result = name.match(TYPE_SPEC_REGEX)
+
+            type =
+              if result
+                type_id, member_id = result[1..2]
+                container[type_id].member(self[member_id])
+              else
+                container[name]
+              end
+          when Class
+            self[identifier(name)]
           end
 
-        type_map[name] = type
+        type
       end
     end
 

data/lib/dry/data/optional.rb

@@ -0,0 +1,20 @@
+module Dry
+  module Data
+    class Optional
+      attr_reader :type
+
+      def initialize(type)
+        @type = type
+      end
+
+      def valid?(input)
+        type.valid?(input)
+      end
+
+      def call(input)
+        Maybe(type[input])
+      end
+      alias_method :[], :call
+    end
+  end
+end

data/lib/dry/data/sum_type.rb

@@ -2,28 +2,11 @@ require 'kleisli'
 
 module Dry
   module Data
-    def self.SumType(left, right)
-      klass =
-        if left.is_a?(Type::Optional)
-          SumType::Optional
-        else
-          SumType
-        end
-      klass.new(left, right)
-    end
-
     class SumType
       attr_reader :left
 
       attr_reader :right
 
-      class Optional < SumType
-        def call(input)
-          Maybe(super(input))
-        end
-        alias_method :[], :call
-      end
-
       def initialize(left, right)
         @left, @right = left, right
       end

data/lib/dry/data/type.rb

@@ -1,9 +1,9 @@
-require 'dry/data/type/optional'
 require 'dry/data/type/hash'
 require 'dry/data/type/array'
 require 'dry/data/type/enum'
 
 require 'dry/data/sum_type'
+require 'dry/data/optional'
 
 module Dry
   module Data
@@ -62,6 +62,10 @@ module Dry
         Enum.new(values, constrained(inclusion: values))
       end
 
+      def optional
+        Optional.new(Data['nil'] | self)
+      end
+
       def name
         primitive.name
       end
@@ -76,7 +80,7 @@ module Dry
       end
 
       def |(other)
-        Data.SumType(self, other)
+        SumType.new(self, other)
       end
     end
   end

data/lib/dry/data/type/array.rb

@@ -2,15 +2,23 @@ module Dry
   module Data
     class Type
       class Array < Type
-        def self.constructor(array_constructor, value_constructor, input)
-          array_constructor[input].map(&value_constructor)
+        def self.constructor(array_constructor, member_constructor, input)
+          array_constructor[input].map(&member_constructor)
         end
 
         def member(type)
-          self.class.new(
-            self.class.method(:constructor).to_proc.curry.(constructor, type.constructor),
-            primitive
-          )
+          member_constructor =
+            case type
+            when Type then type.constructor
+            when Class then Data[type].constructor
+            else
+              raise ArgumentError, "+#{type}+ is an unsupported array member"
+            end
+
+          array_constructor = self.class
+            .method(:constructor).to_proc.curry.(constructor, member_constructor)
+
+          self.class.new(array_constructor, primitive)
         end
       end
     end

data/lib/dry/data/type/constrained.rb

@@ -14,13 +14,17 @@ module Dry
         def call(input)
           result = super(input)
 
-          if rule.(result).success?
+          if valid?(result)
             result
           else
             raise ConstraintError, "#{input.inspect} violates constraints"
           end
         end
         alias_method :[], :call
+
+        def valid?(input)
+          super && rule.(input).success?
+        end
       end
 
       def constrained(options)

data/lib/dry/data/types.rb

@@ -22,12 +22,6 @@ module Dry
 
     ALL_PRIMITIVES = COERCIBLE.merge(NON_COERCIBLE).freeze
 
-    # Register optional type
-    register(
-      'optional',
-      Type::Optional.new(Type.method(:passthrough_constructor), NilClass)
-    )
-
     # Register built-in primitive types with kernel coercion methods
     COERCIBLE.each do |name, primitive|
       register(
@@ -55,12 +49,12 @@ module Dry
     # Register non-coercible maybe types
     ALL_PRIMITIVES.each do |name, primitive|
       next if name == :nil
-      register("maybe.strict.#{name}", self["optional"] | self["strict.#{name}"])
+      register("maybe.strict.#{name}", self["strict.#{name}"].optional)
     end
 
     # Register coercible maybe types
     COERCIBLE.each do |name, primitive|
-      register("maybe.coercible.#{name}", self["optional"] | self["coercible.#{name}"])
+      register("maybe.coercible.#{name}", self["coercible.#{name}"].optional)
     end
 
     # Register :bool since it's common and not a built-in Ruby type :(

data/lib/dry/data/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Data
-    VERSION = '0.3.2'.freeze
+    VERSION = '0.4.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-data
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2015-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe
@@ -169,6 +169,7 @@ files:
 - lib/dry/data/constraints.rb
 - lib/dry/data/container.rb
 - lib/dry/data/dsl.rb
+- lib/dry/data/optional.rb
 - lib/dry/data/struct.rb
 - lib/dry/data/sum_type.rb
 - lib/dry/data/type.rb
@@ -176,7 +177,6 @@ files:
 - lib/dry/data/type/constrained.rb
 - lib/dry/data/type/enum.rb
 - lib/dry/data/type/hash.rb
-- lib/dry/data/type/optional.rb
 - lib/dry/data/types.rb
 - lib/dry/data/types/form.rb
 - lib/dry/data/value.rb

data/lib/dry/data/type/optional.rb

@@ -1,19 +0,0 @@
-module Dry
-  module Data
-    class Type
-      class Optional < Type
-        def |(other)
-          Data.SumType(self.class.new(constructor, other.primitive), other)
-        end
-
-        def call(input)
-          Maybe(input)
-        end
-
-        def valid?(input)
-          input.nil? || super
-        end
-      end
-    end
-  end
-end