rom 0.5.0 → 0.6.0.beta1

data/spec/integration/mappers/embedded_spec.rb

@@ -1,23 +1,16 @@
 require 'spec_helper'
+require 'rom/memory'
 
 describe 'Mappers / embedded' do
-  let(:setup) { ROM.setup('memory://test') }
+  let(:setup) { ROM.setup(:memory) }
   let(:rom) { setup.finalize }
 
   it 'allows mapping embedded tuples' do
-    setup.schema do
-      base_relation(:users) do
-        repository :default
-        attribute 'name'
-        attribute 'tasks'
-      end
-    end
-
     setup.relation(:users)
 
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
 
         attribute :name, from: 'name'
 
@@ -27,7 +20,7 @@ describe 'Mappers / embedded' do
       end
     end
 
-    rom.schema.users << {
+    rom.relations.users << {
       'name' => 'Jane',
       'tasks' => [{ 'title' => 'Task One' }, { 'title' => 'Task Two' }]
     }
@@ -41,31 +34,23 @@ describe 'Mappers / embedded' do
   end
 
   it 'allows mapping embedded tuple' do
-    setup.schema do
-      base_relation(:users) do
-        repository :default
-        attribute 'name'
-        attribute 'address'
-      end
-    end
-
     setup.relation(:users)
 
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
 
         attribute :name, from: 'name'
 
         embedded :address, from: 'address', type: :hash do
-          model name: 'Address'
+          model name: 'Test::Address'
           attribute :street, from: 'street'
           attribute :city, from: 'city'
         end
       end
     end
 
-    rom.schema.users << {
+    rom.relations.users << {
       'name' => 'Jane',
       'address' => { 'street' => 'Somewhere 1', 'city' => 'NYC' }
     }
@@ -74,9 +59,9 @@ describe 'Mappers / embedded' do
 
     expect(rom.read(:users).mapper.header.map(&:name)).to eql([:name, :address])
 
-    Address.send(:include, Equalizer.new(:street, :city))
+    Test::Address.send(:include, Equalizer.new(:street, :city))
 
     expect(jane.name).to eql('Jane')
-    expect(jane.address).to eql(Address.new(street: 'Somewhere 1', city: 'NYC'))
+    expect(jane.address).to eql(Test::Address.new(street: 'Somewhere 1', city: 'NYC'))
   end
 end

data/spec/integration/mappers/group_spec.rb

@@ -5,14 +5,6 @@ describe 'Mapper definition DSL' do
 
   let(:header) { mapper.header }
 
-  before do
-    setup.relation(:users) do
-      def email_index
-        project(:email)
-      end
-    end
-  end
-
   describe 'grouped relation mapper' do
     before do
       setup.relation(:tasks) do
@@ -29,7 +21,7 @@ describe 'Mapper definition DSL' do
 
       setup.mappers do
         define(:users) do
-          model name: 'User'
+          model name: 'Test::User'
 
           attribute :name
           attribute :email
@@ -40,7 +32,7 @@ describe 'Mapper definition DSL' do
     it 'allows defining grouped attributes via options hash' do
       setup.mappers do
         define(:with_tasks, parent: :users) do
-          model name: 'UserWithTasks'
+          model name: 'Test::UserWithTasks'
 
           attribute :name
           attribute :email
@@ -51,12 +43,12 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
+      Test::UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
 
       jane = rom.read(:users).with_tasks.to_a.last
 
       expect(jane).to eql(
-        UserWithTasks.new(
+        Test::UserWithTasks.new(
           name: 'Jane',
           email: 'jane@doe.org',
           tasks: [{ title: 'be cool', priority: 2 }]
@@ -67,7 +59,7 @@ describe 'Mapper definition DSL' do
     it 'allows defining grouped attributes via block' do
       setup.mappers do
         define(:with_tasks, parent: :users) do
-          model name: 'UserWithTasks'
+          model name: 'Test::UserWithTasks'
 
           attribute :name
           attribute :email
@@ -81,12 +73,12 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
+      Test::UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
 
       jane = rom.read(:users).with_tasks.to_a.last
 
       expect(jane).to eql(
-        UserWithTasks.new(
+        Test::UserWithTasks.new(
           name: 'Jane',
           email: 'jane@doe.org',
           tasks: [{ title: 'be cool', priority: 2 }]
@@ -97,13 +89,13 @@ describe 'Mapper definition DSL' do
     it 'allows defining grouped attributes mapped to a model via block' do
       setup.mappers do
         define(:with_tasks, parent: :users) do
-          model name: 'UserWithTasks'
+          model name: 'Test::UserWithTasks'
 
           attribute :name
           attribute :email
 
           group :tasks do
-            model name: 'Task'
+            model name: 'Test::Task'
 
             attribute :title
             attribute :priority
@@ -113,16 +105,16 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
-      Task.send(:include, Equalizer.new(:title, :priority))
+      Test::UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
+      Test::Task.send(:include, Equalizer.new(:title, :priority))
 
       jane = rom.read(:users).with_tasks.to_a.last
 
       expect(jane).to eql(
-        UserWithTasks.new(
+        Test::UserWithTasks.new(
           name: 'Jane',
           email: 'jane@doe.org',
-          tasks: [Task.new(title: 'be cool', priority: 2)]
+          tasks: [Test::Task.new(title: 'be cool', priority: 2)]
         )
       )
     end
@@ -132,18 +124,18 @@ describe 'Mapper definition DSL' do
         define(:tasks)
 
         define(:with_users, parent: :tasks, inherit_header: false) do
-          model name: 'TaskWithUsers'
+          model name: 'Test::TaskWithUsers'
 
           attribute :title
           attribute :priority
 
           group :users do
-            model name: 'TaskUser'
+            model name: 'Test::TaskUser'
 
             attribute :name
 
             group :contacts do
-              model name: 'Contact'
+              model name: 'Test::Contact'
               attribute :email
             end
           end
@@ -152,16 +144,16 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      TaskWithUsers.send(:include, Equalizer.new(:title, :priority, :users))
-      TaskUser.send(:include, Equalizer.new(:name, :contacts))
-      Contact.send(:include, Equalizer.new(:email))
+      Test::TaskWithUsers.send(:include, Equalizer.new(:title, :priority, :users))
+      Test::TaskUser.send(:include, Equalizer.new(:name, :contacts))
+      Test::Contact.send(:include, Equalizer.new(:email))
 
       task = rom.read(:tasks).with_users.to_a.first
 
       expect(task).to eql(
-        TaskWithUsers.new(title: 'be nice', priority: 1, users: [
-          TaskUser.new(name: 'Joe', contacts: [
-            Contact.new(email: 'joe@doe.org')
+        Test::TaskWithUsers.new(title: 'be nice', priority: 1, users: [
+          Test::TaskUser.new(name: 'Joe', contacts: [
+            Test::Contact.new(email: 'joe@doe.org')
           ])
         ])
       )

data/spec/integration/mappers/prefixing_attributes_spec.rb

@@ -1,42 +1,37 @@
 require 'spec_helper'
+require 'rom/memory'
 
 describe 'Mappers / Prefixing attributes' do
-  let(:setup) { ROM.setup(memory: 'memory://test') }
+  let(:setup) { ROM.setup(:memory) }
 
   before do
-    setup.schema do
-      base_relation(:users) do
-        repository :memory
-
-        attribute :user_id
-        attribute :user_name
-        attribute :user_email
-      end
-    end
-
     setup.relation(:users)
   end
 
   it 'automatically maps all attributes using the provided prefix' do
-    setup.mappers do
-      define(:users, prefix: :user) do
-        model name: 'User'
-
-        attribute :id
-        attribute :name
-        attribute :email
-      end
+    class Test::UserMapper < ROM::Mapper
+      relation :users
+      prefix :user
+
+      model name: 'Test::User'
+
+      attribute :id
+      attribute :name
+      attribute :email
     end
 
     rom = setup.finalize
 
-    User.send(:include, Equalizer.new(:id, :name, :email))
+    Test::User.send(:include, Equalizer.new(:id, :name, :email))
 
-    rom.schema.users << { user_id: 123, user_name: 'Jane',
-                          user_email: 'jane@doe.org' }
+    rom.relations.users << {
+      user_id: 123,
+      user_name: 'Jane',
+      user_email: 'jane@doe.org'
+    }
 
     jane = rom.read(:users).to_a.first
 
-    expect(jane).to eql(User.new(id: 123, name: 'Jane', email: 'jane@doe.org'))
+    expect(jane).to eql(Test::User.new(id: 123, name: 'Jane', email: 'jane@doe.org'))
   end
 end

data/spec/integration/mappers/renaming_attributes_spec.rb

@@ -1,25 +1,10 @@
 require 'spec_helper'
+require 'rom/memory'
 
 describe 'Mappers / Renaming attributes' do
-  let(:setup) { ROM.setup(memory: 'memory://test') }
+  let(:setup) { ROM.setup(:memory) }
 
   before do
-    setup.schema do
-      base_relation(:users) do
-        repository :memory
-
-        attribute :_id
-        attribute :user_name
-      end
-
-      base_relation(:addresses) do
-        repository :memory
-
-        attribute :address_id
-        attribute :address_street
-      end
-    end
-
     setup.relation(:addresses)
 
     setup.relation(:users) do
@@ -36,7 +21,7 @@ describe 'Mappers / Renaming attributes' do
   it 'maps renamed attributes for a base relation' do
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
 
         attribute :id, from: :_id
         attribute :name, from: :user_name
@@ -45,26 +30,26 @@ describe 'Mappers / Renaming attributes' do
 
     rom = setup.finalize
 
-    User.send(:include, Equalizer.new(:id, :name))
+    Test::User.send(:include, Equalizer.new(:id, :name))
 
-    rom.schema.users << { _id: 123, user_name: 'Jane' }
+    rom.relations.users << { _id: 123, user_name: 'Jane' }
 
     jane = rom.read(:users).to_a.first
 
-    expect(jane).to eql(User.new(id: 123, name: 'Jane'))
+    expect(jane).to eql(Test::User.new(id: 123, name: 'Jane'))
   end
 
   it 'maps renamed attributes for a wrapped relation' do
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
 
         attribute :id, from: :_id
         attribute :name, from: :user_name
       end
 
       define(:with_address, parent: :users) do
-        model name: 'UserWithAddress'
+        model name: 'Test::UserWithAddress'
 
         attribute :id, from: :_id
         attribute :name, from: :user_name
@@ -78,31 +63,31 @@ describe 'Mappers / Renaming attributes' do
 
     rom = setup.finalize
 
-    UserWithAddress.send(:include, Equalizer.new(:id, :name, :address))
+    Test::UserWithAddress.send(:include, Equalizer.new(:id, :name, :address))
 
-    rom.schema.users << { _id: 123, user_name: 'Jane' }
-    rom.schema.addresses << { _id: 123, address_id: 321,
-                              address_street: 'Street 1' }
+    rom.relations.users << { _id: 123, user_name: 'Jane' }
+    rom.relations.addresses <<
+      { _id: 123, address_id: 321, address_street: 'Street 1' }
 
     jane = rom.read(:users).with_address.first
 
     expect(jane).to eql(
-      UserWithAddress.new(id: 123, name: 'Jane',
-                          address: { id: 321, street: 'Street 1' })
+      Test::UserWithAddress.new(id: 123, name: 'Jane',
+                                address: { id: 321, street: 'Street 1' })
     )
   end
 
   it 'maps renamed attributes for a grouped relation' do
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
 
         attribute :id, from: :_id
         attribute :name, from: :user_name
       end
 
       define(:with_addresses, parent: :users) do
-        model name: 'UserWithAddresses'
+        model name: 'Test::UserWithAddresses'
 
         attribute :id, from: :_id
         attribute :name, from: :user_name
@@ -116,18 +101,18 @@ describe 'Mappers / Renaming attributes' do
 
     rom = setup.finalize
 
-    UserWithAddresses.send(:include, Equalizer.new(:id, :name, :addresses))
+    Test::UserWithAddresses.send(:include, Equalizer.new(:id, :name, :addresses))
 
-    rom.schema.users << { _id: 123, user_name: 'Jane' }
-    rom.schema.addresses << { _id: 123, address_id: 321,
-                              address_street: 'Street 1' }
-    rom.schema.addresses << { _id: 123, address_id: 654,
-                              address_street: 'Street 2' }
+    rom.relations.users << { _id: 123, user_name: 'Jane' }
+    rom.relations.addresses <<
+      { _id: 123, address_id: 321, address_street: 'Street 1' }
+    rom.relations.addresses <<
+      { _id: 123, address_id: 654, address_street: 'Street 2' }
 
     jane = rom.read(:users).with_addresses.first
 
     expect(jane).to eql(
-      UserWithAddresses.new(
+      Test::UserWithAddresses.new(
         id: 123,
         name: 'Jane',
         addresses: [{ id: 321, street: 'Street 1' },

data/spec/integration/mappers/symbolizing_attributes_spec.rb

@@ -1,32 +1,23 @@
 require 'spec_helper'
+require 'rom/memory'
 
 describe 'Mappers / Symbolizing atributes' do
-  let(:setup) { ROM.setup(memory: 'memory://test') }
+  let(:setup) { ROM.setup(:memory) }
   let(:rom) { setup.finalize }
 
   before do
-    setup.schema do
-      base_relation(:users) do
-        repository :memory
-
-        attribute 'user_id'
-        attribute 'first_name'
-        attribute 'email'
-      end
-
-      base_relation(:tasks) do
-        repository :memory
-
-        attribute 'title'
-        attribute 'task_priority'
-        attribute 'task_description'
-      end
-    end
+    setup.relation(:users)
+    setup.relation(:tasks)
   end
 
   it 'automatically maps all attributes using top-level settings' do
-    setup.mappers do
-      define(:users, symbolize_keys: true, inherit_header: false, prefix: 'user') do
+    module Test
+      class UserMapper < ROM::Mapper
+        relation :users
+
+        symbolize_keys true
+        prefix 'user'
+
         attribute :id
 
         wrap :details, prefix: 'first' do
@@ -39,7 +30,7 @@ describe 'Mappers / Symbolizing atributes' do
       end
     end
 
-    rom.schema.users << {
+    rom.relations.users << {
       'user_id' => 123,
       'first_name' => 'Jane',
       'email' => 'jane@doe.org'
@@ -53,8 +44,11 @@ describe 'Mappers / Symbolizing atributes' do
   end
 
   it 'automatically maps all attributes using settings for wrap block' do
-    setup.mappers do
-      define(:tasks, symbolize_keys: true) do
+    module Test
+      class TaskMapper < ROM::Mapper
+        relation :tasks
+        symbolize_keys true
+
         attribute :title
 
         wrap :details, prefix: 'task' do
@@ -64,7 +58,7 @@ describe 'Mappers / Symbolizing atributes' do
       end
     end
 
-    rom.schema.tasks << {
+    rom.relations.tasks << {
       'title' => 'Task One',
       'task_priority' => 1,
       'task_description' => 'It is a task'