dry-data 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 63d84521c44133ae20569f13cfe37198d145b84b
-  data.tar.gz: 34a54445feeb95d3caffec626f3cca303eaa3455
+  metadata.gz: 66f872c57c14fed55be62785dabd619e72cf79ff
+  data.tar.gz: 663d9e422d10619df80ff448ecc268c66651586a
 SHA512:
-  metadata.gz: c4ed0e1ca95bdb0e7d07dd744480da21d0316d96a43dc9e52e35963edbbc45f4eca370b4116a5ef4db51f6c0dda8e68b8f0b836ab1235fd7b2850ecfaa4f4558
-  data.tar.gz: 87f09d1e60fbfef3a96750561ef81e354ced647d6e4371d02e49fd204e6229684b50e194f7ed3c6cf8c8d312e1d329b60de0f876f5a5cfca1fed9ffafb92cfe7
+  metadata.gz: e675b8735a351ec4f5d086cbc51eeb64a1f1d06ad28d3b96e09024ee076eef687cac70cc209afc63b6bc463f73ebe2f8c6dbdb86159befed7fb61e40d7610282
+  data.tar.gz: a44e721d53be8ff1e25c34e95acd174bf15982199e5bcd9626f4aaa608c022658454a3e03f3d5260f6011e839cd7c37d84b0996224cb1bd54835e616c88d8ec2

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v0.2.0 2015-11-29
+
+## Added
+
+* `form.nil` which coerces empty strings to `nil` (solnic)
+* `bool` sum-type (true | false) (solnic)
+* Type compiler supports sum-types now (solnic)
+
+## Changed
+
+* Constructing optional types uses the new `Dry::Data["optional"]` built-in type (solnic)
+
+[Compare v0.1.0...v0.2.0](https://github.com/dryrb/dry-data/compare/v0.1.0...v0.2.0)
+
 # v0.1.0 2015-11-27
 
 ## Added

data/README.md

@@ -117,7 +117,7 @@ maybe_int['12.3'] # Some(12.3)
 You can define your own optional types too:
 
 ``` ruby
-maybe_string = Dry::Data["nil"] | Dry::Data["string"]
+maybe_string = Dry::Data["optional"] | Dry::Data["string"]
 
 maybe_string[nil]
 # => None

data/lib/dry/data/coercions/form.rb

@@ -10,6 +10,14 @@ module Dry
         FALSE_VALUES = %w[0 off f false n no].freeze
         BOOLEAN_MAP = Hash[TRUE_VALUES.product([true]) + FALSE_VALUES.product([false])].freeze
 
+        def self.to_nil(input)
+          if input.is_a?(String) && input == ''
+            nil
+          else
+            input
+          end
+        end
+
         def self.to_date(input)
           Date.parse(input)
         rescue ArgumentError

data/lib/dry/data/compiler.rb

@@ -1,10 +1,10 @@
 module Dry
   module Data
     class Compiler
-      attr_reader :types
+      attr_reader :registry
 
-      def initialize(types)
-        @types = types
+      def initialize(registry)
+        @registry = registry
       end
 
       def call(ast)
@@ -21,18 +21,18 @@ module Dry
         if args
           send(:"visit_#{type}", args)
         else
-          types[type]
+          registry[type]
         end
       end
 
       def visit_hash(node)
         constructor, schema = node
-        types['hash'].public_send(constructor, schema.map { |key| visit(key) }.reduce(:merge))
+        registry['hash'].public_send(constructor, schema.map { |key| visit(key) }.reduce(:merge))
       end
 
       def visit_key(node)
-        name, type = node
-        { name => type }
+        name, types = node
+        { name => types.map { |id| registry[id] }.reduce(:|) }
       end
     end
   end

data/lib/dry/data/sum_type.rb

@@ -4,7 +4,7 @@ module Dry
   module Data
     def self.SumType(left, right)
       klass =
-        if left.primitive == NilClass
+        if left.is_a?(Type::Optional)
           SumType::Optional
         else
           SumType
@@ -33,15 +33,17 @@ module Dry
       end
 
       def call(input)
-        result = left[input]
-
-        if left.valid?(result)
-          result
-        else
+        begin
+          value = left[input]
+
+          if left.valid?(value)
+            value
+          else
+            right[value]
+          end
+        rescue TypeError
           right[input]
         end
-      rescue TypeError
-        right[input]
       end
       alias_method :[], :call
 

data/lib/dry/data/type.rb

@@ -1,3 +1,4 @@
+require 'dry/data/type/optional'
 require 'dry/data/type/hash'
 require 'dry/data/type/array'
 
@@ -47,7 +48,7 @@ module Dry
       alias_method :[], :call
 
       def valid?(input)
-        input.instance_of?(primitive)
+        input.is_a?(primitive)
       end
 
       def |(other)

data/lib/dry/data/type/hash.rb

@@ -48,8 +48,8 @@ module Dry
         end
 
         def schema(type_map, meth = :safe_constructor)
-          value_constructors = type_map.each_with_object({}) { |(name, type_id), result|
-            result[name] = Data[type_id]
+          value_constructors = type_map.each_with_object({}) { |(name, type), result|
+            result[name] = type.is_a?(String) ? Data[type] : type
           }
 
           self.class.new(

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

@@ -0,0 +1,19 @@
+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

data/lib/dry/data/types.rb

@@ -20,6 +20,12 @@ 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(
@@ -47,15 +53,16 @@ module Dry
     # Register non-coercible maybe types
     ALL_PRIMITIVES.each do |name, primitive|
       next if name == :nil
-      register("maybe.strict.#{name}", self["strict.nil"] | self["strict.#{name}"])
+      register("maybe.strict.#{name}", self["optional"] | self["strict.#{name}"])
     end
 
     # Register coercible maybe types
     COERCIBLE.each do |name, primitive|
-      register("maybe.coercible.#{name}", self["strict.nil"] | self["coercible.#{name}"])
+      register("maybe.coercible.#{name}", self["optional"] | self["coercible.#{name}"])
     end
 
     # Register :bool since it's common and not a built-in Ruby type :(
+    register("bool", self["true"] | self["false"])
     register("strict.bool", self["strict.true"] | self["strict.false"])
   end
 end

data/lib/dry/data/types/form.rb

@@ -2,6 +2,10 @@ require 'dry/data/coercions/form'
 
 module Dry
   module Data
+    register('form.nil') do
+      Type.new(Coercions::Form.method(:to_nil), NilClass)
+    end
+
     register('form.date') do
       Type.new(Coercions::Form.method(:to_date), Date)
     end

data/lib/dry/data/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Data
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-data
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-27 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-container
@@ -130,6 +130,7 @@ files:
 - lib/dry/data/type.rb
 - lib/dry/data/type/array.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/version.rb