disco-railties 0.5.0.rc3 → 0.5.0.rc4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0bd165f0944683d0c5b4de539f11bea205e7444e
-  data.tar.gz: 6b02ed63e4f88f0eb0814d69a908fa5f2b582177
+  metadata.gz: 363cbe23952c7e14f9fe448bd13d7cad3fbe9a0f
+  data.tar.gz: 81451efafd0ef2b0d6cb0d2bae3b2dd611550101
 SHA512:
-  metadata.gz: 3a782de11c12f863ce01b8d00c0553c4ce53c0fca2922147602b64ae21e713c4e4f3df28db37a2d1ac34274daa86f311ee8ab5704a12caa78e96c2a619e4b8c9
-  data.tar.gz: 85a24c8d0f675affd054749e9024b456579abd2729f80f96a55b73453a9bbbeeec1292408bedf45e15fbb1d979990f51fa3d03211c31dba0a0b78bb9e0e9e9fa
+  metadata.gz: a40e0e8afb54f6c4292e95ba17d812c327535f838bd96c506ae53e6df910a0d12cd2bbe019c1aa3a5da2dd597e433a25330b486079f96e94a916c932872886db
+  data.tar.gz: f80339d1425e6c52d8870e2ef8fd128daff32326e799c92ef3b5903d548b3d758723759d042a99c47c5cf014b192beef417f1c29a75c1aef506a874aa7fb1615

data/lib/disco/server/projection_servers.rb

@@ -9,11 +9,10 @@ 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}" : ""}"
+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
-ActiveProjection::Autoload.worker_config = {path: ROOT_DIR, count: WORKER_COUNT, number: WORKER_NUMBER}
 
 watchable_dirs = ActiveEvent::Autoload.watchable_dirs.merge ActiveProjection::Autoload.watchable_dirs
 RELOADER = ActiveSupport::FileUpdateChecker.new([], watchable_dirs) do

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

@@ -37,6 +37,7 @@ gem 'puma'\n" unless behavior == :revoke
       inside 'config/initializers' do
         template 'create_domain.rb'
         copy_file 'build_validations_registry.rb'
+        copy_file 'event_source_server.rb'
       end
     end
 
@@ -70,7 +71,7 @@ gem 'puma'\n" unless behavior == :revoke
 
       def add_event_source_route
         return if behavior == :revoke
-        route "get 'event_stream' => 'event_source#stream'"
+        route "get 'event_source/:projection/:event' => 'event_source#projected'"
       end
 
       def enable_rake_tasks

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

@@ -1,16 +1,25 @@
 class EventSourceController < ApplicationController
   include ActionController::Live
-  include ActiveEvent::EventSourceServer
 
-  def stream
-    event_connection.start
+  def projected
     response.headers['Content-Type'] = 'text/event-stream'
     sse = ActiveEvent::SSE.new(response.stream)
-    subscribe_to event_queue do |delivery_info, properties, body|
-      sse.write({:id => body}, :event => 'refresh')
+    ActiveEvent::EventSourceServer.after_event_projection event_id, projection do
+      sse.write(nil, event: 'projected')
     end
   rescue IOError
+    # ignored
   ensure
     sse.close
   end
-end
+
+  private
+
+  def event_id
+    params[:event].to_i
+  end
+
+  def projection
+    params[:projection]
+  end
+end

data/lib/generators/disco/app/templates/config/initializers/event_source_server.rb

@@ -0,0 +1,2 @@
+# create instance (auto starts server)
+ActiveEvent::EventSourceServer.instance

data/lib/generators/disco/command/USAGE

@@ -2,7 +2,7 @@ Description:
     Generates a Command, an Event and adds it to the CommandProcessor or creates one.
 
 Example:
-    rails generate disco:command CreateThing [attr1, attr2] --event=CreatedThing --processor=Thing
+    rails generate disco:command CreateThing attr1 attr2 --event=CreatedThing --processor=Thing
 
     This will create:
         app/commands/create_thing_command.rb

data/lib/generators/disco/command/command_generator.rb

@@ -6,7 +6,7 @@ module Disco
   module Generators
     class CommandGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
-      argument :attributes, type: :array, default: [], banner: 'attribute attribute'
+      argument :attributes, type: :array, default: [], banner: '[attribute] [attribute]'
       class_option :unique_id, type: :boolean, default: false, desc: 'Create a unique id when processing the command'
       class_option :skip_model, type: :boolean, default: false, desc: 'Skip active model from the command'
       class_option :model_name, type: :string, desc: 'Name of the active model behind the command'

data/lib/generators/disco/projection/projection_generator.rb

@@ -8,11 +8,11 @@ module Disco
       include UseDomainOption
 
       def create_projection_file
-        template use_domain('projection.rb'), use_domain_class_file_path('projections', "#{plural_file_name}_projection.rb")
+        template use_domain('projection.rb'), use_domain_class_file_path('projections', "#{file_name}_projection.rb")
       end
 
       def create_test_files
-        template use_domain('projection_test.rb'), File.join('test/projections', use_domain_class_path, "#{plural_file_name}_projection_test.rb")
+        template use_domain('projection_test.rb'), File.join('test/projections', use_domain_class_path, "#{file_name}_projection_test.rb")
       end
     end
   end

data/lib/generators/disco/scaffold/USAGE

@@ -3,10 +3,10 @@ Description:
     commands, events and command_processor.
 
 Example:
-    disco generate scaffold Thing [attr1:type, attr2:type]
+    disco generate scaffold Thing title:string
 
     This will create:
-        app/controllers/things_controller
+        app/controllers/things_controller.rb
         app/commands/create_thing_command.rb
         app/commands/update_thing_command.rb
         app/commands/delete_thing_command.rb
@@ -14,7 +14,7 @@ Example:
         app/events/created_thing_event.rb
         app/events/updated_thing_event.rb
         app/events/deleted_thing_event.rb
-        app/projections/things_projection.rb
+        app/projections/thing_projection.rb
         db/migrate/create_things.rb
         app/models/thing.rb
         app/helpers/things_helper.rb

data/lib/generators/disco/scaffold/scaffold_generator.rb

@@ -64,20 +64,19 @@ module Disco
 
       def add_event_stream_to_views
         return if behavior == :revoke
-        include_text = '<%= javascript_tag render partial: \'application/eventstream/eventstream\', formats: [:js], locals: {event_id: @event_id} %>'
+        include_text = "<%= javascript_tag render partial: 'application/eventstream/eventstream', formats: [:js], locals: {event_id: @event_id, projection: '#{class_name}Projection'} %>\n"
         prepend_to_file File.join('app/views', class_path, plural_file_name, 'index.html.erb'), include_text
         prepend_to_file File.join('app/views', class_path, plural_file_name, 'show.html.erb'), include_text
       end
 
       def add_to_projections(action)
         return if behavior == :revoke
-        content = "
-
+        content = "\n
   def #{projection_name_for_action(action)}(event)
     #{projection_body_for_action(action)}
   end"
         indent(content) if namespaced?
-        inject_into_file File.join('app/projections', class_path, "#{plural_file_name}_projection.rb"), content, after: /(\s)*include(\s)*ActiveProjection::ProjectionType/
+        inject_into_file File.join('app/projections', class_path, "#{file_name}_projection.rb"), content, after: /(\s)*include(\s)*ActiveProjection::ProjectionType/
       end
 
       def command_name_for_action(action)

data/lib/generators/disco/scaffold/templates/_eventstream.js.erb

@@ -1,16 +1,10 @@
 <% if event_id.present? %>
     $(document).ready(function () {
         setTimeout(function () {
-            var source = new EventSource('/event_stream');
-            source.addEventListener('refresh', function (e) {
-                var event = JSON.parse(e.data);
-                if (<%= event_id %> == event.id){
-                    window.location.reload();
-                }else if (<%= event_id %> < event.id){
-                    source.removeEventListener('refresh');
-                    source.close();
-                }
+            var source = new EventSource('/event_source/<%= projection %>/<%= event_id %>');
+            source.addEventListener('projected', function (e) {
+                window.location.reload();
             });
         }, 1);
     });
-<% end %>
+<% end %>

data/lib/rails-disco/version.rb

@@ -3,7 +3,7 @@ module RailsDisco
     MAJOR = 0
     MINOR = 5
     TINY  = 0
-    PRE   = "rc3"
+    PRE   = "rc4"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: disco-railties
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc3
+  version: 0.5.0.rc4
 platform: ruby
 authors:
 - HicknHack Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-24 00:00:00.000000000 Z
+date: 2014-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_event
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.5.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.5.0.rc4
 - !ruby/object:Gem::Dependency
   name: active_domain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.5.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.5.0.rc4
 - !ruby/object:Gem::Dependency
   name: active_projection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.5.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc3
+        version: 0.5.0.rc4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -92,6 +92,7 @@ files:
 - lib/generators/disco/app/templates/config/disco.yml
 - lib/generators/disco/app/templates/config/initializers/build_validations_registry.rb
 - lib/generators/disco/app/templates/config/initializers/create_domain.rb
+- lib/generators/disco/app/templates/config/initializers/event_source_server.rb
 - lib/generators/disco/app/templates/db/seeds.rb
 - lib/generators/disco/app/USAGE
 - lib/generators/disco/command/command_generator.rb