dry-types 0.8.1 → 0.9.0

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.8.1'.freeze
+    VERSION = '0.9.0'.freeze
   end
 end

data/lib/spec/dry/types.rb

@@ -0,0 +1,56 @@
+RSpec.shared_examples_for 'Dry::Types::Definition without primitive' do
+  def be_boolean
+    satisfy { |x| x == true || x == false  }
+  end
+
+  describe '#constrained?' do
+    it 'returns a boolean value' do
+      expect(type.constrained?).to be_boolean
+    end
+  end
+
+  describe '#default?' do
+    it 'returns a boolean value' do
+      expect(type.default?).to be_boolean
+    end
+  end
+
+  describe '#valid?' do
+    it 'returns a boolean value' do
+      expect(type.valid?(1)).to be_boolean
+    end
+  end
+
+  describe '#eql?' do
+    it 'has #eql? defined' do
+      expect(type).to eql(type)
+    end
+  end
+
+  describe '#==' do
+    it 'has #== defined' do
+      expect(type).to eq(type)
+    end
+  end
+end
+
+RSpec.shared_examples_for 'Dry::Types::Definition#meta' do
+  describe '#meta' do
+    it 'allows setting meta information' do
+      with_meta = type.meta(foo: :bar).meta(baz: '1')
+
+      expect(with_meta).to be_instance_of(type.class)
+      expect(with_meta.meta).to eql(foo: :bar, baz: '1')
+    end
+  end
+end
+
+RSpec.shared_examples_for Dry::Types::Definition do
+  it_behaves_like 'Dry::Types::Definition without primitive'
+
+  describe '#primitive' do
+    it 'returns a class' do
+      expect(type.primitive).to be_instance_of(Class)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-13 00:00:00.000000000 Z
+date: 2016-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: dry-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: dry-container
   requirement: !ruby/object:Gem::Requirement
@@ -72,20 +86,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: inflecto
   requirement: !ruby/object:Gem::Requirement
@@ -107,75 +121,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.0.2
 - !ruby/object:Gem::Dependency
-  name: dry-monads
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.1
-- !ruby/object:Gem::Dependency
-  name: ice_nine
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
-  type: :runtime
+        version: '1.6'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '11.0'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: dry-monads
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '0.2'
 description: Type system for Ruby supporting coercions, constraints and complex types
   like structs, value objects, enums etc.
 email:
@@ -192,8 +192,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- benchmarks/basic.rb
-- benchmarks/constrained.rb
+- benchmarks/hash_schemas.rb
 - dry-types.gemspec
 - lib/dry-types.rb
 - lib/dry/types.rb
@@ -215,20 +214,18 @@ files:
 - lib/dry/types/definition.rb
 - lib/dry/types/enum.rb
 - lib/dry/types/errors.rb
+- lib/dry/types/extensions.rb
+- lib/dry/types/extensions/maybe.rb
 - lib/dry/types/form.rb
 - lib/dry/types/hash.rb
 - lib/dry/types/hash/schema.rb
-- lib/dry/types/hashify.rb
 - lib/dry/types/json.rb
-- lib/dry/types/maybe.rb
 - lib/dry/types/options.rb
 - lib/dry/types/result.rb
 - lib/dry/types/safe.rb
-- lib/dry/types/struct.rb
-- lib/dry/types/struct/class_interface.rb
 - lib/dry/types/sum.rb
-- lib/dry/types/value.rb
 - lib/dry/types/version.rb
+- lib/spec/dry/types.rb
 homepage: https://github.com/dryrb/dry-types
 licenses:
 - MIT
@@ -242,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -256,4 +253,3 @@ specification_version: 4
 summary: Type system for Ruby supporting coercions, constraints and complex types
   like structs, value objects, enums etc.
 test_files: []
-has_rdoc: 

data/benchmarks/basic.rb

@@ -1,57 +0,0 @@
-require 'dry/types'
-require 'virtus'
-require 'fast_attributes'
-require 'attrio'
-require 'ostruct'
-
-require 'benchmark/ips'
-
-class VirtusUser
-  include Virtus.model
-
-  attribute :name, String
-  attribute :age, Integer
-end
-
-class FastUser
-  extend FastAttributes
-
-  define_attributes initialize: true, attributes: true do
-    attribute :name, String
-    attribute :age,  Integer
-  end
-end
-
-class AttrioUser
-  include Attrio
-
-  define_attributes do
-    attr :name, String
-    attr :age, Integer
-  end
-
-  def initialize(attributes = {})
-    self.attributes = attributes
-  end
-
-  def attributes=(attributes = {})
-    attributes.each do |attr,value|
-      self.send("#{attr}=", value) if self.respond_to?("#{attr}=")
-    end
-  end
-end
-
-class DryTypesUser < Dry::Types::Struct
-  attributes(name: 'string', age: 'form.int')
-end
-
-puts DryTypesUser.new(name: 'Jane', age: '21').inspect
-
-Benchmark.ips do |x|
-  x.report('virtus') { VirtusUser.new(name: 'Jane', age: '21') }
-  x.report('fast_attributes') { FastUser.new(name: 'Jane', age: '21') }
-  x.report('attrio') { AttrioUser.new(name: 'Jane', age: '21') }
-  x.report('dry-types') { DryTypesUser.new(name: 'Jane', age: '21') }
-
-  x.compare!
-end

data/benchmarks/constrained.rb

@@ -1,37 +0,0 @@
-require 'dry/types'
-
-require 'active_record'
-require 'benchmark/ips'
-
-ActiveRecord::Base.establish_connection(adapter: "sqlite3", database: ":memory:")
-
-ActiveRecord::Schema.define do
-  create_table :users do |table|
-    table.column :name, :string
-    table.column :age, :integer
-  end
-end
-
-class ARUser < ActiveRecord::Base
-  self.table_name = :users
-end
-
-module Types
-  include Dry::Types.module
-end
-
-class DryTypesUser < Dry::Types::Struct
-  attribute :id, Types::Form::Int
-  attribute :name, Types::Strict::String.constrained(size: 3..64)
-  attribute :age, Types::Form::Int.constrained(gt: 18)
-end
-
-puts ARUser.new(id: 1, name: 'Jane', age: '21').inspect
-puts DryTypesUser.new(id: 1, name: 'Jane', age: '21').inspect
-
-Benchmark.ips do |x|
-  x.report('active record') { ARUser.new(id: 1, name: 'Jane', age: '21') }
-  x.report('dry-types') { DryTypesUser.new(id: 1, name: 'Jane', age: '21') }
-
-  x.compare!
-end

data/lib/dry/types/hashify.rb

@@ -1,12 +0,0 @@
-# Converts value to hash recursively
-module Hashify
-  def self.[](value)
-    if value.respond_to?(:to_hash)
-      value.to_hash
-    elsif value.respond_to?(:map)
-      value.map { |item| self[item] }
-    else
-      value
-    end
-  end
-end

data/lib/dry/types/maybe.rb

@@ -1,34 +0,0 @@
-require 'dry/monads/maybe'
-require 'dry/types/decorator'
-
-module Dry
-  module Types
-    class Maybe
-      include Dry::Equalizer(:type, :options)
-      include Decorator
-      include Builder
-      include Dry::Monads::Maybe::Mixin
-
-      def call(input)
-        input.is_a?(Dry::Monads::Maybe) ? input : Maybe(type[input])
-      end
-      alias_method :[], :call
-
-      def try(input)
-        Result::Success.new(Maybe(type[input]))
-      end
-
-      def maybe?
-        true
-      end
-
-      def default(value)
-        if value.nil?
-          raise ArgumentError, "nil cannot be used as a default of a maybe type"
-        else
-          super
-        end
-      end
-    end
-  end
-end

data/lib/dry/types/struct.rb

@@ -1,25 +0,0 @@
-require_relative 'hashify'
-require 'dry/types/struct/class_interface'
-
-module Dry
-  module Types
-    class Struct
-      extend ClassInterface
-
-      def initialize(attributes)
-        attributes.each { |key, value| instance_variable_set("@#{key}", value) }
-      end
-
-      def [](name)
-        public_send(name)
-      end
-
-      def to_hash
-        self.class.schema.keys.each_with_object({}) do |key, result|
-          result[key] = Hashify[self[key]]
-        end
-      end
-      alias_method :to_h, :to_hash
-    end
-  end
-end

data/lib/dry/types/struct/class_interface.rb

@@ -1,107 +0,0 @@
-module Dry
-  module Types
-    class Struct
-      module ClassInterface
-        include Builder
-
-        attr_accessor :constructor
-
-        attr_accessor :equalizer
-
-        attr_writer :constructor_type
-
-        protected :constructor=, :equalizer=, :constructor_type=
-
-        def inherited(klass)
-          super
-
-          klass.equalizer = Equalizer.new(*schema.keys)
-          klass.constructor_type = constructor_type
-          klass.send(:include, klass.equalizer)
-
-          unless klass == Value
-            klass.constructor = Types['coercible.hash']
-            Types.register(Types.identifier(klass), klass)
-          end
-
-          klass.attributes({}) unless equal?(Struct)
-        end
-
-        def attribute(name, type)
-          attributes(name => type)
-        end
-
-        def 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)
-          equalizer.instance_variable_get('@keys').concat(new_schema.keys)
-
-          self
-        end
-
-        def check_schema_duplication(new_schema)
-          shared_keys = new_schema.keys & schema.keys
-
-          fail RepeatedAttributeError, shared_keys.first if shared_keys.any?
-        end
-        private :check_schema_duplication
-
-        def constructor_type(type = nil)
-          if type
-            @constructor_type = type
-          else
-            @constructor_type || :strict
-          end
-        end
-
-        def schema
-          super_schema = superclass.respond_to?(:schema) ? superclass.schema : {}
-          super_schema.merge(@schema || {})
-        end
-
-        def new(attributes = default_attributes)
-          if attributes.instance_of?(self)
-            attributes
-          else
-            super(constructor[attributes])
-          end
-        rescue SchemaError, SchemaKeyError => error
-          raise StructError, "[#{self}.new] #{error}"
-        end
-        alias_method :call, :new
-        alias_method :[], :new
-
-        def default_attributes
-          schema.each_with_object({}) { |(name, type), result|
-            result[name] = type.default? ? type.evaluate : type[nil]
-          }
-        end
-
-        def try(input)
-          Result::Success.new(self[input])
-        rescue StructError => e
-          failure = Result::Failure.new(input, e.message)
-          block_given? ? yield(failure) : failure
-        end
-
-        def maybe?
-          false
-        end
-
-        def default?
-          false
-        end
-
-        def valid?(value)
-          self === value
-        end
-      end
-    end
-  end
-end