rails_event_store_active_record 0.34.0 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ecd9126ba4ac3a8c749122e76290b605152f25c177d12e06aa050910077bdfe
-  data.tar.gz: ed776c89a46e9a401ba28fcebfd584fd835bd06b0a1f72846b124771a2f027d6
+  metadata.gz: 0543625e5144d53c19de64b10aded2fa8a0c5583d68d409a0fe0e46b786e2a9b
+  data.tar.gz: dcbe74fad2d9995ae8de47416c1db4c798919d0ef435a7db56a90b7b4969ac3e
 SHA512:
-  metadata.gz: df85cbbcbeab5492145ae68dc031481058b5f2d0fa56d422f629d95808132aa5baf70d9081c5a8909ba92b7935d16155bc9fdfae81e51361559b23a821a38cb3
-  data.tar.gz: 7ded0302fa417f62365d91e6ad275a5003e77c372f813c35f23bf6979004831210b691518a2e18d2c5c0de8c6b97a6322da215c966be4df229bf20458af183c1
+  metadata.gz: 913a22954ba77274a6332302d079844f604cc8e02829bcb42ed54f5e475841cebd96f33a85a9a80f648d729f9ee215b3e31b5cba6aad903a84438c3505f5aadd
+  data.tar.gz: a42226376f9ecd60891ec6069bddabe77e4ad8c50311f210b211e14cac6881c5f165e27423ff5c33e105044dbdcc63c717e1004a7843228e82d9a26900178ecb

data/Gemfile

@@ -1,8 +1,12 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'ruby_event_store', path: '../ruby_event_store'
+eval_gemfile File.expand_path('../lib/Gemfile.shared', __dir__)
 
-if v = ENV['RAILS_VERSION']
-  gem 'rails', v
-end
+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'
+gem 'rails', ENV['RAILS_VERSION']

data/Makefile

@@ -7,54 +7,20 @@ IGNORE       = RailsEventStoreActiveRecord::IndexViolationDetector\#detect \
 SUBJECT      ?= RailsEventStoreActiveRecord*
 DATABASE_URL ?= sqlite3::memory:
 
-install: ## Install gem dependencies
-	@echo "Installing gem dependencies"
-	@bundle install
-	@BUNDLE_GEMFILE=../lib/Gemfile.0_33_0 bundle install
+include ../lib/install.mk
+include ../lib/test.mk
+include ../lib/mutant.mk
+include ../lib/gem.mk
+include ../lib/help.mk
 
-remove-lock:
-	@echo "Removing resolved dependency versions"
-	-rm Gemfile.lock
-	-rm ../lib/Gemfile.0_33_0.lock
-
-reinstall: remove-lock install ## Removing resolved dependency versions
-
-test: ## Run unit tests
-	@echo "Running unit tests"
-	@BUNDLE_GEMFILE=Gemfile bundle exec rspec
-
-mutate: test ## Run mutation tests
-	@echo "Running mutation tests"
-	@MUTATING=true BUNDLE_GEMFILE=Gemfile DATABASE_URL=$(DATABASE_URL) bundle exec mutant --include lib \
-		$(addprefix --require ,$(REQUIRE)) \
-		$(addprefix --ignore-subject ,$(IGNORE)) \
-		--use rspec "$(SUBJECT)"
-
-mutate-fast: ## Run mutation tests with --fail-fast
-	@echo "Running mutation tests with --fail-fast"
-	@MUTATING=true BUNDLE_GEMFILE=Gemfile DATABASE_URL=$(DATABASE_URL) bundle exec mutant --include lib \
-		$(addprefix --require ,$(REQUIRE)) \
-		$(addprefix --ignore-subject ,$(IGNORE)) \
-		--fail-fast \
-		--use rspec "$(SUBJECT)"
+install: install-gemfiles
 
-build:
-	@echo "Building gem package"
-	@gem build -V $(GEM_NAME).gemspec
-	@mkdir -p pkg/
-	@mv $(GEM_NAME)-$(GEM_VERSION).gem pkg/
+remove-lock: remove-lockfiles
 
-push:
-	@echo "Pushing package to RubyGems"
-	@gem push -k dev_arkency pkg/$(GEM_NAME)-$(GEM_VERSION).gem
-
-clean:
-	@echo "Removing previously built package"
-	-rm pkg/$(GEM_NAME)-$(GEM_VERSION).gem
-
-help:
-	@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'
-
-.PHONY: help
-.DEFAULT_GOAL := help
+install-gemfiles:
+	@BUNDLE_GEMFILE=../lib/Gemfile.0_33_0 bundle check || BUNDLE_GEMFILE=../lib/Gemfile.0_33_0 bundle install
+	@BUNDLE_GEMFILE=../lib/Gemfile.0_34_0 bundle check || BUNDLE_GEMFILE=../lib/Gemfile.0_34_0 bundle install
 
+remove-lockfiles:
+	-rm ../lib/Gemfile.0_33_0.lock
+	-rm ../lib/Gemfile.0_34_0.lock

data/lib/rails_event_store_active_record.rb

@@ -1,6 +1,7 @@
 require 'rails_event_store_active_record/generators/migration_generator'
 require 'rails_event_store_active_record/generators/index_by_event_type_generator'
 require 'rails_event_store_active_record/generators/limit_for_event_id_generator'
+require 'rails_event_store_active_record/generators/binary_data_and_metadata_generator'
 require 'rails_event_store_active_record/event'
 require 'rails_event_store_active_record/event_repository'
 require 'rails_event_store_active_record/event_repository_reader'

data/lib/rails_event_store_active_record/event_repository.rb

@@ -42,6 +42,10 @@ module RailsEventStoreActiveRecord
       @repo_reader.read(specification)
     end
 
+    def count(specification)
+      @repo_reader.count(specification)
+    end
+
     def update_messages(messages)
       hashes = messages.map(&:to_h)
       hashes.each{|h| h[:id] = h.delete(:event_id) }

data/lib/rails_event_store_active_record/event_repository_reader.rb

@@ -13,13 +13,7 @@ module RailsEventStoreActiveRecord
     def read(spec)
       raise RubyEventStore::ReservedInternalName if spec.stream.name.eql?(EventRepository::SERIALIZED_GLOBAL_STREAM_NAME)
 
-      stream = EventInStream.preload(:event).where(stream: normalize_stream_name(spec))
-      stream = stream.where(event_id: spec.with_ids) if spec.with_ids?
-      stream = stream.joins(:event).where(event_store_events: {event_type: spec.with_types}) if spec.with_types?
-      stream = stream.order(position: order(spec)) unless spec.stream.global?
-      stream = stream.limit(spec.limit) if spec.limit?
-      stream = stream.where(start_condition(spec)) unless spec.head?
-      stream = stream.order(id: order(spec))
+      stream = read_scope(spec)
 
       if spec.batched?
         batch_reader = ->(offset, limit) { stream.offset(offset).limit(limit).map(&method(:build_event_instance)) }
@@ -35,8 +29,25 @@ module RailsEventStoreActiveRecord
       end
     end
 
+    def count(spec)
+      raise RubyEventStore::ReservedInternalName if spec.stream.name.eql?(EventRepository::SERIALIZED_GLOBAL_STREAM_NAME)
+
+      read_scope(spec).count
+    end
+
     private
 
+    def read_scope(spec)
+      stream = EventInStream.preload(:event).where(stream: normalize_stream_name(spec))
+      stream = stream.where(event_id: spec.with_ids) if spec.with_ids?
+      stream = stream.joins(:event).where(event_store_events: {event_type: spec.with_types}) if spec.with_types?
+      stream = stream.order(position: order(spec)) unless spec.stream.global?
+      stream = stream.limit(spec.limit) if spec.limit?
+      stream = stream.where(start_condition(spec)) unless spec.head?
+      stream = stream.order(id: order(spec))
+      stream
+    end
+
     def normalize_stream_name(specification)
       specification.stream.global? ? EventRepository::SERIALIZED_GLOBAL_STREAM_NAME : specification.stream.name
     end

data/lib/rails_event_store_active_record/generators/binary_data_and_metadata_generator.rb

@@ -0,0 +1,29 @@
+begin
+  require 'rails/generators'
+rescue LoadError
+end
+
+module RailsEventStoreActiveRecord
+  class BinaryDataAndMetadataGenerator < Rails::Generators::Base
+    source_root File.expand_path(File.join(File.dirname(__FILE__), '../generators/templates'))
+
+    def create_migration
+      template "binary_data_and_metadata_template.rb", "db/migrate/#{timestamp}_binary_data_and_metadata.rb"
+    end
+
+    private
+
+    def rails_version
+      Rails::VERSION::STRING
+    end
+
+    def migration_version
+      return nil if Gem::Version.new(rails_version) < Gem::Version.new("5.0.0")
+      "[4.2]"
+    end
+
+    def timestamp
+      Time.now.strftime("%Y%m%d%H%M%S")
+    end
+  end
+end if defined?(Rails::Generators::Base)

data/lib/rails_event_store_active_record/generators/templates/binary_data_and_metadata_template.rb

@@ -0,0 +1,33 @@
+class BinaryDataAndMetadata < ActiveRecord::Migration<%= migration_version %>
+  def change
+    rails_42 = Gem::Version.new(ActiveRecord::VERSION::STRING) < Gem::Version.new("5.0.0")
+
+    case ActiveRecord::Base.connection.adapter_name
+    when "SQLite"
+      rename_table :event_store_events, :old_event_store_events
+      create_table(:event_store_events, id: false, force: false) do |t|
+        t.string :id, limit: 36, primary_key: true, null: false
+        t.string      :event_type,  null: false
+        t.binary      :metadata
+        t.binary      :data,        null: false
+        t.datetime    :created_at,  null: false
+      end
+      add_index :event_store_events, :id, unique: true if rails_42
+      add_index :event_store_events, :created_at
+      add_index :event_store_events, :event_type
+      execute <<-SQL
+        INSERT INTO event_store_events(id, event_type, metadata, data, created_at)
+        SELECT id, event_type, metadata, data, created_at FROM old_event_store_events;
+      SQL
+      drop_table :old_event_store_events
+    when "PostgreSQL"
+      execute <<-SQL
+        ALTER TABLE event_store_events ALTER COLUMN data     TYPE bytea USING convert_to(data,     'UTF8');
+        ALTER TABLE event_store_events ALTER COLUMN metadata TYPE bytea USING convert_to(metadata, 'UTF8');
+      SQL
+    else
+      change_column :event_store_events, :data,     :binary
+      change_column :event_store_events, :metadata, :binary
+    end
+  end
+end

data/lib/rails_event_store_active_record/generators/templates/create_event_store_events_template.rb

@@ -21,16 +21,16 @@ class CreateEventStoreEvents < ActiveRecord::Migration<%= migration_version %>
     if postgres
       create_table(:event_store_events, id: :uuid, default: 'gen_random_uuid()', force: false) do |t|
         t.string      :event_type,  null: false
-        t.text        :metadata
-        t.text        :data,        null: false
+        t.binary      :metadata
+        t.binary      :data,        null: false
         t.datetime    :created_at,  null: false
       end
     else
       create_table(:event_store_events, id: false, force: false) do |t|
         t.string :id, limit: 36, primary_key: true, null: false
         t.string      :event_type,  null: false
-        t.text        :metadata
-        t.text        :data,        null: false
+        t.binary      :metadata
+        t.binary      :data,        null: false
         t.datetime    :created_at,  null: false
       end
       if sqlite && rails_42

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.34.0"
+  VERSION = "0.35.0"
 end

data/rails_event_store_active_record.gemspec

@@ -25,19 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.15'
-  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 'sqlite3', '1.3.13'
-  spec.add_development_dependency 'pg', '0.21'
-  spec.add_development_dependency 'mysql2', '0.4.10'
-  spec.add_development_dependency 'mutant-rspec', '= 0.8.17'
-  spec.add_development_dependency 'fakefs', '~> 0.11.2'
-  spec.add_development_dependency 'childprocess'
-  spec.add_development_dependency 'google-protobuf', '~> 3.5.1.2'
-
-  spec.add_dependency 'ruby_event_store', '= 0.34.0'
+  spec.add_dependency 'ruby_event_store', '= 0.35.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activerecord-import', '~> 0.21'

metadata

@@ -1,183 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-23 00:00:00.000000000 Z
+date: 2018-12-07 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.6'
-- !ruby/object:Gem::Dependency
-  name: rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.2'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.13
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.3.13
-- !ruby/object:Gem::Dependency
-  name: pg
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.21'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: '0.21'
-- !ruby/object:Gem::Dependency
-  name: mysql2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.4.10
-- !ruby/object:Gem::Dependency
-  name: mutant-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.17
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.8.17
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  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: google-protobuf
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.1.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.5.1.2
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.35.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.34.0
+        version: 0.35.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -239,9 +85,11 @@ files:
 - lib/rails_event_store_active_record/event.rb
 - lib/rails_event_store_active_record/event_repository.rb
 - lib/rails_event_store_active_record/event_repository_reader.rb
+- lib/rails_event_store_active_record/generators/binary_data_and_metadata_generator.rb
 - lib/rails_event_store_active_record/generators/index_by_event_type_generator.rb
 - lib/rails_event_store_active_record/generators/limit_for_event_id_generator.rb
 - lib/rails_event_store_active_record/generators/migration_generator.rb
+- lib/rails_event_store_active_record/generators/templates/binary_data_and_metadata_template.rb
 - lib/rails_event_store_active_record/generators/templates/create_event_store_events_template.rb
 - lib/rails_event_store_active_record/generators/templates/index_by_event_type_template.rb
 - lib/rails_event_store_active_record/generators/templates/limit_for_event_id_template.rb