rom-model 0.1.1 → 0.2.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6603e93e6f5f8d81a8ea8e11b90eab50a1838341
-  data.tar.gz: dbf3b3ca0ef55c9414f7bd495e08858c5ba67f9d
+  metadata.gz: f8e29081a0af75745a0bc941c1e04de03a39521d
+  data.tar.gz: a97ee12e2918f9d59aa9d423c2046774c60c9e4a
 SHA512:
-  metadata.gz: 57127a346d805caec84570a3ce603d4a049b22412a74be6ef8fa12b5707a5ea4282ac1b9efa3d73c5142160772eade72cd6f322abf716e75c200e08ab1048da0
-  data.tar.gz: e4ff1ee087a43c703b1f6c39b35b898df2ef99c3d27f1624b0f2806b0456c8d83c9f6e818eb7a8e4983e1ba7fbddfdcec12843f0cdd5083ef95e2f52dfe9856b
+  metadata.gz: c90b1614112a4b2649d5e3366b9f8e9f5908913bc12b3976aceb59417ed6368eb15fa00b1554b66262d207d82ae7fa813176dcda9a3c1c6e7023e55b335cbe90
+  data.tar.gz: 79cadeb47cc841d120042c3ec1fe6595439d1b5b4ec856ec279ec88f00c1e5ad672a9006eb1cb1ac3e2f13c493e896620fcdbcf4acbadb2a5e0f8eb46c3aeee8

data/.travis.yml

@@ -10,7 +10,7 @@ rvm:
   - 2.1
   - 2.2
   - rbx-2
-  - jruby
+  - jruby-9000
   - jruby-head
   - ruby-head
 env:

data/Gemfile

@@ -4,6 +4,9 @@ gemspec
 
 gem 'rom', github: 'rom-rb/rom', branch: 'master'
 gem 'rom-sql', github: 'rom-rb/rom-sql', branch: 'master'
+gem 'rom-support', github: 'rom-rb/rom-support', branch: 'master'
+gem 'rom-mapper', github: 'rom-rb/rom-mapper', branch: 'master'
+gem 'transproc', github: 'solnic/transproc', branch: 'master'
 gem 'pg', platforms: [:mri, :rbx]
 gem 'pg_jruby', platforms: :jruby
 

data/README.md

@@ -25,7 +25,7 @@ The package includes:
 ## The Plan™
 
 This gem is built on top of existing 3rd party gems that have proven to be stable
-and good-enough. Unfortunatelly neither Virtus nor ActiveModel do not meet certain
+and good-enough. Unfortunately neither Virtus nor ActiveModel do not meet certain
 design requirements to be a good fit in the long term.
 
 For that reason we're exploring how to build a better foundation for rom-model.

data/lib/rom/model/validator.rb

@@ -1,3 +1,4 @@
+require 'dry-equalizer'
 require 'charlatan'
 
 require 'rom/support/constants'
@@ -6,11 +7,21 @@ require 'rom/constants'
 require 'rom/model/validator/uniqueness_validator'
 require 'rom/support/class_macros'
 
+require 'rom/pipeline'
+
 module ROM
   module Model
     class ValidationError < CommandError
       include Charlatan.new(:errors)
-      include Equalizer.new(:errors)
+      include Dry::Equalizer(:errors)
+    end
+
+    class Composite < Pipeline::Composite
+      def call(attributes)
+        left.call(attributes)
+
+        right.call(attributes)
+      end
     end
 
     # Mixin for ROM-compliant validator objects
@@ -44,7 +55,7 @@ module ROM
           extend ROM::ClassMacros
 
           include ActiveModel::Validations
-          include Equalizer.new(:attributes, :errors)
+          include Dry::Equalizer(:attributes, :errors)
 
           base.defines :embedded_validators
 
@@ -99,6 +110,7 @@ module ROM
         attributes
       end
 
+
       private
 
       # This is needed for ActiveModel::Validations to work properly
@@ -157,6 +169,21 @@ module ROM
           validator.call
         end
 
+        # Compose a validation with a command
+        #
+        # The command will be called if validations succeed
+        #
+        # @example
+        #   validated_command = (UserValidator >> users.create)
+        #   validated_command.call(attributes)
+        #
+        # @return [Composite]
+        #
+        # @api public
+        def >>(other)
+          Composite.new(self, other)
+        end
+
         # Specify an embedded validator for nested structures
         #
         # @example

data/lib/rom/model/version.rb

@@ -1,5 +1,5 @@
 module ROM
   module Model
-    VERSION = '0.1.1'.freeze
+    VERSION = '0.2.0.beta1'.freeze
   end
 end

data/rom-model.gemspec

@@ -17,7 +17,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'rom-support', '~> 0.1'
+  spec.add_runtime_dependency 'dry-equalizer', '~> 0.2'
+  spec.add_runtime_dependency 'rom-support', '~> 1.0.0.beta1'
   spec.add_runtime_dependency 'charlatan', '~> 0.1'
   spec.add_runtime_dependency 'virtus', '~> 1.0', '>= 1.0.5'
   spec.add_runtime_dependency 'activemodel', '>= 3.0', '< 5.0'

data/spec/integration/chainable_validator_spec.rb

@@ -0,0 +1,53 @@
+describe 'Chaning validations into a commad' do
+  include_context 'database'
+
+  subject(:validator) { user_validator.new(attributes) }
+
+  let(:user_attrs) do
+    Class.new {
+      include ROM::Model::Attributes
+
+      set_model_name 'User'
+
+      attribute :name, String
+      attribute :email, String
+      attribute :birthday, Date
+    }
+  end
+
+  let(:user_validator) do
+    Class.new {
+      include ROM::Model::Validator
+
+      relation :users
+
+      validates :name, presence: true, uniqueness: { message: 'TAKEN!' }
+      validates :email, uniqueness: true
+
+      def self.name
+        'User'
+      end
+    }
+  end
+
+  it 'works' do
+    expect { rom.command(:users).create.call(name: 'John', email: 'john@doe.org') }
+      .to change(rom.relation(:users), :count).by 1
+  end
+
+  it 'runs validations' do
+    validated_command = (user_validator >> rom.command(:users).create)
+    expect {
+      validated_command.call({})
+    }.to raise_error(ROM::Model::ValidationError)
+  end
+
+  it 'calls the nested command when validations pass' do
+    validated_command = (user_validator >> rom.command(:users).create)
+    attributes = user_attrs.new(name: 'John', email: 'john@doe.org')
+    expect {
+      validated_command.call(attributes)
+    }.to change(rom.relation(:users), :count).by 1
+
+  end
+end

data/spec/shared/database.rb

@@ -1,5 +1,6 @@
 shared_context 'database' do
-  let(:rom) { ROM.env }
+  let(:rom) { ROM.env = ROM.container(configuration) }
+  let(:configuration) { ROM::Configuration.new(:sql, DB_URI).use(:macros) }
   let(:uri) { DB_URI }
   let(:conn) { Sequel.connect(uri) }
 
@@ -10,8 +11,6 @@ shared_context 'database' do
   end
 
   before do
-    setup = ROM.setup(:sql, conn)
-
     drop_tables
 
     conn.create_table :users do
@@ -23,7 +22,11 @@ shared_context 'database' do
       check { char_length(name) > 2 }
     end
 
-    setup.relation(:users)
+    configuration.relation(:users)
+
+    configuration.commands(:users) do
+      define(:create)
+    end
   end
 
   after do

data/spec/spec_helper.rb

@@ -28,5 +28,3 @@ I18n.load_path << [root.join('../config/locales/en.yml').realpath]
 RSpec.configure do |config|
   config.order = "random"
 end
-
-ROM.use :auto_registration

data/spec/unit/validator_spec.rb

@@ -1,6 +1,8 @@
 describe 'Validation' do
   include_context 'database'
 
+  before { rom }
+
   subject(:validator) { user_validator.new(attributes) }
 
   let(:user_attrs) do
@@ -30,8 +32,6 @@ describe 'Validation' do
     }
   end
 
-  before { ROM.finalize }
-
   describe '#call' do
     let(:attributes) { user_attrs.new }
 

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: rom-model
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-19 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
+- !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: rom-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: charlatan
   requirement: !ruby/object:Gem::Requirement
@@ -159,6 +173,7 @@ files:
 - rakelib/mutant.rake
 - rakelib/rubocop.rake
 - rom-model.gemspec
+- spec/integration/chainable_validator_spec.rb
 - spec/shared/database.rb
 - spec/spec_helper.rb
 - spec/unit/attributes_spec.rb
@@ -179,9 +194,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -189,8 +204,10 @@ signing_key:
 specification_version: 4
 summary: A small collection of extensions useful for data coercion and validation
 test_files:
+- spec/integration/chainable_validator_spec.rb
 - spec/shared/database.rb
 - spec/spec_helper.rb
 - spec/unit/attributes_spec.rb
 - spec/unit/validator/embedded_spec.rb
 - spec/unit/validator_spec.rb
+has_rdoc: