rom 0.8.1 → 0.9.0.beta1

data/lib/rom/relation/class_interface.rb

@@ -1,5 +1,8 @@
 require 'set'
 
+require 'rom/support/auto_curry'
+require 'rom/relation/curried'
+
 module ROM
   class Relation
     module ClassInterface
@@ -21,7 +24,7 @@ module ROM
         klass.class_eval do
           use :registry_reader
 
-          defines :gateway, :dataset, :register_as, :exposed_relations
+          defines :gateway, :dataset, :register_as
 
           deprecate_class_method :repository, :gateway
           deprecate :repository, :gateway
@@ -29,7 +32,6 @@ module ROM
           gateway :default
 
           dataset(default_name)
-          exposed_relations Set.new
 
           # Relation's dataset name
           #
@@ -40,16 +42,6 @@ module ROM
           # @api public
           attr_reader :name
 
-          # A set with public method names that return "virtual" relations
-          #
-          # Only those methods are exposed directly on relations return by
-          # Env#relation interface
-          #
-          # @return [Set]
-          #
-          # @api private
-          attr_reader :exposed_relations
-
           # Set or get name under which a relation will be registered
           #
           # This defaults to `dataset` name
@@ -65,18 +57,14 @@ module ROM
             end
           end
 
-          # Hook used to collect public method names
-          #
-          # @api private
-          def self.method_added(name)
-            super
-            exposed_relations << name if public_instance_methods.include?(name)
+          def self.exposed_relations(*args)
+            Deprecations.announce("#{self}.exposed_relations", 'this method has no effect anymore')
+            Set.new
           end
 
           # @api private
           def initialize(dataset, options = {})
             @name = self.class.dataset
-            @exposed_relations = self.class.exposed_relations
             super
           end
 
@@ -90,7 +78,7 @@ module ROM
           end
         end
 
-        ROM.register_relation(klass)
+        klass.extend(AutoCurry)
       end
 
       # Return adapter-specific relation subclass
@@ -187,10 +175,15 @@ module ROM
         registry
       end
 
+      # @api private
+      def curried
+        Curried
+      end
+
       # Hook to finalize a relation after its instance was created
       #
       # @api private
-      def finalize(_env, _relation)
+      def finalize(_container, _relation)
         # noop
       end
     end

data/lib/rom/relation/curried.rb

@@ -1,12 +1,24 @@
-require 'rom/relation/lazy'
+require 'rom/support/options'
+require 'rom/relation/materializable'
 
 module ROM
   class Relation
-    class Curried < Lazy
+    class Curried
+      include Options
+      include Materializable
+
       option :name, type: Symbol, reader: true
       option :arity, type: Integer, reader: true, default: -1
       option :curry_args, type: Array, reader: true, default: EMPTY_ARRAY
 
+      attr_reader :relation
+
+      # @api private
+      def initialize(relation, options = {})
+        @relation = relation
+        super
+      end
+
       # Load relation if args match the arity
       #
       # @return [Loaded,Lazy,Curried]
@@ -47,12 +59,34 @@ module ROM
         true
       end
 
+      # @api private
+      def respond_to_missing?(name, include_private = false)
+        super || relation.respond_to?(name)
+      end
+
       private
 
       # @api private
       def __new__(relation, new_opts = {})
         Curried.new(relation, options.merge(new_opts))
       end
+
+      # @api private
+      def method_missing(meth, *args, &block)
+        if relation.respond_to?(meth)
+          response = relation.__send__(meth, *args, &block)
+
+          super if response.is_a?(self.class)
+
+          if response.is_a?(Relation) || response.is_a?(Graph)
+            __new__(response)
+          else
+            response
+          end
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/rom/relation/graph.rb

@@ -93,6 +93,13 @@ module ROM
 
         Loaded.new(self, [left, right])
       end
+
+      private
+
+      # @api private
+      def decorate?(other)
+        super || other.is_a?(Curried)
+      end
     end
   end
 end

data/lib/rom/relation_registry.rb

@@ -0,0 +1,4 @@
+module ROM
+  class RelationRegistry < Registry
+  end
+end

data/lib/rom/setup.rb

@@ -7,7 +7,7 @@ module ROM
   # @api public
   class Setup
     extend Deprecations
-    include Equalizer.new(:gateways, :env)
+    include Equalizer.new(:gateways, :container)
 
     # @return [Hash] configured gateways
     #
@@ -39,10 +39,11 @@ module ROM
     # @api private
     attr_reader :command_classes
 
-    # @return [Env] finalized env after setup phase is over
+    # @return [Conainer] finalized container after setup phase is over
     #
     # @api private
-    attr_reader :env
+    attr_reader :container
+    alias_method :env, :container
 
     # @api private
     def initialize(gateways, default_adapter = nil)
@@ -51,21 +52,21 @@ module ROM
       @relation_classes = []
       @mapper_classes = []
       @command_classes = []
-      @env = nil
+      @container = nil
     end
 
     # Finalize the setup
     #
-    # @return [Env] frozen env with access to gateways, relations,
-    #                mappers and commands
+    # @return [Container] frozen container with access to gateways, 
+    #                relations, mappers and commands
     #
     # @api public
     def finalize
-      raise EnvAlreadyFinalizedError if env
+      raise EnvAlreadyFinalizedError if container
       finalize = Finalize.new(
         gateways, relation_classes, mapper_classes, command_classes
       )
-      @env = finalize.run!
+      @container = finalize.run!
     end
 
     # Return gateway identified by name

data/lib/rom/setup/finalize.rb

@@ -1,16 +1,16 @@
 require 'rom/relation'
-require 'rom/mapper'
 require 'rom/command'
 
 require 'rom/support/registry'
+require 'rom/relation_registry'
 require 'rom/command_registry'
 require 'rom/mapper_registry'
 
-require 'rom/env'
+require 'rom/container'
 
 module ROM
   class Setup
-    # This giant builds an environment using defined classes for core parts of ROM
+    # This giant builds an container using defined classes for core parts of ROM
     #
     # It is used by the setup object after it's done gathering class definitions
     #
@@ -43,7 +43,7 @@ module ROM
       #
       # This creates relations, mappers and commands
       #
-      # @return [Env]
+      # @return [Container]
       #
       # @api private
       def run!
@@ -53,7 +53,7 @@ module ROM
         mappers = load_mappers
         commands = load_commands(relations)
 
-        Env.new(gateways, relations, mappers, commands)
+        Container.new(gateways, relations, mappers, commands)
       end
 
       private

data/lib/rom/version.rb

@@ -1,3 +1,3 @@
 module ROM
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.9.0.beta1'.freeze
 end

data/rom.gemspec

@@ -17,6 +17,8 @@ Gem::Specification.new do |gem|
 
   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_development_dependency 'rake', '~> 10.3'
   gem.add_development_dependency 'rspec', '~> 3.3'

data/spec/integration/commands/create_spec.rb

@@ -115,7 +115,7 @@ describe 'Commands / Create' do
           end
         end
         setup.finalize
-      }.to raise_error(ROM::InvalidOptionValueError)
+      }.to raise_error(ROM::Options::InvalidOptionValueError)
     end
   end
 

data/spec/integration/commands/update_spec.rb

@@ -97,7 +97,7 @@ describe 'Commands / Update' do
           end
         end
         setup.finalize
-      }.to raise_error(ROM::InvalidOptionValueError)
+      }.to raise_error(ROM::Options::InvalidOptionValueError)
     end
   end
 

data/spec/integration/mappers/unwrap_spec.rb

@@ -13,7 +13,7 @@ describe 'Mapper definition DSL' do
             tuple.merge(user: users.restrict(name: tuple[:name]).first)
           }
 
-          self.class.new(tuples)
+          __new__(tuples)
         end
       end
 

data/spec/spec_helper.rb

@@ -46,3 +46,5 @@ RSpec.configure do |config|
     ConstantLeakFinder.find(example)
   end
 end
+
+ROM.use :auto_registration

data/spec/unit/rom/{env_spec.rb → container_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe ROM::Env do
+describe ROM::Container do
   include_context 'users and tasks'
 
   before do
@@ -64,9 +64,9 @@ describe ROM::Env do
       expect(by_name['Jane']).to match_array([{ name: 'Jane' }])
     end
 
-    it 'returns lazy relation without mappers when mappers are not defined' do
-      expect(rom.relation(:tasks)).to be_instance_of(ROM::Relation::Lazy)
-      expect(rom.relation(:tasks).relation).to be(rom.relations.tasks)
+    it 'returns relation without mappers when mappers are not defined' do
+      expect(rom.relation(:tasks)).to be_kind_of(ROM::Relation)
+      expect(rom.relation(:tasks).mappers.elements).to be_empty
     end
   end
 
@@ -75,7 +75,7 @@ describe ROM::Env do
       expect {
         result = rom.read(:users) { |r| r.by_name('Jane') }.as(:name_list)
         expect(result.call).to match_array([{ name: 'Jane' }])
-      }.to output(/^ROM::Env#read is deprecated/).to_stderr
+      }.to output(/^ROM::Container#read is deprecated/).to_stderr
     end
   end
 

data/spec/unit/rom/plugin_spec.rb

@@ -9,10 +9,6 @@ describe "ROM::PluginRegistry" do
     Test::CommandPlugin   = Module.new
     Test::MapperPlugin    = Module.new
     Test::RelationPlugin  = Module.new do
-      def self.included(mod)
-        mod.exposed_relations << :plugged_in
-      end
-
       def plugged_in
         "a relation"
       end
@@ -73,10 +69,6 @@ describe "ROM::PluginRegistry" do
 
   it "allows definition of adapter restricted plugins" do
     Test::LazyPlugin = Module.new do
-      def self.included(mod)
-        mod.exposed_relations << :lazy?
-      end
-
       def lazy?
         true
       end

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

@@ -25,7 +25,7 @@ describe ROM::Relation::Composite do
       relation = users >> name_list >> upcaser
       loaded = relation.call
 
-      expect(loaded.source).to eql(users.relation)
+      expect(loaded.source).to eql(users)
       expect(loaded).to match_array(%w(JANE JOE))
     end
 
@@ -33,7 +33,7 @@ describe ROM::Relation::Composite do
       relation = users >> users.sorted
       loaded = relation.call
 
-      expect(loaded.source).to eql(users.relation)
+      expect(loaded.source).to eql(users)
       expect(loaded).to match_array([
         { name: 'Jane', email: 'jane@doe.org' },
         { name: 'Joe', email: 'joe@doe.org' }

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

@@ -0,0 +1,53 @@
+require 'spec_helper'
+
+RSpec.describe ROM::Relation::Curried do
+  include_context 'users and tasks'
+
+  let(:users) { rom.relations.users }
+
+  before do
+    setup.relation(:users) do
+      def by_name(name)
+        restrict(name: name)
+      end
+
+      def find(criteria)
+        restrict(criteria)
+      end
+    end
+  end
+
+  describe '#call' do
+    let(:relation) { users.by_name.('Jane') }
+
+    it 'materializes a relation' do
+      expect(relation).to match_array([
+        name: 'Jane', email: 'jane@doe.org'
+      ])
+    end
+
+    it 'returns a loaded relation' do
+      expect(relation.source).to eql(users.by_name('Jane'))
+    end
+  end
+
+  describe '#respond_to?' do
+    it 'returns true if wrapped relation responds to a method' do
+      expect(users.by_name).to respond_to(:dataset)
+    end
+
+    it 'returns false if wrapped relation does not respond to a method' do
+      expect(users.by_name).not_to respond_to(:not_here)
+    end
+  end
+
+  describe '#method_missing' do
+    it 'forwards to the relation' do
+      expect(users.by_name.dataset).to eql(users.dataset)
+    end
+
+    it 'does not forward to the relation when method is auto-curried' do
+      expect { users.by_name.find }.to raise_error(NoMethodError, /find/)
+    end
+  end
+end

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

@@ -41,6 +41,10 @@ describe ROM::Relation::Graph do
       expect(graph.by_name('Jane')).to be_instance_of(ROM::Relation::Graph)
     end
 
+    it 'forwards methods to the root and decorates curried response' do
+      expect((users.combine(tasks.for_users)).by_name).to be_instance_of(ROM::Relation::Graph)
+    end
+
     it 'returns original response from the root' do
       expect(graph.mappers).to eql(users.mappers)
     end