dry-types 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2df871ef8f32a388ed641c5025ab9838a090f460
-  data.tar.gz: 2766ba15e0358b3ac14b30cbb3027c8887fa609d
+  metadata.gz: 9f7f3d17e795bd1fc9393df39d6388e47f20abd5
+  data.tar.gz: caaa567b13b3806de44c36daa5f30d41579c6405
 SHA512:
-  metadata.gz: 83951c294c86aeeb1bed5ed85bb8e28b6e898ff72170b246012494d892ae9fb19a3d60ed635348e0e45d5048290f7d5bc8c2c0976bd0e42cebc13648537c19c9
-  data.tar.gz: 6a09c6f25ab11725d0c18adffb72eb93d3be87cffba4bb40bdd259a55dd3427953dc1026857540f8b83e0c8099c6748893bbbe9b1bca5dd536a95f7a4bc07836
+  metadata.gz: 2161c43f4f094bf12e4d5e2e64cd4d48b5a517ff1a3293a25bfda045bbfbe1fe1d7816d4f736e5273dbb4516947aa5342d854d8bab33c634f4c236ed9203e410
+  data.tar.gz: 806dfa70f3950020943c46ee415710d2dc4e45355d3b087bbb8b2c33e6259bca1745a9400dd2f0c4b6f1df4c2d46427d8c02550540ce14e6aa1b2bc691dbd8fa

data/.travis.yml

@@ -20,7 +20,6 @@ env:
 matrix:
   allow_failures:
     - rvm: rbx-3
-    - rvm: jruby-9.1.8.0
 notifications:
   email: false
   webhooks:

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+# v0.10.1 2017-04-28
+
+## Added
+
+* `Type#optional?` returns true if type is Sum and left is nil (GustavoCaso)
+* `Type#pristine` returns a type without `meta` (flash-gordon)
+
+## Fixed
+
+* `meta` is used in type equality again (solnic)
+* `Any` works correctly with meta again (flash-gordon)
+
+[Compare v0.10.0...v0.10.1](https://github.com/dry-rb/dry-types/compare/v0.10.0...v0.10.1)
+
 # v0.10.0 2017-04-26
 
 ## Added
@@ -13,7 +27,7 @@
 * Meta data are now stored separately from options (flash-gordon)
 * `Types::Object` was renamed to `Types::Any` (flash-gordon)
 
-[Compare v0.9.4...v0.10.0](https://github.com/dryrb/dry-types/compare/v0.9.4...v0.10.0)
+[Compare v0.9.4...v0.10.0](https://github.com/dry-rb/dry-types/compare/v0.9.4...v0.10.0)
 
 # v0.9.4 2017-01-24
 
@@ -21,7 +35,7 @@
 
 * Added `Types::Object` which passes an object of any type (flash-gordon)
 
-[Compare v0.9.3...v0.9.4](https://github.com/dryrb/dry-types/compare/v0.9.3...v0.9.4)
+[Compare v0.9.3...v0.9.4](https://github.com/dry-rb/dry-types/compare/v0.9.3...v0.9.4)
 
 # v0.9.3 2016-12-03
 
@@ -29,7 +43,7 @@
 
 * Updated to dry-core >= 0.2.1 (ruby warnings are gone) (flash-gordon)
 
-[Compare v0.9.2...v0.9.3](https://github.com/dryrb/dry-types/compare/v0.9.2...v0.9.3)
+[Compare v0.9.2...v0.9.3](https://github.com/dry-rb/dry-types/compare/v0.9.2...v0.9.3)
 
 # v0.9.2 2016-11-13
 
@@ -41,7 +55,7 @@
 
 * Optimized object allocation in hash schemas, resulting in up to 25% speed boost (davydovanton)
 
-[Compare v0.9.1...v0.9.2](https://github.com/dryrb/dry-types/compare/v0.9.1...v0.9.2)
+[Compare v0.9.1...v0.9.2](https://github.com/dry-rb/dry-types/compare/v0.9.1...v0.9.2)
 
 # v0.9.1 2016-11-04
 
@@ -53,7 +67,7 @@
 
 * `Hash#weak` accepts Hash-descendants again (solnic)
 
-[Compare v0.9.0...v0.9.1](https://github.com/dryrb/dry-types/compare/v0.9.0...v0.9.1)
+[Compare v0.9.0...v0.9.1](https://github.com/dry-rb/dry-types/compare/v0.9.0...v0.9.1)
 
 # v0.9.0 2016-09-21
 
@@ -77,7 +91,7 @@
 * `Types::Form::{Date,DateTime,Time}` fail gracefully for invalid input (padde)
 * ice_nine dependency has been dropped as it was required by Struct only (flash-gordon)
 
-[Compare v0.8.1...v0.9.0](https://github.com/dryrb/dry-types/compare/v0.8.1...v0.9.0)
+[Compare v0.8.1...v0.9.0](https://github.com/dry-rb/dry-types/compare/v0.8.1...v0.9.0)
 
 # v0.8.1 2016-07-13
 
@@ -86,7 +100,7 @@
 * Compiler no longer chokes on type nodes without args (solnic)
 * Removed `bin/console` from gem package (solnic)
 
-[Compare v0.8.0...v0.8.1](https://github.com/dryrb/dry-types/compare/v0.8.0...v0.8.1)
+[Compare v0.8.0...v0.8.1](https://github.com/dry-rb/dry-types/compare/v0.8.0...v0.8.1)
 
 # v0.8.0 2016-07-01
 
@@ -106,7 +120,7 @@
 * `:symbolized` hash schema is now based on `:weak` schema (solnic)
 * `Struct::Value` instances are now **deeply frozen** via ice_nine (backus)
 
-[Compare v0.7.2...v0.8.0](https://github.com/dryrb/dry-types/compare/v0.7.2...v0.8.0)
+[Compare v0.7.2...v0.8.0](https://github.com/dry-rb/dry-types/compare/v0.7.2...v0.8.0)
 
 # v0.7.2 2016-05-11
 
@@ -125,7 +139,7 @@
 - Coerce empty strings in form posts to blank arrays and hashes (timriley)
 - update to use dry-logic v0.2.3 (fran-worley)
 
-[Compare v0.7.1...v0.7.2](https://github.com/dryrb/dry-types/compare/v0.7.1...v0.7.2)
+[Compare v0.7.1...v0.7.2](https://github.com/dry-rb/dry-types/compare/v0.7.1...v0.7.2)
 
 # v0.7.1 2016-04-06
 
@@ -138,7 +152,7 @@
 - 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)
+[Compare v0.7.0...v0.7.1](https://github.com/dry-rb/dry-types/compare/v0.7.0...v0.7.1)
 
 # v0.7.0 2016-03-30
 
@@ -172,7 +186,7 @@ Major focus of this release is to make complex type composition possible and imp
 - `Type#default` will raise if `nil` was passed for `Maybe` type (solnic)
 - `Hash` with a schema will set maybe values for missing keys or nils (flash-gordon)
 
-[Compare v0.6.0...v0.7.0](https://github.com/dryrb/dry-types/compare/v0.6.0...v0.7.0)
+[Compare v0.6.0...v0.7.0](https://github.com/dry-rb/dry-types/compare/v0.6.0...v0.7.0)
 
 # v0.6.0 2016-03-16
 
@@ -207,7 +221,7 @@ Renamed from `dry-data` to `dry-types` and:
 * `Dry::Types::Definition` is now the base type definition object (solnic)
 * `Dry::Types::Constructor` is now a type definition with a constructor function (solnic)
 
-[Compare v0.5.1...v0.6.0](https://github.com/dryrb/dry-types/compare/v0.5.1...v0.6.0)
+[Compare v0.5.1...v0.6.0](https://github.com/dry-rb/dry-types/compare/v0.5.1...v0.6.0)
 
 # v0.5.1 2016-01-11
 
@@ -217,7 +231,7 @@ Renamed from `dry-data` to `dry-types` and:
   not match input's class (solnic)
 * `form.array` and `form.hash` safe types (solnic)
 
-[Compare v0.5.0...v0.5.1](https://github.com/dryrb/dry-types/compare/v0.5.0...v0.5.1)
+[Compare v0.5.0...v0.5.1](https://github.com/dry-rb/dry-types/compare/v0.5.0...v0.5.1)
 
 # v0.5.0 2016-01-11
 
@@ -238,7 +252,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * `attribute` raises proper error when type definition is missing (solnic)
 
-[Compare v0.4.2...v0.5.0](https://github.com/dryrb/dry-types/compare/v0.4.2...v0.5.0)
+[Compare v0.4.2...v0.5.0](https://github.com/dry-rb/dry-types/compare/v0.4.2...v0.5.0)
 
 # v0.4.2 2015-12-27
 
@@ -250,7 +264,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * Array member uses type objects now rather than just their constructors (solnic)
 
-[Compare v0.4.1...v0.4.2](https://github.com/dryrb/dry-types/compare/v0.4.1...v0.4.2)
+[Compare v0.4.1...v0.4.2](https://github.com/dry-rb/dry-types/compare/v0.4.1...v0.4.2)
 
 # v0.4.0 2015-12-11
 
@@ -263,7 +277,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * `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-types/compare/v0.3.2...v0.4.0)
+[Compare v0.3.2...v0.4.0](https://github.com/dry-rb/dry-types/compare/v0.3.2...v0.4.0)
 
 # v0.3.2 2015-12-10
 
@@ -275,7 +289,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * Added missing require for `dry-equalizer` (solnic)
 
-[Compare v0.3.1...v0.3.2](https://github.com/dryrb/dry-types/compare/v0.3.1...v0.3.2)
+[Compare v0.3.1...v0.3.2](https://github.com/dry-rb/dry-types/compare/v0.3.1...v0.3.2)
 
 # v0.3.1 2015-12-09
 
@@ -283,7 +297,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * Removed require of constrained type and make it optional (solnic)
 
-[Compare v0.3.0...v0.3.1](https://github.com/dryrb/dry-types/compare/v0.3.0...v0.3.1)
+[Compare v0.3.0...v0.3.1](https://github.com/dry-rb/dry-types/compare/v0.3.0...v0.3.1)
 
 # v0.3.0 2015-12-09
 
@@ -295,7 +309,7 @@ Renamed from `dry-data` to `dry-types` and:
 * `Dry::Data::Type#enum` for defining an enum from a specific type (solnic)
 * New types: `symbol` and `class` along with their `strict` versions (solnic)
 
-[Compare v0.2.1...v0.3.0](https://github.com/dryrb/dry-types/compare/v0.2.1...v0.3.0)
+[Compare v0.2.1...v0.3.0](https://github.com/dry-rb/dry-types/compare/v0.2.1...v0.3.0)
 
 # v0.2.1 2015-11-30
 
@@ -311,7 +325,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * Improved structure of the ast (solnic)
 
-[Compare v0.2.0...v0.2.1](https://github.com/dryrb/dry-types/compare/v0.2.0...v0.2.1)
+[Compare v0.2.0...v0.2.1](https://github.com/dry-rb/dry-types/compare/v0.2.0...v0.2.1)
 
 # v0.2.0 2015-11-29
 
@@ -325,7 +339,7 @@ Renamed from `dry-data` to `dry-types` and:
 
 * 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-types/compare/v0.1.0...v0.2.0)
+[Compare v0.1.0...v0.2.0](https://github.com/dry-rb/dry-types/compare/v0.1.0...v0.2.0)
 
 # v0.1.0 2015-11-27
 
@@ -338,7 +352,7 @@ Renamed from `dry-data` to `dry-types` and:
   setting its `.new` method as the constructor (solnic)
 * `Dry::Data::Compiler` for building a type from a simple ast (solnic)
 
-[Compare v0.0.1...HEAD](https://github.com/dryrb/dry-types/compare/v0.0.1...HEAD)
+[Compare v0.0.1...HEAD](https://github.com/dry-rb/dry-types/compare/v0.0.1...HEAD)
 
 # v0.0.1 2015-10-05
 

data/lib/dry/types/any.rb

@@ -1,8 +1,8 @@
 module Dry
   module Types
     Any = Class.new(Definition) do
-      def initialize
-        super(::Object)
+      def initialize(**options)
+        super(::Object, options)
       end
 
       # @return [String]
@@ -15,6 +15,12 @@ module Dry
       def valid?(_)
         true
       end
+
+      # @param [Hash] new_options
+      # @return [Type]
+      def with(new_options)
+        self.class.new(**options, meta: @meta, **new_options)
+      end
     end.new
   end
 end

data/lib/dry/types/definition.rb

@@ -6,7 +6,7 @@ module Dry
   module Types
     class Definition
       include Type
-      include Dry::Equalizer(:primitive, :options)
+      include Dry::Equalizer(:primitive, :options, :meta)
       include Options
       include Builder
 
@@ -51,6 +51,11 @@ module Dry
         false
       end
 
+      # @return [false]
+      def optional?
+        false
+      end
+
       # @param [BasicObject] input
       # @return [BasicObject]
       def call(input)

data/lib/dry/types/options.rb

@@ -26,6 +26,12 @@ module Dry
       def meta(data = nil)
         data ? with(meta: @meta.merge(data)) : @meta
       end
+
+      # Resets meta
+      # @return [Dry::Types::Type]
+      def pristine
+        with(meta: EMPTY_HASH)
+      end
     end
   end
 end

data/lib/dry/types/sum.rb

@@ -4,7 +4,7 @@ module Dry
   module Types
     class Sum
       include Type
-      include Dry::Equalizer(:left, :right, :options)
+      include Dry::Equalizer(:left, :right, :options, :meta)
       include Builder
       include Options
 
@@ -25,6 +25,11 @@ module Dry
           true
         end
 
+        # @return [Boolean]
+        def optional?
+          left.primitive == NilClass
+        end
+
         # @param [Object] input
         # @return [Object]
         # @raise [ConstraintError] if given +input+ not passing {#try}
@@ -65,6 +70,11 @@ module Dry
         false
       end
 
+      # @return [Boolean]
+      def optional?
+        left.primitive == NilClass
+      end
+
       # @param [Object] input
       # @return [Object]
       def call(input)

data/lib/dry/types/version.rb

@@ -1,5 +1,5 @@
 module Dry
   module Types
-    VERSION = '0.10.0'.freeze
+    VERSION = '0.10.1'.freeze
   end
 end

data/lib/spec/dry/types.rb

@@ -32,6 +32,12 @@ RSpec.shared_examples_for 'Dry::Types::Definition without primitive' do
       expect(type).to eq(type)
     end
   end
+
+  describe '#optional?' do
+    it 'returns a boolean value' do
+      expect(type.optional?).to be_boolean
+    end
+  end
 end
 
 RSpec.shared_examples_for 'Dry::Types::Definition#meta' do
@@ -43,9 +49,18 @@ RSpec.shared_examples_for 'Dry::Types::Definition#meta' do
       expect(with_meta.meta).to eql(foo: :bar, baz: '1')
     end
 
-    it "doesn't use meta in equality checks" do
-      expect(type.meta(foo: :bar)).to eql(type)
-      expect(type.meta(foo: :bar).hash).to eql(type.hash)
+    it 'equalizes on empty meta' do
+      expect(type).to eql(type.meta({}))
+    end
+
+    it 'equalizes on filled meta' do
+      expect(type).to_not eql(type.meta(i_am: 'different'))
+    end
+  end
+
+  describe '#pristine' do
+    it 'erases meta' do
+      expect(type.meta(foo: :bar).pristine).to eql(type)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-types
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby