drailties 0.4.3 → 0.5.0.pre

data/lib/generators/drails/model/model_generator.rb

@@ -1,23 +1,29 @@
-require 'generators/drails/use_domain_option.rb'
-
-module Drails
-  module Generators
-    class ModelGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
-      argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
-      include UseDomainOption
-
-      def create_projection_file
-        generate 'drails:projection', name, use_domain_param
-      end
-
-      def create_model_file
-        template use_domain('model.rb'), use_domain_class_file_path('models', "#{file_name}.rb")
-      end
-
-      def create_migration
-        generate 'drails:migration', "create_#{table_name}", attributes.map { |x| "#{x.name}:#{x.type}" }.join(' '), use_domain_param
-      end
-    end
-  end
-end
+require 'generators/drails/use_domain_option.rb'
+
+module Drails
+  module Generators
+    class ModelGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+      argument :attributes, type: :array, default: [], banner: 'field[:type] field[:type]'
+      include UseDomainOption
+
+      hook_for :projection, require: true do |hook|
+        invoke hook, [name]
+      end
+
+      def create_model_file
+        template use_domain('model.rb'), use_domain_class_file_path('models', "#{file_name}.rb")
+      end
+
+      hook_for :migration, require: true do |hook|
+        invoke hook, ["create_#{table_name}", *attributes]
+      end
+
+      private
+
+      # do not parse - keep attributes for forwarding to migration
+      def parse_attributes!
+      end
+    end
+  end
+end

data/lib/generators/drails/model/templates/domain_model.rb

@@ -1,5 +1,5 @@
-module <%=if Rails::Generators.namespace.present? then Rails::Generators.namespace.name end%>Domain
-  class <%= class_name %> < ActiveRecord::Base
-    self.table_name = '<%=table_name %>'
-  end
-end
+module <%= Rails::Generators.namespace.name if Rails::Generators.namespace.present? %>Domain
+  class <%= class_name %> < ActiveRecord::Base
+    self.table_name = '<%=table_name %>'
+  end
+end

data/lib/generators/drails/model/templates/model.rb

@@ -1,5 +1,5 @@
-<% module_namespacing do -%>
-class <%= class_name %> < ActiveRecord::Base
-  self.table_name = '<%=table_name %>'
-end
+<% module_namespacing do -%>
+class <%= class_name %> < ActiveRecord::Base
+  self.table_name = '<%=table_name %>'
+end
 <% end -%>

data/lib/generators/drails/processor_name.rb

@@ -1,48 +1,48 @@
-require 'active_support/concern'
-
-module Drails
-  module Generators
-    module ProcessorName
-      extend ActiveSupport::Concern
-
-      included do
-        class_option :processor, type: :string, default: nil, desc: "class_name of the command processor (defaults to NAME)"
-        class_option :skip_processor, type: :boolean, default: false, desc: "Skip command processor generation"
-      end
-
-      def initialize(args, *options)
-        super
-        assign_processor_names!(processor_name)
-      end      
-
-      protected
-
-      attr_reader :processor_file_name
-      attr_reader :processor_class_path
-
-      def skip_processor?
-        options[:skip_processor]
-      end
-
-      def processor_name
-        options[:processor] || name
-      end
-
-      def processor_file_path
-        @processor_file_path ||= (processor_class_path + [processor_file_name]).join('/')
-      end
-
-      def processor_domain_class_path
-        @processor_domain_class_path ||= class_path_domain processor_class_path
-      end
-
-      private
-
-      def assign_processor_names!(processor_name)
-        @processor_class_path = processor_name.include?('/') ? processor_name.split('/') : processor_name.split('::')
-        @processor_class_path.map! &:underscore
-        @processor_file_name = @processor_class_path.pop
-      end
-    end
-  end
+require 'active_support/concern'
+
+module Drails
+  module Generators
+    module ProcessorName
+      extend ActiveSupport::Concern
+
+      included do
+        class_option :processor, type: :string, default: nil, desc: "class_name of the command processor (defaults to NAME)"
+        class_option :skip_processor, type: :boolean, default: false, desc: "Skip command processor generation"
+      end
+
+      def initialize(args, *options)
+        super
+        assign_processor_names!(processor_name)
+      end      
+
+      protected
+
+      attr_reader :processor_file_name
+      attr_reader :processor_class_path
+
+      def skip_processor?
+        options[:skip_processor]
+      end
+
+      def processor_name
+        options[:processor] || name
+      end
+
+      def processor_file_path
+        @processor_file_path ||= (processor_class_path + [processor_file_name]).join('/')
+      end
+
+      def processor_domain_class_path
+        @processor_domain_class_path ||= class_path_domain processor_class_path
+      end
+
+      private
+
+      def assign_processor_names!(processor_name)
+        @processor_class_path = processor_name.include?('/') ? processor_name.split('/') : processor_name.split('::')
+        @processor_class_path.map! &:underscore
+        @processor_file_name = @processor_class_path.pop
+      end
+    end
+  end
 end

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

@@ -4,7 +4,7 @@ module Drails
   module Generators
     class ProjectionGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
-      argument :events, type: :array, default: [], banner: "event event"
+      argument :events, type: :array, default: [], banner: 'event event'
       include UseDomainOption
 
       def create_projection_file
@@ -12,8 +12,8 @@ module Drails
       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, "#{plural_file_name}_projection_test.rb")
       end
     end
   end
-end
+end

data/lib/generators/drails/projection/templates/domain_projection.rb

@@ -1,9 +1,9 @@
-module <%=if Rails::Generators.namespace.present? then Rails::Generators.namespace.name end%>Domain
-  class <%= class_name %>Projection
-    include ActiveDomain::Projection
-    <% events.each do |event| %>
-    def <%= event.underscore.split('/') * '__' %>(event)
-    end
-    <% end %>
-  end
-end
+module <%= Rails::Generators.namespace.name if Rails::Generators.namespace.present? %>Domain
+  class <%= class_name %>Projection
+    include ActiveDomain::Projection
+    <% events.each do |event| %>
+    def <%= event.underscore.split('/') * '__' %>(event)
+    end
+    <% end %>
+  end
+end

data/lib/generators/drails/projection/templates/domain_projection_test.rb

@@ -1,6 +1,6 @@
-require 'test_helper'
-
-module <%=if Rails::Generators.namespace.present? then Rails::Generators.namespace.name end%>Domain
-  class <%= plural_name.camelcase %>ProjectionTest < ActiveSupport::TestCase
-  end
-end
+require 'test_helper'
+
+module <%= Rails::Generators.namespace.name if Rails::Generators.namespace.present? %>Domain
+  class <%= plural_name.camelcase %>ProjectionTest < ActiveSupport::TestCase
+  end
+end

data/lib/generators/drails/projection/templates/projection.rb

@@ -1,9 +1,9 @@
-<% module_namespacing do -%>
-class <%= class_name %>Projection
-  include ActiveProjection::ProjectionType
-  <% events.each do |event| %>
-      def <%= event.underscore.split('/') * '__' %>(event)
-      end
-  <% end %>
-end
-<% end -%>
+<% module_namespacing do -%>
+class <%= class_name %>Projection
+  include ActiveProjection::ProjectionType
+  <% events.each do |event| %>
+  def <%= event.underscore.split('/') * '__' %>(event)
+  end
+  <% end %>
+end
+<% end -%>

data/lib/generators/drails/projection/templates/projection_test.rb

@@ -1,6 +1,6 @@
-require 'test_helper'
-
-<% module_namespacing do -%>
-class <%= plural_name.camelcase %>ProjectionTest < ActiveSupport::TestCase
-end
-<% end -%>
+require 'test_helper'
+
+<% module_namespacing do -%>
+class <%= plural_name.camelcase %>ProjectionTest < ActiveSupport::TestCase
+end
+<% end -%>

data/lib/generators/drails/scaffold/USAGE

@@ -1,27 +1,27 @@
-Description:
-    Scaffolds a complete resource with models, migration, projections, controller, views
-    commands, events and command_processor.
-
-Example:
-    rails generate drails:scaffold Thing [attr1:type, attr2:type]
-
-    This will create:
-        app/controllers/things_controller
-        app/commands/create_thing_command.rb
-        app/commands/update_thing_command.rb
-        app/commands/delete_thing_command.rb
-        domain/command_processors/thing_processor.rb
-        app/events/created_thing_event.rb
-        app/events/updated_thing_event.rb
-        app/events/deleted_thing_event.rb
-        app/projections/things_projection.rb
-        db/migrate/create_things.rb
-        app/models/thing.rb
-        app/helpers/things_helper.rb
-        app/views/things/_eventstream.js.erb
-        app/views/things/_form.html.erb
-        app/views/things/edit.html.erb
-        app/views/things/index.html.erb
-        app/views/things/new.html.erb
-        app/views/things/show.html.erb
+Description:
+    Scaffolds a complete resource with models, migration, projections, controller, views
+    commands, events and command_processor.
+
+Example:
+    rails generate drails:scaffold Thing [attr1:type, attr2:type]
+
+    This will create:
+        app/controllers/things_controller
+        app/commands/create_thing_command.rb
+        app/commands/update_thing_command.rb
+        app/commands/delete_thing_command.rb
+        domain/command_processors/thing_processor.rb
+        app/events/created_thing_event.rb
+        app/events/updated_thing_event.rb
+        app/events/deleted_thing_event.rb
+        app/projections/things_projection.rb
+        db/migrate/create_things.rb
+        app/models/thing.rb
+        app/helpers/things_helper.rb
+        app/views/things/_eventstream.js.erb
+        app/views/things/_form.html.erb
+        app/views/things/edit.html.erb
+        app/views/things/index.html.erb
+        app/views/things/new.html.erb
+        app/views/things/show.html.erb
         a resource route

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

@@ -1,89 +1,91 @@
-require 'generators/drails/processor_name.rb'
-require 'generators/drails/domain.rb'
-
-module Drails
-  module Generators
-    class ScaffoldGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('../templates', __FILE__)
-      argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
-      include ProcessorName
-      include Domain
-
-      def create_models
-        generate 'drails:model', name, attr_string
-      end
-
-      def create_commands
-        %w(create update delete).each do |action|
-          attr_arg = attributes_names.join(' ') unless action == 'delete'
-          command = (class_path + ["#{action}_#{file_name}"]) * '/'
-          event_arg = "--event=" + (class_path + ["#{action}d_#{file_name}"]) * '/'
-          processor_arg = "--processor=#{processor_name}"
-          processor_arg = "--skip-processor" if skip_processor?
-          generate 'drails:command', command, attr_arg, processor_arg, event_arg
-          add_to_projections(action)
-        end
-      end
-
-      def add_to_command_processor
-        content = "
-      command.id = ActiveDomain::UniqueCommandIdRepository.new_for command.class.name"
-        inject_into_file File.join('domain/command_processors', domain_class_path, "#{processor_file_name}_processor.rb"), content, after: /(\s)*process(\s)*(.)*CreateCommand(.)*/
-      end
-
-      def add_routes
-        routing_code = ""
-        class_path.each_with_index do |ns, i|
-          add_line_with_indent routing_code, (i + 1), "namespace :#{ns} do"
-        end
-        add_line_with_indent routing_code, (class_path.length + 1), "resources :#{plural_name}"
-        class_path.each_with_index do |ns, i|
-          add_line_with_indent routing_code, (class_path.length - i), "end"
-        end
-        route routing_code[2..-1]
-      end
-
-      def create_controller
-        generate 'drails:controller', name, attr_string
-      end
-
-      def copy_event_stream_client
-        copy_file '_eventstream.js.erb', File.join('app', 'views', 'application', '_eventstream.js.erb')
-      end
-
-      def add_event_stream_client_to_views
-        include_text = '<%= javascript_tag render partial: \'eventstream\', formats: [:js], locals: {event_id: @event_id} %>'
-        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
-
-      private
-
-      def attr_string
-        @attr_string ||= attributes.map { |x| "#{x.name}:#{x.type}" }.join(' ')
-      end
-
-      def add_to_projections(action)
-        event_func = (class_path + ["#{action}d_#{file_name}_event"]) * '__'
-        content = "
-
-    def #{event_func}(event)
-      #{method_bodies[action]}
-    end"
-        inject_into_file File.join('app/projections', class_path, "#{plural_file_name}_projection.rb"), content, after: /(\s)*include(\s)*ActiveProjection::ProjectionType/
-      end
-
-      def method_bodies
-        {
-            'create' => "#{class_name}.create! event.values.merge(id: event.id)",
-            'update' => "#{class_name}.find(event.id).update! event.values",
-            'delete' => "#{class_name}.find(event.id).destroy!",
-        }
-      end
-
-      def add_line_with_indent(target, indent, str)
-        target << "#{"  " * indent}#{str}\n"
-      end
-    end
-  end
-end
+require 'generators/drails/processor_name.rb'
+require 'generators/drails/domain.rb'
+
+module Drails
+  module Generators
+    class ScaffoldGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('../templates', __FILE__)
+      argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
+      include ProcessorName
+      include Domain
+
+      hook_for :model, in: :drails, require: true
+
+      hook_for :command, in: :drails, require: true do |hook|
+        %w(create update delete).each do |action|
+          args = [(class_path + ["#{action}_#{file_name}"]) * '/']
+          args += attributes_names unless action == 'delete'
+          opts = ["--event=#{(class_path + ["#{action}d_#{file_name}"]) * '/'}"]
+          opts << "--processor=#{processor_name}" unless skip_processor?
+          opts << '--skip_model' if action == 'delete'
+          opts << "--model_name=#{class_name}"
+          opts << '--persisted' if action == 'update'
+          invoke hook, args, opts
+          add_to_projections(action)
+        end
+        add_to_command_processor
+      end
+
+      def add_routes
+        routing_code = ''
+        class_path.each_with_index do |ns, i|
+          add_line_with_indent routing_code, (i + 1), "namespace :#{ns} do"
+        end
+        add_line_with_indent routing_code, (class_path.length + 1), "resources :#{plural_name}"
+        class_path.each_with_index do |ns, i|
+          add_line_with_indent routing_code, (class_path.length - i), 'end'
+        end
+        route routing_code[2..-1]
+      end
+
+      hook_for :scaffold_controller, in: :drails, require: true do |hook|
+        invoke hook
+        add_event_stream_client_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
+      end
+
+      protected
+
+      def add_event_stream_client_to_views
+        return if behavior == :revoke
+        include_text = '<%= javascript_tag render partial: \'application/eventstream/eventstream\', formats: [:js], locals: {event_id: @event_id} %>'
+        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_command_processor
+        return if behavior == :revoke
+        content = "\n       command.id = ActiveDomain::UniqueCommandIdRepository.new_for command.class.name"
+        insert_into_file File.join('domain/command_processors', domain_class_path, "#{processor_file_name}_processor.rb"), content, after: /(\s)*process(\s)*(.)*CreateCommand(.)*/
+      end
+
+      def add_to_projections(action)
+        return if behavior == :revoke
+        event_func = (class_path + ["#{action}d_#{file_name}_event"]) * '__'
+        content = "
+
+  def #{event_func}(event)
+    #{method_bodies[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/
+      end
+
+      def method_bodies
+        {
+            'create' => "#{class_name}.create! event.values.merge(id: event.id)",
+            'update' => "#{class_name}.find(event.id).update! event.values",
+            'delete' => "#{class_name}.find(event.id).destroy!",
+        }
+      end
+
+      def add_line_with_indent(target, indent, str)
+        target << "#{"  " * indent}#{str}\n"
+      end
+    end
+  end
+end

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

@@ -1,16 +1,16 @@
-<% 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();
-                }
-            });
-        }, 1);
-    });
+<% 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();
+                }
+            });
+        }, 1);
+    });
 <% end %>

data/lib/generators/drails/{controller → scaffold_controller}/USAGE

@@ -1 +1 @@
-Not intended for extern use!
+Not intended for extern use!

data/lib/generators/drails/{controller/controller_generator.rb → scaffold_controller/scaffold_controller_generator.rb}

@@ -1,26 +1,27 @@
-require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
-module Drails
-  module Generators
-    class ControllerGenerator < Rails::Generators::ScaffoldControllerGenerator
-      source_root File.expand_path('../templates', __FILE__)
-      hide!
-      remove_hook_for :test_framework
-
-      def create_test_files
-        template "controller_test.rb", File.join("test/controllers", controller_class_path, "#{controller_file_name}_controller_test.rb")
-      end
-
-      protected
-
-      def command_class_name(command)
-        (class_path + ["#{command}_#{file_name}"]).map(&:camelize) * '::'
-      end
-
-      private
-      
-      def params_string
-        attributes.map { |x| "#{x.name}: params[:#{singular_table_name}][:#{x.name}]" }.join(', ')
-      end
-    end
-  end
-end
+require 'rails/generators/rails/scaffold_controller/scaffold_controller_generator'
+module Drails
+  module Generators
+    class ScaffoldControllerGenerator < Rails::Generators::ScaffoldControllerGenerator
+      source_root File.expand_path('../templates', __FILE__)
+      hide!
+
+      # the normal test_framework will not cover our usecase
+      remove_hook_for :test_framework
+      def create_test_files
+        template 'controller_test.rb', File.join('test/controllers', controller_class_path, "#{controller_file_name}_controller_test.rb")
+      end
+
+      protected
+
+      def command_class_name(command)
+        (class_path + ["#{command}_#{file_name}"]).map(&:camelize) * '::'
+      end
+
+      private
+      
+      def params_string
+        attributes.map { |x| "#{x.name}: params[:#{singular_table_name}][:#{x.name}]" }.join(', ')
+      end
+    end
+  end
+end