ruby_event_store-rom 0.39.0 → 0.40.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '09d23ab19b18dde2c940ff44c4e801bd947dcd3b0084f1952ebb3e841c08764f'
-  data.tar.gz: 3b4a6944ee281dd7a19db514493f4854db851c3df5423309921247620c8378db
+  metadata.gz: 93e5cd45e5a2b089e08face73b1208bea7372beccea31eeb5a93853daaa0c3af
+  data.tar.gz: c5140402ae0991b2659b90b4f58e8b907e84fcb4a3cb55c6e9b5edf76ce1aeb2
 SHA512:
-  metadata.gz: bb6329728b35a4ead04583b6a9e4826b872253373931651b8421a0198917a2cea3a27365e5d401258579384d51b4901ada69f6439a4e8be5f33967377b6454fd
-  data.tar.gz: c8f94b6a130ba920b2391eac4548bcc6a384cbee518b13aee954a56bfb459ebe9a2daf98d3bff005278df10484713e45813383ca57a499bf2d81035577737751
+  metadata.gz: b45bdc9846968d2d34250bdce821c2dbeeb381651ef62e35ddfa4f4eb31def75746c744ee6f6b9518dcf68663b23947a34bb5de059147653efd94c53286285fc
+  data.tar.gz: a0ad08b7f19f8854a0e25271897ea1ec418cb66baa5003c329df7aedbfae8bd6bd3567e1c07264c975d0eefd44fb5dfe12d533bcb93ea60b16cf268d93fad0e1

data/lib/ruby_event_store/rom.rb

@@ -1,5 +1,4 @@
 require 'rom-changeset'
-require 'rom-mapper'
 require 'rom-repository'
 require 'ruby_event_store'
 require 'ruby_event_store/rom/types'
@@ -14,40 +13,43 @@ require 'ruby_event_store/rom/version'
 module RubyEventStore
   module ROM
     class Env
-      attr_accessor :container
+      include Dry::Container::Mixin
 
-      def initialize(container)
-        @container = container
+      attr_accessor :rom_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 })
+      def initialize(rom_container)
+        @rom_container = rom_container
+
+        register(:unique_violation_error_handlers, Set.new)
+        register(:not_found_error_handlers, Set.new)
+        register(:logger, Logger.new(STDOUT).tap { |logger| logger.level = Logger::WARN })
       end
 
       def logger
-        container[:logger]
+        resolve(:logger)
       end
 
       def unit_of_work(&block)
-        options = container[:unit_of_work_options].dup
+        options = resolve(:unit_of_work_options).dup
         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)
+        register(:unit_of_work_options, options)
       end
 
       def register_error_handler(type, handler)
-        container[:"#{type}_error_handlers"] << handler
+        resolve(:"#{type}_error_handlers") << handler
       end
 
       def handle_error(type, *args, swallow: [])
         yield
-      rescue StandardError => ex
+      rescue StandardError => e
         begin
-          container[:"#{type}_error_handlers"].each { |h| h.call(ex, *args) }
-          raise ex
+          resolve(:"#{type}_error_handlers").each { |h| h.call(e, *args) }
+          raise e
         rescue *swallow
+          # swallow
         end
       end
     end
@@ -94,7 +96,7 @@ module RubyEventStore
           end
         }
 
-        find_adapters(env.container.gateways).each do |adapter|
+        find_adapters(env.rom_container.gateways).each do |adapter|
           adapter.configure(env)
         end
       end

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

@@ -4,9 +4,9 @@ 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::Integer.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 :position, ::ROM::Types::Strict::Integer.optional
             attribute :event_id, ::ROM::Types::Strict::String.meta(foreign_key: true, relation: :events)
             attribute :created_at, RubyEventStore::ROM::Types::DateTime
 

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

@@ -13,7 +13,7 @@ module RubyEventStore
             begin
               until changesets.empty?
                 changeset = changesets.shift
-                relation = env.container.relations[changeset.relation.name]
+                relation = env.rom_container.relations[changeset.relation.name]
 
                 committed << [changeset, relation]
 

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

@@ -5,7 +5,7 @@ module RubyEventStore
         class UpdateEvents < ::ROM::Changeset::Create
           include ROM::Changesets::UpdateEvents::Defaults
 
-          UPSERT_COLUMNS = %i[event_type data metadata created_at]
+          UPSERT_COLUMNS = %i[event_type data metadata created_at].freeze
 
           def commit
             if SQL.supports_on_duplicate_key_update?(relation.dataset.db)

data/lib/ruby_event_store/rom/adapters/sql/tasks/migration_tasks.rake

@@ -5,7 +5,7 @@ MIGRATIONS_PATH = 'db/migrate'.freeze
 desc 'Setup ROM EventRespository environment'
 task 'db:setup' do
   Dir.chdir(Dir.pwd)
-  ROM::SQL::RakeSupport.env = ::RubyEventStore::ROM.configure(:sql).container
+  ROM::SQL::RakeSupport.env = ::RubyEventStore::ROM.configure(:sql).rom_container
 end
 
 desc 'Copy RubyEventStore SQL migrations to db/migrate'

data/lib/ruby_event_store/rom/event_repository.rb

@@ -13,8 +13,8 @@ module RubyEventStore
         raise ArgumentError, 'Must specify rom' unless rom && rom.instance_of?(Env)
 
         @rom = rom
-        @events = Repositories::Events.new(rom.container)
-        @stream_entries = Repositories::StreamEntries.new(rom.container)
+        @events = Repositories::Events.new(rom.rom_container)
+        @stream_entries = Repositories::StreamEntries.new(rom.rom_container)
       end
 
       def append_to_stream(events, stream, expected_version)

data/lib/ruby_event_store/rom/memory.rb

@@ -52,7 +52,7 @@ module RubyEventStore
         end
 
         def gateway
-          env.container.gateways.fetch(:default)
+          env.rom_container.gateways.fetch(:default)
         end
 
         def drop_gateway_schema

data/lib/ruby_event_store/rom/sql.rb

@@ -63,7 +63,7 @@ module RubyEventStore
 
         def supports_upsert?(db)
           supports_on_duplicate_key_update?(db) ||
-          supports_insert_conflict_update?(db)
+            supports_insert_conflict_update?(db)
         end
 
         def supports_on_duplicate_key_update?(db)
@@ -76,7 +76,7 @@ module RubyEventStore
             true
           when :sqlite
             # Sqlite 3.24.0+ supports PostgreSQL upsert syntax
-            db.sqlite_version >= 32400
+            db.sqlite_version >= 32_400
           else
             false
           end
@@ -91,7 +91,7 @@ module RubyEventStore
             :sql,
             database_uri,
             max_connections: database_uri =~ /sqlite/ ? 1 : 5,
-            preconnect: :concurrently,
+            preconnect: :concurrently
             # sql_mode: %w[NO_AUTO_VALUE_ON_ZERO STRICT_ALL_TABLES]
           )
           # $stdout.sync = true
@@ -113,7 +113,7 @@ module RubyEventStore
         end
 
         def gateway
-          env.container.gateways.fetch(:default)
+          env.rom_container.gateways.fetch(:default)
         end
 
         def gateway_type?(name)

data/lib/ruby_event_store/rom/types.rb

@@ -2,7 +2,16 @@ module RubyEventStore
   module ROM
     module Types
       DateTime = ::ROM::Types::DateTime
-                 .constructor { |value| value.is_a?(::String) ? ::DateTime.iso8601(value) : value }
+                 .constructor do |value|
+                   case value
+                   when nil
+                     Dry::Core::Constants::Undefined
+                   when ::String
+                     ::DateTime.iso8601(value)
+                   else
+                     value
+                   end
+                 end
                  .default { ::DateTime.now.new_offset(0) }
 
       SerializedRecordSerializer = ::ROM::Types::String

data/lib/ruby_event_store/rom/unit_of_work.rb

@@ -8,7 +8,7 @@ module RubyEventStore
       end
 
       def call(**options)
-        gateway = @env.container.gateways.fetch(options.delete(:gateway) { :default })
+        gateway = @env.rom_container.gateways.fetch(options.delete(:gateway) { :default })
 
         yield(changesets = [])
 

data/lib/ruby_event_store/rom/version.rb

@@ -1,5 +1,5 @@
 module RubyEventStore
   module ROM
-    VERSION = "0.39.0"
+    VERSION = "0.40.0"
   end
 end

data/lib/ruby_event_store/spec/rom/event_repository_lint.rb

@@ -6,8 +6,8 @@ module RubyEventStore::ROM
     subject(:repository) { repository_class.new(rom: env) }
 
     let(:env) { rom_helper.env }
-    let(:container) { env.container }
-    let(:rom_db) { container.gateways[:default] }
+    let(:rom_container) { env.rom_container }
+    let(:rom_db) { rom_container.gateways[:default] }
 
     around(:each) do |example|
       rom_helper.run_lifecycle { example.run }
@@ -68,7 +68,7 @@ module RubyEventStore::ROM
         RubyEventStore::SRecord.new(event_id: u3 = SecureRandom.uuid)
       ]
 
-      repo = Repositories::Events.new(container)
+      repo = Repositories::Events.new(rom_container)
       repo.create_changeset(events).commit
 
       expect(repo.events.to_a.size).to eq(3)
@@ -100,7 +100,7 @@ module RubyEventStore::ROM
         RubyEventStore::SRecord.new(event_id: u3 = SecureRandom.uuid)
       ]
 
-      repo = Repositories::Events.new(container)
+      repo = Repositories::Events.new(rom_container)
       repo.create_changeset(events).commit
 
       expect(repo.events.to_a.size).to eq(3)
@@ -145,9 +145,9 @@ module RubyEventStore::ROM
 
     # TODO: Port from AR to ROM
     def additional_limited_concurrency_for_auto_check
-      positions = container.relations[:stream_entries]
-                           .ordered(:forward, default_stream)
-                           .map { |entity| entity[:position] }
+      positions = rom_container.relations[:stream_entries]
+                               .ordered(:forward, default_stream)
+                               .map { |entity| entity[:position] }
       expect(positions).to eq((0..positions.size - 1).to_a)
     end
 

data/lib/ruby_event_store/spec/rom/relations/events_lint.rb

@@ -1,9 +1,9 @@
 RSpec.shared_examples :events_relation do |_relation_class|
-  subject(:relation) { container.relations[:events] }
+  subject(:relation) { rom_container.relations[:events] }
 
   let(:env) { rom_helper.env }
-  let(:container) { env.container }
-  let(:rom_db) { container.gateways[:default] }
+  let(:rom_container) { env.rom_container }
+  let(:rom_db) { rom_container.gateways[:default] }
 
   around(:each) do |example|
     rom_helper.run_lifecycle { example.run }

data/lib/ruby_event_store/spec/rom/relations/stream_entries_lint.rb

@@ -1,9 +1,9 @@
 RSpec.shared_examples :stream_entries_relation do |_relation_class|
-  subject(:relation) { container.relations[:stream_entries] }
+  subject(:relation) { rom_container.relations[:stream_entries] }
 
   let(:env) { rom_helper.env }
-  let(:container) { env.container }
-  let(:rom_db) { container.gateways[:default] }
+  let(:rom_container) { env.rom_container }
+  let(:rom_db) { rom_container.gateways[:default] }
 
   around(:each) do |example|
     rom_helper.run_lifecycle { example.run }

data/lib/ruby_event_store/spec/rom/spec_helper_lint.rb

@@ -1,15 +1,15 @@
 module RubyEventStore::ROM
   RSpec.shared_examples :rom_spec_helper do |_rom_spec_helper_class|
     let(:env) { rom_helper.env }
-    let(:container) { env.container }
-    let(:rom_db) { container.gateways[:default] }
+    let(:rom_container) { env.rom_container }
+    let(:rom_db) { rom_container.gateways[:default] }
 
     around(:each) do |example|
       rom_helper.run_lifecycle { example.run }
     end
 
     specify '#env gives access to ROM container' do
-      expect(subject.env.container).to be_a(::ROM::Container)
+      expect(subject.env.rom_container).to be_a(::ROM::Container)
     end
   end
 end

data/lib/ruby_event_store/spec/rom/unit_of_work_lint.rb

@@ -3,15 +3,15 @@ module RubyEventStore::ROM
     subject(:unit_of_work) { unit_of_work_class.new(rom: env) }
 
     let(:env) { rom_helper.env }
-    let(:container) { env.container }
-    let(:rom_db) { container.gateways[:default] }
+    let(:v) { env.rom_container }
+    let(:rom_db) { rom_container.gateways[:default] }
 
     around(:each) do |example|
       rom_helper.run_lifecycle { example.run }
     end
 
     specify '#env gives access to ROM container' do
-      expect(subject.env.container).to be_a(::ROM::Container)
+      expect(subject.env.rom_container).to be_a(::ROM::Container)
     end
 
     specify '#call to throw an exeption' do

data/ruby_event_store-rom.gemspec

@@ -24,12 +24,14 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'dry-initializer', '= 2.5.0'
-  spec.add_dependency 'dry-types', '~> 0.12.2'
-  spec.add_dependency 'dry-container', '< 0.7.0'
-  spec.add_dependency 'rom-changeset', '>= 1.0'
-  spec.add_dependency 'rom-repository', '>= 2.0'
-  spec.add_dependency 'rom-sql', '>= 2.4'
-  spec.add_dependency 'ruby_event_store', '= 0.39.0'
+  spec.required_ruby_version = '>= 2.4'
+
+  spec.add_dependency 'dry-container', '>= 0.6'
+  spec.add_dependency 'dry-initializer', '>= 3.0'
+  spec.add_dependency 'dry-types', '>= 1.0'
+  spec.add_dependency 'rom-changeset', '>= 5.0'
+  spec.add_dependency 'rom-repository', '>= 5.0'
+  spec.add_dependency 'rom-sql', '>= 3.0'
+  spec.add_dependency 'ruby_event_store', '= 0.40.0'
   spec.add_dependency 'sequel', '>= 5.11.0'
 end

metadata

@@ -1,113 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: ruby_event_store-rom
 version: !ruby/object:Gem::Version
-  version: 0.39.0
+  version: 0.40.0
 platform: ruby
 authors:
 - Joel Van Horn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-24 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: dry-container
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: '0.6'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.12.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rom-changeset
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rom-repository
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rom-sql
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.39.0
+        version: 0.40.0
 - !ruby/object:Gem::Dependency
   name: sequel
   requirement: !ruby/object:Gem::Requirement
@@ -189,14 +189,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: ROM events repository for Ruby Event Store