dry-data 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8a5fe08504f98f2f3e85ae1f07ac1773cd53b18
-  data.tar.gz: e22495f0d07c2fe8f933ebc777aacbbc417b8fd3
+  metadata.gz: 11440d87987301e5ab00e881aca9769d10ca46b6
+  data.tar.gz: 10aac35f319d13a0f42875976005c32f8feb08f4
 SHA512:
-  metadata.gz: e72b078024b770b78a6b8bde42570314d57fedd55b1517a49d73b7b2f4f37d453fc36cd3db661f5b38c13f6340f4339c59fd5743fa57f9dcba651f5f1a89c2ef
-  data.tar.gz: 9518ca648f2fa8665c95742c3faaf18d138aab32af1d1c0ed2d9a9fe40fda47ca27369f0ff6e8799cde999c0fe041ea8c83261d42233b9eda0c52eccbeea7241
+  metadata.gz: 7b992fddcabd0940aec06466dff1fc804161183fb579619ea53fb4b38f4ca7229812677001b718f6af8d91e2c99603ae808e5c253e2e9bde93f2dec797b77b99
+  data.tar.gz: fa2e28003cf3ca3bffbb6f2953a5d8860c312e9fbf5135249432f5f7ecd358f94e8a64938f2e7add69618b66c4c947c84c215338e111d9cc61e73fa94a8dd806

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 sudo: false
 cache: bundler
-bundler_args: --without console
+bundler_args: --without benchmarks tools
 script:
   - bundle exec rake spec
 rvm:

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# v0.3.2 2015-12-10
+
+## Added
+
+* `Dry::Data::Value` which works like a struct but is a value object with equalizer (solnic)
+
+## Fixed
+
+* Added missing require for `dry-equalizer` (solnic)
+
+[Compare v0.3.1...v0.3.2](https://github.com/dryrb/dry-data/compare/v0.3.1...v0.3.2)
+
 # v0.3.1 2015-12-09
 
 ## Changed

data/Gemfile

@@ -5,9 +5,14 @@ gemspec
 gem 'dry-validation'
 
 group :tools do
+  gem 'byebug', platform: :mri
+end
+
+group :benchmarks do
+  gem 'sqlite3'
+  gem 'activerecord'
   gem 'benchmark-ips'
   gem 'virtus'
   gem 'fast_attributes'
   gem 'attrio'
-  gem 'byebug', platform: :mri
 end

data/benchmarks/basic.rb

@@ -42,7 +42,7 @@ class AttrioUser
 end
 
 class DryDataUser < Dry::Data::Struct
-  attributes(name: 'coercible.string', age: 'coercible.int')
+  attributes(name: 'string', age: 'form.int')
 end
 
 puts DryDataUser.new(name: 'Jane', age: '21').inspect

data/benchmarks/constrained.rb

@@ -0,0 +1,43 @@
+require 'dry-data'
+require 'dry/data/type/constrained'
+
+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
+end
+
+Dry::Data.configure do |config|
+  config.namespace = Types
+end
+
+Dry::Data.finalize
+
+class DryDataUser < Dry::Data::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 DryDataUser.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-data') { DryDataUser.new(id: 1, name: 'Jane', age: '21') }
+
+  x.compare!
+end

data/dry-data.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |spec|
 
   spec.add_runtime_dependency 'thread_safe', '~> 0.3'
   spec.add_runtime_dependency 'dry-container', '~> 0.2'
+  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
   spec.add_runtime_dependency 'dry-configurable', '~> 0.1'
   spec.add_runtime_dependency 'inflecto', '~> 0.0.0', '>= 0.0.2'
   spec.add_runtime_dependency 'kleisli', '~> 0.2'

data/lib/dry/data.rb

@@ -2,14 +2,17 @@ require 'bigdecimal'
 require 'date'
 require 'set'
 
-require 'dry-container'
 require 'inflecto'
 require 'thread_safe/cache'
 
+require 'dry-container'
+require 'dry-equalizer'
+
 require 'dry/data/version'
 require 'dry/data/container'
 require 'dry/data/type'
 require 'dry/data/struct'
+require 'dry/data/value'
 require 'dry/data/dsl'
 
 module Dry

data/lib/dry/data/constraints.rb

@@ -1,5 +1,3 @@
-require 'dry-equalizer' # FIXME: this should not be needed
-
 require 'dry/validation/rule_compiler'
 require 'dry/validation/predicates'
 

data/lib/dry/data/struct.rb

@@ -7,7 +7,7 @@ module Dry
 
       def self.inherited(klass)
         super
-        Data.register_class(klass)
+        Data.register_class(klass) unless klass == Value
       end
 
       def self.attribute(*args)

data/lib/dry/data/value.rb

@@ -0,0 +1,20 @@
+module Dry
+  module Data
+    class Value < Struct
+      def self.inherited(klass)
+        super
+        klass.instance_variable_set('@equalizer', Equalizer.new)
+        klass.send(:include, klass.equalizer)
+      end
+
+      def self.attributes(*args)
+        super
+        equalizer.instance_variable_get('@keys').concat(schema.keys).uniq!
+      end
+
+      def self.equalizer
+        @equalizer
+      end
+    end
+  end
+end

data/lib/dry/data/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-data
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-09 00:00:00.000000000 Z
+date: 2015-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thread_safe
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: dry-equalizer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: dry-configurable
   requirement: !ruby/object:Gem::Requirement
@@ -144,6 +158,7 @@ files:
 - README.md
 - Rakefile
 - benchmarks/basic.rb
+- benchmarks/constrained.rb
 - bin/console
 - bin/setup
 - dry-data.gemspec
@@ -164,6 +179,7 @@ files:
 - lib/dry/data/type/optional.rb
 - lib/dry/data/types.rb
 - lib/dry/data/types/form.rb
+- lib/dry/data/value.rb
 - lib/dry/data/version.rb
 homepage: https://github.com/dryrb/dry-data
 licenses:
@@ -186,8 +202,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple type-system for Ruby
 test_files: []
+has_rdoc: