rom 0.9.1 → 1.0.0.beta1

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

@@ -1,11 +1,10 @@
 require 'spec_helper'
 
 describe ROM::Relation::Loaded do
+  include_context 'no container'
   include_context 'users and tasks'
 
-  subject(:users) { ROM::Relation::Loaded.new(rom.relations.users) }
-
-  before { setup.relation(:users) }
+  subject(:users) { ROM::Relation::Loaded.new(users_relation) }
 
   describe '#each' do
     it 'yields tuples from relation' do

data/spec/unit/rom/relation_spec.rb

@@ -12,6 +12,16 @@ describe ROM::Relation do
   describe '.[]' do
     before do
       module Test::TestAdapter
+        class Relation < ROM::Relation
+          adapter :test
+
+          def test_relation?
+            true
+          end
+        end
+      end
+
+      module Test::BrokenAdapter
         class Relation < ROM::Relation
           def test_relation?
             true
@@ -20,13 +30,30 @@ describe ROM::Relation do
       end
 
       ROM.register_adapter(:test, Test::TestAdapter)
+      ROM.register_adapter(:broken, Test::BrokenAdapter)
     end
 
     it 'returns relation subclass from the registered adapter' do
-      relation = ROM::Relation[:test].new([])
+      subclass = Class.new(ROM::Relation[:test])
+
+      relation = subclass.new([])
 
       expect(relation).to be_test_relation
     end
+
+    it 'raises error when adapter relation has no identifier' do
+      expect {
+        Class.new(ROM::Relation[:broken])
+      }.to raise_error(ROM::MissingAdapterIdentifierError, /Test::BrokenAdapter::Relation/)
+    end
+  end
+
+  describe ".dataset" do
+    it 'allows setting dataset name' do
+      rel_class = Class.new(ROM::Relation[:memory]) { dataset :users }
+
+      expect(rel_class.dataset).to be(:users)
+    end
   end
 
   describe ".register_as" do
@@ -54,7 +81,7 @@ describe ROM::Relation do
         dataset :users
       end
 
-      class Test::DescendantUsers < Test::SuperUsers;end
+      class Test::DescendantUsers < Test::SuperUsers; end
 
       expect(Test::DescendantUsers.register_as).to eq(:test_descendant_users)
     end
@@ -153,4 +180,14 @@ describe ROM::Relation do
       expect(relation.to_a).to eql([jane, joe])
     end
   end
+
+  describe "#with" do
+    it "returns a new instance with the original dataset and given custom options" do
+      custom_opts = { mappers: "Custom Mapper Registry" }
+      new_relation = relation.with(custom_opts)
+
+      expect(new_relation.dataset).to be(relation.dataset)
+      expect(new_relation.options).to include(custom_opts)
+    end
+  end
 end

metadata

@@ -1,95 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: rom
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0.beta1
 platform: ruby
 authors:
 - Piotr Solnica
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: transproc
+  name: dry-equalizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: rom-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.0.0.beta1
 - !ruby/object:Gem::Dependency
   name: rom-mapper
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0.beta1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -141,21 +103,32 @@ files:
 - lib/rom/command.rb
 - lib/rom/command_registry.rb
 - lib/rom/commands.rb
-- lib/rom/commands/abstract.rb
+- lib/rom/commands/class_interface.rb
 - lib/rom/commands/composite.rb
 - lib/rom/commands/create.rb
 - lib/rom/commands/delete.rb
 - lib/rom/commands/graph.rb
+- lib/rom/commands/graph/builder.rb
 - lib/rom/commands/graph/class_interface.rb
 - lib/rom/commands/graph/input_evaluator.rb
 - lib/rom/commands/lazy.rb
+- lib/rom/commands/lazy/create.rb
+- lib/rom/commands/lazy/delete.rb
+- lib/rom/commands/lazy/update.rb
 - lib/rom/commands/result.rb
 - lib/rom/commands/update.rb
+- lib/rom/configuration.rb
+- lib/rom/configuration_dsl.rb
+- lib/rom/configuration_dsl/command.rb
+- lib/rom/configuration_dsl/command_dsl.rb
+- lib/rom/configuration_dsl/mapper.rb
+- lib/rom/configuration_dsl/mapper_dsl.rb
+- lib/rom/configuration_dsl/relation.rb
+- lib/rom/configuration_plugin.rb
 - lib/rom/constants.rb
 - lib/rom/container.rb
+- lib/rom/create_container.rb
 - lib/rom/environment.rb
-- lib/rom/environment_plugin.rb
-- lib/rom/environment_plugins/auto_registration.rb
 - lib/rom/gateway.rb
 - lib/rom/global.rb
 - lib/rom/global/plugin_dsl.rb
@@ -175,7 +148,11 @@ files:
 - lib/rom/plugin.rb
 - lib/rom/plugin_base.rb
 - lib/rom/plugin_registry.rb
+- lib/rom/plugins/configuration/configuration_dsl.rb
+- lib/rom/plugins/relation/key_inference.rb
 - lib/rom/plugins/relation/registry_reader.rb
+- lib/rom/plugins/relation/view.rb
+- lib/rom/plugins/relation/view/dsl.rb
 - lib/rom/relation.rb
 - lib/rom/relation/class_interface.rb
 - lib/rom/relation/composite.rb
@@ -184,27 +161,32 @@ files:
 - lib/rom/relation/loaded.rb
 - lib/rom/relation/materializable.rb
 - lib/rom/relation_registry.rb
-- lib/rom/repository.rb
 - lib/rom/setup.rb
+- lib/rom/setup/auto_registration.rb
 - lib/rom/setup/finalize.rb
-- lib/rom/setup_dsl/command.rb
-- lib/rom/setup_dsl/command_dsl.rb
-- lib/rom/setup_dsl/mapper.rb
-- lib/rom/setup_dsl/mapper_dsl.rb
-- lib/rom/setup_dsl/relation.rb
-- lib/rom/setup_dsl/setup.rb
+- lib/rom/setup/finalize/commands.rb
+- lib/rom/setup/finalize/mappers.rb
+- lib/rom/setup/finalize/relations.rb
 - lib/rom/support/configurable.rb
 - lib/rom/version.rb
 - rakelib/benchmark.rake
 - rakelib/mutant.rake
 - rakelib/rubocop.rake
 - rom.gemspec
+- spec/fixtures/app/commands/create_user.rb
+- spec/fixtures/app/mappers/user_list.rb
+- spec/fixtures/app/relations/users.rb
+- spec/fixtures/lib/persistence/commands/create_user.rb
+- spec/fixtures/lib/persistence/mappers/user_list.rb
+- spec/fixtures/lib/persistence/relations/users.rb
+- spec/integration/command_registry_spec.rb
 - spec/integration/commands/create_spec.rb
 - spec/integration/commands/delete_spec.rb
 - spec/integration/commands/error_handling_spec.rb
+- spec/integration/commands/graph_builder_spec.rb
 - spec/integration/commands/graph_spec.rb
 - spec/integration/commands/update_spec.rb
-- spec/integration/inline_setup_spec.rb
+- spec/integration/commands_spec.rb
 - spec/integration/mappers/combine_spec.rb
 - spec/integration/mappers/deep_embedded_spec.rb
 - spec/integration/mappers/definition_dsl_spec.rb
@@ -225,8 +207,12 @@ files:
 - spec/integration/mappers/ungroup_spec.rb
 - spec/integration/mappers/unwrap_spec.rb
 - spec/integration/mappers/wrap_spec.rb
+- spec/integration/memory/commands/create_spec.rb
+- spec/integration/memory/commands/delete_spec.rb
+- spec/integration/memory/commands/update_spec.rb
 - spec/integration/multi_env_spec.rb
 - spec/integration/multi_repo_spec.rb
+- spec/integration/relations/default_dataset_spec.rb
 - spec/integration/relations/inheritance_spec.rb
 - spec/integration/relations/reading_spec.rb
 - spec/integration/relations/registry_dsl_spec.rb
@@ -234,8 +220,12 @@ files:
 - spec/integration/repositories/setting_logger_spec.rb
 - spec/integration/setup_spec.rb
 - spec/shared/command_behavior.rb
+- spec/shared/command_graph.rb
+- spec/shared/container.rb
 - spec/shared/enumerable_dataset.rb
+- spec/shared/gateway_only.rb
 - spec/shared/materializable.rb
+- spec/shared/no_container.rb
 - spec/shared/one_behavior.rb
 - spec/shared/proxy.rb
 - spec/shared/users_and_tasks.rb
@@ -243,23 +233,26 @@ files:
 - spec/support/constant_leak_finder.rb
 - spec/support/mutant.rb
 - spec/test/memory_repository_lint_test.rb
-- spec/unit/rom/command_registry_spec.rb
+- spec/unit/rom/auto_registration_spec.rb
 - spec/unit/rom/commands/graph_spec.rb
 - spec/unit/rom/commands/lazy_spec.rb
 - spec/unit/rom/commands/result_spec.rb
 - spec/unit/rom/commands_spec.rb
+- spec/unit/rom/configurable_spec.rb
+- spec/unit/rom/configuration_spec.rb
 - spec/unit/rom/container_spec.rb
+- spec/unit/rom/create_container_spec.rb
+- spec/unit/rom/environment_spec.rb
 - spec/unit/rom/gateway_spec.rb
 - spec/unit/rom/global_spec.rb
 - spec/unit/rom/mapper_registry_spec.rb
-- spec/unit/rom/memory/commands/create_spec.rb
-- spec/unit/rom/memory/commands/delete_spec.rb
-- spec/unit/rom/memory/commands/update_spec.rb
 - spec/unit/rom/memory/dataset_spec.rb
 - spec/unit/rom/memory/relation_spec.rb
 - spec/unit/rom/memory/repository_spec.rb
 - spec/unit/rom/memory/storage_spec.rb
 - spec/unit/rom/plugin_spec.rb
+- spec/unit/rom/plugins/relation/key_inference_spec.rb
+- spec/unit/rom/plugins/relation/view_spec.rb
 - spec/unit/rom/registry_spec.rb
 - spec/unit/rom/relation/composite_spec.rb
 - spec/unit/rom/relation/curried_spec.rb
@@ -268,8 +261,6 @@ files:
 - spec/unit/rom/relation/lazy_spec.rb
 - spec/unit/rom/relation/loaded_spec.rb
 - spec/unit/rom/relation_spec.rb
-- spec/unit/rom/repository_spec.rb
-- spec/unit/rom/setup_spec.rb
 homepage: http://rom-rb.org
 licenses:
 - MIT
@@ -285,9 +276,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5
@@ -295,3 +286,4 @@ signing_key:
 specification_version: 4
 summary: Ruby Object Mapper
 test_files: []
+has_rdoc: 

data/lib/rom/commands/abstract.rb

@@ -1,184 +0,0 @@
-require 'rom/support/options'
-require 'rom/support/deprecations'
-
-require 'rom/commands/composite'
-require 'rom/commands/graph'
-require 'rom/commands/lazy'
-
-module ROM
-  module Commands
-    # Abstract command class
-    #
-    # Provides a constructor accepting relation with options and basic behavior
-    # for calling, currying and composing commands.
-    #
-    # Typically command subclasses should inherit from specialized
-    # Create/Update/Delete, not this one.
-    #
-    # @abstract
-    #
-    # @private
-    class Abstract
-      include Options
-      extend Deprecations
-
-      option :type, allow: [:create, :update, :delete]
-      option :source, reader: true
-      option :result, reader: true, allow: [:one, :many]
-      option :validator, reader: true
-      option :input, reader: true
-      option :curry_args, type: Array, reader: true, default: EMPTY_ARRAY
-
-      # @attr_reader [Relation] relation The command's relation
-      attr_reader :relation
-
-      deprecate :target, :relation,
-        'Source relation is now available as `Command#source`'
-
-      # @api private
-      def initialize(relation, options = EMPTY_HASH)
-        super
-        @relation = relation
-        @source = options[:source] || relation
-      end
-
-      # Execute the command
-      #
-      # @abstract
-      #
-      # @return [Array] an array with inserted tuples
-      #
-      # @api private
-      def execute(*)
-        raise(
-          NotImplementedError,
-          "#{self.class}##{__method__} must be implemented"
-        )
-      end
-
-      # Call the command and return one or many tuples
-      #
-      # @api public
-      def call(*args)
-        tuples = execute(*(curry_args + args))
-
-        if one?
-          tuples.first
-        else
-          tuples
-        end
-      end
-      alias_method :[], :call
-
-      # Curry this command with provided args
-      #
-      # Curried command can be called without args
-      #
-      # @return [Command]
-      #
-      # @api public
-      def curry(*args)
-        if curry_args.empty? && args.first.is_a?(Graph::InputEvaluator)
-          Lazy.new(self, args.first)
-        else
-          self.class.build(relation, options.merge(curry_args: args))
-        end
-      end
-      alias_method :with, :curry
-
-      # Compose a command with another one
-      #
-      # The other one will be called with the result from the first one
-      #
-      # @example
-      #
-      #   command = users.create.curry(name: 'Jane')
-      #   command >>= tasks.create.curry(title: 'Task One')
-      #
-      #   command.call # creates user, passes it to tasks and creates task
-      #
-      # @return [Composite]
-      #
-      # @api public
-      def >>(other)
-        Composite.new(self, other)
-      end
-
-      # @api public
-      def combine(*others)
-        Graph.new(self, others)
-      end
-
-      # @api private
-      def lazy?
-        false
-      end
-
-      # @api private
-      def graph?
-        false
-      end
-
-      # @api private
-      def one?
-        result.equal?(:one)
-      end
-
-      # @api private
-      def many?
-        result.equal?(:many)
-      end
-
-      # Assert that tuple count in the relation corresponds to :result
-      # setting
-      #
-      # @raise TupleCountMismatchError
-      #
-      # @api private
-      def assert_tuple_count
-        if one? && tuple_count > 1
-          raise TupleCountMismatchError, "#{inspect} expects one tuple"
-        end
-      end
-
-      # Return number of tuples in the relation relation
-      #
-      # This should be overridden by gateways when `#count` is not available
-      # in the relation objects
-      #
-      # @return [Fixnum]
-      #
-      # @api private
-      def tuple_count
-        relation.count
-      end
-
-      # @api private
-      def respond_to_missing?(name, _include_private = false)
-        relation.respond_to?(name) || super
-      end
-
-      # @api private
-      def new(new_relation)
-        self.class.build(new_relation, options.merge(source: relation))
-      end
-
-      private
-
-      # @api private
-      def method_missing(name, *args, &block)
-        if relation.respond_to?(name)
-          response = relation.public_send(name, *args, &block)
-
-          if response.instance_of?(relation.class)
-            new(response)
-          else
-            response
-          end
-        else
-          super
-        end
-      end
-    end
-  end
-end