ruby_event_store 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 212817e54f12a8231a77260d38f5c41980d0e0c4d465ac3fae5ef49fb5b5301d
-  data.tar.gz: c24731e1641aa7874d8417acda1550cd182df6d24c79f2f0906bdbb17b0e8e8f
+  metadata.gz: a2e4768baf6a615d130234f71b2eeeeea911baafcab466651e42e4f5873430a3
+  data.tar.gz: 587f48214166735f91685638143133723cb7c3e2e46a3ec657490ce7c13cda00
 SHA512:
-  metadata.gz: d13612719037ba3a5e703f9eb34280968957056a5bd4f53c169817cdeec59c1965c984aeb322843f826e7baa875cd25690f7073900718a0ae2c86fd747d0718e
-  data.tar.gz: eb230b36b3103386bbe315765a165842d1bc287400f6543f8c9b0625a42c7e85e9cbb8583b4fd8897f3429e26bdb021243aac6954802155d8417e37fd8f57063
+  metadata.gz: 2115d731ca0d1f6e6b9eb26d4a8cf8e8ea41c634bb521de9cfc2b181c3fec7f98d4b0a33667befeb16343247fdae1315cf543ac77ab4808bf6cb23740f91233f
+  data.tar.gz: 71473199da981d2832cc60fac2887a4222b4a6606f15f0bf7356414ea11bdb3abd80ca38baf3f07cb377c6afe4e69662db0c97d3bdf5fbe364253d2d713b9fcd

data/Gemfile

@@ -1,4 +1,11 @@
 source 'https://rubygems.org'
 gemspec
 
+eval_gemfile File.expand_path('../lib/Gemfile.shared', __dir__)
+
 gem 'protobuf_nested_struct'
+gem 'parser'
+gem 'unparser'
+gem 'astrolabe'
+gem 'google-protobuf', '~> 3.5.1.2'
+gem 'activesupport', '~> 5.0'

data/Makefile

@@ -14,57 +14,11 @@ IGNORE      = RubyEventStore::InMemoryRepository\#append_with_synchronize \
               RubyEventStore::SpecificationResult\#count \
               RubyEventStore::SpecificationResult\#direction \
               RubyEventStore::SpecificationResult\#stream_name \
-              RubyEventStore::SpecificationResult\#global_stream? \
-
-
+              RubyEventStore::SpecificationResult\#global_stream?
 SUBJECT     ?= RubyEventStore*
 
-install: ## Install gem dependencies
-	@echo "Installing gem dependencies"
-	@bundle install
-
-remove-lock:
-	@echo "Removing resolved dependency versions"
-	-rm Gemfile.lock
-
-reinstall: remove-lock install ## Removing resolved dependency versions
-
-test: ## Run unit tests
-	@echo "Running unit tests"
-	@bundle exec rspec
-
-mutate: test ## Run mutation tests
-	@echo "Running mutation tests"
-	@MUTATING=true bundle exec mutant --include lib \
-		$(addprefix --require ,$(REQUIRE)) \
-		$(addprefix --ignore-subject ,$(IGNORE)) \
-		--use rspec "$(SUBJECT)"
-
-mutate-fast: ## Run mutation tests with --fail-fast
-	@echo "Running mutation tests"
-	@MUTATING=true bundle exec mutant --include lib \
-		$(addprefix --require ,$(REQUIRE)) \
-		$(addprefix --ignore-subject ,$(IGNORE)) \
-		--fail-fast \
-		--use rspec "$(SUBJECT)"
-
-build:
-	@echo "Building gem package"
-	@gem build -V $(GEM_NAME).gemspec
-	@mkdir -p pkg/
-	@mv $(GEM_NAME)-$(GEM_VERSION).gem pkg/
-
-push:
-	@echo "Pushing package to RubyGems"
-	@gem push -k dev_arkency pkg/$(GEM_NAME)-$(GEM_VERSION).gem
-
-clean:
-	@echo "Removing previously built package"
-	-rm pkg/$(GEM_NAME)-$(GEM_VERSION).gem
-
-help:
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-.PHONY: help
-.DEFAULT_GOAL := help
-
+include ../lib/install.mk
+include ../lib/test.mk
+include ../lib/mutant.mk
+include ../lib/gem.mk
+include ../lib/help.mk

data/lib/ruby_event_store.rb

@@ -14,6 +14,7 @@ require 'ruby_event_store/event'
 require 'ruby_event_store/stream'
 require 'ruby_event_store/expected_version'
 require 'ruby_event_store/serialized_record'
+require 'ruby_event_store/transform_keys'
 require 'ruby_event_store/mappers/default'
 require 'ruby_event_store/mappers/protobuf'
 require 'ruby_event_store/mappers/null_mapper'

data/lib/ruby_event_store/batch_enumerator.rb

@@ -8,8 +8,7 @@ module RubyEventStore
 
     def each
       return to_enum unless block_given?
-      (0...total_limit).step(batch_size) do |batch_offset|
-        batch_offset = Integer(batch_offset)
+      0.step(total_limit - 1, batch_size) do |batch_offset|
         batch_limit  = [batch_size, total_limit - batch_offset].min
         result       = reader.call(batch_offset, batch_limit)
 

data/lib/ruby_event_store/in_memory_repository.rb

@@ -32,12 +32,7 @@ module RubyEventStore
     end
 
     def read(spec)
-      events = spec.stream.global? ? global : stream_of(spec.stream.name)
-      events = events.select{|e| spec.with_ids.any?{|x| x.eql?(e.event_id)}} if spec.with_ids?
-      events = events.select{|e| spec.with_types.any?{|x| x.eql?(e.event_type)}} if spec.with_types?
-      events = events.reverse if spec.backward?
-      events = events.drop(index_of(events, spec.start) + 1) unless spec.head?
-      events = events[0...spec.limit] if spec.limit?
+      events = read_scope(spec)
       if spec.batched?
         batch_reader = ->(offset, limit) { events.drop(offset).take(limit) }
         BatchEnumerator.new(spec.batch_size, events.size, batch_reader).each
@@ -50,6 +45,10 @@ module RubyEventStore
       end
     end
 
+    def count(spec)
+      read_scope(spec).count
+    end
+
     def update_messages(messages)
       messages.each do |new_msg|
         location = global.index{|m| new_msg.event_id.eql?(m.event_id)} or raise EventNotFound.new(new_msg.event_id)
@@ -68,6 +67,15 @@ module RubyEventStore
     end
 
     private
+    def read_scope(spec)
+      events = spec.stream.global? ? global : stream_of(spec.stream.name)
+      events = events.select{|e| spec.with_ids.any?{|x| x.eql?(e.event_id)}} if spec.with_ids?
+      events = events.select{|e| spec.with_types.any?{|x| x.eql?(e.event_type)}} if spec.with_types?
+      events = events.reverse if spec.backward?
+      events = events.drop(index_of(events, spec.start) + 1) unless spec.head?
+      events = events[0...spec.limit] if spec.limit?
+      events
+    end
 
     def read_event(event_id)
       global.find {|e| event_id.eql?(e.event_id)} or raise EventNotFound.new(event_id)

data/lib/ruby_event_store/instrumented_repository.rb

@@ -37,6 +37,12 @@ module RubyEventStore
       end
     end
 
+    def count(specification)
+      instrumentation.instrument("count.repository.rails_event_store", specification: specification) do
+        repository.count(specification)
+      end
+    end
+
     def update_messages(messages)
       instrumentation.instrument("update_messages.repository.rails_event_store", messages: messages) do
         repository.update_messages(messages)

data/lib/ruby_event_store/mappers/default.rb

@@ -21,20 +21,13 @@ module RubyEventStore
         event_type = events_class_remapping.fetch(record.event_type) { record.event_type }
         Object.const_get(event_type).new(
           event_id: record.event_id,
-          metadata: symbolize(serializer.load(record.metadata)),
+          metadata: TransformKeys.symbolize(serializer.load(record.metadata)),
           data:     serializer.load(record.data)
         )
       end
 
       private
-
       attr_reader :serializer, :events_class_remapping
-
-      def symbolize(hash)
-        hash.each_with_object({}) do |(k, v), memo|
-          memo[k.to_sym] = v
-        end
-      end
     end
   end
 end

data/lib/ruby_event_store/mappers/protobuf.rb

@@ -4,31 +4,11 @@ module RubyEventStore
       data.class.descriptor.name
     end
 
-    def encode_with(coder)
-      coder['event_id']   = event_id
-      coder['metadata']   = ProtobufNestedStruct::HashMapStringValue.dump(metadata.each_with_object({}){|(k,v),h| h[k.to_s] =v })
-      coder['data.proto'] = data.class.encode(data)
-      coder['data.type']  = type
-    end
-
-    def init_with(coder)
-      @event_id = coder['event_id']
-      @metadata = Metadata.new
-      ProtobufNestedStruct::HashMapStringValue.load(coder['metadata']).each_with_object(metadata){|(k,v),meta| meta[k.to_sym] = v }
-      @data = pool.lookup(coder['data.type']).msgclass.decode(coder['data.proto'])
-    end
-
     def ==(other_event)
       other_event.instance_of?(self.class) &&
         other_event.event_id.eql?(event_id) &&
         other_event.data == data # https://github.com/google/protobuf/issues/4455
     end
-
-    private
-
-    def pool
-      Google::Protobuf::DescriptorPool.generated_pool
-    end
   end
 
   module Mappers
@@ -41,7 +21,7 @@ module RubyEventStore
       def event_to_serialized_record(domain_event)
         SerializedRecord.new(
           event_id:   domain_event.event_id,
-          metadata:   ProtobufNestedStruct::HashMapStringValue.dump(domain_event.metadata.each_with_object({}) {|(k, v), h| h[k.to_s] = v}),
+          metadata:   ProtobufNestedStruct::HashMapStringValue.dump(TransformKeys.stringify(domain_event.metadata)),
           data:       encode_data(domain_event.data),
           event_type: domain_event.type
         )
@@ -61,9 +41,7 @@ module RubyEventStore
       attr_reader :event_id_getter, :events_class_remapping
 
       def load_metadata(protobuf_metadata)
-        ProtobufNestedStruct::HashMapStringValue.load(protobuf_metadata).each_with_object({}) do |(k, v), meta|
-          meta[k.to_sym] = v
-        end
+        TransformKeys.symbolize(ProtobufNestedStruct::HashMapStringValue.load(protobuf_metadata))
       end
 
       def load_data(event_type, protobuf_data)
@@ -85,4 +63,4 @@ module RubyEventStore
       end
     end
   end
-end
+end

data/lib/ruby_event_store/metadata.rb

@@ -43,9 +43,9 @@ module RubyEventStore
     private
 
     def allowed_types
-      [String, Integer, Float, Date, Time, TrueClass, FalseClass, nil]
+      [String, Integer, Float, Date, Time, TrueClass, FalseClass, nil, Hash, Array]
     end
 
     private_constant :SAFE_HASH_METHODS
   end
-end
+end

data/lib/ruby_event_store/spec/event_repository_lint.rb

@@ -977,7 +977,6 @@ module RubyEventStore
 
     specify 'can store arbitrary binary data' do
       skip unless test_binary
-      migrate_to_binary
       binary = "\xB0"
       expect(binary.valid_encoding?).to eq(false)
       binary.force_encoding("binary")
@@ -1226,5 +1225,47 @@ module RubyEventStore
       expect(repository.read(specification.of_type([Type3]).result).to_a).to eq([])
       expect(repository.read(specification.of_type([Type1, Type2, Type3]).result).to_a).to eq([e1,e2,e3])
     end
+
+    specify do
+      stream = Stream.new('Stream A')
+      dummy  = Stream.new('Dummy')
+
+      expect(repository.count(specification.result)).to eq(0)
+      (1..3).each do
+        repository.append_to_stream([SRecord.new(event_type: Type1.to_s)], stream, version_any)
+      end
+      expect(repository.count(specification.result)).to eq(3)
+      event_id = SecureRandom.uuid
+      repository.append_to_stream([SRecord.new(event_type: Type1.to_s, event_id: event_id)], dummy, version_any)
+      expect(repository.count(specification.result)).to eq(4)
+      expect(repository.count(specification.in_batches.result)).to eq(4)
+      expect(repository.count(specification.in_batches(2).result)).to eq(4)
+
+      expect(repository.count(specification.with_id([event_id]).result)).to eq(1)
+      not_existing_uuid = SecureRandom.uuid
+      expect(repository.count(specification.with_id([not_existing_uuid]).result)).to eq(0)
+
+      expect(repository.count(specification.stream(stream.name).result)).to eq(3)
+      expect(repository.count(specification.stream('Dummy').result)).to eq(1)
+      expect(repository.count(specification.stream('not-existing-stream').result)).to eq(0)
+
+      repository.append_to_stream([SRecord.new(event_type: Type1.to_s)], dummy, version_any)
+      expect(repository.count(specification.from(:head).result)).to eq(5)
+      expect(repository.count(specification.from(event_id).result)).to eq(1)
+      expect(repository.count(specification.stream("Dummy").from(:head).result)).to eq(2)
+      expect(repository.count(specification.stream("Dummy").from(event_id).result)).to eq(1)
+
+      expect(repository.count(specification.limit(100).result)).to eq(5)
+      expect(repository.count(specification.limit(2).result)).to eq(2)
+
+      repository.append_to_stream([SRecord.new(event_type: Type2.to_s)], dummy, version_any)
+      repository.append_to_stream([SRecord.new(event_type: Type3.to_s)], dummy, version_any)
+      repository.append_to_stream([SRecord.new(event_type: Type3.to_s)], dummy, version_any)
+      expect(repository.count(specification.of_type([Type1]).result)).to eq(5)
+      expect(repository.count(specification.of_type([Type2]).result)).to eq(1)
+      expect(repository.count(specification.of_type([Type3]).result)).to eq(2)
+      expect(repository.count(specification.stream("Dummy").of_type([Type3]).result)).to eq(2)
+      expect(repository.count(specification.stream(stream.name).of_type([Type3]).result)).to eq(0)
+    end
   end
 end

data/lib/ruby_event_store/specification.rb

@@ -91,6 +91,14 @@ module RubyEventStore
       end
     end
 
+    # Calculates the size of result set based on the specification build up to this point.
+    # {http://railseventstore.org/docs/read/ Find out more}.
+    #
+    # @return [Integer] Number of events to read
+    def count
+      reader.count(result)
+    end
+
     # Executes the query based on the specification built up to this point.
     # Returns array of domain events.
     # {http://railseventstore.org/docs/read/ Find out more}.

data/lib/ruby_event_store/specification_reader.rb

@@ -23,6 +23,12 @@ module RubyEventStore
       end
     end
 
+    # @api private
+    # @private
+    def count(specification_result)
+      repository.count(specification_result)
+    end
+
     # @api private
     # @private
     def has_event?(event_id)

data/lib/ruby_event_store/transform_keys.rb

@@ -0,0 +1,25 @@
+module RubyEventStore
+  class TransformKeys
+    def self.stringify(data)
+      transform(data) {|k| k.to_s}
+    end
+
+    def self.symbolize(data)
+      transform(data) {|k| k.to_sym}
+    end
+
+    private
+    def self.transform(data, &block)
+      data.each_with_object({}) do |(k, v), h|
+        h[yield(k)] = case v
+          when Hash
+            transform(v, &block)
+          when Array
+            v.map{|i| Hash === i ? transform(i, &block) : i}
+          else
+            v
+        end
+      end
+    end
+  end
+end

data/lib/ruby_event_store/version.rb

@@ -1,3 +1,3 @@
 module RubyEventStore
-  VERSION = "0.34.0"
+  VERSION = "0.35.0"
 end

data/ruby_event_store.gemspec

@@ -25,15 +25,5 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-
   spec.add_dependency 'concurrent-ruby', '~> 1.0'
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  spec.add_development_dependency 'rake', '~> 10.0'
-  spec.add_development_dependency 'rspec', '~> 3.6'
-  spec.add_development_dependency 'mutant-rspec', '= 0.8.17'
-  spec.add_development_dependency 'parser'
-  spec.add_development_dependency 'unparser'
-  spec.add_development_dependency 'astrolabe'
-  spec.add_development_dependency 'google-protobuf', '~> 3.5.1.2'
-  spec.add_development_dependency 'activesupport', '~> 5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -24,132 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: mutant-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.17
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.17
-- !ruby/object:Gem::Dependency
-  name: parser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: unparser
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: astrolabe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: google-protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.1.2
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
 description: Implementation of Event Store in Ruby
 email:
 - dev@arkency.com
@@ -199,6 +73,7 @@ files:
 - lib/ruby_event_store/specification_reader.rb
 - lib/ruby_event_store/specification_result.rb
 - lib/ruby_event_store/stream.rb
+- lib/ruby_event_store/transform_keys.rb
 - lib/ruby_event_store/version.rb
 - ruby_event_store.gemspec
 homepage: https://railseventstore.org
@@ -225,7 +100,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.0.beta2
 signing_key: 
 specification_version: 4
 summary: Event Store in Ruby