rom 0.9.1 → 1.0.0.beta1

data/spec/integration/mappers/symbolizing_attributes_spec.rb

@@ -2,12 +2,11 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe 'Mappers / Symbolizing atributes' do
-  let(:setup) { ROM.setup(:memory) }
-  let(:rom) { setup.finalize }
+  include_context 'container'
 
   before do
-    setup.relation(:users)
-    setup.relation(:tasks)
+    configuration.relation(:users)
+    configuration.relation(:tasks)
   end
 
   it 'automatically maps all attributes using top-level settings' do
@@ -30,13 +29,15 @@ describe 'Mappers / Symbolizing atributes' do
       end
     end
 
-    rom.relations.users << {
+    configuration.register_mapper(Test::UserMapper)
+
+    container.relations.users << {
       'user_id' => 123,
       'first_name' => 'Jane',
       'email' => 'jane@doe.org'
     }
 
-    jane = rom.relation(:users).as(:users).first
+    jane = container.relation(:users).as(:users).first
 
     expect(jane).to eql(
       id: 123, details: { name: 'Jane' }, contact: { email: 'jane@doe.org' }
@@ -58,13 +59,15 @@ describe 'Mappers / Symbolizing atributes' do
       end
     end
 
-    rom.relations.tasks << {
+    configuration.register_mapper(Test::TaskMapper)
+
+    container.relations.tasks << {
       'title' => 'Task One',
       'task_priority' => 1,
       'task_description' => 'It is a task'
     }
 
-    task = rom.relation(:tasks).as(:tasks).first
+    task = container.relation(:tasks).as(:tasks).first
 
     expect(task).to eql(
       title: 'Task One',

data/spec/integration/mappers/unfold_spec.rb

@@ -2,13 +2,12 @@ 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',  roles: ['admin', 'user', 'user', nil])
     users.insert(name: 'Jane', roles: 'user')
@@ -16,10 +15,10 @@ describe 'Mapper definition DSL' do
   end
 
   describe 'unfold' do
-    let(:mapped_users) { rom.relation(:users).as(:users).to_a }
+    let(:mapped_users) { container.relation(:users).as(:users).to_a }
 
     it 'splits the attribute' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { unfold :roles }
       end
 
@@ -34,7 +33,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'renames unfolded attribute when necessary' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { unfold :role, from: :roles }
       end
 
@@ -49,7 +48,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'rewrites the existing attribute' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { unfold :name, from: :roles }
       end
 
@@ -64,7 +63,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'ignores the absent attribute' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { unfold :foo, from: :absent }
       end
 
@@ -76,7 +75,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'accepts block' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { unfold(:role, from: :roles) {} }
       end
 

data/spec/integration/mappers/ungroup_spec.rb

@@ -2,29 +2,28 @@ 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', emails: [
       { address: 'joe@home.org', type: 'home' },
       { address: 'joe@job.com',  type: 'job'  },
       { address: 'joe@doe.com',  type: 'job'  },
       { address: 'joe@thor.org'               },
-      {                          type: 'home' },
+      { type: 'home' },
       {}
     ])
     users.insert(name: 'Jane')
   end
 
   describe 'ungroup' do
-    subject(:mapped_users) { rom.relation(:users).as(:users).to_a }
+    subject(:mapped_users) { container.relation(:users).as(:users).to_a }
 
     it 'partially ungroups attributes' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { ungroup emails: [:type] }
       end
 
@@ -46,7 +45,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'removes group when all attributes extracted' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) { ungroup emails: [:address, :type, :foo] }
       end
 
@@ -62,7 +61,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'accepts block syntax' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           ungroup :emails do
             attribute :address
@@ -83,7 +82,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'renames ungrouped attributes' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           ungroup :emails do
             attribute :email, from: :address
@@ -104,7 +103,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'skips existing attributes' do
-      setup.mappers do
+      configuration.mappers do
         define(:users) do
           ungroup :emails do
             attribute :name, from: :address

data/spec/integration/mappers/unwrap_spec.rb

@@ -1,13 +1,14 @@
 require 'spec_helper'
 
 describe 'Mapper definition DSL' do
+  include_context 'container'
   include_context 'users and tasks'
 
   let(:header) { mapper.header }
 
   describe 'unwrapping relation mapper' do
     before do
-      setup.relation(:tasks) do
+      configuration.relation(:tasks) do
         def with_user
           tuples = map { |tuple|
             tuple.merge(user: users.restrict(name: tuple[:name]).first)
@@ -17,9 +18,9 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      setup.relation(:users)
+      configuration.relation(:users)
 
-      setup.mappers do
+      configuration.mappers do
         define(:tasks) do
           model name: 'Test::Task'
 
@@ -30,7 +31,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'unwraps nested attributes via options hash' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks) do
           attribute :title
           attribute :priority
@@ -39,9 +40,7 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
-
-      result = rom.relation(:tasks).with_user.as(:with_user).to_a.last
+      result = container.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(result).to eql(title: 'be cool',
                             priority: 2,
@@ -50,7 +49,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'unwraps nested attributes via options block' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks) do
           attribute :title
           attribute :priority
@@ -62,9 +61,7 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
-
-      result = rom.relation(:tasks).with_user.as(:with_user).to_a.last
+      result = container.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(result).to eql(title: 'be cool',
                             priority: 2,
@@ -73,7 +70,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'unwraps specified attributes via options block' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks) do
           attribute :title
           attribute :priority
@@ -84,9 +81,7 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
-
-      result = rom.relation(:tasks).with_user.as(:with_user).to_a.last
+      result = container.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(result).to eql(title: 'be cool',
                             priority: 2,

data/spec/integration/mappers/wrap_spec.rb

@@ -1,21 +1,22 @@
 require 'spec_helper'
 
 describe 'Mapper definition DSL' do
+  include_context 'container'
   include_context 'users and tasks'
 
   let(:header) { mapper.header }
 
   describe 'wrapped relation mapper' do
     before do
-      setup.relation(:tasks) do
+      configuration.relation(:tasks) do
         def with_user
           join(users)
         end
       end
 
-      setup.relation(:users)
+      configuration.relation(:users)
 
-      setup.mappers do
+      configuration.mappers do
         define(:tasks) do
           model name: 'Test::Task'
 
@@ -26,7 +27,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'
 
@@ -37,11 +38,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(
@@ -53,7 +54,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'
 
@@ -66,11 +67,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(
@@ -82,7 +83,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'allows defining nested wrapped attributes via a block' do
-      setup.mappers do
+      configuration.mappers do
         define(:with_user, parent: :tasks, inherit_header: false) do
           model name: 'Test::TaskWithUser'
 
@@ -101,13 +102,13 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      rom = setup.finalize
+      container
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
       Test::TaskUser.send(:include, Equalizer.new(:name, :contact))
       Test::Contact.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(
@@ -121,7 +122,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'
 
@@ -135,12 +136,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/{unit/rom → integration}/memory/commands/create_spec.rb

@@ -3,19 +3,21 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe ROM::Memory::Commands::Create do
+  include_context 'container'
   include_context 'users and tasks'
 
-  subject(:command) { ROM::Memory::Commands::Create.build(users) }
-
-  let(:users) { rom.relations[:users] }
-
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_id(id)
         restrict(id: id)
       end
     end
+    configuration.commands(:users) do
+      define(:create)
+    end
   end
 
+  subject(:command) { container.command(:users).create }
+
   it_behaves_like 'a command'
 end

data/spec/{unit/rom → integration}/memory/commands/delete_spec.rb

@@ -3,19 +3,21 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe ROM::Memory::Commands::Delete do
+  include_context 'container'
   include_context 'users and tasks'
 
-  subject(:command) { ROM::Memory::Commands::Delete.build(users) }
-
-  let(:users) { rom.relations[:users] }
-
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_id(id)
         restrict(id: id)
       end
     end
+    configuration.commands(:users) do
+      define(:delete)
+    end
   end
 
+  subject(:command) { container.command(:users).delete }
+
   it_behaves_like 'a command'
 end

data/spec/{unit/rom → integration}/memory/commands/update_spec.rb

@@ -3,19 +3,21 @@ require 'spec_helper'
 require 'rom/memory'
 
 describe ROM::Memory::Commands::Update do
+  include_context 'container'
   include_context 'users and tasks'
 
-  subject(:command) { ROM::Memory::Commands::Update.build(users) }
-
-  let(:users) { rom.relations[:users] }
-
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_id(id)
         restrict(id: id)
       end
     end
+    configuration.commands(:users) do
+      define(:update)
+    end
   end
 
+  subject(:command) { container.command(:users).update }
+
   it_behaves_like 'a command'
 end