evt-event_source 0.19.0.0 → 0.21.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d2023c4a4fded3ae97318f828482cfa3a1984560
-  data.tar.gz: '07874a76c0b95e1bc4f7a7da7a3404e5738a7556'
+  metadata.gz: c07ab23b9cdab1727b295c3a4c62852eaca8bd0e
+  data.tar.gz: b4a4eb08ca7951c7d2d9a5503ba675a7673e7525
 SHA512:
-  metadata.gz: d6c814ec4314887fb5a92b42d5588aa49cf22fe6434b5e9e89318bee444fb948eac1a1285da114d63f9a3d05840d418e4bc7fe6ff7b55fcdbc578f249ce1a393
-  data.tar.gz: 6e84704a70a50dc4a4d854e9d2266d4b8394b4b4f0e94867a9c603293088520f9e61e7a665bf6bf0cab3debc0d7a1126c1de58b44fb6c1e6a7687ab5852b3b44
+  metadata.gz: d991692faa442fc677b0bdf76caaa25aa4dfae4429ac3f3bcf731b5ec1e012b26e7adfbf556d14e46251eb1f1b63f5c2c2b5c5389232f3961966d85547fcc104
+  data.tar.gz: 2a9e1151cde3dc5b55bede1a631ea42c4c98a0a3ab9fb705b17699a18d6ceaa30045b56d9909103342f9f641a211fdbfd06c79bf3d2c3af418884c624de864f2

data/lib/event_source.rb

@@ -6,14 +6,12 @@ require 'identifier/uuid'
 require 'schema'
 require 'initializer'; Initializer.activate
 require 'transform'
-require 'cycle'
 require 'virtual'; Virtual.activate
 require 'async_invocation'
 
 require 'event_source/expected_version'
 require 'event_source/no_stream'
 require 'event_source/stream_name'
-require 'event_source/stream'
 require 'event_source/event_data'
 require 'event_source/event_data/hash'
 require 'event_source/event_data/write'
@@ -21,6 +19,7 @@ require 'event_source/event_data/read'
 
 require 'event_source/log'
 
+require 'event_source/get'
 require 'event_source/iterator'
 require 'event_source/read'
 require 'event_source/write'

data/lib/event_source/controls.rb

@@ -7,7 +7,6 @@ require 'event_source/controls/time'
 require 'event_source/controls/id'
 require 'event_source/controls/category'
 require 'event_source/controls/stream_name'
-require 'event_source/controls/stream'
 require 'event_source/controls/read'
 require 'event_source/controls/event_data'
 require 'event_source/controls/event_data/hash'
@@ -15,3 +14,4 @@ require 'event_source/controls/event_data/metadata'
 require 'event_source/controls/event_data/write'
 require 'event_source/controls/event_data/read'
 require 'event_source/controls/write'
+require 'event_source/controls/get'

data/lib/event_source/controls/get.rb

@@ -0,0 +1,25 @@
+module EventSource
+  module Controls
+    module Get
+      def self.example(batch_size: nil, count: nil, global_position_offset: nil)
+        batch_size ||= 1
+        count ||= 1
+        global_position_offset ||= -> (x) { x ** 2 }
+
+        get = EventSource::Get::Substitute.build(batch_size: batch_size)
+
+        elements = (0..(count - 1)).to_a
+
+        elements.each do |e|
+          event_data = EventData::Read.example
+          event_data.position = e
+          event_data.global_position = global_position_offset.(event_data.position)
+
+          get.items << event_data
+        end
+
+        get
+      end
+    end
+  end
+end

data/lib/event_source/controls/read.rb

@@ -1,9 +1,9 @@
 module EventSource
   module Controls
     module Read
-      def self.example(stream: nil)
-        stream ||= Stream.example
-        Example.new(stream)
+      def self.example(stream_name: nil)
+        stream_name ||= StreamName.example
+        Example.new(stream_name)
       end
 
       class Example

data/lib/event_source/event_data/read.rb

@@ -4,8 +4,8 @@ module EventSource
       include EventData
 
       attribute :stream_name, String
-      attribute :position, Fixnum
-      attribute :global_position, Fixnum
+      attribute :position, Integer
+      attribute :global_position, Integer
       attribute :time, Time
 
       def category

data/lib/event_source/get.rb

@@ -0,0 +1,61 @@
+module EventSource
+  module Get
+    def self.included(cls)
+      cls.class_exec do
+        include Log::Dependency
+
+        abstract :call
+      end
+    end
+
+    class Substitute
+      include Get
+
+      initializer na(:batch_size)
+
+      def batch_size
+        @batch_size ||= 1
+      end
+
+      def items
+        @items ||= []
+      end
+
+      def self.build(batch_size: nil, session: nil)
+        new(batch_size)
+      end
+
+      def call(stream_name=nil, position: nil)
+        position ||= 0
+
+        logger.trace(tag: :control) { "Getting (Position: #{position}, Batch Size: #{batch_size}, Stream Name: #{stream_name.inspect})" }
+
+        logger.debug(tags: [:control, :data]) { "Items: \n#{items.pretty_inspect}" }
+        logger.debug(tag: :control) { "Position: #{position.inspect}" }
+        logger.debug(tag: :control) { "Batch Size: #{batch_size.inspect}" }
+
+        unless EventSource::StreamName.category?(stream_name)
+          index = (items.index { |i| i.position >= position })
+        else
+          index = (items.index { |i| i.global_position >= position })
+        end
+
+        logger.debug(tag: :control) { "Index: #{index.inspect}" }
+
+        if index.nil?
+          items = []
+        else
+          range = index..(index + batch_size - 1)
+          logger.debug(tag: :control) { "Range: #{range.pretty_inspect}" }
+
+          items = self.items[range]
+        end
+
+        logger.info(tags: [:control, :data]) { "Got: \n#{items.pretty_inspect}" }
+        logger.info(tag: :control) { "Finished getting (Position: #{position}, Stream Name: #{stream_name.inspect})" }
+
+        items
+      end
+    end
+  end
+end

data/lib/event_source/iterator.rb

@@ -2,101 +2,123 @@ module EventSource
   class Iterator
     include Log::Dependency
 
-    dependency :cycle, Cycle
-
-    attr_accessor :position
+    attr_accessor :starting_position
     attr_accessor :batch
 
-    def batch_position
-      @batch_position ||= 0
-    end
-    attr_writer :batch_position
-
-    def stream_offset
-      @stream_offset ||= (position || 0)
+    def batch_index
+      @batch_index ||= 0
     end
-    attr_writer :stream_offset
+    attr_writer :batch_index
 
     initializer :get, :stream_name
 
-    def self.build(get, stream_name, position: nil, cycle: nil)
+    def self.build(get, stream_name, position: nil)
       new(get, stream_name).tap do |instance|
-        instance.position = position
-        Cycle.configure instance, cycle: cycle
+        instance.starting_position = position
+        Log.get(self).debug { "Built Iterator (Stream Name: #{stream_name}, Starting Position: #{position.inspect})" }
       end
     end
 
-    def self.configure(receiver, get, stream_name, attr_name: nil, position: nil, cycle: nil)
+    def self.configure(receiver, get, stream_name, attr_name: nil, position: nil)
       attr_name ||= :iterator
-      instance = build(get, stream_name, position: position, cycle: cycle)
+      instance = build(get, stream_name, position: position)
       receiver.public_send "#{attr_name}=", instance
     end
 
     def next
-      logger.trace { "Getting next event data (Batch Length: #{batch.nil? ? '<none>' : batch.length}, Batch Position: #{batch_position}, Stream Offset: #{stream_offset})" }
+      logger.trace { "Getting next event data (Batch Length: #{(batch &.length).inspect}, Batch Index: #{batch_index})" }
 
-      resupply(batch)
+      resupply if batch_depleted?
 
-      event_data = batch[batch_position]
+      event_data = batch[batch_index]
 
-      logger.debug { "Finished getting next event data (Batch Length: #{batch.nil? ? '<none>' : batch.length}, Batch Position: #{batch_position}, Stream Offset: #{stream_offset})" }
-      logger.debug(tags: [:data, :event_data]) { "Event Data: #{event_data.pretty_inspect}" }
+      logger.debug(tags: [:data, :event_data]) { "Next event data: #{event_data.pretty_inspect}" }
+      logger.debug { "Done getting next event data (Batch Length: #{(batch &.length).inspect}, Batch Index: #{batch_index})" }
 
-      advance_positions
+      advance_batch_index
 
       event_data
     end
 
-    def resupply(batch)
-      logger.trace { "Resupplying batch" }
+    def advance_batch_index
+      logger.trace { "Advancing batch index (Batch Index: #{batch_index})" }
+      self.batch_index += 1
+      logger.debug { "Advanced batch index (Batch Index: #{batch_index})" }
+    end
 
+    def batch_depleted?
       if batch.nil?
-        batch_log_text = "Batch: #{batch.inspect}"
-      else
-        batch_log_text = "Batch Length: #{batch.length}"
+        logger.debug { "Batch is depleted (Batch is nil)" }
+        return true
       end
 
-      if batch.nil? || batch_position == batch.length
-        logger.debug { "Current batch is depleted (#{batch_log_text}, Batch Position: #{batch_position})" }
+      if batch.empty?
+        logger.debug { "Batch is depleted (Batch is empty)" }
+        return true
+      end
 
-        batch = get_batch
-        reset(batch)
-      else
-        logger.debug { "Current batch not depleted (#{batch_log_text}, Batch Position: #{batch_position})" }
+      if batch_index == batch.length
+        logger.debug { "Batch is depleted (Batch Index: #{batch_index}, Batch Length: #{batch.length})" }
+        return true
       end
 
-      logger.debug { "Finished resupplying batch" }
+      false
     end
 
-    def reset(batch)
-      logger.trace { "Resetting batch" }
+    def resupply
+      logger.trace { "Resupplying batch (Current Batch Length: #{(batch &.length).inspect})" }
 
-      self.batch = batch
-      self.batch_position = 0
+      batch = get_batch
+      reset(batch)
 
-      logger.debug { "Reset batch" }
-      logger.debug(tags: [:data, :batch]) { "Batch: #{batch.pretty_inspect}" }
-      logger.debug(tags: [:data, :batch]) { "Batch Position: #{batch_position.inspect}" }
+      logger.debug { "Batch resupplied (Next Batch Length: #{(batch &.length).inspect})" }
     end
 
     def get_batch
-      logger.trace "Getting batch"
+      position = next_batch_starting_position
 
-      batch = nil
-      cycle.() do
-        batch = get.(stream_name, position: stream_offset)
+      logger.trace "Getting batch (Position: #{position.inspect})"
+
+      batch = []
+      if position.nil? || position >= 0
+        batch = get.(stream_name, position: position)
       end
 
-      logger.debug { "Finished getting batch (Count: #{batch.length})" }
+      logger.debug { "Finished getting batch (Count: #{batch.length}, Position: #{position.inspect})" }
 
       batch
     end
 
-    def advance_positions
-      logger.trace { "Advancing positions (Batch Position: #{batch_position}, Stream Offset: #{stream_offset})" }
-      self.batch_position += 1
-      self.stream_offset += 1
-      logger.debug { "Advanced positions (Batch Position: #{batch_position}, Stream Offset: #{stream_offset})" }
+    def next_batch_starting_position
+      if batch.nil?
+        logger.debug { "Batch is nil (Next batch starting position: #{starting_position.inspect})" }
+        return starting_position
+      end
+
+      previous_position = last_position
+      next_position = previous_position + 1
+      logger.debug { "End of batch (Next starting position: #{next_position}, Previous Position: #{previous_position})" }
+
+      next_position
+    end
+
+    def last_position
+      unless EventSource::StreamName.category?(stream_name)
+        batch.last.position
+      else
+        batch.last.global_position
+      end
+    end
+
+    def reset(batch)
+      logger.trace { "Resetting batch" }
+
+      self.batch = batch
+      self.batch_index = 0
+
+      logger.debug(tags: [:data, :batch]) { "Batch set to: \n#{batch.pretty_inspect}" }
+      logger.debug(tags: [:data, :batch]) { "Batch position set to: #{batch_index.inspect}" }
+      logger.debug { "Done resetting batch" }
     end
   end
 end

data/lib/event_source/read.rb

@@ -9,10 +9,10 @@ module EventSource
         cls.extend Configure
 
         dependency :iterator, Iterator
+        dependency :get, Get
 
         initializer :stream_name
 
-        attr_accessor :get
         abstract :configure
       end
     end
@@ -20,27 +20,25 @@ module EventSource
     class Error < RuntimeError; end
 
     module Build
-      def build(stream_name, position: nil, batch_size: nil, precedence: nil, cycle_maximum_milliseconds: nil, cycle_timeout_milliseconds: nil, cycle: nil, session: nil)
-        cycle ||= Cycle.build(maximum_milliseconds: cycle_maximum_milliseconds, timeout_milliseconds: cycle_timeout_milliseconds)
-
+      def build(stream_name, position: nil, batch_size: nil, session: nil)
         new(stream_name).tap do |instance|
-          instance.configure(batch_size: batch_size, precedence: precedence, session: session)
-          Iterator.configure instance, instance.get, stream_name, position: position, cycle: cycle
+          instance.configure(batch_size: batch_size, session: session)
+          Iterator.configure instance, instance.get, stream_name, position: position
         end
       end
     end
 
     module Call
-      def call(stream_name, position: nil, batch_size: nil, precedence: nil, cycle_maximum_milliseconds: nil, cycle_timeout_milliseconds: nil, cycle: nil, session: nil, &action)
-        instance = build(stream_name, position: position, batch_size: batch_size, precedence: precedence, cycle_maximum_milliseconds: cycle_maximum_milliseconds, cycle_timeout_milliseconds: cycle_timeout_milliseconds, cycle: cycle, session: session)
+      def call(stream_name, position: nil, batch_size: nil, session: nil, &action)
+        instance = build(stream_name, position: position, batch_size: batch_size, session: session)
         instance.(&action)
       end
     end
 
     module Configure
-      def configure(receiver, stream_name, attr_name: nil, position: nil, batch_size: nil, precedence: nil, cycle_maximum_milliseconds: nil, cycle_timeout_milliseconds: nil, cycle: nil, session: nil)
+      def configure(receiver, stream_name, attr_name: nil, position: nil, batch_size: nil, session: nil)
         attr_name ||= :read
-        instance = build(stream_name, position: position, batch_size: batch_size, precedence: precedence, cycle_maximum_milliseconds: cycle_maximum_milliseconds, cycle_timeout_milliseconds: cycle_timeout_milliseconds, cycle: cycle, session: session)
+        instance = build(stream_name, position: position, batch_size: batch_size, session: session)
         receiver.public_send "#{attr_name}=", instance
       end
     end

data/lib/event_source/stream_name.rb

@@ -17,6 +17,10 @@ module EventSource
       stream_name.split('-')[0]
     end
 
+    def self.category?(stream_name)
+      !stream_name.include?('-')
+    end
+
     def self.get_type(name)
       type = name.split(':').last.split('-').first
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-event_source
 version: !ruby/object:Gem::Version
-  version: 0.19.0.0
+  version: 0.21.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-25 00:00:00.000000000 Z
+date: 2017-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: evt-casing
@@ -94,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: evt-cycle
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: evt-async_invocation
   requirement: !ruby/object:Gem::Requirement
@@ -150,10 +136,10 @@ files:
 - lib/event_source/controls/event_data/metadata.rb
 - lib/event_source/controls/event_data/read.rb
 - lib/event_source/controls/event_data/write.rb
+- lib/event_source/controls/get.rb
 - lib/event_source/controls/id.rb
 - lib/event_source/controls/random_value.rb
 - lib/event_source/controls/read.rb
-- lib/event_source/controls/stream.rb
 - lib/event_source/controls/stream_name.rb
 - lib/event_source/controls/time.rb
 - lib/event_source/controls/write.rb
@@ -162,11 +148,11 @@ files:
 - lib/event_source/event_data/read.rb
 - lib/event_source/event_data/write.rb
 - lib/event_source/expected_version.rb
+- lib/event_source/get.rb
 - lib/event_source/iterator.rb
 - lib/event_source/log.rb
 - lib/event_source/no_stream.rb
 - lib/event_source/read.rb
-- lib/event_source/stream.rb
 - lib/event_source/stream_name.rb
 - lib/event_source/write.rb
 - lib/loader.rb

data/lib/event_source/controls/stream.rb

@@ -1,17 +0,0 @@
-module EventSource
-  module Controls
-    module Stream
-      def self.example(stream_name: nil, category: nil, id: nil, randomize_category: nil)
-        stream_name ||= StreamName.example category: category, id: id, randomize_category: randomize_category
-        EventSource::Stream.new stream_name
-      end
-
-      module Category
-        def self.example(category: nil, randomize_category: nil)
-          category ||= Controls::Category.example category: category, randomize_category: randomize_category
-          EventSource::Stream.new category
-        end
-      end
-    end
-  end
-end

data/lib/event_source/stream.rb

@@ -1,30 +0,0 @@
-module EventSource
-  class Stream
-    initializer :name
-
-    def self.build(subject)
-      return subject if subject.is_a? self
-      new(subject)
-    end
-
-    def id
-      @id ||= StreamName.get_id(name)
-    end
-
-    def category
-      @category ||= StreamName.get_category(name)
-    end
-
-    def type
-      @type ||= StreamName.get_type(name)
-    end
-
-    def category?
-      @is_category ||= !name.include?('-')
-    end
-
-    def ==(stream)
-      name == stream.name
-    end
-  end
-end