messaging 3.4.2 → 3.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e2d081991ad2e8413244571ae8c9f9d3d3d5af9ce48bfcbff424e968c1d5c18
-  data.tar.gz: 8ca81941ebd45f6daad6a6c08435598a8b9f0bd3dede7fb99e9cc859a56bb6de
+  metadata.gz: 30a2583692555ea89d81c50ea5cbf03f21763c3e030ceded07ecbf2f46335015
+  data.tar.gz: 61164fd9cc9bae8acffe8094bcfcf3dfd4ca2d39fb03f279488d64f5e8a212e8
 SHA512:
-  metadata.gz: d932b1bfe5c5456e681c21280efbb055eb12acd6bcf5358dfe36d7afaca1bae61da98fbc994ea830a68c2db91230ef6883182b86d482201ae5242f38d19b3280
-  data.tar.gz: 6bcf879f6c3a9f2e8353c8877c81340d64e7418b85c84a9003337927402314d4a2cc3b6d279faf25b0ba1d0209a45ef510dd9067cc23bf48cc60a1bd0ab3852c
+  metadata.gz: bd04d056d7dd80c5b7a79d0ff999c5feefb0e1f77e176f9b13c8931b1b439bb3d7ade1746ad951c7e43d43d96d439909c79b190c423fdaf11cd195870b896b71
+  data.tar.gz: ffc5d6ba0b9801ca7ef4f55232815c0719c10e8c7e2d27fa8a6f94a1109d195143ee43c861372c92f33c7e7e9ef99f1674ab00ccb87a8b39d8b50e9b69916945

data/.gitignore

@@ -9,3 +9,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+Gemfile.lock

data/Gemfile

@@ -3,8 +3,6 @@ source 'https://rubygems.org'
 git_source(:github) { |path| "https://github.com/#{path}.git" }
 
 gem 'bootsnap', require: false
-gem 'bukowskis_after_transaction', github: 'bukowskis/after_transaction'
-gem 'bukowskis_method_object', github: 'bukowskis/method_object'
 gem 'listen'
 gem 'pg'
 gem 'pry'

data/lib/messaging.rb

@@ -53,6 +53,10 @@ module Messaging
     @routes ||= Routes.new
   end
 
+  def self.category(name)
+    message_store.category(name)
+  end
+
   def self.stream(name)
     name = name.stream_name if name.respond_to?(:stream_name)
     message_store.stream(name)

data/lib/messaging/adapters/postgres/categories.rb

@@ -0,0 +1,27 @@
+module Messaging
+  module Adapters
+    class Postgres
+      class Categories
+        include Enumerable
+
+        def each
+          return enum_for(:each) unless block_given?
+
+          all_categories.each do |name|
+            yield Category.new(name)
+          end
+        end
+
+        def [](name)
+          Category.new(name)
+        end
+
+        private
+
+        def all_categories
+          SerializedMessage.distinct.pluck(:stream_category).lazy
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/postgres/category.rb

@@ -0,0 +1,40 @@
+module Messaging
+  module Adapters
+    class Postgres
+      class Category
+        # @return [String] the name of the category
+        attr_reader :name
+
+        # Should not be used directly.
+        # Use {Messaging.category} or {Store#category}
+        # @api private
+        # @see Messaging.category
+        # @see Store.category
+        def initialize(name)
+          @name = name
+        end
+
+        # Access to all messages in the category sorted by created_at
+        # @return [ActiveRecord::Relation]
+        def messages
+          SerializedMessage.where(stream_category: name).order(:created_at)
+        end
+
+        def messages_older_than(time)
+          messages.where('created_at < ?', time)
+        end
+
+        def delete_messages_older_than!(time)
+          SerializedMessage.transaction do
+            ActiveRecord::Base.connection.execute "SET LOCAL statement_timeout = '0'"
+            messages_older_than(time).delete_all
+          end
+        end
+
+        def inspect
+          "#<Category:#{name}>>"
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/postgres/serialized_message.rb

@@ -23,7 +23,8 @@ module Messaging
           self.expected_version = message.expected_version
           self.message_type = message.message_type
           self.stream = message.stream_name
-          self.stream_category, self.stream_id = message.stream_name.split('$')
+          self.stream_category = message.stream_category
+          self.stream_id = message.stream_id
           self.uuid = message.uuid
         end
 

data/lib/messaging/adapters/postgres/store.rb

@@ -1,3 +1,5 @@
+require_relative 'category'
+require_relative 'categories'
 require_relative 'stream'
 require_relative 'streams'
 
@@ -20,11 +22,16 @@ module Messaging
         # @see Streams
         attr_reader :streams
 
+        # @return [Categories] all the stream categories in the store
+        # @see Categories
+        attr_reader :categories
+
         # Should not be used directly. Access the store though
         # Messaging.message_store or Messaging::Adapters::Store[:postgres]
         # @api private
         def initialize
           @streams = Streams.new
+          @categories = Categories.new
         end
 
         # Get a specific stream by name
@@ -34,6 +41,13 @@ module Messaging
           streams[name]
         end
 
+        # Get a specific category by name
+        # @return [Stream]
+        # @see Messaging.category
+        def category(name)
+          categories[name]
+        end
+
         # Access to all messages.
         # Use with caution in production as there are probably
         # a lot of messages so queries could take a long time or timeout.

data/lib/messaging/adapters/test/categories.rb

@@ -0,0 +1,19 @@
+module Messaging
+  module Adapters
+    class Test
+      class Categories
+        def initialize
+          clear!
+        end
+
+        def [](name)
+          @categories[name]
+        end
+
+        def clear!
+          @categories = Hash.new { |h, k| h[k] = Category.new(k) }
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/test/category.rb

@@ -0,0 +1,21 @@
+module Messaging
+  module Adapters
+    class Test
+      class Category
+        attr_accessor :name
+
+        def initialize(name)
+          self.name = name
+        end
+
+        def messages
+          @messages ||= []
+        end
+
+        def delete_messages_older_than!(time)
+          messages.delete_if { |m| m.timestamp < time }
+        end
+      end
+    end
+  end
+end

data/lib/messaging/adapters/test/store.rb

@@ -1,4 +1,6 @@
 require_relative 'stream'
+require_relative 'category'
+require_relative 'categories'
 
 module Messaging
   module Adapters
@@ -29,7 +31,10 @@ module Messaging
         # @see Stream
         attr_reader :streams
 
+        attr_reader :categories
+
         def initialize
+          @categories = Categories.new
           clear!
         end
 
@@ -40,8 +45,13 @@ module Messaging
           streams[name]
         end
 
+        def category(name)
+          categories[name]
+        end
+
         def clear!
           @streams = Hash.new { |h, k| h[k] = Stream.new(k) }
+          categories.clear!
           @messages = []
         end
 
@@ -55,10 +65,12 @@ module Messaging
           return message unless message.stream_name
 
           stream = stream(message.stream_name)
+          category = category(message.stream_name.split('$').first)
           ExpectedVersion.new(message.expected_version || :any).match!(stream.current_position)
           persisted_message = message.class.new(message.attributes.merge(stream_position: stream.current_position + 1))
           @messages << persisted_message
           stream.messages << persisted_message
+          category.messages << persisted_message
           persisted_message
         end
       end

data/lib/messaging/message.rb

@@ -92,6 +92,18 @@ module Messaging
       nil
     end
 
+    def stream_category
+      return unless stream_name
+
+      stream_name.split('$').first
+    end
+
+    def stream_id
+      return unless stream_name
+
+      stream_name.split('$').last
+    end
+
     def message_type
       self.class.to_s
     end

data/lib/messaging/version.rb

@@ -1,3 +1,3 @@
 module Messaging
-  VERSION = '3.4.2'.freeze
+  VERSION = '3.4.3'.freeze
 end

data/messaging.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'activerecord'
   spec.add_dependency 'activesupport'
-  spec.add_dependency 'bukowskis_after_transaction'
+  spec.add_dependency 'after_transaction'
   spec.add_dependency 'method_object'
   spec.add_dependency 'concurrent-ruby', '>= 1.0.2'
   spec.add_dependency 'concurrent-ruby-ext', '>= 1.0.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: messaging
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.4.3
 platform: ruby
 authors:
 - Bukowskis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bukowskis_after_transaction
+  name: after_transaction
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -275,7 +275,6 @@ files:
 - ".rspec"
 - ".ruby-version"
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - _config.yml
@@ -289,11 +288,15 @@ files:
 - lib/messaging/adapters/kafka/producer.rb
 - lib/messaging/adapters/postgres.rb
 - lib/messaging/adapters/postgres/advisory_transaction_lock.rb
+- lib/messaging/adapters/postgres/categories.rb
+- lib/messaging/adapters/postgres/category.rb
 - lib/messaging/adapters/postgres/serialized_message.rb
 - lib/messaging/adapters/postgres/store.rb
 - lib/messaging/adapters/postgres/stream.rb
 - lib/messaging/adapters/postgres/streams.rb
 - lib/messaging/adapters/test.rb
+- lib/messaging/adapters/test/categories.rb
+- lib/messaging/adapters/test/category.rb
 - lib/messaging/adapters/test/consumer.rb
 - lib/messaging/adapters/test/store.rb
 - lib/messaging/adapters/test/stream.rb

data/Gemfile.lock

@@ -1,222 +0,0 @@
-GIT
-  remote: https://github.com/bukowskis/after_transaction.git
-  revision: d9c250d497b861cdeb1aa924d82bbc5d38cfc56a
-  specs:
-    bukowskis_after_transaction (0.0.1)
-      activerecord (< 6.0)
-
-GIT
-  remote: https://github.com/bukowskis/method_object.git
-  revision: bfb21cabafceec3b191d5c42d681a8e99ff38e6d
-  specs:
-    bukowskis_method_object (0.0.1)
-      dry-initializer
-
-PATH
-  remote: .
-  specs:
-    messaging (3.4.2)
-      activerecord
-      activesupport
-      bukowskis_after_transaction
-      concurrent-ruby (>= 1.0.2)
-      concurrent-ruby-ext (>= 1.0.2)
-      dry-configurable
-      dry-container
-      dry-equalizer
-      dry-initializer
-      meter (>= 1.2.1)
-      method_object
-      ruby-kafka (>= 0.5.3)
-      virtus
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
-      rack-test (>= 0.6.3)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
-      builder (~> 3.1)
-      erubi (~> 1.4)
-      rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activesupport (5.2.2)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    arel (9.0.0)
-    axiom-types (0.1.1)
-      descendants_tracker (~> 0.0.4)
-      ice_nine (~> 0.11.0)
-      thread_safe (~> 0.3, >= 0.3.1)
-    bootsnap (1.3.2)
-      msgpack (~> 1.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    coercible (1.0.0)
-      descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.4)
-    concurrent-ruby-ext (1.1.4)
-      concurrent-ruby (= 1.1.4)
-    connection_pool (2.2.2)
-    crass (1.0.4)
-    descendants_tracker (0.0.4)
-      thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    digest-crc (0.4.1)
-    docile (1.3.1)
-    dry-configurable (0.8.3)
-      concurrent-ruby (~> 1.0)
-      dry-core (~> 0.4, >= 0.4.7)
-    dry-container (0.7.2)
-      concurrent-ruby (~> 1.0)
-      dry-configurable (~> 0.1, >= 0.1.3)
-    dry-core (0.4.9)
-      concurrent-ruby (~> 1.0)
-    dry-equalizer (0.2.2)
-    dry-initializer (2.5.0)
-    equalizer (0.0.11)
-    erubi (1.8.0)
-    ffi (1.10.0)
-    geocoder (1.2.13)
-    hashie (3.6.0)
-    i18n (1.5.3)
-      concurrent-ruby (~> 1.0)
-    ice_nine (0.11.2)
-    json (2.1.0)
-    listen (3.1.5)
-      rb-fsevent (~> 0.9, >= 0.9.4)
-      rb-inotify (~> 0.9, >= 0.9.7)
-      ruby_dep (~> 1.2)
-    locality (1.1.0)
-      activesupport
-      geocoder (= 1.2.13)
-      hashie
-      i18n
-      maxminddb (= 0.1.8)
-      operation
-      trouble
-    loofah (2.2.3)
-      crass (~> 1.0.2)
-      nokogiri (>= 1.5.9)
-    maxminddb (0.1.8)
-    meter (1.2.7)
-      locality (~> 1.1.0)
-      useragent (~> 0.16.3)
-    method_object (1.0.0)
-      dry-initializer
-    method_source (0.9.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    msgpack (1.2.6)
-    nokogiri (1.10.1)
-      mini_portile2 (~> 2.4.0)
-    operation (1.4.1)
-    pg (1.1.4)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    pry-rails (0.3.9)
-      pry (>= 0.10.4)
-    rack (2.0.6)
-    rack-protection (2.0.5)
-      rack
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails-dom-testing (2.0.3)
-      activesupport (>= 4.2.0)
-      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    rb-fsevent (0.10.3)
-    rb-inotify (0.10.0)
-      ffi (~> 1.0)
-    redis (4.1.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    ruby-kafka (0.7.10)
-      digest-crc
-    ruby_dep (1.5.0)
-    sidekiq (5.2.5)
-      connection_pool (~> 2.2, >= 2.2.2)
-      rack (>= 1.5.0)
-      rack-protection (>= 1.5.0)
-      redis (>= 3.3.5, < 5)
-    simplecov (0.16.1)
-      docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    trouble (0.0.13)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    useragent (0.16.10)
-    virtus (1.0.5)
-      axiom-types (~> 0.1)
-      coercible (~> 1.0)
-      descendants_tracker (~> 0.0, >= 0.0.3)
-      equalizer (~> 0.0, >= 0.0.9)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bootsnap
-  bukowskis_after_transaction!
-  bukowskis_method_object!
-  bundler (~> 1.14)
-  listen
-  messaging!
-  pg
-  pry
-  pry-rails
-  railties
-  rake (~> 10.0)
-  rspec (~> 3.0)
-  rspec-rails
-  sidekiq
-  simplecov
-
-BUNDLED WITH
-   1.17.3