rom 1.0.0 → 2.0.0

data/lib/rom/commands/class_interface.rb

@@ -1,3 +1,5 @@
+require 'rom/support/class_builder'
+
 module ROM
   # Base command class with factory class-level interface and setup-related logic
   #
@@ -52,6 +54,28 @@ module ROM
         new(relation, self.options.merge(options))
       end
 
+      # Create a command class with a specific type
+      #
+      # @param [Symbol] command name
+      # @param [Class] parent class
+      #
+      # @yield [Class] create class
+      #
+      # @return [Class, Object] return result of the block if it was provided
+      #
+      # @api public
+      def create_class(name, type, &block)
+        klass = ClassBuilder
+          .new(name: "#{Inflector.classify(type)}[:#{name}]", parent: type)
+          .call
+
+        if block
+          yield(klass)
+        else
+          klass
+        end
+      end
+
       # Use a configured plugin in this relation
       #
       # @example
@@ -70,25 +94,15 @@ module ROM
         ROM.plugin_registry.commands.fetch(plugin, adapter).apply_to(self)
       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
+      # Extend a command class with relation view methods
+      #
+      # @param [Relation]
+      #
+      # @return [Class]
+      #
+      # @api public
+      def extend_for_relation(relation)
+        include(relation_methods_mod(relation.class))
       end
 
       # Return default name of the command class based on its name
@@ -110,6 +124,25 @@ module ROM
       def options
         { input: input, validator: validator, result: result }
       end
+
+      # @api private
+      def relation_methods_mod(relation_class)
+        Module.new do
+          relation_class.view_methods.each do |meth|
+            module_eval <<-RUBY, __FILE__, __LINE__ + 1
+              def #{meth}(*args)
+                response = relation.public_send(:#{meth}, *args)
+
+                if response.is_a?(relation.class)
+                  new(response)
+                else
+                  response
+                end
+              end
+            RUBY
+          end
+        end
+      end
     end
   end
 end

data/lib/rom/commands/composite.rb

@@ -1,4 +1,5 @@
 require 'rom/pipeline'
+require 'rom/support/constants'
 
 module ROM
   module Commands
@@ -16,6 +17,10 @@ module ROM
       def call(*args)
         response = left.call(*args)
 
+        if response.nil? || (many? && response.size == 0)
+          return one? ? nil : EMPTY_ARRAY
+        end
+
         if one? && !graph?
           if right.is_a?(Command) || right.is_a?(Commands::Composite)
             right.call([response].first)

data/lib/rom/commands/delete.rb

@@ -8,11 +8,7 @@ module ROM
     #
     # @abstract
     class Delete < Command
-      # @see AbstractCommand#call
-      def call(*args)
-        assert_tuple_count
-        super
-      end
+      restrictable true
     end
   end
 end

data/lib/rom/commands/graph.rb

@@ -22,6 +22,9 @@ module ROM
       # @attr_reader [Array<Command>] nodes The child commands
       attr_reader :nodes
 
+      # @attr_reader [Symbol] root's relation name
+      attr_reader :name
+
       alias_method :left, :root
       alias_method :right, :nodes
 
@@ -32,6 +35,7 @@ module ROM
         super
         @root = root
         @nodes = nodes
+        @name = root.name
       end
 
       # Calls root and all nodes with the result from root
@@ -87,6 +91,13 @@ module ROM
       def graph?
         true
       end
+
+      private
+
+      # @api public
+      def composite_class
+        Command::Composite
+      end
     end
   end
 end

data/lib/rom/commands/lazy.rb

@@ -12,6 +12,8 @@ module ROM
       # @attr_reader [Command] command The wrapped command
       attr_reader :command
 
+      alias_method :unwrap, :command
+
       # @attr_reader [Proc] evaluator The proc that will evaluate the input
       attr_reader :evaluator
 

data/lib/rom/commands/update.rb

@@ -8,11 +8,7 @@ module ROM
     #
     # @abstract
     class Update < Command
-      # @see AbstractCommand#call
-      def call(*args)
-        assert_tuple_count
-        super
-      end
+      restrictable true
     end
   end
 end

data/lib/rom/configuration.rb

@@ -1,9 +1,11 @@
 require 'rom/environment'
 require 'rom/setup'
+require 'rom/configuration_dsl'
 
 module ROM
   class Configuration
     extend Forwardable
+    include ROM::ConfigurationDSL
 
     NoDefaultAdapterError = Class.new(StandardError)
 

data/lib/rom/container.rb

@@ -110,7 +110,7 @@ module ROM
         name = graph.name
 
         if mappers.key?(name)
-          graph.with(mappers: mappers[graph.name])
+          graph.with(mappers: mappers[name])
         else
           graph
         end
@@ -120,9 +120,9 @@ module ROM
         raise ArgumentError, "#{self.class}#command accepts a symbol or an array"
       end
     end
-    
+
     def disconnect
-      gateways.each_key(&:disconnect)
+      gateways.each_value(&:disconnect)
     end
   end
 end

data/lib/rom/global.rb

@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 require 'rom/plugin_registry'
 require 'rom/global/plugin_dsl'
 require 'rom/support/deprecations'
@@ -13,7 +14,6 @@ module ROM
     def self.extended(rom)
       super
 
-      rom.instance_variable_set('@env', nil)
       rom.instance_variable_set('@adapters', {})
       rom.instance_variable_set('@plugin_registry', PluginRegistry.new)
     end
@@ -56,27 +56,5 @@ module ROM
       adapters[identifier] = adapter
       self
     end
-
-    def env=(container)
-      @env = container
-    end
-
-    def env
-      if @env.nil?
-        ROM::Deprecations.announce(:env, %q{
-ROM.env is no longer automatically populated with your container.
-If possible, refactor your code to remove the dependency on global ROM state. If it is not
-possible—or as a temporary solution—you can assign your container to `ROM.env` upon
-creation:
-
-  ROM.env = ROM.container(:memory) do |rom|
-    ...
-  end
-        })
-        nil
-      else
-        @env
-      end
-    end
   end
 end

data/lib/rom/memory/commands.rb

@@ -11,6 +11,7 @@ module ROM
       # @api public
       class Create < ROM::Commands::Create
         adapter :memory
+        use :schema
 
         # @see ROM::Commands::Create#execute
         def execute(tuples)
@@ -28,6 +29,7 @@ module ROM
       # @api public
       class Update < ROM::Commands::Update
         adapter :memory
+        use :schema
 
         # @see ROM::Commands::Update#execute
         def execute(params)

data/lib/rom/memory/relation.rb

@@ -1,3 +1,5 @@
+require 'rom/memory/types'
+
 module ROM
   module Memory
     # Relation subclass for memory adapter
@@ -9,6 +11,7 @@ module ROM
     # @api public
     class Relation < ROM::Relation
       include Enumerable
+      include Memory
 
       adapter :memory
 

data/lib/rom/memory/storage.rb

@@ -1,8 +1,5 @@
-begin
-  require 'thread_safe'
-rescue LoadError
-  raise LoadError, 'Please install the `thread_safe` gem.'
-end
+require 'concurrent/hash'
+require 'concurrent/array'
 
 require 'rom/memory/dataset'
 
@@ -21,7 +18,7 @@ module ROM
 
       # @api private
       def initialize
-        @data = ThreadSafe::Hash.new
+        @data = Concurrent::Hash.new
       end
 
       # @return [Dataset]
@@ -37,7 +34,7 @@ module ROM
       #
       # @api private
       def create_dataset(name)
-        data[name] = Dataset.new(ThreadSafe::Array.new)
+        data[name] = Dataset.new(Concurrent::Array.new)
       end
 
       # Check if there's dataset under specified key

data/lib/rom/memory/types.rb

@@ -0,0 +1,9 @@
+require 'rom/types'
+
+module ROM
+  module Memory
+    module Types
+      include ROM::Types
+    end
+  end
+end

data/lib/rom/pipeline.rb

@@ -3,20 +3,34 @@ module ROM
   #
   # @api private
   module Pipeline
-    # Compose two relation with a left-to-right composition
+    # Common `>>` operator extension
     #
-    # @example
-    #   users.by_name('Jane') >> tasks.for_users
-    #
-    # @param [Relation] other The right relation
-    #
-    # @return [Relation::Composite]
-    #
-    # @api public
-    def >>(other)
-      Relation::Composite.new(self, other)
+    # @api private
+    module Operator
+      # Compose two relation with a left-to-right composition
+      #
+      # @example
+      #   users.by_name('Jane') >> tasks.for_users
+      #
+      # @param [Relation] other The right relation
+      #
+      # @return [Relation::Composite]
+      #
+      # @api public
+      def >>(other)
+        composite_class.new(self, other)
+      end
+
+      private
+
+      # @api private
+      def composite_class
+        raise NotImplementedError
+      end
     end
 
+    include Operator
+
     # Send data through specified mappers
     #
     # @return [Relation::Composite]
@@ -24,7 +38,7 @@ module ROM
     # @api public
     def map_with(*names)
       [self, *names.map { |name| mappers[name] }]
-        .reduce { |a, e| Relation::Composite.new(a, e) }
+        .reduce { |a, e| composite_class.new(a, e) }
     end
     alias_method :as, :map_with
 

data/lib/rom/plugin_registry.rb

@@ -11,7 +11,7 @@ module ROM
     #
     # @api private
     attr_reader :configuration
-    
+
     # Internal registry for command plugins
     #
     # @return [InternalPluginRegistry]
@@ -158,7 +158,7 @@ module ROM
     # Return the plugin for a given adapter
     #
     # @param [Symbol] name The name of the plugin
-    # @param [Symbol] adapter (:default) The name of the adapter used
+    # @param [Symbol] adapter_name (:default) The name of the adapter used
     #
     # @raises [UnknownPluginError] if no plugin is found with the given name
     #

data/lib/rom/plugins/command/schema.rb

@@ -0,0 +1,26 @@
+module ROM
+  module Plugins
+    module Command
+      # @api private
+      module Schema
+        def self.included(klass)
+          super
+          klass.extend(ClassInterface)
+        end
+
+        # @api private
+        module ClassInterface
+          # @see Command.build
+          # @api public
+          def build(relation, options = {})
+            if options.key?(:input) || !relation.schema?
+              super
+            else
+              super(relation, options.merge(input: relation.schema_hash))
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/rom/plugins/configuration/configuration_dsl.rb

@@ -1,4 +1,5 @@
 require 'rom/configuration_dsl'
+require 'rom/support/deprecations'
 
 module ROM
   module ConfigurationPlugins
@@ -9,7 +10,7 @@ module ROM
 
       # @api private
       def self.apply(configuration, options = {})
-        configuration.extend(ROM::ConfigurationDSL)
+        ROM::Deprecations.announce(:macros, "Calling `use(:macros)` is no longer necessary. Macros are enabled by default.")
       end
     end
   end

data/lib/rom/plugins/relation/key_inference.rb

@@ -9,13 +9,28 @@ module ROM
         # @return [Symbol]
         #
         # @api private
-        def foreign_key
-          :"#{Inflector.singularize(name)}_id"
+        def foreign_key(other = nil)
+          if other
+            if schema
+              rel_name = other.respond_to?(:to_sym) ?
+                ROM::Relation::Name[other.to_sym] : other.base_name
+
+              key = schema.foreign_key(rel_name.dataset)
+              key ? key.meta[:name] : __registry__[rel_name].foreign_key
+            else
+              relation = other.respond_to?(:to_sym) ?
+                __registry__[other] : other
+
+              relation.foreign_key
+            end
+          else
+            :"#{Inflector.singularize(name.dataset)}_id"
+          end
         end
 
         # Return base name which defaults to name attribute
         #
-        # @return [Symbol]
+        # @return [ROM::Relation::Name]
         #
         # @api private
         def base_name