rom 0.6.0.beta3 → 0.6.0.rc1

data/lib/rom/relation/lazy.rb

@@ -167,7 +167,7 @@ module ROM
         else
           arity = relation.method(meth).arity
 
-          if arity == -1 || arity == args.size
+          if arity < 0 || arity == args.size
             response = relation.__send__(meth, *args, &block)
             if response.is_a?(Relation)
               __new__(response)

data/lib/rom/relation/registry_reader.rb

@@ -4,7 +4,7 @@ module ROM
       # @api private
       def self.included(klass)
         super
-        klass.option :__registry__, type: Hash, default: {}, reader: true
+        klass.option :__registry__, type: Hash, default: EMPTY_HASH, reader: true
       end
 
       # @api private

data/lib/rom/setup/finalize.rb

@@ -1,6 +1,5 @@
 require 'rom/relation'
 require 'rom/mapper'
-require 'rom/reader'
 require 'rom/command'
 
 require 'rom/support/registry'
@@ -52,9 +51,8 @@ module ROM
         relations = load_relations
         mappers = load_mappers
         commands = load_commands(relations)
-        readers = load_readers(relations, mappers)
 
-        Env.new(repositories, relations, mappers, commands, readers)
+        Env.new(repositories, relations, mappers, commands)
       end
 
       private
@@ -91,24 +89,6 @@ module ROM
         Registry.new(registry_hash)
       end
 
-      # Build entire reader and mapper registries
-      #
-      # @api private
-      def load_readers(relations, mappers)
-        readers = {}
-
-        mappers.each do |name, rel_mappers|
-          next unless rel_mappers.key?(name)
-
-          relation = relations[name]
-          methods = relation.exposed_relations
-
-          readers[name] = Reader.build(name, relation, rel_mappers, methods)
-        end
-
-        ReaderRegistry.new(readers)
-      end
-
       # Build entire command registries
       #
       # This includes both classes created via DSL and explicit definitions

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.6.0.beta3'.freeze
+  VERSION = '0.6.0.rc1'.freeze
 end

data/rakelib/benchmark.rake

@@ -1,6 +1,8 @@
 desc "Run benchmarks (tweak count via COUNT envvar)"
 task :benchmark do
-  sh "ruby benchmarks/basic.rb"
+  FileList["benchmarks/**/*_bench.rb"].each do |bench|
+    sh "ruby #{bench}"
+  end
 end
 
 namespace :benchmark do

data/rom.gemspec

@@ -16,8 +16,8 @@ Gem::Specification.new do |gem|
   gem.license       = 'MIT'
   gem.required_ruby_version = '~> 2.0'
 
-  gem.add_runtime_dependency 'transproc',   '~> 0.1'
-  gem.add_runtime_dependency 'equalizer',   '~> 0.0', '>= 0.0.9'
+  gem.add_runtime_dependency 'transproc', '~> 0.1', '>= 0.1.2'
+  gem.add_runtime_dependency 'equalizer', '~> 0.0', '>= 0.0.9'
 
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec-core', '~> 3.2'

data/spec/integration/mappers/deep_embedded_spec.rb

@@ -33,7 +33,7 @@ describe 'Mappers / deeply embedded tuples' do
       ]
     }
 
-    jane = rom.read(:users).to_a.first
+    jane = rom.relation(:users).as(:users).first
 
     expect(jane.name).to eql('Jane')
 

data/spec/integration/mappers/definition_dsl_spec.rb

@@ -14,13 +14,15 @@ describe 'Mapper definition DSL' do
   end
 
   describe 'default PORO mapper' do
-    subject(:mapper) { rom.read(:users).mapper }
+    subject(:mapper) { rom.mappers.users.entity }
 
     before do
       setup.mappers do
         define(:users) do
           model name: 'Test::User'
 
+          register_as :entity
+
           attribute :name
           attribute :email
         end
@@ -38,7 +40,7 @@ describe 'Mapper definition DSL' do
 
   describe 'excluding attributes' do
     context 'by setting :inherit_header to false' do
-      subject(:mapper) { rom.read(:users).email_index.mapper }
+      subject(:mapper) { rom.mappers.users.email_index }
 
       before do
         setup.mappers do
@@ -63,7 +65,7 @@ describe 'Mapper definition DSL' do
   end
 
   describe 'virtual relation mapper' do
-    subject(:mapper) { rom.read(:users).email_index.mapper }
+    subject(:mapper) { rom.mappers.users.email_index }
 
     before do
       setup.mappers do
@@ -124,7 +126,7 @@ describe 'Mapper definition DSL' do
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
-      jane = rom.read(:tasks).with_user.to_a.last
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -153,7 +155,7 @@ describe 'Mapper definition DSL' do
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
-      jane = rom.read(:tasks).with_user.to_a.last
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -184,7 +186,7 @@ describe 'Mapper definition DSL' do
       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
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(

data/spec/integration/mappers/embedded_spec.rb

@@ -25,9 +25,7 @@ describe 'Mappers / embedded' do
       'tasks' => [{ 'title' => 'Task One' }, { 'title' => 'Task Two' }]
     }
 
-    jane = rom.read(:users).to_a.first
-
-    expect(rom.read(:users).mapper.header.map(&:name)).to eql([:name, :tasks])
+    jane = rom.relation(:users).map_with(:users).first
 
     expect(jane.name).to eql('Jane')
     expect(jane.tasks).to eql([{ title: 'Task One' }, { title: 'Task Two' }])
@@ -55,9 +53,7 @@ describe 'Mappers / embedded' do
       'address' => { 'street' => 'Somewhere 1', 'city' => 'NYC' }
     }
 
-    jane = rom.read(:users).to_a.first
-
-    expect(rom.read(:users).mapper.header.map(&:name)).to eql([:name, :address])
+    jane = rom.relation(:users).as(:users).first
 
     Test::Address.send(:include, Equalizer.new(:street, :city))
 

data/spec/integration/mappers/group_spec.rb

@@ -45,7 +45,7 @@ describe 'Mapper definition DSL' do
 
       Test::UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
 
-      jane = rom.read(:users).with_tasks.to_a.last
+      jane = rom.relation(:users).with_tasks.map_with(:with_tasks).to_a.last
 
       expect(jane).to eql(
         Test::UserWithTasks.new(
@@ -75,7 +75,7 @@ describe 'Mapper definition DSL' do
 
       Test::UserWithTasks.send(:include, Equalizer.new(:name, :email, :tasks))
 
-      jane = rom.read(:users).with_tasks.to_a.last
+      jane = rom.relation(:users).with_tasks.map_with(:with_tasks).to_a.last
 
       expect(jane).to eql(
         Test::UserWithTasks.new(
@@ -108,7 +108,7 @@ describe 'Mapper definition DSL' do
       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
+      jane = rom.relation(:users).with_tasks.map_with(:with_tasks).to_a.last
 
       expect(jane).to eql(
         Test::UserWithTasks.new(
@@ -148,7 +148,7 @@ describe 'Mapper definition DSL' do
       Test::TaskUser.send(:include, Equalizer.new(:name, :contacts))
       Test::Contact.send(:include, Equalizer.new(:email))
 
-      task = rom.read(:tasks).with_users.to_a.first
+      task = rom.relation(:tasks).with_users.map_with(:with_users).first
 
       expect(task).to eql(
         Test::TaskWithUsers.new(title: 'be nice', priority: 1, users: [

data/spec/integration/mappers/prefixing_attributes_spec.rb

@@ -30,7 +30,7 @@ describe 'Mappers / Prefixing attributes' do
       user_email: 'jane@doe.org'
     }
 
-    jane = rom.read(:users).to_a.first
+    jane = rom.relation(:users).as(:users).first
 
     expect(jane).to eql(Test::User.new(id: 123, name: 'Jane', email: 'jane@doe.org'))
   end

data/spec/integration/mappers/renaming_attributes_spec.rb

@@ -34,7 +34,7 @@ describe 'Mappers / Renaming attributes' do
 
     rom.relations.users << { _id: 123, user_name: 'Jane' }
 
-    jane = rom.read(:users).to_a.first
+    jane = rom.relation(:users).as(:users).first
 
     expect(jane).to eql(Test::User.new(id: 123, name: 'Jane'))
   end
@@ -66,10 +66,11 @@ describe 'Mappers / Renaming attributes' do
     Test::UserWithAddress.send(:include, Equalizer.new(:id, :name, :address))
 
     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
+    jane = rom.relation(:users).with_address.as(:with_address).first
 
     expect(jane).to eql(
       Test::UserWithAddress.new(id: 123, name: 'Jane',
@@ -104,12 +105,13 @@ describe 'Mappers / Renaming attributes' do
     Test::UserWithAddresses.send(:include, Equalizer.new(:id, :name, :addresses))
 
     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
+    jane = rom.relation(:users).with_addresses.as(:with_addresses).first
 
     expect(jane).to eql(
       Test::UserWithAddresses.new(

data/spec/integration/mappers/symbolizing_attributes_spec.rb

@@ -36,7 +36,7 @@ describe 'Mappers / Symbolizing atributes' do
       'email' => 'jane@doe.org'
     }
 
-    jane = rom.read(:users).first
+    jane = rom.relation(:users).as(:users).first
 
     expect(jane).to eql(
       id: 123, details: { name: 'Jane' }, contact: { email: 'jane@doe.org' }
@@ -64,7 +64,7 @@ describe 'Mappers / Symbolizing atributes' do
       'task_description' => 'It is a task'
     }
 
-    task = rom.read(:tasks).first
+    task = rom.relation(:tasks).as(:tasks).first
 
     expect(task).to eql(
       title: 'Task One',

data/spec/integration/mappers/wrap_spec.rb

@@ -41,7 +41,7 @@ describe 'Mapper definition DSL' do
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
-      jane = rom.read(:tasks).with_user.to_a.last
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -70,7 +70,7 @@ describe 'Mapper definition DSL' do
 
       Test::TaskWithUser.send(:include, Equalizer.new(:title, :priority, :user))
 
-      jane = rom.read(:tasks).with_user.to_a.last
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -107,7 +107,7 @@ describe 'Mapper definition DSL' do
       Test::TaskUser.send(:include, Equalizer.new(:name, :contact))
       Test::Contact.send(:include, Equalizer.new(:email))
 
-      jane = rom.read(:tasks).with_user.to_a.last
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(
@@ -140,7 +140,7 @@ describe 'Mapper definition DSL' do
       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
+      jane = rom.relation(:tasks).with_user.as(:with_user).to_a.last
 
       expect(jane).to eql(
         Test::TaskWithUser.new(

data/spec/integration/multi_repo_spec.rb

@@ -35,7 +35,11 @@ describe 'Using in-memory repositories for cross-repo access' do
     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_and_tasks = rom.relation(:users_and_tasks)
+      .by_user('Jane')
+      .as(:users_and_tasks)
+
+    expect(user_and_tasks).to match_array([
       { user_id: 2, name: 'Jane', tasks: [{ title: 'Have fun' }] }
     ])
   end

data/spec/integration/relations/reading_spec.rb

@@ -27,7 +27,7 @@ describe 'Reading relations' do
 
     rom = setup.finalize
 
-    users = rom.read(:users).sorted.by_name('Jane')
+    users = rom.relation(:users).sorted.by_name('Jane').as(:users)
     user = users.first
 
     expect(user).to be_an_instance_of(Test::User)
@@ -68,18 +68,13 @@ describe 'Reading relations' do
     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])
-
-    user = rom.read(:users).sorted.first
+    user = rom.relation(:users).sorted.as(:users).first
 
     expect(user).to eql(
       Test::User.new(name: "Jane", email: "jane@doe.org")
     )
 
-    expect(rom.read(:users)).to_not respond_to(:join)
-
-    user = rom.read(:users).with_tasks.sorted.first
+    user = rom.relation(:users).with_tasks.sorted.as(:with_tasks).first
 
     expect(user).to eql(
       Test::UserWithTasks.new(
@@ -122,10 +117,7 @@ describe 'Reading relations' do
     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])
-
-    user = rom.read(:users).sorted.with_task.first
+    user = rom.relation(:users).sorted.with_task.as(:with_task).first
 
     expect(user).to eql(
       Test::UserWithTask.new(name: "Jane", email: "jane@doe.org",
@@ -146,7 +138,7 @@ describe 'Reading relations' do
 
     rom = setup.finalize
 
-    user = rom.read(:users).by_name("Jane").first
+    user = rom.relation(:users).by_name("Jane").as(:users).first
 
     expect(user).to eql(name: "Jane", email: "jane@doe.org")
   end
@@ -167,7 +159,7 @@ describe 'Reading relations' do
     end
 
     rom = setup.finalize
-    user = rom.read(:users).map(:prefixer).first
+    user = rom.relation(:users).map_with(:prefixer).first
 
     expect(user).to eql(user_name: 'Joe', user_email: "joe@doe.org")
   end

data/spec/integration/setup_spec.rb

@@ -44,7 +44,7 @@ describe 'Setting up ROM' do
       rom = setup.finalize
 
       expect(rom.relations).to eql(ROM::RelationRegistry.new)
-      expect(rom.readers).to eql(ROM::ReaderRegistry.new)
+      expect(rom.mappers).to eql(ROM::Registry.new)
     end
   end
 
@@ -110,7 +110,7 @@ describe 'Setting up ROM' do
 
       rom.commands.users.create.call(name: 'Jane')
 
-      expect(rom.read(:users).by_name('Jane').to_a)
+      expect(rom.relation(:users).by_name('Jane').as(:users).to_a)
         .to eql([Test::User.new(name: 'Jane')])
     end
   end
@@ -146,7 +146,7 @@ describe 'Setting up ROM' do
 
       rom.command(:users).create.call(name: 'Jane')
 
-      expect(rom.read(:users).by_name('Jane').to_a)
+      expect(rom.relation(:users).by_name('Jane').as(:users).to_a)
         .to eql([Test::User.new(name: 'Jane')])
     end
   end

data/spec/unit/rom/env_spec.rb

@@ -46,7 +46,7 @@ describe ROM::Env do
 
   describe '#mappers' do
     it 'returns mappers for all relations' do
-      expect(rom.mappers.users).to eql(rom.readers.users.mappers)
+      expect(rom.mappers.users[:name_list]).to_not be(nil)
     end
   end
 end

data/spec/unit/rom/relation/lazy_spec.rb

@@ -8,14 +8,14 @@ describe ROM::Relation::Lazy do
 
   before do
     setup.relation(:users) do
-      def repository
-        :default
-      end
-
       def by_name(name)
         restrict(name: name)
       end
 
+      def by_name_sorted(name, order_by = :name)
+        by_name(name).order(order_by)
+      end
+
       def by_email(email)
         restrict(name: email)
       end
@@ -129,6 +129,10 @@ describe ROM::Relation::Lazy do
         ArgumentError, 'ROM::Relation[Users]#by_name arity is 1 (0 args given)'
       )
     end
+
+    it 'does not raise when relation is curried and arity matches' do
+      expect { users.by_name_sorted('Joe').first }.to_not raise_error
+    end
   end
 
   describe '#each' do
@@ -153,6 +157,10 @@ describe ROM::Relation::Lazy do
         ArgumentError, 'ROM::Relation[Users]#by_name arity is 1 (0 args given)'
       )
     end
+
+    it 'does not raise when relation is curried and arity matches' do
+      expect { users.by_name_sorted('Jane').first }.to_not raise_error
+    end
   end
 
   describe '#to_ary' do
@@ -168,6 +176,10 @@ describe ROM::Relation::Lazy do
         ArgumentError, 'ROM::Relation[Users]#by_name arity is 1 (0 args given)'
       )
     end
+
+    it 'does not raise when relation is curried and arity matches' do
+      expect { users.by_name_sorted('Jane').first }.to_not raise_error
+    end
   end
 
   describe '#>>' do