rom 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fef04bd27871ee67a85b39c0cfb4a2a9c588a01f
-  data.tar.gz: 6f5e0515a4cdd8d0df9816c574bf176aa9634783
+  metadata.gz: 1f71a2cbfa094787fbd2ca709cd2c229aca10799
+  data.tar.gz: 73f461e9a6e50aec0d632f4332137fc389d57a70
 SHA512:
-  metadata.gz: 9ea6324c33c9c7701ab5452f291d7c397e41062ea706c2345c66d167b9cad8e7914f39af536fa065cb76e3bdca612898bc89de9e0fa6d46a1e58a4c532b88576
-  data.tar.gz: 9954ad8c0413dc7e94d4170703b47dd3a80387a22236c37a86d71ce7b6a01b8588658673a0cd10224013cf7b166c6592f800585f5c2fa4ecc691825701d3dcb0
+  metadata.gz: a74fec1aaf8c1d5f0feb8b2128fa4db3c0ec31cf7018f8905ef396e3a614d071f17d7f60f2bd3411ca887efdbb9959faa3e73f0082fa3cbedcf43a95efd93286
+  data.tar.gz: 1ad96805142be1ac15bb329109e251c8c4170ce2c42f6fc409b7351899bb8ae283686241b414a7f1ff1bb08dc4b1b10f0ff59da2ad4e0d46f2e3c8e90f1dbf62

data/.gitignore

@@ -20,3 +20,4 @@ vendor/
 .yardoc
 _yardoc
 doc/
+.ruby-version

data/.rubocop.yml

@@ -5,6 +5,7 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   Exclude:
     - tmp/**/*
+    - vendor/**/*
 
 Style/BlockDelimiters:
   EnforcedStyle: semantic
@@ -35,10 +36,6 @@ Style/AlignParameters:
 Style/AsciiComments:
   Enabled: false
 
-# Allow using braces for value-returning blocks
-Style/Blocks:
-  Enabled: false
-
 # Documentation checked by Inch CI
 Style/Documentation:
   Enabled: false
@@ -55,15 +52,15 @@ Style/Lambda:
 Style/MultilineBlockChain:
   Enabled: false
 
+# Multiline operation chains are indented
+Style/MultilineOperationIndentation:
+  EnforcedStyle: indented
+
 # Result::Success and Result::Failure use > for callbacks
 Style/OpMethod:
   Exclude:
     - lib/rom/command_registry.rb
 
-# Even a single escaped slash can be confusing
-Style/RegexpLiteral:
-  MaxSlashes: 0
-
 # Don’t introduce semantic fail/raise distinction
 Style/SignalException:
   EnforcedStyle: only_raise

data/CHANGELOG.md

@@ -1,3 +1,30 @@
+## v0.8.0 2015-06-22
+
+### Added
+
+* New `step` mapper operation that allows multistep transformations inside a single mapper (dekz)
+* New `ungroup` and `unfold` mapper operations inverse `group` and `fold` (nepalez)
+* Support deep nesting of `unwrap` mapper operations (nepalez)
+* Support usage of `exclude` in a root of the mapper (nepalez)
+* Support usage of `prefix` and `prefix_separator` mapper operations inside blocks (nepalez)
+* Support renaming of the rest of an attribute after `unwrap` (nepalez)
+
+### Changed
+
+* `Repository` class has been renamed to `Gateway` with proper deprecation
+  warnings (cflipse)
+* `combine` in mapper can be used without a block (kwando)
+* `wrap` and `group` in mapper will raise error if `:mapper` is set along with
+  block or options (vrish88)
+
+### Fixed
+
+* `order` memory repository operation sorts tuples containing empty values (nepalez)
+* `Mapper::AttributeDSL#embedded` now honors `option[:type]` when used
+  with `option[:mapper]` (c0)
+
+[Compare v0.7.1...v0.8.0](https://github.com/rom-rb/rom/compare/v0.7.1...v0.8.0)
+
 ## v0.7.1 2015-05-22
 
 ### Added
@@ -14,7 +41,7 @@
 * [rom/memory] `restrict` operation supports array as a value (gotar)
 * [rom/memory] `restrict` operation supports regexp as a value (gotar)
 
-[Compare v0.7.0...HEAD](https://github.com/rom-rb/rom/compare/v0.7.0...HEAD)
+[Compare v0.7.0...v0.7.1](https://github.com/rom-rb/rom/compare/v0.7.0...v0.7.1)
 
 ## v0.7.0 2015-05-17
 

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,13 @@
+# Contributor Code of Conduct
+
+As contributors and maintainers of this project, we pledge to respect all people who contribute through reporting issues, posting feature requests, updating documentation, submitting pull requests or patches, and other activities.
+
+We are committed to making participation in this project a harassment-free experience for everyone, regardless of level of experience, gender, gender identity and expression, sexual orientation, disability, personal appearance, body size, race, age, or religion.
+
+Examples of unacceptable behavior by participants include the use of sexual language or imagery, derogatory comments or personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct. Project maintainers who do not follow the Code of Conduct may be removed from the project team.
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by opening an issue or contacting one or more of the project maintainers.
+
+This Code of Conduct is adapted from the [Contributor Covenant](http:contributor-covenant.org), version 1.0.0, available at [http://contributor-covenant.org/version/1/0/0/](http://contributor-covenant.org/version/1/0/0/)

data/Gemfile

@@ -34,7 +34,7 @@ group :benchmarks do
 end
 
 group :tools do
-  gem 'rubocop'
+  gem 'rubocop', '~> 0.31'
 
   gem 'guard'
   gem 'guard-rspec'
@@ -43,7 +43,7 @@ group :tools do
   gem 'byebug'
 
   platform :mri do
-    gem 'mutant', '>= 0.7.7'
+    gem 'mutant', '>= 0.8.0', github: 'mbj/mutant', branch: 'master'
     gem 'mutant-rspec'
   end
 end

data/lib/rom.rb

@@ -14,7 +14,7 @@ require 'rom/support/class_builder'
 require 'rom/plugin'
 require 'rom/relation'
 require 'rom/mapper'
-require 'rom/command'
+require 'rom/commands'
 
 # default mapper processor using Transproc gem
 require 'rom/processor/transproc'

data/lib/rom/command.rb

@@ -50,6 +50,8 @@ module ROM
     # @api private
     def self.adapter_namespace(adapter)
       ROM.adapters.fetch(adapter).const_get(:Commands)
+    rescue KeyError
+      raise AdapterNotPresentError.new(adapter, :relation)
     end
 
     # Build a command class for a specific relation with options
@@ -84,20 +86,20 @@ module ROM
     # @option options [Symbol] :adapter (:default) first adapter to check for plugin
     #
     # @api public
-    def self.use(plugin, options = {})
+    def self.use(plugin, _options = {})
       ROM.plugin_registry.commands.fetch(plugin, adapter).apply_to(self)
     end
 
     # Build command registry hash for provided relations
     #
     # @param [RelationRegistry] relations registry
-    # @param [Hash] repositories
+    # @param [Hash] gateways
     # @param [Array] descendants a list of command subclasses
     #
     # @return [Hash]
     #
     # @api private
-    def self.registry(relations, repositories, descendants)
+    def self.registry(relations, gateways, descendants)
       descendants.each_with_object({}) do |klass, h|
         rel_name = klass.relation
 
@@ -106,8 +108,8 @@ module ROM
         relation = relations[rel_name]
         name = klass.register_as || klass.default_name
 
-        repository = repositories[relation.class.repository]
-        repository.extend_command_class(klass, relation.dataset)
+        gateway = gateways[relation.class.gateway]
+        gateway.extend_command_class(klass, relation.dataset)
 
         (h[rel_name] ||= {})[name] = klass.build(relation)
       end

data/lib/rom/command_registry.rb

@@ -36,7 +36,7 @@ module ROM
     # @example
     #
     #   rom.command(:users).try { create(name: 'Jane') }
-    #   rom.command(:users).try { update(:by_id, 1).set(name: 'Jane Doe') }
+    #   rom.command(:users).try { update(:by_id, 1).call(name: 'Jane Doe') }
     #   rom.command(:users).try { delete(:by_id, 1) }
     #
     # @return [Commands::Result]

data/lib/rom/commands.rb

@@ -1,5 +1,3 @@
-require 'rom/support/options'
-
 require 'rom/commands/create'
 require 'rom/commands/update'
 require 'rom/commands/delete'

data/lib/rom/commands/abstract.rb

@@ -1,4 +1,8 @@
+require 'rom/support/deprecations'
+
 require 'rom/commands/composite'
+require 'rom/commands/graph'
+require 'rom/commands/lazy'
 
 module ROM
   module Commands
@@ -15,20 +19,26 @@ module ROM
     # @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 :target
       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 = {})
-        @relation = relation
         super
+        @relation = relation
+        @source = options[:source] || relation
       end
 
       # Execute the command
@@ -51,7 +61,7 @@ module ROM
       def call(*args)
         tuples = execute(*(curry_args + args))
 
-        if result == :one
+        if one?
           tuples.first
         else
           tuples
@@ -67,7 +77,11 @@ module ROM
       #
       # @api public
       def curry(*args)
-        self.class.new(relation, options.merge(curry_args: args))
+        if curry_args.empty? && args.first.is_a?(Proc)
+          Lazy.new(self, args.first)
+        else
+          self.class.build(relation, options.merge(curry_args: args))
+        end
       end
       alias_method :with, :curry
 
@@ -89,48 +103,53 @@ module ROM
         Composite.new(self, other)
       end
 
-      # Return new update command with new relation
-      #
+      # @api public
+      def combine(*others)
+        Graph.new(self, others)
+      end
+
       # @api private
-      def new(*args, &block)
-        self.class.build(relation.public_send(*args, &block), options)
+      def lazy?
+        false
       end
 
-      # Target relation on which the command will operate
-      #
-      # By default this is set to the relation that's passed to the constructor.
-      # Specialized commands like Delete may set the target to a different
-      # relation.
-      #
-      # @return [Relation]
-      #
-      # @api public
-      def target
-        relation
+      # @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 target relation corresponds to :result
+      # Assert that tuple count in the relation corresponds to :result
       # setting
       #
       # @raise TupleCountMismatchError
       #
       # @api private
       def assert_tuple_count
-        if result == :one && tuple_count > 1
+        if one? && tuple_count > 1
           raise TupleCountMismatchError, "#{inspect} expects one tuple"
         end
       end
 
-      # Return number of tuples in the target relation
+      # Return number of tuples in the relation relation
       #
-      # This should be overridden by repositories when `#count` is not available
+      # This should be overridden by gateways when `#count` is not available
       # in the relation objects
       #
       # @return [Fixnum]
       #
       # @api private
       def tuple_count
-        target.count
+        relation.count
       end
 
       # @api private
@@ -138,12 +157,23 @@ module ROM
         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)
-          new(name, *args, &block)
+          response = relation.public_send(name, *args, &block)
+
+          if response.instance_of?(relation.class)
+            new(response)
+          else
+            response
+          end
         else
           super
         end

data/lib/rom/commands/composite.rb

@@ -14,22 +14,34 @@ module ROM
       def call(*args)
         response = left.call(*args)
 
-        if result == :one
+        if one? && !graph?
           if right.is_a?(Command) || right.is_a?(Commands::Composite)
             right.call([response].first)
           else
             right.call([response]).first
           end
+        elsif one? && graph?
+          right.call(response).first
         else
           right.call(response)
         end
       end
       alias_method :[], :call
 
+      # @api private
+      def graph?
+        left.is_a?(Graph)
+      end
+
       # @api private
       def result
         left.result
       end
+
+      # @api private
+      def decorate?(response)
+        super || response.is_a?(Graph)
+      end
     end
   end
 end

data/lib/rom/commands/delete.rb

@@ -8,14 +8,6 @@ module ROM
     #
     # @abstract
     class Delete < Command
-      attr_reader :target
-
-      # @api private
-      def initialize(relation, options = {})
-        super
-        @target = options[:target] || relation
-      end
-
       # @see AbstractCommand#call
       def call(*args)
         assert_tuple_count

data/lib/rom/commands/graph.rb

@@ -0,0 +1,102 @@
+require 'rom/pipeline'
+require 'rom/support/options'
+require 'rom/commands/graph/class_interface'
+
+module ROM
+  module Commands
+    # Command graph
+    #
+    # @api private
+    class Graph
+      extend ClassInterface
+
+      include Options
+      include Pipeline
+      include Pipeline::Proxy
+
+      # @attr_reader [Command] root The root command
+      attr_reader :root
+
+      # @attr_reader [Array<Command>] nodes The child commands
+      attr_reader :nodes
+
+      alias_method :left, :root
+      alias_method :right, :nodes
+
+      option :mappers, reader: true, default: proc { MapperRegistry.new }
+
+      # @api private
+      def initialize(root, nodes, options = {})
+        super
+        @root = root
+        @nodes = nodes
+      end
+
+      # Calls root and all nodes with the result from root
+      #
+      # Graph results are mappable through `combine` operation in mapper DSL
+      #
+      # @example
+      #   create_user = rom.command(:users).create
+      #   create_task = rom.command(:tasks).create
+      #
+      #   command = create_user
+      #     .with(name: 'Jane')
+      #     .combine(create_task.with(title: 'Task'))
+      #
+      #   command.call
+      #
+      # @return [Array] nested array with command results
+      #
+      # @api public
+      def call(*args)
+        begin
+          left = root.call(*args)
+
+          right = nodes.map do |node|
+            begin
+              response =
+                if node.lazy?
+                  node.call(args.first, left)
+                else
+                  node.call(left)
+                end
+            rescue => err
+              raise CommandFailure.new(node, err)
+            rescue CommandFailure => err
+              raise err
+            end
+
+            if node.one? && !node.graph?
+              [response]
+            else
+              response
+            end
+          end
+
+          if one?
+            [[left], right]
+          else
+            [left, right]
+          end
+        rescue => err
+          raise CommandFailure.new(root, err)
+        rescue CommandFailure => err
+          raise err
+        end
+      end
+
+      # Return a new graph with updated options
+      #
+      # @api private
+      def with(new_options)
+        self.class.new(root, nodes, options.merge(new_options))
+      end
+
+      # @api private
+      def graph?
+        true
+      end
+    end
+  end
+end