disco-railties 0.5.0.rc4 → 0.5.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 363cbe23952c7e14f9fe448bd13d7cad3fbe9a0f
-  data.tar.gz: 81451efafd0ef2b0d6cb0d2bae3b2dd611550101
+  metadata.gz: 6fa0988a2fd462ab708c12e956cd372b4859cf72
+  data.tar.gz: fafb6fb6db76a307a10f6a6cef30ae8a3f4350c9
 SHA512:
-  metadata.gz: a40e0e8afb54f6c4292e95ba17d812c327535f838bd96c506ae53e6df910a0d12cd2bbe019c1aa3a5da2dd597e433a25330b486079f96e94a916c932872886db
-  data.tar.gz: f80339d1425e6c52d8870e2ef8fd128daff32326e799c92ef3b5903d548b3d758723759d042a99c47c5cf014b192beef417f1c29a75c1aef506a874aa7fb1615
+  metadata.gz: cdb9a57f8daff86b729189a86f871f793091010b573469e7eb308e8a3204fe709c3e9815f2a6645e283f03e79e7e7687fedcd275df277f5d1f599353f85f6aa3
+  data.tar.gz: 206b953d09f884b9ca24a0fab684e121d9659eae5b7de12079ccd4fc56ce54c0cbce79b3a17d3275c94e1cf82b48f8e998c28cc1d841ccae7af67a62697db901

data/lib/generators/disco/app/USAGE

@@ -7,8 +7,21 @@ Example:
     This will create:
         bin/disco
         app/controllers/event_source_controller.rb
-        a route for this controller
+        app/controllers/concerns/event_source.rb
+        app/helpers/event_source_helper.rb
+        app/assets/javascripts/event_source.js
+        app/assets/stylesheets/event_source.css
         config/initializers/build_validations_registry.rb
         config/initializers/create_domain.rb
+        config/initializers/event_source_server.rb
         config/disco.yml
+        app/commands/
+        app/events/
+        app/projections/
+        app/validations/
+        domain/command_processors/domain/
+        domain/models/domain/
+        domain/projections/domain/
+        domain/validations/domain/
+        adds event_source route
         adds rails-disco to your gemfile

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

@@ -15,6 +15,10 @@ gem 'puma'\n" unless behavior == :revoke
     def app
       super
       copy_file 'app/controllers/event_source_controller.rb'
+      copy_file 'app/controllers/concerns/event_source.rb'
+      copy_file 'app/helpers/event_source_helper.rb'
+      copy_file 'app/assets/javascripts/event_source.js'
+      copy_file 'app/assets/stylesheets/event_source.css'
       keep_file 'app/commands'
       keep_file 'app/events'
       keep_file 'app/projections'
@@ -71,7 +75,7 @@ gem 'puma'\n" unless behavior == :revoke
 
       def add_event_source_route
         return if behavior == :revoke
-        route "get 'event_source/:projection/:event' => 'event_source#projected'"
+        route "get 'event_source/:projection/:event' => 'event_source#projected', as: 'event_source'"
       end
 
       def enable_rake_tasks

data/lib/generators/disco/app/templates/app/assets/javascripts/event_source.js

@@ -0,0 +1,19 @@
+$(function () {
+    var event_source = $('.event-source[data-href]');
+    if (event_source.length==1 && typeof(EventSource)!=='undefined') {
+        var source = new EventSource(event_source.data('href'));
+        source.addEventListener('projected', function (e) {
+            window.location.reload();
+        });
+        source.addEventListener('exception', function (e) {
+            var d = $.parseJSON(e.data);
+            $('body').prepend(
+                $('<div class="alert alert-projection">').append(
+                    $('<div class="message">').text(d['error']),
+                    $('<div class="backtrace">').text(d['backtrace'].join('\n'))
+                )
+            );
+            source.close();
+        });
+    }
+});

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

@@ -0,0 +1,4 @@
+
+.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/concerns/event_source.rb

@@ -0,0 +1,16 @@
+module EventSource
+  extend ActiveSupport::Concern
+  EVENT_ID_KEY = :event_id
+
+  included do
+    helper_method :read_and_clear_event_id
+  end
+  
+  def read_and_clear_event_id
+    session.delete EVENT_ID_KEY
+  end
+
+  def store_event_id(event_id)
+    session[EVENT_ID_KEY] = event_id
+  end
+end

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

@@ -5,10 +5,12 @@ class EventSourceController < ApplicationController
     response.headers['Content-Type'] = 'text/event-stream'
     sse = ActiveEvent::SSE.new(response.stream)
     ActiveEvent::EventSourceServer.after_event_projection event_id, projection do
-      sse.write(nil, event: 'projected')
+      sse.event('projected')
     end
   rescue IOError
-    # ignored
+    # ignore disconnect
+  rescue ActiveEvent::ProjectionException => e
+    sse.event('exception', {error: e.message, backtrace: e.backtrace})
   ensure
     sse.close
   end

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

@@ -0,0 +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

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

@@ -35,12 +35,7 @@ module Disco
 
       hook_for :scaffold_controller, in: :disco, require: true do |hook|
         invoke hook
-        add_event_stream_to_views
-      end
-
-      def copy_event_stream_client
-        # ensure if app was created before this was default
-        copy_file '_eventstream.js.erb', 'app/views/application/eventstream/_eventstream.js.erb', verbose: false, skip: true
+        add_event_source_to_views
       end
 
       protected
@@ -62,9 +57,9 @@ module Disco
         opts
       end
 
-      def add_event_stream_to_views
+      def add_event_source_to_views
         return if behavior == :revoke
-        include_text = "<%= javascript_tag render partial: 'application/eventstream/eventstream', formats: [:js], locals: {event_id: @event_id, projection: '#{class_name}Projection'} %>\n"
+        include_text = "<%= event_source('#{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

data/lib/generators/disco/scaffold_controller/templates/controller.rb

@@ -4,14 +4,14 @@ require_dependency '<%= namespaced_file_path %>/application_controller'
 <% end -%>
 <% module_namespacing do -%>
 class <%= controller_class_name %>Controller < ApplicationController
-  before_action :set_event_id, only: [:index, :show]
+  include EventSource
 
   def index
     @<%= plural_table_name %> = <%= orm_class.all(class_name) %>
   end
 
   def show
-    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'params[:id]') %>
+    @<%= singular_table_name %> = <%= orm_class.find(class_name, 'id_param') %>
   end
 
   def new
@@ -19,12 +19,12 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def edit
-    @<%= singular_table_name %> = <%= command_class_name('update') %>Command.new <%= orm_class.find(class_name, 'params[:id]') %>.attributes
+    @<%= singular_table_name %> = <%= command_class_name('update') %>Command.new <%= orm_class.find(class_name, 'id_param') %>.attributes
   end
 
   def create
     @<%= singular_table_name %> = <%= command_class_name('create') %>Command.new <%= singular_table_name %>_params
-    if @<%= singular_table_name %>.valid? && (session[:tmp_event_id] = Domain.run_command(@<%= singular_table_name %>))
+    if store_event_id Domain.run_command(@<%= singular_table_name %>)
       redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully created.'" %>
     else
       render action: 'new'
@@ -32,8 +32,8 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def update
-    @<%= singular_table_name %> = <%= command_class_name('update') %>Command.new <%= singular_table_name %>_params.merge(id: params[:id])
-    if @<%= singular_table_name %>.valid? && (session[:tmp_event_id] = Domain.run_command(@<%= singular_table_name %>))
+    @<%= singular_table_name %> = <%= command_class_name('update') %>Command.new <%= singular_table_name %>_params.merge(id: id_param)
+    if store_event_id Domain.run_command(@<%= singular_table_name %>)
       redirect_to @<%= singular_table_name %>, notice: <%= "'#{human_name} was successfully updated.'" %>
     else
       render action: 'edit'
@@ -41,12 +41,11 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def destroy
-    delete_<%= singular_table_name %> = <%= command_class_name('delete') %>Command.new(id: params[:id])
-    session[:tmp_event_id] = event_id = Domain.run_command(delete_<%= singular_table_name %>)
-    if event_id
+    delete_<%= singular_table_name %> = <%= command_class_name('delete') %>Command.new(id: id_param)
+    if store_event_id Domain.run_command(delete_<%= singular_table_name %>)
       redirect_to <%= index_helper %>_url, notice: <%= "'#{human_name} was successfully destroyed.'" %>
     else
-      redirect_to <%= singular_table_name %>_url(id: params[:id]), alert: <%= "'#{human_name} could not be deleted.'" %>
+      redirect_to <%= singular_table_name %>_url(id: id_param), alert: <%= "'#{human_name} could not be deleted.'" %>
     end
   end
 
@@ -60,9 +59,8 @@ class <%= controller_class_name %>Controller < ApplicationController
     <%- end -%>
   end
 
-  def set_event_id
-    @event_id = session[:tmp_event_id]
-    session[:tmp_event_id] = nil
+  def id_param
+    params.require(:id).to_i
   end
 end
 <% end -%>

data/lib/rails-disco/version.rb

@@ -3,7 +3,7 @@ module RailsDisco
     MAJOR = 0
     MINOR = 5
     TINY  = 0
-    PRE   = "rc4"
+    PRE   = "rc5"
 
     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.rc4
+  version: 0.5.0.rc5
 platform: ruby
 authors:
 - HicknHack Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-05-04 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.rc4
+        version: 0.5.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc4
+        version: 0.5.0.rc5
 - !ruby/object:Gem::Dependency
   name: active_domain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc4
+        version: 0.5.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc4
+        version: 0.5.0.rc5
 - !ruby/object:Gem::Dependency
   name: active_projection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc4
+        version: 0.5.0.rc5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc4
+        version: 0.5.0.rc5
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -74,67 +74,71 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- MIT-LICENSE
+- Rakefile
+- bin/disco
+- bin/drails
 - lib/disco/app_disco_loader.rb
 - lib/disco/cli.rb
+- lib/disco/commands.rb
 - lib/disco/commands/application.rb
 - lib/disco/commands/destroy.rb
 - lib/disco/commands/domainserver.rb
 - lib/disco/commands/generate.rb
 - lib/disco/commands/projectionserver.rb
 - lib/disco/commands/server.rb
-- lib/disco/commands.rb
 - lib/disco/generators.rb
 - lib/disco/server/domain_server.rb
 - lib/disco/server/projection_servers.rb
+- lib/generators/disco/app/USAGE
 - lib/generators/disco/app/app_generator.rb
+- lib/generators/disco/app/templates/app/assets/javascripts/event_source.js
+- lib/generators/disco/app/templates/app/assets/stylesheets/event_source.css
+- lib/generators/disco/app/templates/app/controllers/concerns/event_source.rb
 - lib/generators/disco/app/templates/app/controllers/event_source_controller.rb
+- lib/generators/disco/app/templates/app/helpers/event_source_helper.rb
 - lib/generators/disco/app/templates/bin/disco
 - 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/USAGE
 - lib/generators/disco/command/command_generator.rb
 - lib/generators/disco/command/templates/command.rb.erb
 - lib/generators/disco/command/templates/event.rb.erb
-- lib/generators/disco/command/USAGE
+- lib/generators/disco/command_processor/USAGE
 - lib/generators/disco/command_processor/command_processor_generator.rb
 - lib/generators/disco/command_processor/templates/command_processor.rb.erb
-- lib/generators/disco/command_processor/USAGE
 - lib/generators/disco/domain.rb
 - lib/generators/disco/event_name.rb
+- lib/generators/disco/migration/USAGE
 - lib/generators/disco/migration/migration_generator.rb
 - lib/generators/disco/migration/templates/create_table_migration.rb
-- lib/generators/disco/migration/USAGE
+- lib/generators/disco/model/USAGE
 - lib/generators/disco/model/model_generator.rb
 - lib/generators/disco/model/templates/domain_model.rb.erb
 - lib/generators/disco/model/templates/model.rb.erb
-- lib/generators/disco/model/USAGE
 - lib/generators/disco/processor_name.rb
+- lib/generators/disco/projection/USAGE
 - lib/generators/disco/projection/projection_generator.rb
 - lib/generators/disco/projection/templates/domain_projection.rb
 - lib/generators/disco/projection/templates/domain_projection_test.rb
 - lib/generators/disco/projection/templates/projection.rb
 - lib/generators/disco/projection/templates/projection_test.rb
-- lib/generators/disco/projection/USAGE
+- lib/generators/disco/scaffold/USAGE
 - lib/generators/disco/scaffold/scaffold_generator.rb
 - lib/generators/disco/scaffold/templates/_eventstream.js.erb
-- lib/generators/disco/scaffold/USAGE
+- lib/generators/disco/scaffold_controller/USAGE
 - lib/generators/disco/scaffold_controller/scaffold_controller_generator.rb
 - lib/generators/disco/scaffold_controller/templates/controller.rb
 - lib/generators/disco/scaffold_controller/templates/controller_test.rb
-- lib/generators/disco/scaffold_controller/USAGE
 - lib/generators/disco/use_domain_option.rb
 - lib/rails-disco/railtie.rb
 - lib/rails-disco/tasks.rb
 - lib/rails-disco/version.rb
 - lib/tasks/db.rake
 - lib/tasks/split.rake
-- Rakefile
-- MIT-LICENSE
-- bin/disco
-- bin/drails
 homepage: https://github.com/hicknhack-software/rails-disco
 licenses:
 - MIT
@@ -155,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Tools for working with Rails Disco