disco-railties 0.5.2 → 0.5.3

data/lib/disco/commands/destroy.rb

@@ -1,12 +1,12 @@
-require 'disco/generators'
-
-if [nil, '-h', '--help'].include?(ARGV.first)
-  Rails::Generators.help 'destroy'
-  exit
-end
-
-name = ARGV.shift
-name = name.sub(/^disco:/, '')
-
-root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
-Rails::Generators.invoke "disco:#{name}", ARGV, behavior: :revoke, destination_root: root
+require 'disco/generators'
+
+if [nil, '-h', '--help'].include?(ARGV.first)
+  Rails::Generators.help 'destroy'
+  exit
+end
+
+name = ARGV.shift
+name = name.sub(/^disco:/, '')
+
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+Rails::Generators.invoke "disco:#{name}", ARGV, behavior: :revoke, destination_root: root

data/lib/disco/commands/domainserver.rb

@@ -1,6 +1,9 @@
-puts 'Starting Domain Command Server'
-puts '=> Ctrl-C to shutdown domain server'
-Signal.trap('INT') { puts; exit(1) }
-
-Process.spawn({'ROOT_DIR' => Dir.pwd}, "ruby #{File.expand_path '../../server', __FILE__}/domain_server.rb")
-Process.waitall
+puts 'Starting Domain Command Server'
+puts '=> Ctrl-C to shutdown domain server'
+Signal.trap('INT') do
+  puts
+  exit(1)
+end
+
+Process.spawn({'ROOT_DIR' => Dir.pwd}, "ruby #{File.expand_path '../../server', __FILE__}/domain_server.rb")
+Process.waitall

data/lib/disco/commands/generate.rb

@@ -1,12 +1,12 @@
-require 'disco/generators'
-
-if [nil, '-h', '--help'].include?(ARGV.first)
-  Rails::Generators.help 'generate'
-  exit
-end
-
-name = ARGV.shift
-name = name.sub(/^disco:/, '')
-
-root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
-Rails::Generators.invoke "disco:#{name}", ARGV, behavior: :invoke, destination_root: root
+require 'disco/generators'
+
+if [nil, '-h', '--help'].include?(ARGV.first)
+  Rails::Generators.help 'generate'
+  exit
+end
+
+name = ARGV.shift
+name = name.sub(/^disco:/, '')
+
+root = defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+Rails::Generators.invoke "disco:#{name}", ARGV, behavior: :invoke, destination_root: root

data/lib/disco/commands/projectionserver.rb

@@ -1,9 +1,13 @@
-count = [ARGV.shift.to_i, 1].max
-puts "Starting Projection Server (#{count} processes)"
-puts '=> Ctrl-C to shutdown projections server'
-Signal.trap('INT') { puts; exit(1) }
-
-count.times do |i|
-  Process.spawn({'ROOT_DIR' => Dir.pwd, 'WORKER_COUNT' => count.to_s, 'WORKER_NUMBER' => i.to_s}, "ruby #{File.expand_path '../../server', __FILE__}/projection_servers.rb")
-end
-Process.waitall
+count = [ARGV.shift.to_i, 1].max
+puts "Starting Projection Server (#{count} processes)"
+puts '=> Ctrl-C to shutdown projections server'
+Signal.trap('INT') do
+  puts
+  exit(1)
+end
+
+count.times do |i|
+  server_env = {'ROOT_DIR' => Dir.pwd, 'WORKER_COUNT' => count.to_s, 'WORKER_NUMBER' => i.to_s}
+  Process.spawn(server_env, "ruby #{File.expand_path '../../server', __FILE__}/projection_servers.rb")
+end
+Process.waitall

data/lib/disco/commands/server.rb

@@ -1,22 +1,23 @@
-count = [ARGV.shift.to_i, 1].max
-puts "Starting domain, projection (*#{count}) and Rails server..."
-puts '=> Ctrl-C to shutdown all servers'
-env = {'ROOT_DIR' => Dir.pwd}
-pids = []
-pids << Process.spawn(env, "ruby #{File.expand_path '../../server', __FILE__}/domain_server.rb")
-count.times do |i|
-  pids << Process.spawn(env.merge('WORKER_COUNT' => count.to_s, 'WORKER_NUMBER' => i.to_s), "ruby #{File.expand_path '../../server', __FILE__}/projection_servers.rb")
-end
-pids << Process.spawn(env, 'rails s')
-trap(:INT) do
-  pids.each do |pid|
-    begin
-      Process.kill 9, pid
-    rescue Exception
-      # do nothing
-    end
-  end
-  puts
-  exit(1)
-end
-Process.waitall
+count = [ARGV.shift.to_i, 1].max
+puts "Starting domain, projection (*#{count}) and Rails server..."
+puts '=> Ctrl-C to shutdown all servers'
+env = {'ROOT_DIR' => Dir.pwd}
+pids = []
+pids << Process.spawn(env, "ruby #{File.expand_path '../../server', __FILE__}/domain_server.rb")
+count.times do |i|
+  server_env = env.merge('WORKER_COUNT' => count.to_s, 'WORKER_NUMBER' => i.to_s)
+  pids << Process.spawn(server_env, "ruby #{File.expand_path '../../server', __FILE__}/projection_servers.rb")
+end
+pids << Process.spawn(env, 'rails s')
+trap(:INT) do
+  pids.each do |pid|
+    begin
+      Process.kill 9, pid
+    rescue
+      # do nothing
+    end
+  end
+  puts
+  exit(1)
+end
+Process.waitall

data/lib/disco/generators.rb

@@ -1,48 +1,46 @@
-require 'rails/generators'
-
-module Rails
-  module Generators
-
-    def self.help(command = 'generate')
-      lookup!
-
-      namespaces = subclasses.map { |k| k.namespace }
-      namespaces.sort!
-
-      disco = []
-      namespaces.each do |namespace|
-        disco << namespace if namespace.split(':').first == 'disco'
-      end
-
-      puts <<-EOT
-Usage: disco #{command} GENERATOR [args] [options]
-
-General options:
-  -h, [--help]     # Print generator's options and usage
-  -p, [--pretend]  # Run but do not make any changes
-  -f, [--force]    # Overwrite files that already exist
-  -s, [--skip]     # Skip files that already exist
-  -q, [--quiet]    # Suppress status output
-
-Please choose a generator below.
-
-      EOT
-
-      disco.reject! { |n| hidden_namespaces.include?(n) }
-      disco.map! { |n| n.sub(/^disco:/, '') }
-      disco.delete('app')
-      disco.delete('plugin_new')
-      print_list('disco', disco)
-    end
-
-  end
-end
-
-Rails::Generators.options.deep_merge! disco: {
-    command: :command,
-    command_processor: :command_processor,
-    migration: :migration,
-    model: :model,
-    projection: :projection,
-    scaffold_controller: :scaffold_controller,
-}
+require 'rails/generators'
+
+module Rails
+  module Generators
+    def self.help(command = 'generate')
+      lookup!
+
+      namespaces = subclasses.map { |k| k.namespace }
+      namespaces.sort!
+
+      disco = []
+      namespaces.each do |namespace|
+        disco << namespace if namespace.split(':').first == 'disco'
+      end
+
+      puts <<-EOT
+Usage: disco #{command} GENERATOR [args] [options]
+
+General options:
+  -h, [--help]     # Print generator's options and usage
+  -p, [--pretend]  # Run but do not make any changes
+  -f, [--force]    # Overwrite files that already exist
+  -s, [--skip]     # Skip files that already exist
+  -q, [--quiet]    # Suppress status output
+
+Please choose a generator below.
+
+      EOT
+
+      disco.reject! { |n| hidden_namespaces.include?(n) }
+      disco.map! { |n| n.sub(/^disco:/, '') }
+      disco.delete('app')
+      disco.delete('plugin_new')
+      print_list('disco', disco)
+    end
+  end
+end
+
+Rails::Generators.options.deep_merge! disco: {
+  command: :command,
+  command_processor: :command_processor,
+  migration: :migration,
+  model: :model,
+  projection: :projection,
+  scaffold_controller: :scaffold_controller,
+}

data/lib/disco/server/domain_server.rb

@@ -1,26 +1,26 @@
-#!/usr/bin/env ruby.exe
-ROOT_DIR ||= ENV['ROOT_DIR']
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ROOT_DIR)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-
-require 'active_event'
-require 'active_domain'
-require 'active_record'
-
-LOGGER = ActiveEvent::Support::MultiLogger.new 'Domain Server'
-
-ActiveEvent::Autoload.app_path = ROOT_DIR
-ActiveDomain::Autoload.app_path = ROOT_DIR
-
-watchable_dirs = ActiveEvent::Autoload.watchable_dirs.merge ActiveDomain::Autoload.watchable_dirs
-RELOADER = ActiveSupport::FileUpdateChecker.new([], watchable_dirs) do
-  ActiveEvent::Autoload.reload_module :ValidationsRegistry
-  ActiveDomain::Autoload.reload_module :ProjectionRegistry
-  ActiveEvent::Autoload.reload
-  ActiveDomain::Autoload.reload
-  ActiveEvent::ValidationsRegistry.build
-end
-
-ActiveEvent::ValidationsRegistry.build
-ActiveDomain::Server.base_path = ROOT_DIR
-ActiveDomain::Server.run
+#!/usr/bin/env ruby.exe
+ROOT_DIR ||= ENV['ROOT_DIR']
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ROOT_DIR)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'active_event'
+require 'active_domain'
+require 'active_record'
+
+LOGGER = ActiveEvent::Support::MultiLogger.new 'Domain Server'
+
+ActiveEvent::Autoload.app_path = ROOT_DIR
+ActiveDomain::Autoload.app_path = ROOT_DIR
+
+watchable_dirs = ActiveEvent::Autoload.watchable_dirs.merge ActiveDomain::Autoload.watchable_dirs
+RELOADER = ActiveSupport::FileUpdateChecker.new([], watchable_dirs) do
+  ActiveEvent::Autoload.reload_module :ValidationsRegistry
+  ActiveDomain::Autoload.reload_module :ProjectionRegistry
+  ActiveEvent::Autoload.reload
+  ActiveDomain::Autoload.reload
+  ActiveEvent::ValidationsRegistry.build
+end
+
+ActiveEvent::ValidationsRegistry.build
+ActiveDomain::Server.base_path = ROOT_DIR
+ActiveDomain::Server.run

data/lib/disco/server/projection_servers.rb

@@ -1,25 +1,25 @@
-#!/usr/bin/env ruby.exe
-ROOT_DIR ||= ENV['ROOT_DIR']
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ROOT_DIR)
-require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
-
-require 'active_event'
-require 'active_projection'
-require 'active_record'
-
-WORKER_COUNT = [ENV['WORKER_COUNT'].to_i, 1].max
-WORKER_NUMBER = ENV['WORKER_NUMBER'].to_i
-LOGGER = ActiveEvent::Support::MultiLogger.new "Projection Server#{WORKER_COUNT > 1 ? " Nr. #{WORKER_NUMBER}" : ''}"
-
-ActiveEvent::Autoload.app_path = ROOT_DIR
-ActiveProjection::Autoload.app_path = ROOT_DIR
-
-watchable_dirs = ActiveEvent::Autoload.watchable_dirs.merge ActiveProjection::Autoload.watchable_dirs
-RELOADER = ActiveSupport::FileUpdateChecker.new([], watchable_dirs) do
-  ActiveEvent::Autoload.reload_module :ValidationsRegistry
-  ActiveProjection::Autoload.reload_module :ProjectionTypeRegistry
-  ActiveEvent::Autoload.reload
-  ActiveProjection::Autoload.reload
-end
-ActiveProjection::Server.base_path = ROOT_DIR
-ActiveProjection::Server.run
+#!/usr/bin/env ruby.exe
+ROOT_DIR ||= ENV['ROOT_DIR']
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('Gemfile', ROOT_DIR)
+require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
+
+require 'active_event'
+require 'active_projection'
+require 'active_record'
+
+WORKER_COUNT = [ENV['WORKER_COUNT'].to_i, 1].max
+WORKER_NUMBER = ENV['WORKER_NUMBER'].to_i
+LOGGER = ActiveEvent::Support::MultiLogger.new "Projection Server#{WORKER_COUNT > 1 ? " Nr. #{WORKER_NUMBER}" : ''}"
+
+ActiveEvent::Autoload.app_path = ROOT_DIR
+ActiveProjection::Autoload.app_path = ROOT_DIR
+
+watchable_dirs = ActiveEvent::Autoload.watchable_dirs.merge ActiveProjection::Autoload.watchable_dirs
+RELOADER = ActiveSupport::FileUpdateChecker.new([], watchable_dirs) do
+  ActiveEvent::Autoload.reload_module :ValidationsRegistry
+  ActiveProjection::Autoload.reload_module :ProjectionTypeRegistry
+  ActiveEvent::Autoload.reload
+  ActiveProjection::Autoload.reload
+end
+ActiveProjection::Server.base_path = ROOT_DIR
+ActiveProjection::Server.run

data/lib/generators/disco/app/app_generator.rb

@@ -3,7 +3,6 @@ require 'yaml'
 
 module Disco
   class AppBuilder < Rails::AppBuilder
-
     def gemfile
       super
       append_file 'Gemfile', "\n# Rails Disco support
@@ -60,17 +59,20 @@ gem 'puma'\n" unless behavior == :revoke
     class AppGenerator < Rails::Generators::AppGenerator
       remove_class_option :version
       class_option :version, type: :boolean, aliases: '-v', group: :disco,
-                   desc: 'Show Rails Disco version number and quit'
+                             desc: 'Show Rails Disco version number and quit'
 
       remove_class_option :help
       class_option :help, type: :boolean, aliases: '-h', group: :disco,
-                   desc: 'Show this help message and quit'
+                          desc: 'Show this help message and quit'
 
       # this does not seem to work !
       remove_command :apply_rails_template, :run_bundle
 
       def source_paths
-        [File.join(Gem::Specification.find_by_name('railties').gem_dir, 'lib/rails/generators/rails/app/templates'), File.expand_path('../templates', __FILE__)]
+        [
+          File.join(Gem::Specification.find_by_name('railties').gem_dir, 'lib/rails/generators/rails/app/templates'),
+          File.expand_path('../templates', __FILE__),
+        ]
       end
 
       def add_event_source_route
@@ -83,7 +85,7 @@ gem 'puma'\n" unless behavior == :revoke
         content = "
 require 'rails-disco/tasks'"
         inject_into_file File.join('config/application.rb'), content, after: /require 'rails\/all'/
-      rescue Exception
+      rescue
         puts "Seems like you invoked it from an engine, so put\n
         require 'rails-disco/tasks'\n
         in your application.rb from the main application to have the rails disco rake tasks available"
@@ -93,7 +95,7 @@ require 'rails-disco/tasks'"
         return if behavior == :revoke
         application 'config.preload_frameworks = true'
         application 'config.allow_concurrency = true'
-      rescue Exception
+      rescue
         puts "Seems like you invoked it from an engine, so remember to put\n
         config.preload_frameworks = true
         config.allow_concurrency = true\n
@@ -102,10 +104,8 @@ require 'rails-disco/tasks'"
 
       public_task :apply_rails_template, :run_bundle
 
-      protected
-
       def self.banner
-        "disco new #{self.arguments.map(&:usage).join(' ')} [options]"
+        "disco new #{arguments.map(&:usage).join(' ')} [options]"
       end
 
       private
@@ -117,7 +117,7 @@ require 'rails-disco/tasks'"
       def domain_database(env, indent_level)
         config = YAML.load(File.read('config/database.yml'))[env.to_s]
         config['database'].sub!(/.*#{env}/, '\0_domain')
-        indent( ({'domain_database' => config}.to_yaml(indentation: 2))[4..-1], indent_level)
+        indent(({'domain_database' => config}.to_yaml(indentation: 2))[4..-1], indent_level)
       end
 
       # copied namespace support from NamedBase
@@ -129,7 +129,7 @@ require 'rails-disco/tasks'"
 
       def indent(content, multiplier = 2)
         spaces = ' ' * multiplier
-        content.each_line.map {|line| line.blank? ? line : "#{spaces}#{line}" }.join
+        content.each_line.map { |line| line.blank? ? line : "#{spaces}#{line}" }.join
       end
 
       def wrap_with_namespace(content)

data/lib/generators/disco/app/templates/app/assets/stylesheets/event_source.css

@@ -1,4 +1,4 @@
-
-.alert-projection { border: solid 2px #f44; padding: 4px; }
-.alert-projection .message { font-size: 200%; color: #f44; }
-.alert-projection .backtrace { white-space: pre; }
+
+.alert-projection { border: solid 2px #f44; padding: 4px; }
+.alert-projection .message { font-size: 200%; color: #f44; }
+.alert-projection .backtrace { white-space: pre; }

data/lib/generators/disco/app/templates/app/controllers/event_source_controller.rb

@@ -4,9 +4,8 @@ class EventSourceController < ApplicationController
   def projected
     response.headers['Content-Type'] = 'text/event-stream'
     sse = ActiveEvent::SSE.new(response.stream)
-    ActiveEvent::EventSourceServer.after_event_projection event_id, projection do
-      sse.event('projected')
-    end
+    ActiveEvent::EventSourceServer.wait_for_event_projection event_id, projection, timeout: 10
+    sse.event('projected')
   rescue IOError
     # ignore disconnect
   rescue ActiveEvent::ProjectionException => e

data/lib/generators/disco/app/templates/app/helpers/event_source_helper.rb

@@ -1,11 +1,11 @@
-module EventSourceHelper
-  def event_source(projection)
-    ActiveEvent::EventSourceServer.projection_status(projection)
-    event_id = read_and_clear_event_id
-    if event_id
-      content_tag(:div, '',
-                  class: 'event-source',
-                  data: {href: event_source_path(projection: projection, event: event_id)})
-    end
-  end
-end
+module EventSourceHelper
+  def event_source(projection)
+    ActiveEvent::EventSourceServer.fail_on_projection_error(projection)
+    event_id = read_and_clear_event_id
+    if event_id
+      content_tag(:div, '',
+                  class: 'event-source',
+                  data: {href: event_source_path(projection: projection, event: event_id)})
+    end
+  end
+end