rails_event_store 0.28.2 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36c977dd02fc9617c8070e6651071696f4cf321636dbce536f682ec700790a62
-  data.tar.gz: 93958d4387d436f61486c7bbe06989892c95d48ec6b1f6708b11de63649a89d8
+  metadata.gz: fd9e513f596526d177e0c8bd4d83e69cc2e4a9e7a1da997b06476f1627e706b9
+  data.tar.gz: 4f206686458299fd3fbea36de7e958fa78f7d7156b31430372ccf418a92642e1
 SHA512:
-  metadata.gz: f73524c174cc4be69e50d74d6e70f9826be46fa03d45d6726ba3c8de5c388a67380937492d830c6795c4cd5998b813d5d05fbd8e5222a0db25e9c27215ca1982
-  data.tar.gz: 829841982455ab52cd685e0d8856b5ab232e765b4c4e93b8d2112763c9b2e61ebb6e48b6276e0608edaf69fff80d42df952e0902af9d984fe689ecd73ecfb98c
+  metadata.gz: 79fe89e91791087fd4882ca33128cdf1bfbb63146b10842534df7fa7cd72c408bdc2b5bdda9847c2c7c4a5eb70d0a7fde670fc39bada18751df3a3b039fa0384
+  data.tar.gz: e25fbdc029a478f45cc1c5de6d4d220712fe0c64ca2a22c79ffc36c1c5bc3453a8e68a5ae98e077440815f4ea5cc7a7f63802003d6b7285a6fe4b53976e9d738

data/lib/rails_event_store/client.rb

@@ -1,16 +1,34 @@
 module RailsEventStore
   class Client < RubyEventStore::Client
+    attr_reader :request_metadata
+
     def initialize(repository: RailsEventStoreActiveRecord::EventRepository.new,
                    mapper: RubyEventStore::Mappers::Default.new,
                    event_broker: EventBroker.new(dispatcher: ActiveJobDispatcher.new),
+                   request_metadata: default_request_metadata,
                    page_size: PAGE_SIZE)
-      capture_metadata = ->{ Thread.current[:rails_event_store] }
       super(repository: repository,
             mapper: mapper,
             event_broker: event_broker,
-            page_size: page_size,
-            metadata_proc: capture_metadata)
+            page_size: page_size)
+      @request_metadata = request_metadata
+    end
+
+    def with_request_metadata(env, &block)
+      with_metadata(request_metadata.call(env)) do
+        block.call
+      end
     end
 
+    private
+    def default_request_metadata
+      ->(env) do
+        request = ActionDispatch::Request.new(env)
+        {
+          remote_ip:  request.remote_ip,
+          request_id: request.uuid
+        }
+      end
+    end
   end
-end
+end

data/lib/rails_event_store/middleware.rb

@@ -1,15 +1,23 @@
 module RailsEventStore
   class Middleware
-    def initialize(app, request_metadata_proc)
+    def initialize(app)
       @app = app
-      @request_metadata_proc = request_metadata_proc
     end
 
     def call(env)
-      Thread.current[:rails_event_store] = @request_metadata_proc.(env)
-      @app.call(env)
-    ensure
-      Thread.current[:rails_event_store] = nil
+      if config.respond_to?(:event_store)
+        config.event_store.with_request_metadata(env) do
+          @app.call(env)
+        end
+      else
+        @app.call(env)
+      end
+    end
+
+    private
+
+    def config
+      Rails.application.config
     end
   end
 end

data/lib/rails_event_store/railtie.rb

@@ -4,28 +4,7 @@ require 'rails_event_store/middleware'
 module RailsEventStore
   class Railtie < ::Rails::Railtie
     initializer 'rails_event_store.middleware' do |rails|
-      rails.middleware.use(::RailsEventStore::Middleware, RailsConfig.new(rails.config).request_metadata)
-    end
-
-    class RailsConfig
-      def initialize(config)
-        @config = config
-      end
-
-      def request_metadata
-        return default_request_metadata unless @config.respond_to?(:rails_event_store)
-        @config.rails_event_store.fetch(:request_metadata, default_request_metadata)
-      end
-
-      private
-      def default_request_metadata
-        ->(env) do
-          request = ActionDispatch::Request.new(env)
-          { remote_ip:  request.remote_ip,
-            request_id: request.uuid,
-          }
-        end
-      end
+      rails.middleware.use(::RailsEventStore::Middleware)
     end
   end
 end

data/lib/rails_event_store/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStore
-  VERSION = "0.28.2"
+  VERSION = "0.29.0"
 end

data/rails_event_store.gemspec

@@ -29,16 +29,15 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'rails', '~> 5.2'
-  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'sqlite3'
   spec.add_development_dependency 'rack-test'
   spec.add_development_dependency 'mutant-rspec', '~> 0.8.14'
   spec.add_development_dependency 'google-protobuf', '~> 3.5.1.2'
 
-  spec.add_dependency 'ruby_event_store', '= 0.28.2'
-  spec.add_dependency 'rails_event_store_active_record', '= 0.28.2'
-  spec.add_dependency 'aggregate_root', '= 0.28.2'
-  spec.add_dependency 'bounded_context', '= 0.28.2'
+  spec.add_dependency 'ruby_event_store', '= 0.29.0'
+  spec.add_dependency 'rails_event_store_active_record', '= 0.29.0'
+  spec.add_dependency 'aggregate_root', '= 0.29.0'
+  spec.add_dependency 'bounded_context', '= 0.29.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activejob', '>= 3.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0
 platform: ruby
 authors:
 - Arkency
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: pry
-  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: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -142,56 +128,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: rails_event_store_active_record
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: aggregate_root
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: bounded_context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -259,7 +245,6 @@ files:
 - Gemfile
 - Makefile
 - README.md
-- Rakefile
 - lib/rails_event_store.rb
 - lib/rails_event_store/active_job_dispatcher.rb
 - lib/rails_event_store/all.rb

data/Rakefile

@@ -1,20 +0,0 @@
-require 'pry'
-
-EMPTY_DB = 'spec/test.sqlite3'
-DEV_DB   = 'tmp/run.sqlite3'
-
-task :run do
-  FileUtils.cp(EMPTY_DB, DEV_DB) unless File.exist?(DEV_DB)
-  require 'rails_event_store'
-  RailsEventStoreActiveRecord::Event.establish_connection(
-    :adapter => 'sqlite3',
-    :database => DEV_DB
-  )
-  pry
-end
-
-task :clean do
-  FileUtils.rm(DEV_DB) if File.exist?(DEV_DB)
-end
-
-task start: [:clean, :run]