dry-types 0.7.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 02e8392346549c5801d50d1fb805951bea41e722
-  data.tar.gz: 6e4873ce2f3f8f92eb1bbbfccfbe68aed67524c2
+  metadata.gz: 8ca173b64639db4a874bc33694d2a8df9f9e0500
+  data.tar.gz: 4bcf324022827e5145dc0cbcc4376a0958e5595f
 SHA512:
-  metadata.gz: 1153d031efd2277c552a3b47e26395da775d5fa70600bc815c9f1a4658cb8200ba99c595b90c52c8128bd896bb017f2bcd1a0fcf80227bbb57118d2a1305f03d
-  data.tar.gz: 0d6c974e7bf9fbb552d4abd95e15a51368685507e21eda31909c9b002c43652dd74c08244728242330797be64e5b196bc7f1763c91d204f6b51ad181d69f65a1
+  metadata.gz: 4f44642bb9ddfb9911fba8439b5dbcbfaa55bafbd47755c23f6279bc37da155c06e6100c56bdaebc1c783fdccd8e892b14f5b36b6eee9c81d21a3b0a9ebe2971
+  data.tar.gz: 5db7721ac8611a08167a91106ad5097db5796fb8664c3f36502ef7ac92706902b3e262bf5c1e9e4c1b20b045df9bfe87073acdd555322bda8b303e9bdb2088a6

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# v0.7.1 2016-04-06
+
+## Added
+
+- `JSON::*` types with JSON-specific coercions (coop)
+
+## Fixed
+
+- Schema is properly inherited in Struct (backus)
+- `constructor_type` is properly inherited in Struct (fbernier)
+
+[Compare v0.7.0...v0.7.1](https://github.com/dryrb/dry-types/compare/v0.7.0...v0.7.1)
+
 # v0.7.0 2016-03-30
 
 Major focus of this release is to make complex type composition possible and improving constraint errors to be more meaningful.

data/lib/dry/types/coercions.rb

@@ -0,0 +1,35 @@
+module Dry
+  module Types
+    module Coercions
+      EMPTY_STRING = ''.freeze
+
+      def to_nil(input)
+        input unless empty_str?(input)
+      end
+
+      def to_date(input)
+        Date.parse(input)
+      rescue ArgumentError
+        input
+      end
+
+      def to_date_time(input)
+        DateTime.parse(input)
+      rescue ArgumentError
+        input
+      end
+
+      def to_time(input)
+        Time.parse(input)
+      rescue ArgumentError
+        input
+      end
+
+      private
+
+      def empty_str?(value)
+        EMPTY_STRING.eql?(value)
+      end
+    end
+  end
+end

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

@@ -1,7 +1,5 @@
-require 'date'
 require 'bigdecimal'
 require 'bigdecimal/util'
-require 'time'
 
 module Dry
   module Types
@@ -11,31 +9,7 @@ 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
-          input
-        end
-
-        def self.to_date_time(input)
-          DateTime.parse(input)
-        rescue ArgumentError
-          input
-        end
-
-        def self.to_time(input)
-          Time.parse(input)
-        rescue ArgumentError
-          input
-        end
+        extend Coercions
 
         def self.to_true(input)
           BOOLEAN_MAP.fetch(input, input)
@@ -46,44 +20,36 @@ module Dry
         end
 
         def self.to_int(input)
-          if input == ''
-            nil
-          else
-            result = input.to_i
+          return if empty_str?(input)
+
+          result = input.to_i
 
-            if result === 0 && input != '0'
-              input
-            else
-              result
-            end
+          if result === 0 && !input.eql?('0')
+            input
+          else
+            result
           end
         end
 
         def self.to_float(input)
-          if input == ''
-            nil
-          else
-            result = input.to_f
+          return if empty_str?(input)
 
-            if result == 0.0 && (input != '0' || input != '0.0')
-              input
-            else
-              result
-            end
+          result = input.to_f
+
+          if result.eql?(0.0) && (!input.eql?('0') && !input.eql?('0.0'))
+            input
+          else
+            result
           end
         end
 
         def self.to_decimal(input)
-          if input == ''
-            nil
-          else
-            result = to_float(input)
+          result = to_float(input)
 
-            if result.is_a?(Float)
-              result.to_d
-            else
-              result
-            end
+          if result.instance_of?(Float)
+            result.to_d
+          else
+            result
           end
         end
       end

data/lib/dry/types/coercions/json.rb

@@ -0,0 +1,18 @@
+require 'date'
+require 'bigdecimal'
+require 'bigdecimal/util'
+require 'time'
+
+module Dry
+  module Types
+    module Coercions
+      module JSON
+        extend Coercions
+
+        def self.to_decimal(input)
+          input.to_d unless empty_str?(input)
+        end
+      end
+    end
+  end
+end

data/lib/dry/types/compiler.rb

@@ -43,6 +43,10 @@ module Dry
         registry['form.array'].member(call(node))
       end
 
+      def visit_json_array(node)
+        registry['json.array'].member(call(node))
+      end
+
       def visit_hash(node)
         constructor, schema = node
         merge_with('hash', constructor, schema)
@@ -57,6 +61,15 @@ module Dry
         end
       end
 
+      def visit_json_hash(node)
+        if node
+          constructor, schema = node
+          merge_with('json.hash', constructor, schema)
+        else
+          registry['json.hash']
+        end
+      end
+
       def visit_key(node)
         name, types = node
         { name => visit(types) }

data/lib/dry/types/core.rb

@@ -65,4 +65,6 @@ module Dry
   end
 end
 
+require 'dry/types/coercions'
 require 'dry/types/form'
+require 'dry/types/json'

data/lib/dry/types/definition.rb

@@ -39,12 +39,10 @@ module Dry
       alias_method :[], :call
 
       def try(input, &block)
-        output = call(input)
-
-        if valid?(output)
-          success(output)
+        if valid?(input)
+          success(input)
         else
-          failure = failure(output, "#{output.inspect} must be an instance of #{primitive}")
+          failure = failure(input, "#{input.inspect} must be an instance of #{primitive}")
           block ? yield(failure) : failure
         end
       end

data/lib/dry/types/errors.rb

@@ -18,6 +18,12 @@ module Dry
 
     StructError = Class.new(TypeError)
 
+    class RepeatedAttributeError < ArgumentError
+      def initialize(key)
+        super("Attribute :#{key} has already been defined")
+      end
+    end
+
     ConstraintError = Class.new(TypeError) do
       attr_reader :result
 

data/lib/dry/types/json.rb

@@ -0,0 +1,33 @@
+require 'dry/types/coercions/json'
+
+module Dry
+  module Types
+    register('json.nil') do
+      self['nil'].constructor(Coercions::JSON.method(:to_nil))
+    end
+
+    register('json.date') do
+      self['date'].constructor(Coercions::JSON.method(:to_date))
+    end
+
+    register('json.date_time') do
+      self['date_time'].constructor(Coercions::JSON.method(:to_date_time))
+    end
+
+    register('json.time') do
+      self['time'].constructor(Coercions::JSON.method(:to_time))
+    end
+
+    register('json.decimal') do
+      self['decimal'].constructor(Coercions::JSON.method(:to_decimal))
+    end
+
+    register('json.array') do
+      self['array'].safe
+    end
+
+    register('json.hash') do
+      self['hash'].safe
+    end
+  end
+end

data/lib/dry/types/maybe.rb

@@ -14,7 +14,7 @@ module Dry
 
       def default(value)
         if value.nil?
-          raise ArgumentError, "nil cannot be used as a default of an optional type"
+          raise ArgumentError, "nil cannot be used as a default of a maybe type"
         else
           super
         end

data/lib/dry/types/struct.rb

@@ -8,13 +8,16 @@ module Dry
       def self.inherited(klass)
         super
 
-        klass.instance_variable_set('@equalizer', Equalizer.new)
+        klass.instance_variable_set('@equalizer', Equalizer.new(*schema.keys))
+        klass.instance_variable_set('@constructor_type', constructor_type)
         klass.send(:include, klass.equalizer)
 
         unless klass == Value
           klass.instance_variable_set('@constructor', Types['coercible.hash'])
           Types.register_class(klass)
         end
+
+        klass.attributes({}) unless equal?(Struct)
       end
 
       def self.equalizer
@@ -26,19 +29,32 @@ module Dry
       end
 
       def self.attributes(new_schema)
+        check_schema_duplication(new_schema)
+
         prev_schema = schema
 
         @schema = prev_schema.merge(new_schema)
         @constructor = Types['coercible.hash'].public_send(constructor_type, schema)
 
-        attr_reader(*(new_schema.keys - prev_schema.keys))
-        equalizer.instance_variable_get('@keys').concat(schema.keys).uniq!
+        attr_reader(*new_schema.keys)
+        equalizer.instance_variable_get('@keys').concat(new_schema.keys)
 
         self
       end
 
-      def self.constructor_type(type = :strict)
-        @constructor_type ||= type
+      def self.check_schema_duplication(new_schema)
+        shared_keys = new_schema.keys & schema.keys
+
+        fail RepeatedAttributeError, shared_keys.first if shared_keys.any?
+      end
+      private_class_method :check_schema_duplication
+
+      def self.constructor_type(type = nil)
+        if type
+          @constructor_type = type
+        else
+          @constructor_type || :strict
+        end
       end
 
       def self.schema
@@ -47,13 +63,13 @@ module Dry
       end
 
       def self.new(attributes = {})
-        if attributes.is_a?(self)
+        if attributes.instance_of?(self)
           attributes
         else
           super(constructor[attributes])
         end
-      rescue SchemaError, SchemaKeyError => e
-        raise StructError, "[#{self}.new] #{e.message}"
+      rescue SchemaError, SchemaKeyError => error
+        raise StructError, "[#{self}.new] #{error}"
       end
 
       def initialize(attributes)

data/lib/dry/types/value.rb

@@ -3,7 +3,7 @@ require 'dry/types/struct'
 module Dry
   module Types
     class Value < Struct
-      def self.new(*, &_block)
+      def self.new(*)
         super.freeze
       end
     end

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.7.0'.freeze
+    VERSION = '0.7.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-30 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -188,7 +188,9 @@ files:
 - lib/dry/types/array.rb
 - lib/dry/types/array/member.rb
 - lib/dry/types/builder.rb
+- lib/dry/types/coercions.rb
 - lib/dry/types/coercions/form.rb
+- lib/dry/types/coercions/json.rb
 - lib/dry/types/compiler.rb
 - lib/dry/types/constrained.rb
 - lib/dry/types/constrained/coercible.rb
@@ -204,6 +206,7 @@ files:
 - lib/dry/types/form.rb
 - lib/dry/types/hash.rb
 - lib/dry/types/hash/schema.rb
+- lib/dry/types/json.rb
 - lib/dry/types/maybe.rb
 - lib/dry/types/options.rb
 - lib/dry/types/result.rb