nexus_cqrs 0.0.10 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1ab92b227b0ff36a308b6495262108cfbd2f993068d86032b22623937726e76
-  data.tar.gz: 1827bd428f92211c7e30c1af6c52b20800f2cda21c4d3d0c6afd1c457aef79ce
+  metadata.gz: 52292e7da4d25c422ec78ea425803320ce2d482748a07e64cf46935a9b529fba
+  data.tar.gz: f6f6ea685f1c98e1d9396735c3bd605823d3fe20807b0d9041c2924501a93346
 SHA512:
-  metadata.gz: 926c2a7d769f2e9df9654006e64b4e9ce55710b7e2ead60ada884b5d3df6c67b0dcd83c50c616a80246399f634bc326f5d765c21fc7c9810bb6dd9aeb4655612
-  data.tar.gz: be235bec498b0e57cbd9748a8ae891f605537b0a8c0b40db0412a4ee08687ec2b3582e82b0ffae884fa35ef94d0718a60a94c83175ce2dab4ba6d42038b92ba9
+  metadata.gz: 86c7633be2217afc934de294f1a01930c417f19d7cc47daa3354a14baae9f0700ab3dbd4864c7059dfe5a9569225c9c1ad2e36b9a3fe93113b10ad6cd8bb4da1
+  data.tar.gz: a45c022c39ad8dabbc1fb86910e3effd7c58bfa1e049dab0b950650b88fc9b31e357fcea0d272454df7efc9ee5203af5d927ffde6b4454ee091b97d5f9291d7b

data/.gitlab-ci.yml

@@ -1,5 +1,9 @@
 image: "ruby:2.7"
 
+stages:
+  - release
+  - test
+
 before_script:
   - sudo apt-get update -qq && sudo apt-get install -y -qq sqlite3 libsqlite3-dev nodejs
   - ruby -v
@@ -13,4 +17,23 @@ rspec:
 
 rubocop:
   script:
-    - bundle exec rubocop
+    - bundle exec rubocop
+
+release:
+  stage: release
+  rules:
+    - if: '$CI_COMMIT_TAG'
+  script:
+    - mkdir -p ~/.gem
+    - cp /builds/pub/nexus_cqrs.tmp/RUBYGEMS_CREDENTIALS ~/.gem/credentials
+    - chmod 0600 ~/.gem/credentials
+    - gem update --system
+    - ruby --version
+    - gem env version
+    - sed -i "s/0.1.0/$CI_COMMIT_TAG/g" lib/nexus_cqrs/version.rb
+    - gem build nexus_cqrs.gemspec
+    - gem push nexus_cqrs*.gem
+  artifacts:
+    paths:
+      - nexus_cqrs*.gem
+    expire_in: 30 days

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile

@@ -9,3 +9,4 @@ gem 'rubocop-shopify', "~> 1.0.4", require: false
 gem 'rspec'
 gem "generator_spec"
 gem 'thread_safe'
+gem 'ibsciss-middleware'

data/Gemfile.lock

@@ -1,7 +1,10 @@
 PATH
   remote: .
   specs:
-    nexus_cqrs (0.0.8)
+    nexus_cqrs (0.1.0)
+      generator_spec
+      ibsciss-middleware
+      thread_safe
 
 GEM
   remote: https://rubygems.org/
@@ -36,17 +39,13 @@ GEM
       railties (>= 3.0.0)
     i18n (1.8.5)
       concurrent-ruby (~> 1.0)
+    ibsciss-middleware (0.4.2)
     loofah (2.6.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     method_source (1.0.0)
     mini_portile2 (2.4.0)
     minitest (5.14.1)
-    multi_json (1.15.0)
-    net-scp (3.0.0)
-      net-ssh (>= 2.6.5, < 7.0.0)
-    net-ssh (6.1.0)
-    net-telnet (0.1.1)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.2)
@@ -79,9 +78,6 @@ GEM
     rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-its (1.3.0)
-      rspec-core (>= 3.0.0)
-      rspec-expectations (>= 3.0.0)
     rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
@@ -100,17 +96,6 @@ GEM
     rubocop-shopify (1.0.4)
       rubocop (>= 0.85, < 0.87)
     ruby-progressbar (1.10.1)
-    serverspec (2.41.5)
-      multi_json
-      rspec (~> 3.0)
-      rspec-its
-      specinfra (~> 2.72)
-    sfl (2.3)
-    specinfra (2.82.19)
-      net-scp
-      net-ssh (>= 2.7)
-      net-telnet (= 0.1.1)
-      sfl
     thor (1.0.1)
     thread_safe (0.3.6)
     tzinfo (1.2.7)
@@ -123,11 +108,11 @@ PLATFORMS
 
 DEPENDENCIES
   generator_spec
+  ibsciss-middleware
   nexus_cqrs!
   rspec
   rubocop
   rubocop-shopify (~> 1.0.4)
-  serverspec
   thread_safe
 
 BUNDLED WITH

data/README.md

@@ -29,6 +29,32 @@ Generators can be used to aide in the creation of Commands and Queries:
 
 Once installed, a CommandBus is required to control the flow of Commands and/or Queries:
 
+### Middleware
+
+Middleware can be created by extending the base middleware:
+
+```ruby
+class MyMiddleware < NexusCqrs::BaseMiddleware
+  def call(command)
+    @next.call(command)
+  end
+end
+```
+
+The above middleware will pass responsibility for execution to the next responder in the chain.
+
+For more information on writing middleware see: https://github.com/Ibsciss/ruby-middleware
+
+When creating a bus, middleware can be attached like so:
+
+```ruby
+middleware_stack = Middleware::Builder.new do |b|
+  b.use MyMiddleware
+end
+
+command_bus = Bus.new(middleware: middleware_stack)
+```
+
 ## Development
 
 To contribute to this gem, simple pull the repository, run `bundle install` and run tests:
@@ -36,4 +62,8 @@ To contribute to this gem, simple pull the repository, run `bundle install` and
 ```shell script
     bundle exec rspec
     bundle exec rubocop
-```
+```
+
+## Releasing
+
+The release process is tied to the git tags. Simply creating a new tag and pushing will trigger a new release to reubygems.

data/lib/generators/nexus_cqrs/command_generator.rb

@@ -22,7 +22,7 @@ module NexusCqrs
         template('register_cqrs_handlers.rb', handler_config)
       end
 
-      code_to_inject = "$COMMAND_EXECUTOR.register_command(#{full_name}, #{full_name}Handler)"
+      code_to_inject = "$COMMAND_EXECUTOR.register_command(#{full_name}, #{full_name}Handler.new)\n"
 
       inject_into_file(handler_config, code_to_inject, after: "# Register Commands\n")
     end

data/lib/generators/nexus_cqrs/query_generator.rb

@@ -22,7 +22,7 @@ module NexusCqrs
         template('register_cqrs_handlers.rb', handler_config)
       end
 
-      code_to_inject = "$QUERY_EXECUTOR.register_command(#{full_name}, #{full_name}Handler)"
+      code_to_inject = "$QUERY_EXECUTOR.register_command(#{full_name}, #{full_name}Handler.new)\n"
 
       inject_into_file(handler_config, code_to_inject, after: "# Register Queries\n")
     end

data/lib/nexus_cqrs.rb

@@ -1,3 +1,5 @@
+require 'nexus_cqrs/base_message'
+require 'nexus_cqrs/base_middleware'
 require 'nexus_cqrs/base_command'
 require 'nexus_cqrs/base_command_handler'
 require 'nexus_cqrs/base_query'

data/lib/nexus_cqrs/base_command.rb

@@ -1,4 +1,4 @@
 module NexusCqrs
-  class BaseCommand
+  class BaseCommand < BaseMessage
   end
 end

data/lib/nexus_cqrs/base_message.rb

@@ -0,0 +1,28 @@
+module NexusCqrs
+  class BaseMessage
+    def set_metadata(key, value)
+      @metadata = {} unless @metadata
+      @metadata[key.to_sym] = value
+    end
+
+    def metadata
+      @metadata || {}
+    end
+
+    def to_h
+      hash = instance_variables.each_with_object({}) do |var, acc|
+        acc[var.to_s[1..-1].to_sym] = instance_variable_get(var)
+      end
+      hash[:metadata] = @metadata || {}
+      hash
+    end
+
+    def policy_class
+      demodularised_class_name + 'Policy'
+    end
+
+    def demodularised_class_name
+      self.class.name.split('::').last
+    end
+  end
+end

data/lib/nexus_cqrs/base_middleware.rb

@@ -0,0 +1,11 @@
+module NexusCqrs
+  class BaseMiddleware
+    def initialize(next_)
+      @next = next_
+    end
+
+    # @param [BaseMessage] message
+    def call(message)
+    end
+  end
+end

data/lib/nexus_cqrs/base_query.rb

@@ -1,4 +1,4 @@
 module NexusCqrs
-  class BaseQuery
+  class BaseQuery < BaseMessage
   end
 end

data/lib/nexus_cqrs/base_query_handler.rb

@@ -1,6 +1,6 @@
 module NexusCqrs
   class BaseQueryHandler
-    def call(command)
+    def call(query)
     end
   end
 end

data/lib/nexus_cqrs/command_bus.rb

@@ -1,13 +1,15 @@
 require 'thread_safe'
+require 'middleware'
 
 module NexusCqrs
   class CommandBus
     UnregisteredHandler = Class.new(StandardError)
     MultipleHandlers    = Class.new(StandardError)
 
-    def initialize
+    def initialize(middleware: nil)
       @handlers =
         ThreadSafe::Cache.new
+      @middleware = middleware || Middleware::Builder.new
     end
 
     def register(klass, handler)
@@ -17,19 +19,23 @@ module NexusCqrs
     end
 
     def call(command)
-      unregistered_handler = proc { raise UnregisteredHandler, "Missing handler for #{command.class}" }
-
-      handlers
-        .fetch(command.class, &unregistered_handler)
-        .call(command)
+      runner = Middleware::Builder.new
+      runner.use(@middleware)
+      runner.use(->(command_) { handler_for_command(command_).call(command_) })
+      runner.call(command)
     end
 
     def registered_handlers
       handlers
     end
 
+    attr_reader :handlers
+
     private
 
-    attr_reader :handlers
+    def handler_for_command(command)
+      unregistered_handler = proc { raise UnregisteredHandler, "Missing handler for #{command.class}" }
+      handlers.fetch(command.class, &unregistered_handler)
+    end
   end
 end

data/lib/nexus_cqrs/helpers.rb

@@ -15,9 +15,8 @@ module NexusCqrs
       @command_executor ||= $COMMAND_EXECUTOR
     end
 
-    # Provide access to the CQRS executor
     def query_executor
-      @command_executor ||= $QUERY_EXECUTOR
+      @query_executor ||= $QUERY_EXECUTOR
     end
   end
 end

data/lib/nexus_cqrs/version.rb

@@ -1,3 +1,3 @@
 module NexusCqrs
-  VERSION = '0.0.10'
+  VERSION = '0.1.1'
 end

data/nexus_cqrs.gemspec

@@ -17,4 +17,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.add_dependency('generator_spec')
+  spec.add_dependency('thread_safe')
+  spec.add_dependency('ibsciss-middleware')
 end

metadata

@@ -1,15 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: nexus_cqrs
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.1.1
 platform: ruby
 authors:
 - Dean Lovett
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
-dependencies: []
+date: 2020-09-30 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: generator_spec
+  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: thread_safe
+  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: ibsciss-middleware
+  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'
 description: 
 email:
 - dean.lovett@nexusmods.com
@@ -19,6 +61,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitlab-ci.yml"
+- ".rspec"
 - ".rubocop.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -38,6 +81,8 @@ files:
 - lib/nexus_cqrs.rb
 - lib/nexus_cqrs/base_command.rb
 - lib/nexus_cqrs/base_command_handler.rb
+- lib/nexus_cqrs/base_message.rb
+- lib/nexus_cqrs/base_middleware.rb
 - lib/nexus_cqrs/base_query.rb
 - lib/nexus_cqrs/base_query_handler.rb
 - lib/nexus_cqrs/command_bus.rb
@@ -63,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Core package for the nexus cqrs gem