rom 0.9.1 → 1.0.0.beta1

data/spec/integration/commands/update_spec.rb

@@ -3,9 +3,10 @@ require 'spec_helper'
 require 'ostruct'
 
 describe 'Commands / Update' do
+  include_context 'container'
   include_context 'users and tasks'
 
-  subject(:users) { rom.commands.users }
+  subject(:users) { container.commands.users }
 
   before do
     module Test
@@ -18,7 +19,9 @@ describe 'Commands / Update' do
       end
     end
 
-    setup.relation(:users) do
+    configuration.relation(:users) do
+      register_as :users
+
       def all(criteria)
         restrict(criteria)
       end
@@ -28,7 +31,7 @@ describe 'Commands / Update' do
       end
     end
 
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:update) do
         validator Test::UserValidator
       end
@@ -50,14 +53,14 @@ describe 'Commands / Update' do
     expect(result.error).to be_instance_of(Test::ValidationError)
     expect(result.error.message).to eql(':email is required')
 
-    expect(rom.relations.users.restrict(name: 'Jane')).to match_array([
+    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
-      setup.commands(:users) do
+      configuration.commands(:users) do
         define(:update_one, type: :update) do
           result :one
         end
@@ -71,7 +74,7 @@ describe 'Commands / Update' do
     end
 
     it 'raises when there is more than one tuple and result is set to :one' do
-      setup.commands(:users) do
+      configuration.commands(:users) do
         define(:update_one, type: :update) do
           result :one
         end
@@ -83,7 +86,7 @@ describe 'Commands / Update' do
 
       expect(result.error).to be_instance_of(ROM::TupleCountMismatchError)
 
-      expect(rom.relations.users).to match_array([
+      expect(container.relations.users).to match_array([
         { name: 'Jane', email: 'jane@doe.org' },
         { name: 'Joe', email: 'joe@doe.org' }
       ])
@@ -91,12 +94,12 @@ describe 'Commands / Update' do
 
     it 'allows only valid result types' do
       expect {
-        setup.commands(:users) do
+        configuration.commands(:users) do
           define(:create_one, type: :create) do
             result :invalid_type
           end
         end
-        setup.finalize
+        container
       }.to raise_error(ROM::Options::InvalidOptionValueError)
     end
   end
@@ -105,14 +108,14 @@ describe 'Commands / Update' do
     it 'allows scoping to a virtual relation' do
       user_model = Class.new { include Anima.new(:name, :email) }
 
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           model user_model
           register_as :entity
         end
       end
 
-      command = rom.command(:users).as(:entity).update.by_name('Jane')
+      command = container.command(:users).as(:entity).update.by_name('Jane')
 
       attributes = { name: 'Jane Doe', email: 'jane@doe.org' }
       result = command[attributes]

data/spec/integration/commands_spec.rb

@@ -0,0 +1,60 @@
+require 'spec_helper'
+
+describe 'Commands' do
+  include_context 'container'
+  include_context 'users and tasks'
+
+  before do
+    configuration.relation(:users) do
+      def by_id(id)
+        restrict(id: id)
+      end
+    end
+    configuration.commands(:users) do
+      define(:update)
+    end
+  end
+
+  let(:command) { container.command(:users)[:update] }
+
+  describe '#method_missing' do
+    it 'forwards known relation view methods' do
+      expect(command.by_id(1).relation).to eql(users_relation.by_id(1))
+    end
+
+    it 'raises no-method error when a non-view relation method was sent' do
+      expect { command.as(:foo) }.to raise_error(NoMethodError, /as/)
+    end
+  end
+
+  describe 'extending command with a db-specific behavior' do
+    before do
+      gateway.instance_exec do
+        def extend_command_class(klass, _)
+          klass.class_eval do
+            def super_command?
+              true
+            end
+          end
+          klass
+        end
+      end
+    end
+
+    it 'applies to defined classes' do
+      klass = Class.new(ROM::Commands::Create[:memory]) { relation :users }
+      configuration.register_command(klass)
+      container
+      command = klass.build(users_relation)
+      expect(command).to be_super_command
+    end
+
+    it 'applies to generated classes' do
+      klass = ROM::ConfigurationDSL::Command.build_class(:create, :users, adapter: :memory)
+      configuration.register_command(klass)
+      container
+      command = klass.build(users_relation)
+      expect(command).to be_super_command
+    end
+  end
+end

data/spec/integration/mappers/combine_spec.rb

@@ -1,11 +1,12 @@
 require 'spec_helper'
 
 describe 'Mapper definition DSL' do
+  include_context 'container'
   include_context 'users and tasks'
 
   describe 'combine' do
     before do
-      setup.relation(:tasks) do
+      configuration.relation(:tasks) do
         def for_users(users)
           names = users.map { |user| user[:name] }
           restrict { |task| names.include?(task[:name]) }
@@ -16,7 +17,7 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      setup.relation(:users) do
+      configuration.relation(:users) do
         def addresses(_users)
           [{ city: 'NYC', user: 'Jane' }, { city: 'Boston', user: 'Joe' }]
         end
@@ -26,7 +27,7 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           register_as :entity
 
@@ -63,8 +64,8 @@ describe 'Mapper definition DSL' do
       end
     end
 
-    let(:users) { rom.relation(:users) }
-    let(:tasks) { rom.relation(:tasks) }
+    let(:users) { container.relation(:users) }
+    let(:tasks) { container.relation(:tasks) }
 
     let(:joe) {
       Test::User.new(
@@ -98,7 +99,7 @@ describe 'Mapper definition DSL' do
     }
 
     it 'works' do
-      rom
+      container
 
       Test::User.send(:include, Equalizer.new(:name, :email, :tasks, :address, :book))
       Test::Task.send(:include, Equalizer.new(:title, :meta))

data/spec/integration/mappers/deep_embedded_spec.rb

@@ -2,13 +2,12 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe 'Mappers / deeply embedded tuples' do
-  let(:setup) { ROM.setup(:memory) }
-  let(:rom) { setup.finalize }
+  include_context 'container'
 
   it 'allows mapping embedded tuples' do
-    setup.relation(:users)
+    configuration.relation(:users)
 
-    setup.mappers do
+    configuration.mappers do
       define(:users) do
         model name: 'Test::User'
 
@@ -25,7 +24,7 @@ describe 'Mappers / deeply embedded tuples' do
       end
     end
 
-    rom.relations.users << {
+    container.relations.users << {
       'name' => 'Jane',
       'tasks' => [
         { 'title' => 'Task One', 'priority' => { 'value' => 1, 'desc' => 'high' } },
@@ -33,7 +32,7 @@ describe 'Mappers / deeply embedded tuples' do
       ]
     }
 
-    jane = rom.relation(:users).as(:users).first
+    jane = container.relation(:users).as(:users).first
 
     expect(jane.name).to eql('Jane')
 

data/spec/integration/mappers/definition_dsl_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 describe 'Mapper definition DSL' do
+  include_context 'container'
   include_context 'users and tasks'
 
   let(:header) { mapper.header }
 
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def email_index
         project(:email)
       end
@@ -14,10 +15,10 @@ describe 'Mapper definition DSL' do
   end
 
   describe 'default PORO mapper' do
-    subject(:mapper) { rom.mappers.users.entity }
+    subject(:mapper) { container.mappers.users.entity }
 
     before do
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           model name: 'Test::User'
 
@@ -40,10 +41,10 @@ describe 'Mapper definition DSL' do
 
   describe 'excluding attributes' do
     context 'by setting :inherit_header to false' do
-      subject(:mapper) { rom.mappers.users.email_index }
+      subject(:mapper) { container.mappers.users.email_index }
 
       before do
-        setup.mappers do
+        configuration.mappers do
           define(:users) do
             model name: 'Test::User'
 
@@ -65,10 +66,10 @@ describe 'Mapper definition DSL' do
   end
 
   describe 'virtual relation mapper' do
-    subject(:mapper) { rom.mappers.users.email_index }
+    subject(:mapper) { container.mappers.users.email_index }
 
     before do
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           model name: 'Test::User'
 
@@ -99,13 +100,13 @@ describe 'Mapper definition DSL' do
 
   describe 'wrapped relation mapper' do
     before do
-      setup.relation(:tasks) do
+      configuration.relation(:tasks) do
         def with_user
           join(users)
         end
       end
 
-      setup.mappers do
+      configuration.mappers do
         define(:tasks) do
           model name: 'Test::Task'
 
@@ -116,7 +117,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'allows defining wrapped attributes via options hash' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks) do
           model name: 'Test::TaskWithUser'
 
@@ -127,11 +128,11 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
+      container
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
-      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
+      jane = container.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -143,7 +144,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'allows defining wrapped attributes via options block' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks) do
           model name: 'Test::TaskWithUser'
 
@@ -156,11 +157,11 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
+      container
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
-      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
+      jane = container.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -172,7 +173,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'allows defining wrapped attributes mapped to a model' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks) do
           model name: 'Test::TaskWithUser'
 
@@ -186,12 +187,12 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
+      container
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
       Test::User.send(:include, Equalizer.new(:email))
 
-      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
+      jane = container.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(

data/spec/integration/mappers/embedded_spec.rb

@@ -2,13 +2,14 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe 'Mappers / embedded' do
-  let(:setup) { ROM.setup(:memory) }
-  let(:rom) { setup.finalize }
+  include_context 'container'
 
-  it 'allows mapping embedded tuples' do
-    setup.relation(:users)
+  before do
+    configuration.relation(:users)
+  end
 
-    setup.mappers do
+  it 'allows mapping embedded tuples' do
+    configuration.mappers do
       define(:users) do
         model name: 'Test::User'
 
@@ -20,21 +21,19 @@ describe 'Mappers / embedded' do
       end
     end
 
-    rom.relations.users << {
+    container.relations.users << {
       'name' => 'Jane',
       'tasks' => [{ 'title' => 'Task One' }, { 'title' => 'Task Two' }]
     }
 
-    jane = rom.relation(:users).map_with(:users).first
+    jane = container.relation(:users).map_with(:users).first
 
     expect(jane.name).to eql('Jane')
     expect(jane.tasks).to eql([{ title: 'Task One' }, { title: 'Task Two' }])
   end
 
   it 'allows mapping embedded tuple' do
-    setup.relation(:users)
-
-    setup.mappers do
+    configuration.mappers do
       define(:users) do
         model name: 'Test::User'
 
@@ -48,12 +47,12 @@ describe 'Mappers / embedded' do
       end
     end
 
-    rom.relations.users << {
+    container.relations.users << {
       'name' => 'Jane',
       'address' => { 'street' => 'Somewhere 1', 'city' => 'NYC' }
     }
 
-    jane = rom.relation(:users).as(:users).first
+    jane = container.relation(:users).as(:users).first
 
     Test::Address.send(:include, Equalizer.new(:street, :city))
 

data/spec/integration/mappers/exclude_spec.rb

@@ -2,23 +2,22 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe 'Mapper definition DSL' do
-  let(:setup) { ROM.setup(:memory) }
-  let(:rom)   { ROM.finalize.env   }
+  include_context 'container'
 
   before do
-    setup.relation(:users)
+    configuration.relation(:users)
 
-    users = setup.default.dataset(:users)
+    users = configuration.default.dataset(:users)
 
     users.insert(name: 'Joe', email: 'joe@doe.com')
     users.insert(name: 'Jane', email: 'jane@doe.com')
   end
 
   describe 'exclude' do
-    let(:mapped_users) { rom.relation(:users).as(:users).to_a }
+    let(:mapped_users) { container.relation(:users).as(:users).to_a }
 
     it 'removes the attribute' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { exclude :email }
       end