rom 0.5.0 → 0.6.0.beta1

data/spec/integration/mappers/wrap_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 'wrapped relation mapper' do
     before do
       setup.relation(:tasks) do
@@ -25,7 +17,7 @@ describe 'Mapper definition DSL' do
 
       setup.mappers do
         define(:tasks) do
-          model name: 'Task'
+          model name: 'Test::Task'
 
           attribute :title
           attribute :priority
@@ -36,7 +28,7 @@ describe 'Mapper definition DSL' do
     it 'allows defining wrapped attributes via options hash' do
       setup.mappers do
         define(:with_user, parent: :tasks) do
-          model name: 'TaskWithUser'
+          model name: 'Test::TaskWithUser'
 
           attribute :title
           attribute :priority
@@ -47,12 +39,12 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
+      Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
       jane = rom.read(:tasks).with_user.to_a.last
 
       expect(jane).to eql(
-        TaskWithUser.new(
+        Test::TaskWithUser.new(
           title: 'be cool',
           priority: 2,
           user: { email: 'jane@doe.org' }
@@ -63,7 +55,7 @@ describe 'Mapper definition DSL' do
     it 'allows defining wrapped attributes via options block' do
       setup.mappers do
         define(:with_user, parent: :tasks) do
-          model name: 'TaskWithUser'
+          model name: 'Test::TaskWithUser'
 
           attribute :title
           attribute :priority
@@ -76,12 +68,12 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
+      Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
       jane = rom.read(:tasks).with_user.to_a.last
 
       expect(jane).to eql(
-        TaskWithUser.new(
+        Test::TaskWithUser.new(
           title: 'be cool',
           priority: 2,
           user: { email: 'jane@doe.org' }
@@ -92,17 +84,17 @@ describe 'Mapper definition DSL' do
     it 'allows defining nested wrapped attributes via a block' do
       setup.mappers do
         define(:with_user, parent: :tasks, inherit_header: false) do
-          model name: 'TaskWithUser'
+          model name: 'Test::TaskWithUser'
 
           attribute :title
           attribute :priority
 
           wrap :user do
-            model name: 'TaskUser'
+            model name: 'Test::TaskUser'
             attribute :name
 
             wrap :contact do
-              model name: 'Contact'
+              model name: 'Test::Contact'
               attribute :email
             end
           end
@@ -111,18 +103,18 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
-      TaskUser.send(:include, Equalizer.new(:name, :contact))
-      Contact.send(:include, Equalizer.new(:email))
+      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.read(:tasks).with_user.to_a.last
 
       expect(jane).to eql(
-        TaskWithUser.new(
+        Test::TaskWithUser.new(
           title: 'be cool',
           priority: 2,
-          user: TaskUser.new(
-            name: 'Jane', contact: Contact.new(email: 'jane@doe.org')
+          user: Test::TaskUser.new(
+            name: 'Jane', contact: Test::Contact.new(email: 'jane@doe.org')
           )
         )
       )
@@ -131,13 +123,13 @@ describe 'Mapper definition DSL' do
     it 'allows defining wrapped attributes mapped to a model' do
       setup.mappers do
         define(:with_user, parent: :tasks) do
-          model name: 'TaskWithUser'
+          model name: 'Test::TaskWithUser'
 
           attribute :title
           attribute :priority
 
           wrap :user do
-            model name: 'User'
+            model name: 'Test::User'
             attribute :email
           end
         end
@@ -145,16 +137,16 @@ describe 'Mapper definition DSL' do
 
       rom = setup.finalize
 
-      TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
-      User.send(:include, Equalizer.new(:email))
+      Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
+      Test::User.send(:include, Equalizer.new(:email))
 
       jane = rom.read(:tasks).with_user.to_a.last
 
       expect(jane).to eql(
-        TaskWithUser.new(
+        Test::TaskWithUser.new(
           title: 'be cool',
           priority: 2,
-          user: User.new(email: 'jane@doe.org')
+          user: Test::User.new(email: 'jane@doe.org')
         )
       )
     end

data/spec/integration/multi_repo_spec.rb

@@ -1,44 +1,24 @@
 require 'spec_helper'
+require 'rom/memory'
 
-describe 'Using in-memory adapter for cross-repo access' do
-  it 'works' do
-    setup = ROM.setup(
-      left: 'memory://localhost/users',
-      right: 'memory://localhost/tasks',
-      main: 'memory://localhost/main'
-    )
-
-    setup.schema do
-      base_relation :users do
-        repository :left
-        attribute :user_id
-        attribute :name
-      end
-
-      base_relation :tasks do
-        repository :right
-        attribute :user_id
-        attribute :title
-      end
-
-      base_relation :users_and_tasks do
-        repository :main
+describe 'Using in-memory repositories for cross-repo access' do
+  let(:setup) do
+    ROM.setup(left: :memory, right: :memory, main: :memory)
+  end
 
-        attribute :user_id
-        attribute :name
-        attribute :title
-      end
-    end
+  let(:repositories) { rom.repositories }
+  let(:rom) { setup.finalize }
 
-    setup.relation(:users) do
+  it 'works' do
+    setup.relation(:users, repository: :left) do
       def by_name(name)
         restrict(name: name)
       end
     end
 
-    setup.relation(:tasks)
+    setup.relation(:tasks, repository: :right)
 
-    setup.relation(:users_and_tasks) do
+    setup.relation(:users_and_tasks, repository: :main) do
       def by_user(name)
         join(users.by_name(name), tasks)
       end
@@ -50,12 +30,10 @@ describe 'Using in-memory adapter for cross-repo access' do
       end
     end
 
-    rom = setup.finalize
-
-    rom.left.users << { user_id: 1, name: 'Joe' }
-    rom.left.users << { user_id: 2, name: 'Jane' }
-    rom.right.tasks << { user_id: 1, title: 'Have fun' }
-    rom.right.tasks << { user_id: 2, title: 'Have fun' }
+    repositories[:left][:users] << { user_id: 1, name: 'Joe' }
+    repositories[:left][:users] << { user_id: 2, name: 'Jane' }
+    repositories[:right][:tasks] << { user_id: 1, title: 'Have fun' }
+    repositories[:right][:tasks] << { user_id: 2, title: 'Have fun' }
 
     expect(rom.read(:users_and_tasks).by_user('Jane').to_a).to eql([
       { user_id: 2, name: 'Jane', tasks: [{ title: 'Have fun' }] }

data/spec/integration/relations/reading_spec.rb

@@ -18,14 +18,19 @@ describe 'Reading relations' do
 
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
+
+        attribute :name
+        attribute :email
       end
     end
 
+    rom = setup.finalize
+
     users = rom.read(:users).sorted.by_name('Jane')
     user = users.first
 
-    expect(user).to be_an_instance_of(User)
+    expect(user).to be_an_instance_of(Test::User)
     expect(user.name).to eql 'Jane'
     expect(user.email).to eql 'jane@doe.org'
   end
@@ -45,11 +50,14 @@ describe 'Reading relations' do
 
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
+
+        attribute :name
+        attribute :email
       end
 
       define(:with_tasks, parent: :users) do
-        model name: 'UserWithTasks'
+        model name: 'Test::UserWithTasks'
 
         group tasks: [:title, :priority]
       end
@@ -57,8 +65,8 @@ describe 'Reading relations' do
 
     rom = setup.finalize
 
-    User.send(:include, Equalizer.new(:name, :email))
-    UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
+    Test::User.send(:include, Equalizer.new(:name, :email))
+    Test::UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
 
     keys = rom.read(:users).with_tasks.header.keys
     expect(keys).to eql([:name, :email, :tasks])
@@ -66,7 +74,7 @@ describe 'Reading relations' do
     user = rom.read(:users).sorted.first
 
     expect(user).to eql(
-      User.new(name: "Jane", email: "jane@doe.org")
+      Test::User.new(name: "Jane", email: "jane@doe.org")
     )
 
     expect(rom.read(:users)).to_not respond_to(:join)
@@ -74,7 +82,7 @@ describe 'Reading relations' do
     user = rom.read(:users).with_tasks.sorted.first
 
     expect(user).to eql(
-      UserWithTasks.new(
+      Test::UserWithTasks.new(
         name: "Jane",
         email: "jane@doe.org",
         tasks: [{ title: "be cool", priority: 2 }])
@@ -96,11 +104,14 @@ describe 'Reading relations' do
 
     setup.mappers do
       define(:users) do
-        model name: 'User'
+        model name: 'Test::User'
+
+        attribute :name
+        attribute :email
       end
 
       define(:with_task, parent: :users) do
-        model name: 'UserWithTask'
+        model name: 'Test::UserWithTask'
 
         wrap task: [:title, :priority]
       end
@@ -108,8 +119,8 @@ describe 'Reading relations' do
 
     rom = setup.finalize
 
-    User.send(:include, Equalizer.new(:name, :email))
-    UserWithTask.send(:include, Equalizer.new(:name, :email, :task))
+    Test::User.send(:include, Equalizer.new(:name, :email))
+    Test::UserWithTask.send(:include, Equalizer.new(:name, :email, :task))
 
     keys = rom.read(:users).with_task.header.keys
     expect(keys).to eql([:name, :email, :task])
@@ -117,8 +128,8 @@ describe 'Reading relations' do
     user = rom.read(:users).sorted.with_task.first
 
     expect(user).to eql(
-      UserWithTask.new(name: "Jane", email: "jane@doe.org",
-                       task: { title: "be cool", priority: 2 })
+      Test::UserWithTask.new(name: "Jane", email: "jane@doe.org",
+                             task: { title: "be cool", priority: 2 })
     )
   end
 
@@ -139,4 +150,61 @@ describe 'Reading relations' do
 
     expect(user).to eql(name: "Jane", email: "jane@doe.org")
   end
+
+  it 'allows cherry-picking of a mapper' do
+    setup.relation(:users)
+
+    setup.mappers do
+      define(:users) do
+        attribute :name
+        attribute :email
+      end
+
+      define(:prefixer, parent: :users) do
+        attribute :user_name, from: :name
+        attribute :user_email, from: :email
+      end
+    end
+
+    rom = setup.finalize
+    user = rom.read(:users).map(:prefixer).first
+
+    expect(user).to eql(user_name: 'Joe', user_email: "joe@doe.org")
+  end
+
+  it 'allows passing a block to retrieve relations for mapping' do
+    setup.relation(:users) do
+      def by_name(name)
+        restrict(name: name)
+      end
+    end
+
+    setup.mappers do
+      define(:users) do
+        attribute :name
+        attribute :email
+      end
+
+      define(:prefixer, parent: :users) do
+        attribute :user_name, from: :name
+        attribute :user_email, from: :email
+      end
+    end
+
+    rom = setup.finalize
+
+    expect {
+      rom.relation(:users) { |users| users.not_here }
+    }.to raise_error(NoMethodError, /not_here/)
+
+    expect {
+      rom.relation(:users) { |users| users.by_name('Joe') }.as(:not_here)
+    }.to raise_error(ROM::MapperMissingError, /not_here/)
+
+    user = rom.relation(:users) { |users|
+      users.by_name('Joe')
+    }.map_with(:prefixer).call.first
+
+    expect(user).to eql(user_name: 'Joe', user_email: "joe@doe.org")
+  end
 end

data/spec/integration/repositories/extending_relations_spec.rb

@@ -0,0 +1,50 @@
+require 'spec_helper'
+require 'rom/memory'
+
+describe 'Repository' do
+  let!(:setup) { ROM.setup(:memory) }
+
+  let(:rom) { setup.finalize }
+
+  before do
+    module ROM
+      module Memory
+        class Relation < ROM::Relation
+          def self.freaking_awesome?
+            true
+          end
+
+          def freaking_cool?
+            true
+          end
+        end
+      end
+    end
+  end
+
+  shared_examples_for 'extended relation' do
+    it 'can extend relation class' do
+      expect(rom.relations.users.class).to be_freaking_awesome
+    end
+
+    it 'can extend relation instance' do
+      expect(rom.relations.users).to be_freaking_cool
+    end
+  end
+
+  context 'using DSL' do
+    it_behaves_like 'extended relation' do
+      before do
+        setup.relation(:users)
+      end
+    end
+  end
+
+  context 'using class definition' do
+    it_behaves_like 'extended relation' do
+      before do
+        Class.new(ROM::Relation[:memory]) { dataset :users }
+      end
+    end
+  end
+end

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

@@ -1,8 +1,9 @@
 require 'spec_helper'
+require 'rom/memory'
 
 require 'logger'
 
-describe 'Adapters / Setting logger' do
+describe 'Repositories / Setting logger' do
   let(:logger_class) do
     Class.new do
       attr_reader :messages
@@ -21,14 +22,14 @@ describe 'Adapters / Setting logger' do
     logger_class.new
   end
 
-  it 'sets up a logger for a given adapter' do
-    setup = ROM.setup(memory: 'memory://localhost')
+  it 'sets up a logger for a given repository' do
+    setup = ROM.setup(:memory)
 
-    setup.memory.use_logger(logger)
+    setup.default.use_logger(logger)
 
     rom = setup.finalize
 
-    rom.memory.logger.info("test")
+    rom.repositories[:default].logger.info("test")
 
     expect(logger.messages).to eql(["test"])
   end