rom 0.9.1 → 1.0.0.beta1

data/lib/rom/setup/finalize/commands.rb

@@ -0,0 +1,67 @@
+require 'rom/support/registry'
+require 'rom/command_registry'
+
+module ROM
+  class Finalize
+    class FinalizeCommands
+      # Build command registry hash for provided relations
+      #
+      # @param [RelationRegistry] relations registry
+      # @param [Hash] gateways
+      # @param [Array] command_classes a list of command subclasses
+      #
+      # @api private
+      def initialize(relations, gateways, command_classes)
+        @relations = relations
+        @gateways = gateways
+        @command_classes = command_classes
+      end
+
+      # @return [Hash]
+      #
+      # @api private
+      def run!
+        registry = @command_classes.each_with_object({}) do |klass, h|
+          rel_name = klass.relation
+          next unless rel_name
+
+          relation = @relations[rel_name]
+          name = klass.register_as || klass.default_name
+
+          gateway = @gateways[relation.class.gateway]
+          gateway.extend_command_class(klass, relation.dataset)
+
+          klass.send(:include, relation_methods_mod(relation.class))
+
+          (h[rel_name] ||= {})[name] = klass.build(relation)
+        end
+
+        commands = registry.each_with_object({}) do |(name, rel_commands), h|
+          h[name] = CommandRegistry.new(rel_commands)
+        end
+
+        Registry.new(commands)
+      end
+
+      # @api private
+      def relation_methods_mod(relation_class)
+        mod = Module.new
+        relation_class.view_methods.each do |meth|
+          mod.module_eval <<-RUBY
+          def #{meth}(*args)
+            response = relation.public_send(:#{meth}, *args)
+
+            if response.is_a?(relation.class)
+              new(response)
+            else
+              response
+            end
+          end
+          RUBY
+        end
+
+        mod
+      end
+    end
+  end
+end

data/lib/rom/setup/finalize/mappers.rb

@@ -0,0 +1,36 @@
+require 'rom/support/registry'
+
+module ROM
+  class Finalize
+    class FinalizeMappers
+      # @api private
+      def initialize(mapper_classes, mapper_objects)
+        @mapper_classes = mapper_classes
+        @mapper_objects = mapper_objects
+      end
+
+      # @api private
+      def run!
+        registry = @mapper_classes.each_with_object({}) do |klass, h|
+          name = klass.register_as || klass.relation
+          (h[klass.base_relation] ||= {})[name] = klass.build
+        end
+
+        registry_hash = registry.each_with_object({}).each { |(relation, mappers), h|
+          h[relation] = MapperRegistry.new(mappers)
+        }
+
+        @mapper_objects.each do |relation, mappers|
+          if registry_hash.key?(relation)
+            mappers_registry = registry_hash[relation]
+            mappers.each { |name, mapper| mappers_registry[name] = mapper }
+          else
+            registry_hash[relation] = MapperRegistry.new(mappers)
+          end
+        end
+
+        Registry.new(registry_hash)
+      end
+    end
+  end
+end

data/lib/rom/setup/finalize/relations.rb

@@ -0,0 +1,53 @@
+require 'rom/relation_registry'
+
+module ROM
+  class Finalize
+    class FinalizeRelations
+      # Build relation registry of specified descendant classes
+      #
+      # This is used by the setup
+      #
+      # @param [Hash] gateways
+      # @param [Array] relation_classes a list of relation descendants
+      #
+      # @api private
+      def initialize(gateways, relation_classes)
+        @gateways = gateways
+        @relation_classes = relation_classes
+      end
+
+      # @return [Hash]
+      #
+      # @api private
+      def run!
+        registry = {}
+
+        @relation_classes.each do |klass|
+          # TODO: raise a meaningful error here and add spec covering the case
+          #       where klass' gateway points to non-existant repo
+          gateway = @gateways.fetch(klass.gateway)
+          ds_proc = klass.dataset_proc || -> { self }
+          dataset = gateway.dataset(klass.dataset).instance_exec(&ds_proc)
+
+          relation = klass.new(dataset, __registry__: registry)
+
+          name = klass.register_as
+
+          if registry.key?(name)
+            raise RelationAlreadyDefinedError,
+              "Relation with `register_as #{name.inspect}` registered more " \
+              "than once"
+          end
+
+          registry[name] = relation
+        end
+
+        registry.each_value do |relation|
+          relation.class.finalize(registry, relation)
+        end
+
+        RelationRegistry.new(registry)
+      end
+    end
+  end
+end

data/lib/rom/support/configurable.rb

@@ -7,8 +7,8 @@ module ROM
       attr_reader :settings
 
       # @api private
-      def initialize
-        @settings = {}
+      def initialize(settings = {})
+        @settings = settings
       end
 
       # @api public
@@ -23,19 +23,33 @@ module ROM
 
       # @api private
       def freeze
-        settings.each_value { |value| value.freeze }
+        settings.each_value(&:freeze)
         super
       end
 
       # @api private
-      def respond_to_missing?(name, include_private = false)
+      def respond_to_missing?(_name, _include_private = false)
         true
       end
-
+      
+      def dup
+        self.class.new(dup_settings(settings))
+      end
+        
       private
+      
+      def dup_settings(settings)
+        settings.each_with_object({}) do |(key, value), new_settings|
+          if value.is_a?(self.class)
+            new_settings[key] = value.dup
+          else
+            new_settings[key] = value
+          end
+        end
+      end
 
       # @api private
-      def method_missing(meth, *args, &block)
+      def method_missing(meth, *args, &_block)
         return settings.fetch(meth, nil) if frozen?
 
         name = meth.to_s
@@ -50,7 +64,7 @@ module ROM
 
       # @api private
       def writer?(name)
-        ! WRITER_REGEXP.match(name).nil?
+        !WRITER_REGEXP.match(name).nil?
       end
     end
 

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.9.1'.freeze
+  VERSION = '1.0.0.beta1'.freeze
 end

data/rakelib/mutant.rake

@@ -4,11 +4,14 @@ task :mutant do
   if subject == 'mutant'
     abort "usage: rake mutant SUBJECT\nexample: rake mutant ROM::Header"
   else
+    sep = subject.include?('#') ? '#' : '.'
+    ns = subject.split(sep).first
+
     opts = {
       'include' => 'lib',
       'require' => 'rom',
       'use' => 'rspec',
-      'ignore-subject' => "#{subject}#respond_to_missing?"
+      'ignore-subject' => "#{ns}#respond_to_missing?"
     }.to_a.map { |k, v| "--#{k} #{v}" }.join(' ')
 
     exec("bundle exec mutant #{opts} #{subject}")

data/rom.gemspec

@@ -15,10 +15,9 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {spec}/*`.split("\n")
   gem.license       = 'MIT'
 
-  gem.add_runtime_dependency 'transproc', '~> 0.3', '>= 0.3.0'
-  gem.add_runtime_dependency 'equalizer', '~> 0.0', '>= 0.0.9'
-  gem.add_runtime_dependency 'rom-support', '~> 0.1', '>= 0.1.0'
-  gem.add_runtime_dependency 'rom-mapper', '~> 0.2', '>= 0.2.0'
+  gem.add_runtime_dependency 'dry-equalizer', '~> 0.2'
+  gem.add_runtime_dependency 'rom-support', '~> 1.0.0.beta1'
+  gem.add_runtime_dependency 'rom-mapper', '~> 0.3.0.beta1'
 
   gem.add_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec', '~> 3.3'

data/spec/fixtures/app/commands/create_user.rb

@@ -0,0 +1,2 @@
+class CreateUser
+end

data/spec/fixtures/app/mappers/user_list.rb

@@ -0,0 +1,2 @@
+class UserList
+end

data/spec/fixtures/app/relations/users.rb

@@ -0,0 +1,2 @@
+class Users
+end

data/spec/fixtures/lib/persistence/commands/create_user.rb

@@ -0,0 +1,6 @@
+module Persistence
+  module Commands
+    class CreateUser
+    end
+  end
+end

data/spec/fixtures/lib/persistence/mappers/user_list.rb

@@ -0,0 +1,6 @@
+module Persistence
+  module Mappers
+    class UserList
+    end
+  end
+end

data/spec/fixtures/lib/persistence/relations/users.rb

@@ -0,0 +1,6 @@
+module Persistence
+  module Relations
+    class Users
+    end
+  end
+end

data/spec/{unit/rom → integration}/command_registry_spec.rb

@@ -1,19 +1,18 @@
 require 'spec_helper'
 
 describe 'ROM::CommandRegistry' do
-  subject(:env) { setup.finalize }
+  include_context 'container'
 
-  let(:setup) { ROM.setup(:memory) }
-  let(:users) { env.command(:users) }
+  let(:users) { container.command(:users) }
 
   before do
-    setup.relation(:users)
+    configuration.relation(:users)
 
-    setup.commands(:users) do
-      define(:create) do
-        validator proc { |input| raise(ROM::CommandError) unless input[:name] }
-      end
-    end
+    configuration.register_command(Class.new(ROM::Commands::Create[:memory]) do
+      register_as :create
+      relation :users
+      validator proc { |input| raise(ROM::CommandError) unless input[:name] }
+    end)
   end
 
   describe '#try' do

data/spec/integration/commands/create_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 
 describe 'Commands / Create' do
+  include_context 'container'
   include_context 'users and tasks'
 
-  let(:users) { rom.commands.users }
-  let(:tasks) { rom.commands.tasks }
+  let(:users) { container.commands.users }
+  let(:tasks) { container.commands.tasks }
 
   before do
     module Test
@@ -19,8 +20,8 @@ describe 'Commands / Create' do
       end
     end
 
-    setup.relation(:users)
-    setup.relation(:tasks)
+    configuration.relation(:users)
+    configuration.relation(:tasks)
 
     class Test::CreateUser < ROM::Commands::Create[:memory]
       relation :users
@@ -62,6 +63,9 @@ describe 'Commands / Create' do
       attribute :name
       attribute :title
     end
+
+    configuration.register_command(Test::CreateUser, Test::CreateTask)
+    configuration.register_mapper(Test::UserMapper, Test::TaskMapper)
   end
 
   it 'inserts user on successful validation' do
@@ -87,12 +91,12 @@ describe 'Commands / Create' do
 
     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)
+    expect(container.relations.users.count).to be(2)
   end
 
   describe '"result" option' do
     it 'returns a single tuple when set to :one' do
-      setup.commands(:users) do
+      configuration.commands(:users) do
         define(:create_one, type: :create) do
           result :one
         end
@@ -109,12 +113,12 @@ describe 'Commands / Create' do
 
     it 'allows only valid result types' do
       expect {
-        setup.commands(:users) do
+        configuration.commands(:users) do
           define(:create_one, type: :create) do
             result :invalid_type
           end
         end
-        setup.finalize
+        container
       }.to raise_error(ROM::Options::InvalidOptionValueError)
     end
   end
@@ -125,7 +129,7 @@ describe 'Commands / Create' do
     end
 
     it 'uses registered mapper to process the result for :one result' do
-      command = rom.command(:users).as(:entity).create
+      command = container.command(:users).as(:entity).create
       result = command[attributes]
 
       expect(result).to eql(Test::User.new(attributes))
@@ -138,11 +142,11 @@ describe 'Commands / Create' do
         mapper_input = tuples
       end
 
-      left = rom.command(:users).as(:entity).create.with(
+      left = container.command(:users).as(:entity).create.with(
         name: 'Jane', email: 'jane@doe.org'
       )
 
-      right = rom.command(:tasks).as(:entity).create.with(
+      right = container.command(:tasks).as(:entity).create.with(
         title: 'Jane task'
       )
 
@@ -157,11 +161,11 @@ describe 'Commands / Create' do
     end
 
     it 'uses registered mapper to process the result for :many results' do
-      setup.commands(:users) do
+      configuration.commands(:users) do
         define(:create_many, type: :create)
       end
 
-      command = rom.command(:users).as(:entity).create_many
+      command = container.command(:users).as(:entity).create_many
       result = command[attributes]
 
       expect(result).to eql([Test::User.new(attributes)])

data/spec/integration/commands/delete_spec.rb

@@ -1,12 +1,13 @@
 require 'spec_helper'
 
 describe 'Commands / Delete' do
+  include_context 'container'
   include_context 'users and tasks'
 
-  subject(:users) { rom.commands.users }
+  subject(:users) { container.commands.users }
 
   before do
-    setup.relation(:users) do
+    configuration.relation(:users) do
       def by_name(name)
         restrict(name: name)
       end
@@ -14,7 +15,7 @@ describe 'Commands / Delete' do
   end
 
   it 'deletes all tuples when there is no restriction' do
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete)
     end
 
@@ -25,11 +26,11 @@ describe 'Commands / Delete' do
       { name: 'Joe', email: 'joe@doe.org' }
     ])
 
-    expect(rom.relation(:users)).to match_array([])
+    expect(container.relation(:users)).to match_array([])
   end
 
   it 'deletes tuples matching restriction' do
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete)
     end
 
@@ -37,13 +38,13 @@ describe 'Commands / Delete' do
 
     expect(result).to match_array([{ name: 'Joe', email: 'joe@doe.org' }])
 
-    expect(rom.relation(:users)).to match_array([
-      { name: 'Jane', email: 'jane@doe.org' },
+    expect(container.relation(:users)).to match_array([
+      { name: 'Jane', email: 'jane@doe.org' }
     ])
   end
 
   it 'returns untouched relation if there are no tuples to delete' do
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete)
     end
 
@@ -53,7 +54,7 @@ describe 'Commands / Delete' do
   end
 
   it 'returns deleted tuple when result is set to :one' do
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete_one, type: :delete) do
         result :one
       end
@@ -65,7 +66,7 @@ describe 'Commands / Delete' do
   end
 
   it 'raises when result is set to :one and relation contains more tuples' do
-    setup.commands(:users) do
+    configuration.commands(:users) do
       define(:delete) do
         result :one
       end
@@ -75,7 +76,7 @@ describe 'Commands / Delete' do
 
     expect(result.error).to be_instance_of(ROM::TupleCountMismatchError)
 
-    expect(rom.relations.users.to_a).to match_array([
+    expect(container.relations.users.to_a).to match_array([
       { name: 'Jane', email: 'jane@doe.org' },
       { name: 'Joe', email: 'joe@doe.org' }
     ])