rom 0.5.0 → 0.6.0.beta1

data/lib/rom/support/registry.rb

@@ -19,7 +19,7 @@ module ROM
 
     def each(&block)
       return to_enum unless block
-      elements.each(&block)
+      elements.each { |element| yield(element) }
     end
 
     def [](key)
@@ -27,17 +27,13 @@ module ROM
     end
 
     def respond_to_missing?(name, include_private = false)
-      key?(name) || super
+      elements.key?(name) || super
     end
 
     private
 
-    def method_missing(name, *args)
-      if elements.key?(name)
-        self[name]
-      else
-        super
-      end
+    def method_missing(name, *)
+      elements.fetch(name) { super }
     end
   end
 end

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0.beta1'.freeze
 end

data/rakelib/benchmark.rake

@@ -0,0 +1,13 @@
+desc "Run benchmarks (tweak count via COUNT envvar)"
+task :benchmark do
+  sh "ruby benchmarks/basic.rb"
+end
+
+namespace :benchmark do
+  desc "Verify benchmarks"
+  task :verify do
+    ENV['VERIFY'] = "true"
+    ENV['COUNT'] = "1"
+    Rake::Task[:benchmark].invoke
+  end
+end

data/rakelib/mutant.rake

@@ -0,0 +1,16 @@
+desc "Run mutant against a specific subject"
+task :mutant do
+  subject = ARGV.last
+  if subject == 'mutant'
+    abort "usage: rake mutant SUBJECT\nexample: rake mutant ROM::Header"
+  else
+    opts = {
+      'include' => 'lib',
+      'require' => 'rom',
+      'use' => 'rspec',
+      'ignore-subject' => "#{subject}#respond_to_missing?"
+    }.to_a.map { |k, v| "--#{k} #{v}" }.join(' ')
+
+    exec("bundle exec mutant #{opts} #{subject}")
+  end
+end

data/rakelib/rubocop.rake

@@ -0,0 +1,18 @@
+begin
+  require "rubocop/rake_task"
+
+  Rake::Task[:default].enhance [:rubocop]
+
+  RuboCop::RakeTask.new do |task|
+    task.options << "--display-cop-names"
+  end
+
+  namespace :rubocop do
+    desc 'Generate a configuration file acting as a TODO list.'
+    task :auto_gen_config do
+      exec "bundle exec rubocop --auto-gen-config"
+    end
+  end
+
+rescue LoadError
+end

data/rom.gemspec

@@ -14,16 +14,13 @@ Gem::Specification.new do |gem|
   gem.files         = `git ls-files`.split("\n").reject { |name| name.include?('benchmarks') }
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
+  gem.required_ruby_version = '~> 2.0'
 
-  gem.add_runtime_dependency 'addressable', '~> 2.3'
   gem.add_runtime_dependency 'transproc',   '~> 0.1'
   gem.add_runtime_dependency 'equalizer',   '~> 0.0', '>= 0.0.9'
-  gem.add_runtime_dependency 'concord',     '~> 0.1', '>= 0.1.4'
-  gem.add_runtime_dependency 'charlatan',   '~> 0.1', '>= 0.1'
-  gem.add_runtime_dependency 'inflecto',    '~> 0.0', '>= 0.0.2'
 
   gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rspec-core', '~> 3.1'
-  gem.add_development_dependency 'rspec-mocks', '~> 3.1'
-  gem.add_development_dependency 'rspec-expectations', '~> 3.1'
+  gem.add_development_dependency 'rspec-core', '~> 3.2'
+  gem.add_development_dependency 'rspec-mocks', '~> 3.2'
+  gem.add_development_dependency 'rspec-expectations', '~> 3.2'
 end

data/spec/integration/commands/create_spec.rb

@@ -7,12 +7,14 @@ describe 'Commands / Create' do
   let(:tasks) { rom.commands.tasks }
 
   before do
-    UserValidator = Class.new do
-      ValidationError = Class.new(ROM::CommandError)
+    module Test
+      UserValidator = Class.new do
+        ValidationError = Class.new(ROM::CommandError)
 
-      def self.call(params)
-        unless params[:name] && params[:email]
-          raise ValidationError, ":name and :email are required"
+        def self.call(params)
+          unless params[:name] && params[:email]
+            raise ValidationError, ":name and :email are required"
+          end
         end
       end
     end
@@ -20,40 +22,46 @@ describe 'Commands / Create' do
     setup.relation(:users)
     setup.relation(:tasks)
 
-    setup.commands(:users) do
-      define(:create) do
-        validator UserValidator
-      end
+    class Test::CreateUser < ROM::Commands::Create[:memory]
+      relation :users
+      register_as :create
+      result :one
+      validator Test::UserValidator
     end
 
-    setup.commands(:tasks) do
-      define(:create)
+    class Test::CreateTask < ROM::Commands::Create[:memory]
+      relation :tasks
+      register_as :create
+      result :one
+
+      def execute(user, task)
+        super(task.merge(name: user[:name]))
+      end
     end
   end
 
   it 'inserts user on successful validation' do
-    result = users.try { create(name: 'Piotr', email: 'piotr@solnic.eu') }
+    result = users.try do
+      users.create.call(name: 'Piotr', email: 'piotr@solnic.eu')
+    end
 
-    expect(result).to match_array([{ name: 'Piotr', email: 'piotr@solnic.eu' }])
+    expect(result.value).to eql(name: 'Piotr', email: 'piotr@solnic.eu')
   end
 
   it 'inserts user and associated task when things go well' do
     result = users.try {
-      create(name: 'Piotr', email: 'piotr@solnic.eu')
-    } >-> users {
-      tasks.try {
-        create(name: users.first[:name], title: 'Finish command-api')
-      }
+      command = users.create.with(name: 'Piotr', email: 'piotr@solnic.eu')
+      command >>= tasks.create.with(title: 'Finish command-api')
+      command
     }
 
-    expect(result)
-      .to match_array([{ name: 'Piotr', title: 'Finish command-api' }])
+    expect(result.value).to eql(name: 'Piotr', title: 'Finish command-api')
   end
 
   it 'returns validation object with errors on failed validation' do
-    result = users.try { create(name: 'Piotr') }
+    result = users.try { users.create.call(name: 'Piotr') }
 
-    expect(result.error).to be_instance_of(ValidationError)
+    expect(result.error).to be_instance_of(Test::ValidationError)
     expect(result.error.message).to eql(":name and :email are required")
     expect(rom.relations.users.count).to be(2)
   end
@@ -69,7 +77,7 @@ describe 'Commands / Create' do
       tuple = { name: 'Piotr', email: 'piotr@solnic.eu' }
 
       result = users.try {
-        create_one(tuple)
+        users.create_one.call(tuple)
       }
 
       expect(result.value).to eql(tuple)
@@ -83,7 +91,7 @@ describe 'Commands / Create' do
           end
         end
         setup.finalize
-      }.to raise_error(ROM::InvalidOptionError)
+      }.to raise_error(ROM::InvalidOptionValueError)
     end
   end
 end

data/spec/integration/commands/delete_spec.rb

@@ -11,14 +11,14 @@ describe 'Commands / Delete' do
         restrict(name: name)
       end
     end
+  end
 
+  it 'deletes all tuples when there is no restriction' do
     setup.commands(:users) do
       define(:delete)
     end
-  end
 
-  it 'deletes all tuples when there is no restriction' do
-    result = users.try { delete }
+    result = users.try { users.delete.call }
 
     expect(result).to match_array([
       { name: 'Jane', email: 'jane@doe.org' },
@@ -27,13 +27,21 @@ describe 'Commands / Delete' do
   end
 
   it 'deletes tuples matching restriction' do
-    result = users.try { delete(:by_name, 'Joe') }
+    setup.commands(:users) do
+      define(:delete)
+    end
+
+    result = users.try { users.delete.by_name('Joe').call }
 
     expect(result).to match_array([{ name: 'Joe', email: 'joe@doe.org' }])
   end
 
   it 'returns untouched relation if there are no tuples to delete' do
-    result = users.try { delete(:by_name, 'Not here') }
+    setup.commands(:users) do
+      define(:delete)
+    end
+
+    result = users.try { users.delete.by_name('Not here').call }
 
     expect(result).to match_array([])
   end
@@ -45,7 +53,7 @@ describe 'Commands / Delete' do
       end
     end
 
-    result = users.try { delete_one(:by_name, 'Jane') }
+    result = users.try { users.delete_one.by_name('Jane').call }
 
     expect(result.value).to eql(name: 'Jane', email: 'jane@doe.org')
   end
@@ -57,7 +65,7 @@ describe 'Commands / Delete' do
       end
     end
 
-    result = users.try { delete }
+    result = users.try { users.delete.call }
 
     expect(result.error).to be_instance_of(ROM::TupleCountMismatchError)
 

data/spec/integration/commands/update_spec.rb

@@ -8,11 +8,13 @@ describe 'Commands / Update' do
   subject(:users) { rom.commands.users }
 
   before do
-    UserValidator = Class.new do
-      ValidationError = Class.new(ROM::CommandError)
+    module Test
+      UserValidator = Class.new do
+        ValidationError = Class.new(ROM::CommandError)
 
-      def self.call(params)
-        raise ValidationError, ":email is required" unless params[:email]
+        def self.call(params)
+          raise ValidationError, ":email is required" unless params[:email]
+        end
       end
     end
 
@@ -28,14 +30,14 @@ describe 'Commands / Update' do
 
     setup.commands(:users) do
       define(:update) do
-        validator UserValidator
+        validator Test::UserValidator
       end
     end
   end
 
   it 'update tuples on successful validation' do
     result = users.try {
-      update(:all, name: 'Jane').set(email: 'jane.doe@test.com')
+      users.update.all(name: 'Jane').set(email: 'jane.doe@test.com')
     }
 
     expect(result)
@@ -43,9 +45,9 @@ describe 'Commands / Update' do
   end
 
   it 'returns validation object with errors on failed validation' do
-    result = users.try { update(:all, name: 'Jane').set(email: nil) }
+    result = users.try { users.update.all(name: 'Jane').set(email: nil) }
 
-    expect(result.error).to be_instance_of(ValidationError)
+    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([
@@ -62,7 +64,7 @@ describe 'Commands / Update' do
       end
 
       result = users.try {
-        update_one(:by_name, 'Jane').set(email: 'jane.doe@test.com')
+        users.update_one.by_name('Jane').set(email: 'jane.doe@test.com')
       }
 
       expect(result.value).to eql(name: 'Jane', email: 'jane.doe@test.com')
@@ -76,7 +78,7 @@ describe 'Commands / Update' do
       end
 
       result = users.try {
-        update_one.set(email: 'jane.doe@test.com')
+        users.update_one.set(email: 'jane.doe@test.com')
       }
 
       expect(result.error).to be_instance_of(ROM::TupleCountMismatchError)
@@ -95,7 +97,7 @@ describe 'Commands / Update' do
           end
         end
         setup.finalize
-      }.to raise_error(ROM::InvalidOptionError)
+      }.to raise_error(ROM::InvalidOptionValueError)
     end
   end
 end

data/spec/integration/mappers/deep_embedded_spec.rb

@@ -1,23 +1,16 @@
 require 'spec_helper'
+require 'rom/memory'
 
 describe 'Mappers / deeply embedded tuples' 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'
 
@@ -32,7 +25,7 @@ describe 'Mappers / deeply embedded tuples' do
       end
     end
 
-    rom.schema.users << {
+    rom.relations.users << {
       'name' => 'Jane',
       'tasks' => [
         { 'title' => 'Task One', 'priority' => { 'value' => 1, 'desc' => 'high' } },

data/spec/integration/mappers/definition_dsl_spec.rb

@@ -19,50 +19,38 @@ describe 'Mapper definition DSL' do
     before do
       setup.mappers do
         define(:users) do
-          model name: 'User'
+          model name: 'Test::User'
+
+          attribute :name
+          attribute :email
         end
       end
     end
 
     it 'defines a constant for the model class' do
-      expect(mapper.model).to be(User)
+      expect(mapper.model).to be(Test::User)
     end
 
-    it 'uses all attributes from the relation header by default' do
-      expect(header.keys).to eql(rom.relations.users.header)
+    it 'defines header with attributes' do
+      expect(header.keys).to eql([:name, :email])
     end
   end
 
   describe 'excluding attributes' do
-    context 'using exclude' do
-      subject(:mapper) { rom.read(:users).mapper }
-
-      before do
-        setup.mappers do
-          define(:users) do
-            model name: 'User'
-
-            exclude :name
-          end
-        end
-      end
-
-      it 'only maps provided attributes' do
-        expect(header.keys).to eql([:email])
-      end
-    end
-
     context 'by setting :inherit_header to false' do
       subject(:mapper) { rom.read(:users).email_index.mapper }
 
       before do
         setup.mappers do
           define(:users) do
-            model name: 'User'
+            model name: 'Test::User'
+
+            attribute :name
+            attribute :email
           end
 
           define(:email_index, parent: :users, inherit_header: false) do
-            model name: 'UserWithoutName'
+            model name: 'Test::UserWithoutName'
             attribute :email
           end
         end
@@ -80,13 +68,14 @@ describe 'Mapper definition DSL' do
     before do
       setup.mappers do
         define(:users) do
-          model name: 'User'
+          model name: 'Test::User'
+
+          attribute :name
+          attribute :email
         end
-      end
 
-      setup.mappers do
         define(:email_index, parent: :users) do
-          model name: 'UserWithoutName'
+          model name: 'Test::UserWithoutName'
           exclude :name
         end
       end
@@ -97,7 +86,7 @@ describe 'Mapper definition DSL' do
     end
 
     it 'builds a new model' do
-      expect(mapper.model).to be(UserWithoutName)
+      expect(mapper.model).to be(Test::UserWithoutName)
     end
   end
 
@@ -109,11 +98,9 @@ describe 'Mapper definition DSL' do
         end
       end
 
-      setup.relation(:users)
-
       setup.mappers do
         define(:tasks) do
-          model name: 'Task'
+          model name: 'Test::Task'
 
           attribute :title
           attribute :priority
@@ -124,7 +111,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
@@ -135,12 +122,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' }
@@ -151,7 +138,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
@@ -164,12 +151,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' }
@@ -180,13 +167,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
@@ -194,16 +181,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