rom 2.0.2 → 3.0.0.beta1

data/spec/integration/commands/error_handling_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Commands / Error handling' do
+RSpec.describe 'Commands / Error handling' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/commands/graph_spec.rb

@@ -1,15 +1,16 @@
 require 'spec_helper'
 
-describe 'Building up a command graph for nested input' do
+RSpec.describe 'Building up a command graph for nested input' do
   include_context 'command graph'
 
   it 'creates a command graph for nested input :one result as root' do
     configuration.commands(:tasks) do
       define(:create) do
         result :one
+        before :associate
 
-        def execute(tuple, user)
-          super(tuple.merge(user: user.fetch(:name)))
+        def associate(tuple, user)
+          tuple.merge(user: user.fetch(:name))
         end
       end
     end
@@ -66,8 +67,10 @@ describe 'Building up a command graph for nested input' do
   it 'creates a command graph for nested input with :many results as root' do
     configuration.commands(:tasks) do
       define(:create) do
-        def execute(tuples, user)
-          super(tuples.map { |t| t.merge(user: user.fetch(:name)) })
+        before :associate
+
+        def associate(tuples, user)
+          tuples.map { |t| t.merge(user: user.fetch(:name)) }
         end
       end
     end
@@ -120,16 +123,19 @@ describe 'Building up a command graph for nested input' do
   it 'updates graph elements cleanly' do
     configuration.commands(:tasks) do
       define(:create) do
-        def execute(tuples, user)
-          super(tuples.map { |t| t.merge(user: user.fetch(:name)) })
+        before :associate
+
+        def associate(tuples, user)
+          tuples.map { |t| t.merge(user: user.fetch(:name)) }
         end
       end
 
       define(:update) do
         result :one
+        before :associate
 
-        def execute(tuple, user)
-          super(tuple.merge(user: user.fetch(:name)))
+        def associate(tuple, user)
+          tuple.merge(user: user.fetch(:name))
         end
       end
 
@@ -186,9 +192,7 @@ describe 'Building up a command graph for nested input' do
 
     create.call(initial)
 
-    container.command(:tasks).create.call(
-      [{ title: 'Task One'}], { name: 'Jane' }
-    )
+    container.command(:tasks).create.with([{ title: 'Task One'}]).(name: 'Jane')
 
     expect(container.relation(:tasks)).to match_array([
       { title: 'Change Name', user: 'Johnny' },
@@ -233,8 +237,10 @@ describe 'Building up a command graph for nested input' do
 
     configuration.commands(:tasks) do
       define(:create) do
-        def execute(tuples, user)
-          super(tuples.map { |t| t.merge(user: user.fetch(:name)) })
+        before :associate
+
+        def associate(tuples, user)
+          tuples.map { |t| t.merge(user: user.fetch(:name)) }
         end
       end
     end

data/spec/integration/commands/update_spec.rb

@@ -1,23 +1,13 @@
 require 'spec_helper'
 require 'dry-struct'
 
-describe 'Commands / Update' do
+RSpec.describe 'Commands / Update' do
   include_context 'container'
   include_context 'users and tasks'
 
   subject(:users) { container.commands.users }
 
   before do
-    module Test
-      UserValidator = Class.new do
-        ValidationError = Class.new(ROM::CommandError)
-
-        def self.call(params)
-          raise ValidationError, ":email is required" unless params[:email]
-        end
-      end
-    end
-
     configuration.relation(:users) do
       register_as :users
 
@@ -31,13 +21,11 @@ describe 'Commands / Update' do
     end
 
     configuration.commands(:users) do
-      define(:update) do
-        validator Test::UserValidator
-      end
+      define(:update)
     end
   end
 
-  it 'update tuples on successful validation' do
+  it 'update tuples' do
     result = users.try {
       users.update.all(name: 'Jane').call(email: 'jane.doe@test.com')
     }
@@ -46,17 +34,6 @@ describe 'Commands / Update' do
       .to match_array([{ name: 'Jane', email: 'jane.doe@test.com' }])
   end
 
-  it 'returns validation object with errors on failed validation' do
-    result = users.try { users.update.all(name: 'Jane').call(email: nil) }
-
-    expect(result.error).to be_instance_of(Test::ValidationError)
-    expect(result.error.message).to eql(':email is required')
-
-    expect(container.relations.users.restrict(name: 'Jane')).to match_array([
-      { name: 'Jane', email: 'jane@doe.org' }
-    ])
-  end
-
   describe '"result" option' do
     it 'returns a single tuple when set to :one' do
       configuration.commands(:users) do
@@ -80,7 +57,7 @@ describe 'Commands / Update' do
           end
         end
         container
-      }.to raise_error(ROM::Options::InvalidOptionValueError)
+      }.to raise_error(Dry::Types::ConstraintError)
     end
   end
 

data/spec/integration/commands_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Commands' do
+RSpec.describe 'Commands' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/{repositories → gateways}/extending_relations_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Repository' do
+RSpec.describe 'Gateways / Extending Relations' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/{repositories → gateways}/setting_logger_spec.rb

@@ -3,7 +3,7 @@ require 'rom/memory'
 
 require 'logger'
 
-describe 'Repositories / Setting logger' do
+RSpec.describe 'Gateways / Setting logger' do
   let(:logger_class) do
     Class.new do
       attr_reader :messages
@@ -26,7 +26,7 @@ describe 'Repositories / Setting logger' do
     container = ROM.container(:memory) do |config|
       config.gateways[:default].use_logger(logger)
     end
-      
+
     container.gateways[:default].logger.info("test")
 
     expect(logger.messages).to eql(["test"])

data/spec/integration/mappers/combine_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/mappers/deep_embedded_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mappers / deeply embedded tuples' do
+RSpec.describe 'Mappers / deeply embedded tuples' do
   include_context 'container'
 
   it 'allows mapping embedded tuples' do

data/spec/integration/mappers/definition_dsl_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/mappers/embedded_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mappers / embedded' do
+RSpec.describe 'Mappers / embedded' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/exclude_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/fold_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/mappers/group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/mappers/overwrite_attributes_value_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mappers / Attributes value' do
+RSpec.describe 'Mappers / Attributes value' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/prefix_separator_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/prefix_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/prefixing_attributes_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mappers / Prefixing attributes' do
+RSpec.describe 'Mappers / Prefixing attributes' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/registering_custom_mappers_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Registering Custom Mappers' do
+RSpec.describe 'Registering Custom Mappers' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/mappers/renaming_attributes_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mappers / Renaming attributes' do
+RSpec.describe 'Mappers / Renaming attributes' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/reusing_mappers_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Reusing mappers' do
+RSpec.describe 'Reusing mappers' do
   it 'allows using another mapper in mapping definitions' do
     class Test::TaskMapper < ROM::Mapper
       attribute :title

data/spec/integration/mappers/step_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/mappers/symbolizing_attributes_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mappers / Symbolizing atributes' do
+RSpec.describe 'Mappers / Symbolizing atributes' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/unfold_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/ungroup_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
 
   before do

data/spec/integration/mappers/unwrap_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 
@@ -14,7 +14,7 @@ describe 'Mapper definition DSL' do
             tuple.merge(user: users.restrict(name: tuple[:name]).first)
           }
 
-          __new__(tuples)
+          new(tuples)
         end
       end
 

data/spec/integration/mappers/wrap_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Mapper definition DSL' do
+RSpec.describe 'Mapper definition DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/memory/commands/create_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 require 'rom/memory'
 
-describe ROM::Memory::Commands::Create do
+RSpec.describe ROM::Memory::Commands::Create do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/memory/commands/delete_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 require 'rom/memory'
 
-describe ROM::Memory::Commands::Delete do
+RSpec.describe ROM::Memory::Commands::Delete do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/memory/commands/update_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 require 'rom/memory'
 
-describe ROM::Memory::Commands::Update do
+RSpec.describe ROM::Memory::Commands::Update do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/multi_env_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Setting up ROM with multiple environments' do
+RSpec.describe 'Setting up ROM with multiple environments' do
   let(:configuration) do
     {
       one: ROM::Configuration.new(:memory),

data/spec/integration/multi_repo_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'rom/memory'
 
-describe 'Using in-memory gateways for cross-repo access' do
+RSpec.describe 'Using in-memory gateways for cross-repo access' do
   let(:configuration) do
     ROM::Configuration.new(left: :memory, right: :memory, main: :memory)
   end

data/spec/integration/relations/default_dataset_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ROM::Relation, '.dataset' do
+RSpec.describe ROM::Relation, '.dataset' do
   include_context 'container'
 
   it 'injects configured dataset when block was provided' do

data/spec/integration/relations/reading_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Reading relations' do
+RSpec.describe 'Reading relations' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/relations/registry_dsl_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Relation registration DSL' do
+RSpec.describe 'Relation registration DSL' do
   include_context 'container'
   include_context 'users and tasks'
 

data/spec/integration/setup_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'dry-struct'
 
-describe 'Configuring ROM' do
+RSpec.describe 'Configuring ROM' do
   context 'with existing schema' do
     include_context 'container'
     include_context 'users and tasks'
@@ -41,9 +41,8 @@ describe 'Configuring ROM' do
   end
 
   describe 'defining classes' do
-    it 'sets up registries based on class definitions' do
-      container = ROM.container(:memory) do |config|
-
+    let(:container) do
+      ROM.container(:memory) do |config|
         class Test::UserRelation < ROM::Relation[:memory]
           dataset :users
 
@@ -64,7 +63,9 @@ describe 'Configuring ROM' do
         config.register_relation(Test::UserRelation, Test::TaskRelation)
         config.register_command(Test::CreateUser)
       end
+    end
 
+    it 'sets up registries based on class definitions' do
       expect(container.relations.users).to be_kind_of(Test::UserRelation)
       expect(container.relations.users.tasks).to be(container.relations.tasks)
 
@@ -73,6 +74,11 @@ describe 'Configuring ROM' do
       expect(container.relations.tasks).to be_kind_of(Test::TaskRelation)
       expect(container.relations.tasks.users).to be(container.relations.users)
     end
+
+    it 'sets empty schemas by default' do
+      expect(container.relations[:users].schema).to be_empty
+      expect(container.relations[:tasks].schema).to be_empty
+    end
   end
 
   describe 'quick setup' do

data/spec/shared/command_graph.rb

@@ -33,16 +33,20 @@ shared_context 'command graph' do
 
     configuration.commands(:books) do
       define(:create) do
-        def execute(tuples, user)
-          super(tuples.map { |t| t.merge(user: user.fetch(:name)) })
+        before :associate
+
+        def associate(tuples, user)
+          tuples.map { |t| t.merge(user: user.fetch(:name)) }
         end
       end
     end
 
     configuration.commands(:tags) do
       define(:create) do
-        def execute(tuples, task)
-          super(tuples.map { |t| t.merge(task: task.fetch(:title)) })
+        before :associate
+
+        def associate(tuples, task)
+          tuples.map { |t| t.merge(task: task.fetch(:title)) }
         end
       end
     end

data/spec/shared/enumerable_dataset.rb

@@ -1,4 +1,4 @@
-shared_examples_for "an enumerable dataset" do
+RSpec.shared_examples_for "an enumerable dataset" do
   subject(:dataset) { klass.new(data) }
 
   let(:data) do

data/spec/spec_helper.rb

@@ -1,10 +1,4 @@
-# encoding: utf-8
-
-# this is needed for guard to work, not sure why :(
-require "bundler"
-Bundler.setup
-
-if ENV['COVERAGE'] == 'true' && RUBY_ENGINE == 'ruby' && RUBY_VERSION='2.3.1'
+if ENV['COVERAGE'] == 'true' && RUBY_ENGINE == 'ruby' && RUBY_VERSION == '2.3.1'
   require "simplecov"
   SimpleCov.start do
     add_filter '/spec/'
@@ -13,8 +7,8 @@ end
 
 SPEC_ROOT = root = Pathname(__FILE__).dirname
 
-require 'rom/support/deprecations'
-ROM::Deprecations.set_logger!(SPEC_ROOT.join('../log/deprecations.log'))
+require 'dry/core/deprecations'
+Dry::Core::Deprecations.set_logger!(SPEC_ROOT.join('../log/deprecations.log'))
 
 require 'rom'
 
@@ -42,6 +36,8 @@ def T(*args)
 end
 
 RSpec.configure do |config|
+  config.include(SchemaHelpers)
+
   config.after do
     Test.remove_constants
   end
@@ -49,4 +45,6 @@ RSpec.configure do |config|
   config.around do |example|
     ConstantLeakFinder.find(example)
   end
+
+  config.disable_monkey_patching!
 end

data/spec/support/schema.rb

@@ -0,0 +1,14 @@
+require 'dry-types'
+
+module SchemaHelpers
+  def define_schema(source, attrs)
+    ROM::Schema.define(
+      source,
+      attributes: attrs.map { |name, type| define_type(name, type, source: source) }
+    )
+  end
+
+  def define_type(name, id, **opts)
+    ROM::Types.const_get(id).meta(name: name, **opts)
+  end
+end

data/spec/unit/rom/array_dataset_spec.rb

@@ -0,0 +1,59 @@
+require 'rom/array_dataset'
+
+RSpec.describe ROM::ArrayDataset do
+  let(:klass) do
+    Class.new do
+      include ROM::ArrayDataset
+
+      def self.row_proc
+        -> i { i.each_with_object({}) { |(k,v),h| h[k.to_sym] = v } }
+      end
+    end
+  end
+
+  it_behaves_like 'an enumerable dataset' do
+    describe '#flatten' do
+      let(:data) { [[{ 'name' => 'Jane' }], [{ 'name' => 'Joe' }]] }
+
+      it 'returns a new dataset with flattened data' do
+        result = dataset.flatten
+
+        expect(result).to match_array([{ name: 'Jane' }, { name: 'Joe' }])
+      end
+    end
+
+    describe '#map!' do
+      context 'with a block' do
+        it 'returns a new dataset with mapped data' do
+          dataset.map! do |row|
+            row.merge(age: 21)
+          end
+
+          expect(dataset).to match_array([
+            { name: 'Jane', age: 21 }, { name: 'Joe', age: 21 }
+          ])
+        end
+      end
+
+      context 'without a block' do
+        it 'returns an enumerator' do
+          result = dataset.map!
+
+          expect(result).to be_instance_of(Enumerator)
+
+          expect(result).to match_array([
+            { name: 'Jane' }, { name: 'Joe' }
+          ])
+        end
+      end
+    end
+
+    describe '#values_at' do
+      it 'returns a new dataset with rows at given indices' do
+        result = dataset.values_at(1)
+
+        expect(result).to match_array([{ name: 'Joe' }])
+      end
+    end
+  end
+end