ruby_event_store-rom 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3760c9bc0e5cbf84b824cab9d38fc9ab85db2aea9fca8cc1ead956a67504d08f
-  data.tar.gz: 520f6ee4fee9f63018c547276691f1c9b2c23ae55dd5384279d55302f2c7d3e8
+  metadata.gz: b0657b44931013a36c0db15e739957207921bc1344dceffd3046c6ab7636de06
+  data.tar.gz: 52a47bed2d4bd98d83928a28f26e85446b7c1ee3cf574f30cbe773dd8ca08071
 SHA512:
-  metadata.gz: df638ec5c1bbb2ec850675769b601df6660c89ce5c1b98cef2a7fe3c05065c86c3176163d2fbd3eddaab116e6d63656a95e711a65acc75877e027ec9194e77f3
-  data.tar.gz: b1df8c60802b4cd81e564da16f707d2b6baa3929507d072c94a7c29196789954150073a4d1b3d2f766663b7c74ddc2a18c1bdc1a92be6f065e9330e164bed23c
+  metadata.gz: 89d84ef8613d86632e570c0179ee3ef273eecd73c0f0e9779e237b0512c0d7690a44a958e5feccf34191bbbfddd10d4f479a520d96d450bf40506483db6a398a
+  data.tar.gz: bc6bfc3cc17b4568b172f15eae603a888d0dcdfbd019a5b5b9620cde86a09c5f1511dbe7ee96611674fa6e175a0008ee59554ce90f3bdefba3fe3ab8f61706f0

data/.rubocop.yml

@@ -0,0 +1 @@
+inherit_from: .rubocop_todo.yml

data/.rubocop_todo.yml

@@ -0,0 +1,84 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2018-12-29 04:25:35 -0500 using RuboCop version 0.61.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 3
+Lint/HandleExceptions:
+  Exclude:
+    - 'Rakefile'
+    - 'lib/ruby_event_store/rom.rb'
+    - 'spec/spec_helper.rb'
+
+# Offense count: 6
+Metrics/AbcSize:
+  Max: 34
+
+# Offense count: 8
+# Configuration parameters: CountComments, ExcludedMethods.
+# ExcludedMethods: refine
+Metrics/BlockLength:
+  Max: 146
+
+# Offense count: 2
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 6
+# Configuration parameters: CountComments, ExcludedMethods.
+Metrics/MethodLength:
+  Max: 30
+
+# Offense count: 1
+# Configuration parameters: CountComments.
+Metrics/ModuleLength:
+  Max: 130
+
+# Offense count: 2
+Metrics/PerceivedComplexity:
+  Max: 11
+
+# Offense count: 1
+# Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms.
+# AllowedAcronyms: CLI, DSL, ACL, API, ASCII, CPU, CSS, DNS, EOF, GUID, HTML, HTTP, HTTPS, ID, IP, JSON, LHS, QPS, RAM, RHS, RPC, SLA, SMTP, SQL, SSH, TCP, TLS, TTL, UDP, UI, UID, UUID, URI, URL, UTF8, VM, XML, XMPP, XSRF, XSS
+Naming/FileName:
+  Exclude:
+    - 'lib/ruby_event_store-rom.rb'
+
+# Offense count: 3
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/ruby_event_store/rom/event_repository.rb'
+    - 'lib/ruby_event_store/rom/memory.rb'
+    - 'lib/ruby_event_store/rom/sql.rb'
+
+# Offense count: 16
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
+# SupportedStyles: nested, compact
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 25
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 2
+Style/MultilineBlockChain:
+  Exclude:
+    - 'spec/rom/adapters/memory/relations/stream_entries_spec.rb'
+
+# Offense count: 136
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 151

data/Gemfile

@@ -3,9 +3,9 @@ gemspec
 
 eval_gemfile File.expand_path('../lib/Gemfile.shared', __dir__)
 
+gem 'childprocess'
+gem 'fakefs', '~> 0.11.2'
+gem 'mysql2', '>= 0.4.10'
+gem 'pg', '>= 0.21'
 gem 'ruby_event_store', path: '../ruby_event_store'
 gem 'sqlite3', '1.3.13'
-gem 'pg', '>= 0.21'
-gem 'mysql2', '>= 0.4.10'
-gem 'fakefs', '~> 0.11.2'
-gem 'childprocess'

data/Makefile

@@ -8,6 +8,9 @@ IGNORE       = RubyEventStore::ROM::EventRepository\#initialize \
                RubyEventStore::ROM::EventRepository\#last_stream_event \
                RubyEventStore::ROM::Repositories::Events\#find_nonexistent_pks \
                RubyEventStore::ROM::Repositories::StreamEntries\#create_changeset \
+               RubyEventStore::ROM::Changesets::CreateStreamEntries::Defaults.included \
+               RubyEventStore::ROM::Changesets::CreateEvents::Defaults.included \
+               RubyEventStore::ROM::Changesets::UpdateEvents::Defaults.included \
                RubyEventStore::ROM::Env\#handle_error \
                RubyEventStore::ROM::Env\#initialize \
                RubyEventStore::ROM::Env\#register_error_handler \

data/Rakefile

@@ -5,16 +5,16 @@ require 'ruby_event_store/rom/adapters/sql/rake_task'
 RSpec::Core::RakeTask.new(:spec)
 task default: [:ci]
 
-desc "Run CI tasks"
+desc 'Run CI tasks'
 task ci: [:spec]
 
 begin
-  require "rubocop/rake_task"
+  require 'rubocop/rake_task'
 
   Rake::Task[:default].enhance [:rubocop]
 
   RuboCop::RakeTask.new do |task|
-    task.options << "--display-cop-names"
+    task.options << '--display-cop-names'
   end
 rescue LoadError
 end

data/db/migrate/20180327044629_create_ruby_event_store_tables.rb

@@ -3,8 +3,14 @@ require 'rom/sql'
 ::ROM::SQL.migration do
   change do
     postgres = database_type =~ /postgres/
-    sqlite   = database_type =~ /sqlite/
-    
+
+    # set when copying migrations
+    # or when running tests
+    ENV['DATA_TYPE'] ||= 'text'
+    data_type = ENV['DATA_TYPE'].to_sym
+    data_types = postgres ? %i[text json jsonb] : %i[text]
+    raise ArgumentError, "DATA_TYPE must be: #{data_types.join(', ')}" unless data_types.include?(data_type)
+
     run 'CREATE EXTENSION IF NOT EXISTS pgcrypto;' if postgres
 
     create_table? :event_store_events_in_streams do
@@ -20,7 +26,7 @@ require 'rom/sql'
       end
 
       column :created_at, DateTime, null: false, index: 'index_event_store_events_in_streams_on_created_at'
-      
+
       index %i[stream position], unique: true, name: 'index_event_store_events_in_streams_on_stream_and_position'
       index %i[stream event_id], unique: true, name: 'index_event_store_events_in_streams_on_stream_and_event_id'
     end
@@ -33,13 +39,16 @@ require 'rom/sql'
       end
 
       column :event_type, String, null: false
-      column :metadata, String, text: true
-      column :data, String, text: true, null: false
-      column :created_at, DateTime, null: false, index: 'index_event_store_events_on_created_at'
 
-      if sqlite # TODO: Is this relevant without ActiveRecord?
-        index :id, unique: true
+      if data_type =~ /json/
+        column :metadata, data_type
+        column :data, data_type, null: false
+      else
+        column :metadata, String, text: true
+        column :data, String, text: true, null: false
       end
+
+      column :created_at, DateTime, null: false, index: 'index_event_store_events_on_created_at'
     end
   end
 end

data/lib/ruby_event_store/rom.rb

@@ -2,7 +2,11 @@ require 'rom-changeset'
 require 'rom-mapper'
 require 'rom-repository'
 require 'ruby_event_store'
+require 'ruby_event_store/rom/types'
 require 'ruby_event_store/rom/event_repository'
+require 'ruby_event_store/rom/changesets/create_events'
+require 'ruby_event_store/rom/changesets/update_events'
+require 'ruby_event_store/rom/changesets/create_stream_entries'
 require 'ruby_event_store/rom/tuple_uniqueness_error'
 require 'ruby_event_store/rom/unit_of_work'
 require 'ruby_event_store/rom/version'
@@ -11,10 +15,10 @@ module RubyEventStore
   module ROM
     class Env
       attr_accessor :container
-  
+
       def initialize(container)
         @container = container
-  
+
         container.register(:unique_violation_error_handlers, Set.new)
         container.register(:not_found_error_handlers, Set.new)
         container.register(:logger, Logger.new(STDOUT).tap { |logger| logger.level = Logger::WARN })
@@ -26,25 +30,24 @@ module RubyEventStore
 
       def unit_of_work(&block)
         options = container[:unit_of_work_options].dup
-        options.delete(:class){UnitOfWork}.new(rom: self).call(**options, &block)
+        options.delete(:class) { UnitOfWork }.new(rom: self).call(**options, &block)
       end
 
       def register_unit_of_work_options(options)
         container.register(:unit_of_work_options, options)
       end
-  
+
       def register_error_handler(type, handler)
         container[:"#{type}_error_handlers"] << handler
       end
-  
+
       def handle_error(type, *args, swallow: [])
         yield
-      rescue => ex
+      rescue StandardError => ex
         begin
-          container[:"#{type}_error_handlers"].each{ |h| h.call(ex, *args) }
+          container[:"#{type}_error_handlers"].each { |h| h.call(ex, *args) }
           raise ex
         rescue *swallow
-          # swallow
         end
       end
     end
@@ -52,7 +55,7 @@ module RubyEventStore
     class << self
       # Set to a default instance
       attr_accessor :env
-  
+
       def configure(adapter_name, database_uri = ENV['DATABASE_URL'], &block)
         if adapter_name.is_a?(::ROM::Configuration)
           # Call config block manually
@@ -61,20 +64,20 @@ module RubyEventStore
           Env.new ::ROM.container(adapter_name, database_uri, &block)
         end
       end
-  
+
       def setup(*args, &block)
         configure(*args) do |config|
           setup_defaults(config)
-          block.call(config) if block
+          yield(config) if block
         end.tap(&method(:configure_defaults))
       end
 
-    private
-      
+      private
+
       def setup_defaults(config)
         require_relative 'rom/repositories/stream_entries'
         require_relative 'rom/repositories/events'
-        
+
         config.register_mapper(ROM::Mappers::EventToSerializedRecord)
         config.register_mapper(ROM::Mappers::StreamEntryToSerializedRecord)
 
@@ -84,10 +87,10 @@ module RubyEventStore
       end
 
       def configure_defaults(env)
-        env.register_error_handler :not_found, -> (ex, event_id) {
+        env.register_error_handler :not_found, lambda { |ex, event_id|
           case ex
           when ::ROM::TupleCountMismatchError
-            raise EventNotFound.new(event_id)
+            raise EventNotFound, event_id
           end
         }
 

data/lib/ruby_event_store/rom/adapters/memory/changesets/create_events.rb

@@ -0,0 +1,17 @@
+module RubyEventStore
+  module ROM
+    module Memory
+      module Changesets
+        class CreateEvents < ROM::Changesets::CreateEvents
+          def commit
+            relation.by_pk(to_a.map { |e| e[:id] }).each do |tuple|
+              raise TupleUniquenessError.for_event_id(tuple[:id])
+            end
+
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_event_store/rom/adapters/memory/changesets/create_stream_entries.rb

@@ -0,0 +1,17 @@
+module RubyEventStore
+  module ROM
+    module Memory
+      module Changesets
+        class CreateStreamEntries < ROM::Changesets::CreateStreamEntries
+          def commit
+            to_a.each do |tuple|
+              relation.send(:verify_uniquness!, tuple)
+            end
+
+            super
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_event_store/rom/adapters/memory/changesets/update_events.rb

@@ -0,0 +1,16 @@
+module RubyEventStore
+  module ROM
+    module Memory
+      module Changesets
+        class UpdateEvents < ROM::Changesets::UpdateEvents
+          def commit
+            to_a.each do |params|
+              attributes = command.input[params].to_h.delete_if { |k, v| k == :created_at && v.nil? }
+              relation.by_pk(params.fetch(:id)).dataset.map { |tuple| tuple.update(attributes) }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/ruby_event_store/rom/adapters/memory/relations/events.rb

@@ -8,18 +8,26 @@ module RubyEventStore
             attribute :event_type, ::ROM::Types::Strict::String
             attribute :metadata, ::ROM::Types::Strict::String.optional
             attribute :data, ::ROM::Types::Strict::String
-            attribute :created_at, ::ROM::Types::Strict::Time.default { Time.now }
+            attribute :created_at, RubyEventStore::ROM::Types::DateTime
+          end
+
+          def create_changeset(tuples)
+            events.changeset(Changesets::CreateEvents, tuples)
+          end
+
+          def update_changeset(tuples)
+            events.changeset(Changesets::UpdateEvents, tuples)
           end
 
           def insert(tuple)
             verify_uniquness!(tuple)
             super
           end
-          
+
           def for_stream_entries(_assoc, stream_entries)
             restrict(id: stream_entries.map { |e| e[:event_id] })
           end
-    
+
           def by_pk(id)
             restrict(id: id)
           end
@@ -31,11 +39,12 @@ module RubyEventStore
           def pluck(name)
             map { |e| e[name] }
           end
-      
-        private
+
+          private
 
           def verify_uniquness!(tuple)
             return unless by_pk(tuple[:id]).exist?
+
             raise TupleUniquenessError.for_event_id(tuple[:id])
           end
         end

data/lib/ruby_event_store/rom/adapters/memory/relations/stream_entries.rb

@@ -4,11 +4,11 @@ module RubyEventStore
       module Relations
         class StreamEntries < ::ROM::Relation[:memory]
           schema(:stream_entries) do
-            attribute :id, ::ROM::Types::Strict::Int.meta(primary_key: true).default { RubyEventStore::ROM::Memory.fetch_next_id }
+            attribute(:id, ::ROM::Types::Strict::Int.meta(primary_key: true).default { RubyEventStore::ROM::Memory.fetch_next_id })
             attribute :stream, ::ROM::Types::Strict::String
             attribute :position, ::ROM::Types::Strict::Int.optional
             attribute :event_id, ::ROM::Types::Strict::String.meta(foreign_key: true, relation: :events)
-            attribute :created_at, ::ROM::Types::Strict::Time.default { Time.now }
+            attribute :created_at, RubyEventStore::ROM::Types::DateTime
 
             associations do
               belongs_to :events, as: :event, foreign_key: :event_id, override: true, view: :for_stream_entries
@@ -23,6 +23,10 @@ module RubyEventStore
 
           SERIALIZED_GLOBAL_STREAM_NAME = 'all'.freeze
 
+          def create_changeset(tuples)
+            changeset(Changesets::CreateStreamEntries, tuples)
+          end
+
           def offset(num)
             num.zero? ? self : new(dataset.slice(num..-1) || [])
           end
@@ -61,7 +65,7 @@ module RubyEventStore
           end
 
           DIRECTION_MAP = {
-            forward:  [false,  :>],
+            forward: [false, :>],
             backward: [true, :<]
           }.freeze
 
@@ -81,7 +85,7 @@ module RubyEventStore
             query
           end
 
-        private
+          private
 
           # Verifies uniqueness of [stream, event_id] and [stream, position]
           def verify_uniquness!(tuple)

data/lib/ruby_event_store/rom/adapters/memory/unit_of_work.rb

@@ -6,39 +6,24 @@ module RubyEventStore
           @mutex ||= Mutex.new
         end
 
-        def commit!(gateway, changesets, **options)
+        def commit!(_gateway, changesets, **_options)
           self.class.mutex.synchronize do
             committed = []
-            
+
             begin
-              while changesets.size > 0
+              until changesets.empty?
                 changeset = changesets.shift
                 relation = env.container.relations[changeset.relation.name]
 
-                case changeset
-                when ROM::Repositories::Events::Create
-                  relation.by_pk(changeset.to_a.map{ |e| e[:id] }).each do |tuple|
-                    raise TupleUniquenessError.for_event_id(tuple[:id])
-                  end
-                when ROM::Repositories::StreamEntries::Create
-                  changeset.to_a.each do |tuple|
-                    relation.send(:verify_uniquness!, tuple)
-                  end
-                else
-                  raise ArgumentError, 'Unknown changeset'
-                end
-
                 committed << [changeset, relation]
 
                 changeset.commit
               end
             rescue StandardError
-              committed.reverse.each do |changeset, relation|
-                relation
-                  .restrict(id: changeset.to_a.map { |e| e[:id] })
-                  .command(:delete, result: :many).call
+              committed.reverse_each do |c, r|
+                r.restrict(id: c.to_a.map { |e| e[:id] }).command(:delete, result: :many).call
               end
-              
+
               raise
             end
           end