ruby_event_store 0.36.0 → 0.37.0

data/lib/ruby_event_store/specification.rb

@@ -27,9 +27,14 @@ module RubyEventStore
     #   #direction
     # @return [Specification]
     def from(start)
+      if start.equal?(:head)
+        warn <<~EOW
+          `:head` has been deprecated. Use event_id or skip from instead.
+        EOW
+      end
       case start
       when Symbol
-        raise InvalidPageStart unless [:head].include?(start)
+        raise InvalidPageStart unless start.equal?(:head)
       else
         raise InvalidPageStart if start.nil? || start.empty?
         raise EventNotFound.new(start) unless reader.has_event?(start)
@@ -37,6 +42,17 @@ module RubyEventStore
       Specification.new(reader, result.dup { |r| r.start = start })
     end
 
+    # Limits the query to events before or after another event.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @param start [String] id of event to start reading from.
+    # @return [Specification]
+    def to(stop)
+      raise InvalidPageStop if stop.nil? || stop.empty?
+      raise EventNotFound.new(stop) unless reader.has_event?(stop)
+      Specification.new(reader, result.dup { |r| r.stop = stop })
+    end
+
     # Sets the order of reading events to ascending (forward from the start).
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
@@ -91,6 +107,27 @@ module RubyEventStore
       end
     end
 
+    # Executes the query based on the specification built up to this point
+    # and maps the result using provided block.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @return [Array] of mapped result
+    def map(&block)
+      raise ArgumentError.new("Block must be given") unless block_given?
+      each.map(&block)
+    end
+
+    # Reduces the results of the query based on the specification
+    # built up to this point result using provided block.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @accumulator starting state for reduce operation
+    # @return reduce result as defined by block given
+    def reduce(accumulator = nil, &block)
+      raise ArgumentError.new("Block must be given") unless block_given?
+      each.reduce(accumulator, &block)
+    end
+
     # Calculates the size of result set based on the specification build up to this point.
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
@@ -160,14 +197,15 @@ module RubyEventStore
       reader.one(read_last.result)
     end
 
-    # Limits the query to certain event types.
+    # Limits the query to certain event type(s).
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
-    # @types [Array(Class)] types of event to look for.
+    # @types [Class, Array(Class)] types of event to look for.
     # @return [Specification]
-    def of_type(types)
-      Specification.new(reader, result.dup{ |r| r.with_types = types })
+    def of_type(*types)
+      Specification.new(reader, result.dup{ |r| r.with_types = types.flatten })
     end
+    alias_method :of_types, :of_type
 
     # Limits the query to certain events by given even ids.
     # {http://railseventstore.org/docs/read/ Find out more}.

data/lib/ruby_event_store/specification_result.rb

@@ -2,14 +2,15 @@ module RubyEventStore
   class SpecificationResult
     def initialize(direction: :forward,
                    start: :head,
+                   stop: nil,
                    count: nil,
                    stream: Stream.new(GLOBAL_STREAM),
                    read_as: :all,
                    batch_size: Specification::DEFAULT_BATCH_SIZE,
                    with_ids: nil,
                    with_types: nil)
-      @attributes = Struct.new(:direction, :start, :count, :stream, :read_as, :batch_size, :with_ids, :with_types)
-        .new(direction, start, count, stream, read_as, batch_size, with_ids, with_types)
+      @attributes = Struct.new(:direction, :start, :stop, :count, :stream, :read_as, :batch_size, :with_ids, :with_types)
+        .new(direction, start, stop, count, stream, read_as, batch_size, with_ids, with_types)
       freeze
     end
 
@@ -53,6 +54,14 @@ module RubyEventStore
       attributes.start
     end
 
+    # Stop position. Event id of stopping event
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @return [String|Symbol]
+    def stop
+      attributes.stop
+    end
+
     # Read direction. True is reading forward
     # {http://railseventstore.org/docs/read/ Find out more}.
     #
@@ -175,6 +184,7 @@ module RubyEventStore
     # * class
     # * direction
     # * start
+    # * stop
     # * count
     # * stream
     # * read_as
@@ -188,6 +198,7 @@ module RubyEventStore
         self.class,
         get_direction,
         start,
+        stop,
         limit,
         stream,
         attributes.read_as,
@@ -197,43 +208,6 @@ module RubyEventStore
       ].hash ^ BIG_VALUE
     end
 
-    # @deprecated Use {#limit} instead. {https://github.com/RailsEventStore/rails_event_store/releases/tag/v0.32.0 More info}
-    def count
-      warn <<~EOW
-        RubyEventStore::SpecificationResult#count has been deprecated.
-        Use RubyEventStore::SpecificationResult#limit instead.
-      EOW
-      limit
-    end
-
-    # @deprecated Use {#forward?} or {#backward?} instead. {https://github.com/RailsEventStore/rails_event_store/releases/tag/v0.32.0 More info}
-    def direction
-      warn <<~EOW
-        RubyEventStore::SpecificationResult#direction has been deprecated.
-        Use RubyEventStore::SpecificationResult#forward? or
-        RubyEventStore::SpecificationResult#backward? instead.
-      EOW
-      get_direction
-    end
-
-    # @deprecated Use {#stream.name} instead. {https://github.com/RailsEventStore/rails_event_store/releases/tag/v0.32.0 More info}
-    def stream_name
-      warn <<~EOW
-        RubyEventStore::SpecificationResult#stream_name has been deprecated.
-        Use RubyEventStore::SpecificationResult#stream.name instead.
-      EOW
-      stream.name
-    end
-
-    # @deprecated Use {#stream.global?} instead. {https://github.com/RailsEventStore/rails_event_store/releases/tag/v0.32.0 More info}
-    def global_stream?
-      warn <<~EOW
-        RubyEventStore::SpecificationResult#global_stream? has been deprecated.
-        Use RubyEventStore::SpecificationResult#stream.global? instead.
-      EOW
-      stream.global?
-    end
-
     private
     attr_reader :attributes
 

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = "0.36.0"
+  VERSION = "0.37.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -27,8 +27,7 @@ dependencies:
 description: Implementation of Event Store in Ruby
 email:
 - dev@arkency.com
-executables:
-- res-deprecated-read-api-migrator
+executables: []
 extensions: []
 extra_rdoc_files: []
 files:
@@ -36,15 +35,12 @@ files:
 - Gemfile
 - Makefile
 - README.md
-- exe/res-deprecated-read-api-migrator
 - lib/ruby_event_store.rb
 - lib/ruby_event_store/batch_enumerator.rb
 - lib/ruby_event_store/client.rb
 - lib/ruby_event_store/composed_dispatcher.rb
 - lib/ruby_event_store/constants.rb
 - lib/ruby_event_store/correlated_commands.rb
-- lib/ruby_event_store/deprecated_read_api_rewriter.rb
-- lib/ruby_event_store/deprecated_read_api_runner.rb
 - lib/ruby_event_store/errors.rb
 - lib/ruby_event_store/event.rb
 - lib/ruby_event_store/expected_version.rb
@@ -54,6 +50,7 @@ files:
 - lib/ruby_event_store/instrumented_repository.rb
 - lib/ruby_event_store/link_by_metadata.rb
 - lib/ruby_event_store/mappers/default.rb
+- lib/ruby_event_store/mappers/instrumented_mapper.rb
 - lib/ruby_event_store/mappers/null_mapper.rb
 - lib/ruby_event_store/mappers/protobuf.rb
 - lib/ruby_event_store/metadata.rb
@@ -64,6 +61,7 @@ files:
 - lib/ruby_event_store/serialized_record.rb
 - lib/ruby_event_store/spec/broker_lint.rb
 - lib/ruby_event_store/spec/dispatcher_lint.rb
+- lib/ruby_event_store/spec/event_lint.rb
 - lib/ruby_event_store/spec/event_repository_lint.rb
 - lib/ruby_event_store/spec/scheduler_lint.rb
 - lib/ruby_event_store/spec/subscriptions_lint.rb
@@ -97,7 +95,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Event Store in Ruby

data/exe/res-deprecated-read-api-migrator

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-begin
-  require 'ruby_event_store/deprecated_read_api_rewriter'
-  require 'ruby_event_store/deprecated_read_api_runner'
-rescue LoadError
-  warn <<-EOS
-
-You need following gems in Gemfile in order to use this script:
-
-  gem 'parser'
-  gem 'unparser'
-  gem 'astrolabe'
-
-EOS
-  exit(2)
-end
-
-RubyEventStore::DeprecatedReadAPIRunner.go(ARGV)

data/lib/ruby_event_store/deprecated_read_api_rewriter.rb

@@ -1,78 +0,0 @@
-require 'parser/current'
-require 'unparser'
-require 'ruby_event_store'
-
-
-module RubyEventStore
-  class DeprecatedReadAPIRewriter < ::Parser::TreeRewriter
-    DEPRECATED_READER_METHODS = [
-      :read_all_streams_backward,
-      :read_events_backward,
-      :read_stream_events_backward,
-      :read_all_streams_forward,
-      :read_events_forward,
-      :read_stream_events_forward
-    ]
-    private_constant :DEPRECATED_READER_METHODS
-
-    def on_send(node)
-      node.each_descendant(:send) { |desc_node| on_send(desc_node) }
-
-      _, method_name, *args = node.children
-      return unless DEPRECATED_READER_METHODS.include?(method_name)
-      replace_range = node.location.selector
-      replace_range = replace_range.join(node.location.end) if node.location.end
-
-      case method_name
-      when :read_all_streams_backward, :read_events_backward
-        rewrite_api("read.backward", replace_range, **parse_args(args))
-      when :read_stream_events_backward
-        rewrite_api("read.backward", replace_range, count: nil, **parse_args(args))
-      when :read_all_streams_forward, :read_events_forward
-        rewrite_api("read", replace_range, **parse_args(args))
-      when :read_stream_events_forward
-        rewrite_api("read", replace_range, count: nil, **parse_args(args))
-      end
-    end
-
-    def rewrite_api(query, range, start: nil, count: PAGE_SIZE, stream: nil)
-      query << ".stream(#{stream})" if stream
-      query << ".from(#{start})" if start
-      query << ".limit(#{count})" if count
-
-      replace(range, "#{query}.to_a")
-    end
-
-    def parse_args(args)
-      return {} if args.empty?
-
-      case args.size
-      when 1
-        case args[0].type
-        when :hash
-          stream_name, kwargs = nil, args[0]
-        else
-          stream_name, kwargs = parse_value(args[0]), AST::Node.new(:hash)
-        end
-      else
-        stream_name, kwargs = parse_value(args[0]), args[1]
-      end
-
-      kwargs
-        .children
-        .reduce({stream: stream_name}) do |memo, pair|
-        keyword, value = pair.children
-        memo[parse_keyword(keyword)] = parse_value(value)
-        memo
-      end
-    end
-
-    def parse_value(node)
-      Unparser.unparse(node)
-    end
-
-    def parse_keyword(node)
-      node.children[0].to_sym
-    end
-  end
-end

data/lib/ruby_event_store/deprecated_read_api_runner.rb

@@ -1,64 +0,0 @@
-require 'parser/runner'
-require 'tempfile'
-require 'astrolabe/builder'
-
-
-module RubyEventStore
-  class DeprecatedReadAPIRunner < Parser::Runner
-    attr_reader :rewriter, :parser_class, :modify
-
-    def initialize
-      super
-      @rewriter = DeprecatedReadAPIRewriter.new
-    end
-
-    def runner_name
-      "res-deprecated-read-api-migrator"
-    end
-
-    def setup_option_parsing(opts)
-      super(opts)
-
-      opts.on '-m', '--modify' do
-        @modify = true
-      end
-    end
-
-    def process(buffer)
-      parser = parser_class.new(Astrolabe::Builder.new)
-      new_source = rewriter.rewrite(buffer, parser.parse(buffer))
-      new_buffer = Parser::Source::Buffer.new(buffer.name + '|after res-deprecated-read-api-migrator')
-      new_buffer.source = new_source
-
-      if !modify
-        old = Tempfile.new('old')
-        old.write(buffer.source + "\n")
-        old.flush
-
-        new = Tempfile.new('new')
-        new.write(new_source + "\n")
-        new.flush
-
-        IO.popen("diff -u #{old.path} #{new.path}") do |io|
-          $stderr.write(
-            io.read
-              .sub(/^---.*/, "--- #{buffer.name}")
-              .sub(/^\+\+\+.*/, "+++ #{new_buffer.name}")
-          )
-        end
-        exit(1)
-      end
-
-      if File.exist?(buffer.name)
-        File.open(buffer.name, 'w') do |file|
-          file.write(new_source)
-        end
-      else
-        if input_size > 1
-          puts "Rewritten content of #{buffer.name}:"
-        end
-        puts new_source
-      end
-    end
-  end
-end