rom 0.4.2 → 0.5.0

data/lib/rom/adapter/memory.rb

@@ -4,7 +4,6 @@ require 'rom/adapter/memory/commands'
 
 module ROM
   class Adapter
-
     class Memory < Adapter
       attr_accessor :logger
 
@@ -28,9 +27,6 @@ module ROM
       def [](name)
         connection[name]
       end
-
-      Adapter.register(self)
     end
-
   end
 end

data/lib/rom/adapter/memory/commands.rb

@@ -1,41 +1,31 @@
 module ROM
   class Adapter
     class Memory < Adapter
-
       module Commands
-
         class Create < ROM::Commands::Create
-
           def execute(tuple)
             attributes = input[tuple]
             validator.call(attributes)
             [relation.insert(attributes.to_h).to_a.last]
           end
-
         end
 
         class Update < ROM::Commands::Update
-
           def execute(params)
             attributes = input[params]
             validator.call(attributes)
             relation.map { |tuple| tuple.update(attributes.to_h) }
           end
-
         end
 
         class Delete < ROM::Commands::Delete
-
           def execute
             tuples = target.to_a
             tuples.each { |tuple| relation.delete(tuple) }
             tuples
           end
-
         end
-
       end
-
     end
   end
 end

data/lib/rom/adapter/memory/dataset.rb

@@ -1,7 +1,6 @@
 module ROM
   class Adapter
     class Memory < Adapter
-
       class Dataset
         include Charlatan.new(:data)
 
@@ -22,16 +21,31 @@ module ROM
           data.each(&block)
         end
 
-        def restrict(criteria = nil, &block)
+        def join(*args)
+          left, right = args.size > 1 ? args : [self, args.first]
+
+          join_map = left.to_a.each_with_object({}) { |tuple, h|
+            others = right.to_a.find_all { |t| (tuple.to_a & t.to_a).any? }
+            (h[tuple] ||= []).concat(others)
+          }
+
+          tuples = left.map { |tuple|
+            join_map[tuple].map { |other| tuple.merge(other) }
+          }.flatten
+
+          self.class.new(tuples, left.header + right.header)
+        end
+
+        def restrict(criteria = nil)
           if criteria
-            find_all { |tuple| criteria.all? { |k, v| tuple[k] == v } }
+            find_all { |tuple| criteria.all? { |k, v| tuple[k].eql?(v) } }
           else
             find_all { |tuple| yield(tuple) }
           end
         end
 
         def project(*names)
-          map { |tuple| tuple.reject { |key,_| names.include?(key) } }
+          map { |tuple| tuple.reject { |key| !names.include?(key) } }
         end
 
         def order(*names)
@@ -47,9 +61,7 @@ module ROM
           data.delete(tuple)
           self
         end
-
       end
-
     end
   end
 end

data/lib/rom/adapter/memory/storage.rb

@@ -1,7 +1,6 @@
 module ROM
   class Adapter
     class Memory < Adapter
-
       class Storage
         attr_reader :data
 
@@ -21,9 +20,7 @@ module ROM
         def key?(name)
           data.key?(name)
         end
-
       end
-
     end
   end
 end

data/lib/rom/command_registry.rb

@@ -1,50 +1,21 @@
-module ROM
-
-  class Result
-    attr_reader :value, :error
-
-    def to_ary
-      raise NotImplementedError
-    end
-    alias_method :to_a, :to_ary
-
-    class Success < Result
-      def initialize(value)
-        @value = value
-      end
-
-      def >(f)
-        f.call(value)
-      end
-
-      def to_ary
-        value
-      end
-      alias_method :to_a, :to_ary
-    end
-
-    class Failure < Result
-      def initialize(error)
-        @error = error
-      end
-
-      def >(f)
-        self
-      end
-
-      def to_ary
-        error
-      end
-    end
-  end
+require 'rom/commands/result'
 
+module ROM
+  # Command registry exposes "try" interface for executing commands
+  #
+  # @public
   class CommandRegistry < Registry
-
     class Evaluator
       include Concord.new(:registry)
 
       private
 
+      # Call a command when method is matching command name
+      #
+      # TODO: this will be replaced by explicit definition of methods for all
+      #       registered commands
+      #
+      # @api public
       def method_missing(name, *args, &block)
         command = registry[name]
 
@@ -58,11 +29,21 @@ module ROM
       end
     end
 
+    # Try to execute a command in a block
+    #
+    # @example
+    #
+    #   rom.command(:users).try { create(name: 'Jane') }
+    #   rom.command(:users).try { update(:by_id, 1).set(name: 'Jane Doe') }
+    #   rom.command(:users).try { delete(:by_id, 1) }
+    #
+    # @return [Commands::Result]
+    #
+    # @api public
     def try(&f)
-      Result::Success.new(Evaluator.new(self).instance_exec(&f))
+      Commands::Result::Success.new(Evaluator.new(self).instance_exec(&f))
     rescue CommandError => e
-      Result::Failure.new(e)
+      Commands::Result::Failure.new(e)
     end
   end
-
 end

data/lib/rom/commands.rb

@@ -1,6 +1,5 @@
 module ROM
   module Commands
-
     class AbstractCommand
       VALID_RESULTS = [:one, :many].freeze
 
@@ -13,7 +12,7 @@ module ROM
 
         @result = options[:result] || :many
 
-        if !VALID_RESULTS.include?(result)
+        unless VALID_RESULTS.include?(result)
           raise InvalidOptionError.new(:result, VALID_RESULTS)
         end
       end
@@ -34,7 +33,8 @@ module ROM
       # 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.
+      # Specialized commands like Delete may set the target to a different
+      # relation.
       #
       # @return [Relation]
       #
@@ -43,7 +43,8 @@ module ROM
         relation
       end
 
-      # Assert that tuple count in the target relation corresponds to :result setting
+      # Assert that tuple count in the target relation corresponds to :result
+      # setting
       #
       # @raises TupleCountMismatchError
       #
@@ -53,9 +54,7 @@ module ROM
           raise TupleCountMismatchError, "#{inspect} expects one tuple"
         end
       end
-
     end
-
   end
 end
 

data/lib/rom/commands/create.rb

@@ -2,7 +2,6 @@ require 'rom/commands/with_options'
 
 module ROM
   module Commands
-
     # Create command
     #
     # This command inserts a new tuple into a relation
@@ -18,11 +17,12 @@ module ROM
       # @return [Array] an array with inserted tuples
       #
       # @api private
-      def execute(tuple)
-        raise NotImplementedError, "#{self.class}##{__method__} must be implemented"
+      def execute(_tuple)
+        raise(
+          NotImplementedError,
+          "#{self.class}##{__method__} must be implemented"
+        )
       end
-
     end
-
   end
 end

data/lib/rom/commands/delete.rb

@@ -1,6 +1,5 @@
 module ROM
   module Commands
-
     # Delete command
     #
     # This command removes tuples from its target relation
@@ -28,17 +27,20 @@ module ROM
       #
       # @api private
       def execute
-        raise NotImplementedError, "#{self.class}##{__method__} must be implemented"
+        raise(
+          NotImplementedError,
+          "#{self.class}##{__method__} must be implemented"
+        )
       end
 
-      # Return new delete command with new target
+      # Create a new delete command scoped to specific relation and execute it
       #
       # @api private
       def new(*args, &block)
-        self.class.new(relation, options.merge(target: relation.public_send(*args, &block)))
+        new_options = options.merge(target: relation.public_send(*args, &block))
+        command = self.class.new(relation, new_options)
+        command.call
       end
-
     end
-
   end
 end

data/lib/rom/commands/result.rb

@@ -0,0 +1,82 @@
+module ROM
+  module Commands
+    # Abstract result class for success and error results
+    #
+    # @public
+    class Result
+      # Return command execution result
+      #
+      # @api public
+      attr_reader :value
+
+      # Return potential command execution result error
+      #
+      # @api public
+      attr_reader :error
+
+      # Coerce result to an array
+      #
+      # @abstract
+      #
+      # @api public
+      def to_ary
+        raise NotImplementedError
+      end
+      alias_method :to_a, :to_ary
+
+      # Success result has a value and no error
+      #
+      # @public
+      class Success < Result
+        # @api private
+        def initialize(value)
+          @value = value
+        end
+
+        # Call next command on continuation
+        #
+        # @api public
+        def >(other)
+          other.call(value)
+        end
+
+        # Return the value
+        #
+        # @return [Array]
+        #
+        # @api public
+        def to_ary
+          value
+        end
+      end
+
+      # Failure result has an error and no value
+      #
+      # @public
+      class Failure < Result
+        # @api private
+        def initialize(error)
+          @error = error
+        end
+
+        # Do not call next command on continuation
+        #
+        # @return [self]
+        #
+        # @api public
+        def >(_other)
+          self
+        end
+
+        # Return the error
+        #
+        # @return [Array<CommandError>]
+        #
+        # @api public
+        def to_ary
+          error
+        end
+      end
+    end
+  end
+end

data/lib/rom/commands/update.rb

@@ -2,7 +2,6 @@ require 'rom/commands/with_options'
 
 module ROM
   module Commands
-
     # Update command
     #
     # This command updates all tuples in its relation with new attributes
@@ -26,8 +25,11 @@ module ROM
       # @abstract
       #
       # @api private
-      def execute(params)
-        raise NotImplementedError, "#{self.class}##{__method__} must be implemented"
+      def execute(_params)
+        raise(
+          NotImplementedError,
+          "#{self.class}##{__method__} must be implemented"
+        )
       end
 
       # Return new update command with new relation
@@ -37,6 +39,5 @@ module ROM
         self.class.new(relation.public_send(*args, &block), options)
       end
     end
-
   end
 end

data/lib/rom/commands/with_options.rb

@@ -1,6 +1,5 @@
 module ROM
   module Commands
-
     # Common behavior for Create and Update commands
     #
     # TODO: find a better name for this module
@@ -11,11 +10,9 @@ module ROM
       def initialize(relation, options)
         super
 
-        @validator = options[:validator] || Proc.new {}
+        @validator = options[:validator] || proc {}
         @input = options[:input] || Hash
       end
-
     end
-
   end
 end