drailties 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8642ab0f98128f69e538d45f9a4debeda51dc9b4
-  data.tar.gz: 1e574718dcefb63cdd7aa34a5438471f490ec775
+  metadata.gz: d08d30f7e31adfdc8b7796b5d37b580298ce45c9
+  data.tar.gz: 432c6895cb8b9095c8d61e1e6641fa27a08d157f
 SHA512:
-  metadata.gz: dfdb7b28db625797316faa897cd402067622a9ebac2294a1ea45ceb753e7a2601e50d44ced3036c01bd09a76c581096e67eccc45bbdf966fb526377089fe81d1
-  data.tar.gz: 6d22d2cd7f89a0c8a6987d1b8946f2cd43a269c2c76f5b44b16f49a6a5a14092a2779ca344ca510f673a316faa0b5c286c1f4eed4ea9ebef6492fb76640141e6
+  metadata.gz: b5c3bc2afcbfc6d5a385371221072562b2eb7d1d926e79c7f76af5cfe84e4ea8599a425817690447931cf1213ac2c6d046e1a8dbfd08df8ef6df1521ef40b6b5
+  data.tar.gz: 8e8de79b5f581b2c57470e296525a79ff03e18d225addf655d7db64ded665ea3616b4764ec09cf5471f4431d3ea7c38a8e84c5ae2810ec62dcb17a10992f2e2c

data/bin/drails

@@ -25,7 +25,6 @@ where COMMAND is one of:
   domainserver(ds)        start the domain server
   projectionserver(ps)    start the projection server
   server(s)               start both server
-  rake                    start a rake task
 EOT
 
 command = ARGV.shift

data/lib/drails/server.rb

@@ -1,7 +1,18 @@
-puts 'Domain and Projection Server started'
-puts '=> Ctrl-C to shutdown both server'
-trap(:INT) { exit }
-Process.spawn({"ROOT_DIR" => ROOT_DIR}, "ruby #{File.expand_path '../server', __FILE__}/domain_server.rb")
-Process.spawn({"ROOT_DIR" => ROOT_DIR}, "ruby #{File.expand_path '../server', __FILE__}/projection_servers.rb")
-Process.spawn({"ROOT_DIR" => ROOT_DIR}, "rails s")
-Process.waitall
+puts 'Starting domain, projection and Rails server...'
+puts '=> Ctrl-C to shutdown all servers'
+env = {'ROOT_DIR' => ROOT_DIR}
+pids = []
+pids << Process.spawn(env, "ruby #{File.expand_path '../server', __FILE__}/domain_server.rb")
+pids << Process.spawn(env, "ruby #{File.expand_path '../server', __FILE__}/projection_servers.rb")
+pids << Process.spawn(env, 'rails s')
+trap(:INT) do
+  pids.each do |pid|
+    begin
+      Process.kill 9, pid
+    rescue Exception
+      # do nothing
+    end
+  end
+  exit
+end
+Process.waitall

data/lib/generators/drails/app/USAGE

@@ -5,6 +5,9 @@ Example:
     rails generate drails:app
 
     This will create:
+        app/controllers/event_source_controller.rb
+        a route for this controller
         config/build_validations_registry.rb
         config/initializers/create_domain.rb
-        config/disco.yml
+        config/disco.yml
+        adds rails-disco to your gemfile

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

@@ -20,9 +20,33 @@ module Drails
         copy_file 'event_source_controller.rb', File.join('app', 'controllers', 'event_source_controller.rb')
       end
 
+      def add_sse_route
+        route "get 'event_stream' => 'event_source#stream'"
+      end
+
       def add_drails_to_gemfile
         gem "rails-disco"
       end
+
+      def enable_rake_tasks
+        content = "
+require 'rails-disco/tasks'"
+        inject_into_file File.join('config/application.rb'), content, after: /require 'rails\/all'/
+      rescue Exception
+        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"
+      end
+
+      def enable_concurrency
+        application 'config.preload_frameworks = true'
+        application 'config.allow_concurrency = true'
+      rescue Exception
+        puts "Seems like you invoked it from an engine, so remember to put\n
+        config.preload_frameworks = true
+        config.allow_concurrency = true\n
+        in your application.rb from the main application"
+      end
     end
   end
 end

data/lib/generators/drails/app/templates/event_source_controller.rb

@@ -5,7 +5,7 @@ class EventSourceController < ApplicationController
   def stream
     event_connection.start
     response.headers['Content-Type'] = 'text/event-stream'
-    sse = Reloader::SSE.new(response.stream)
+    sse = ActiveEvent::SSE.new(response.stream)
     subscribe_to event_queue do |delivery_info, properties, body|
       sse.write({:id => properties.headers['store_id']}, :event => 'refresh')
     end

data/lib/generators/drails/command/USAGE

@@ -2,10 +2,10 @@ Description:
     Generates a Command, an Event and adds it to the CommandProcessor or creates one.
 
 Example:
-    rails generate drails:command ThingCreate
+    rails generate drails:command CreateThing [attr1, attr2] --event=CreatedThing --processor=Things
 
     This will create:
-        app/commands/thing_create_command.rb
-        app/events/thing_create_event.rb
-        domain/command_processors/thing_processor.rb if it not exists
-        Adds a method to this or the existing processor
+        app/commands/create_thing_command.rb
+        app/events/created_thing_event.rb
+        domain/command_processors/things_processor.rb unless it exists
+        Adds a command handler to this or an existing processor

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

@@ -1,43 +1,39 @@
+require 'generators/drails/processor_name.rb'
+require 'generators/drails/event_name.rb'
+require 'generators/drails/domain.rb'
+
 module Drails
   module Generators
     class CommandGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
       argument :attributes, type: :array, default: [], banner: "attribute attribute"
+      include ProcessorName
+      include EventName
+      include Domain
 
       def create_command_file
         template 'command.rb', File.join('app/commands', class_path, "#{file_name}_command.rb")
       end
 
       def create_related_event_file
-        template 'event.rb', File.join('app/events', class_path, "#{file_name}_event.rb")
+        return if skip_event?
+        template 'event.rb', File.join('app/events', event_class_path, "#{event_file_name}_event.rb")
       end
 
       def create_command_processor
-        generate 'drails:command_processor', processor_file_name, '-s'
+        return if skip_processor?
+        generate 'drails:command_processor', processor_file_path, '-s', '--skip-namespace'
       end
 
       def add_to_command_processor
+        return if skip_processor?
         content = "
 
     process #{class_name}Command do |command|
-      command.is_valid_do { event #{class_name}Event.new command.to_hash }
+      command.is_valid_do { event #{event_class_name}Event.new command.to_hash }
     end"
-        inject_into_file File.join('domain/command_processors', domain_ns, "#{processor_file_name}_processor.rb"), content, after: /(\s)*include(\s)*ActiveDomain::CommandProcessor/
-      end
-
-      private
-      def processor_file_name
-        file_name.split('_').first
-      end
-
-      def domain_ns
-        namespace_path = Array.new class_path
-        if namespace_path.empty?
-          namespace_path[0] = 'domain'
-        else
-          namespace_path[-1] += '_domain'
-        end
-        namespace_path
+        file = File.join('domain/command_processors', processor_domain_class_path, "#{processor_file_name}_processor.rb")
+        inject_into_file file, content, after: /(\s)*include(\s)*ActiveDomain::CommandProcessor/
       end
     end
   end

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

@@ -1,4 +1,5 @@
-<% module_namespacing do -%>class <%= class_name %>Command
+<% module_namespacing do -%>
+class <%= class_name %>Command
   include ActiveEvent::Command
   attributes :id<%=',' unless attributes_names.empty? %> <%=attributes_names.map{|x| ":#{x}"}.join(', ')%>
 end

data/lib/generators/drails/command/templates/event.rb

@@ -1,4 +1,5 @@
-<% module_namespacing do -%>class <%= class_name %>Event
+<% module_namespacing do -%>
+class <%= event_class_name %>Event
   include ActiveEvent::EventType
   attributes :id<%=',' unless attributes_names.empty? %> <%=attributes_names.map{|x| ":#{x}"}.join(', ')%>
 

data/lib/generators/drails/command_processor/command_processor_generator.rb

@@ -1,22 +1,14 @@
+require 'generators/drails/domain.rb'
+
 module Drails
   module Generators
     class CommandProcessorGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
+      include Domain
       hide!
 
       def create_command_processor_file
-        template 'command_processor.rb', File.join('domain/command_processors', domain_ns, "#{file_name}_processor.rb")
-      end
-
-      private
-      def domain_ns
-        namespace_path = Array.new class_path
-        if namespace_path.empty?
-          namespace_path[0] = 'domain'
-        else
-          namespace_path[-1] += '_domain'
-        end
-        namespace_path
+        template 'command_processor.rb', File.join('domain/command_processors', domain_class_path, "#{file_name}_processor.rb")
       end
     end
   end

data/lib/generators/drails/controller/controller_generator.rb

@@ -10,7 +10,14 @@ module Drails
         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

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

@@ -18,7 +18,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def create
-    <%= singular_table_name %> = <%= "#{human_name}"%>CreateCommand.new({<%= params_string %>})
+    <%= singular_table_name %> = <%= command_class_name('create') %>Command.new({<%= params_string %>})
     valid = <%= singular_table_name %>.valid?
     if valid and id = Domain.run_command(<%= singular_table_name %>)
       flash[:notice] = <%= "'#{human_name} was successfully created.'" %>
@@ -31,7 +31,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def update
-    <%= singular_table_name %> = <%= "#{human_name}"%>UpdateCommand.new({id: params[:id]<%=',' unless params_string == ''%> <%= params_string %>})
+    <%= singular_table_name %> = <%= command_class_name('update') %>Command.new({id: params[:id]<%=',' unless params_string == ''%> <%= params_string %>})
     valid = <%= singular_table_name %>.valid?
     if valid and id = Domain.run_command(<%= singular_table_name %>)
       flash[:notice] = <%= "'#{human_name} was successfully updated.'" %>
@@ -44,7 +44,7 @@ class <%= controller_class_name %>Controller < ApplicationController
   end
 
   def destroy
-    <%= singular_table_name %> = <%= "#{human_name}"%>DeleteCommand.new({id: params[:id]})
+    <%= singular_table_name %> = <%= command_class_name('delete') %>Command.new({id: params[:id]})
     if id = Domain.run_command(<%= singular_table_name %>)
       session[:tmp_event_id] = id
       flash[:notice] = <%= "'#{human_name} was successfully deleted.'" %>

data/lib/generators/drails/domain.rb

@@ -0,0 +1,19 @@
+require 'active_support/concern'
+
+module Drails
+  module Generators
+    module Domain
+      extend ActiveSupport::Concern
+
+      def domain_class_path
+        @domain_calss_path ||= class_path_domain class_path
+      end
+
+      protected
+
+      def class_path_domain(class_path)
+        (Array.new class_path).unshift 'domain'
+      end
+    end
+  end
+end

data/lib/generators/drails/event_name.rb

@@ -0,0 +1,52 @@
+require 'active_support/concern'
+
+module Drails
+  module Generators
+    module EventName
+      extend ActiveSupport::Concern
+
+      included do
+        class_option :event, type: :string, default: nil, desc: "name of the event (defaults to NAME)"
+        class_option :skip_event, type: :boolean, default: false, desc: "skip event generation"
+      end
+
+      def initialize(args, *options)
+        super
+        assign_event_name!(event_name)
+      end      
+
+      protected
+
+      attr_reader :event_file_name
+      attr_reader :event_class_path
+
+      def skip_event?
+        options[:skip_event]
+      end
+
+      def event_name
+        options[:event] || name
+      end
+
+      def event_class_name
+        (event_class_path + [event_file_name]).map!{ |m| m.camelize }.join('::')
+      end
+
+      def event_file_path
+        @event_file_path ||= (event_class_path + [event_file_name]).join('/')
+      end
+
+      def event_domain_class_path
+        @event_domain_class_path ||= class_path_domain event_class_path
+      end
+
+      private
+
+      def assign_event_name!(event_name)
+        @event_class_path = event_name.include?('/') ? event_name.split('/') : event_name.split('::')
+        @event_class_path.map! &:underscore
+        @event_file_name = @event_class_path.pop
+      end
+    end
+  end
+end

data/lib/generators/drails/migration/migration_generator.rb

@@ -1,12 +1,12 @@
 require 'rails/generators/active_record/migration/migration_generator'
+require 'generators/drails/use_domain_option.rb'
+
 module Drails
   module Generators
     class MigrationGenerator < ActiveRecord::Generators::MigrationGenerator
       source_root File.expand_path('../templates', __FILE__)
       hide!
-      remove_argument :attibutes
-      argument :use_domain, type: :string, default: 'false'
-      argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
+      include UseDomainOption
 
       def create_migration_file
         set_local_assigns!
@@ -15,8 +15,9 @@ module Drails
       end
 
       private
+
       def migration_dir
-        if (/^(true|t|yes|y|1)$/i).match(use_domain)
+        if use_domain?
           'migrate_domain'
         else
           'migrate'

data/lib/generators/drails/migration/templates/create_table_migration.rb

@@ -2,11 +2,11 @@ class <%= migration_class_name %> < ActiveRecord::Migration
   def change
     create_table :<%= table_name %> do |t|
 <% attributes.each do |attribute| -%>
-<% if attribute.password_digest? -%>
+<%   if attribute.password_digest? -%>
       t.string :password_digest<%= attribute.inject_options %>
-<% else -%>
+<%   else -%>
       t.<%= attribute.type %> :<%= attribute.name %><%= attribute.inject_options %>
-<% end -%>
+<%   end -%>
 <% end -%>
 <% if options[:timestamps] %>
       t.timestamps

data/lib/generators/drails/model/USAGE

@@ -2,14 +2,16 @@ Description:
     Generates a Model and a Projection for it.
 
 Example:
-    rails generate drails:model Thing [use_domain] [attr1:type, attr2:type]
+    rails generate drails:model Thing [attr1:type, attr2:type]
 
-    This will create if use_domain is false(standard):
+    This will create:
         app/projection/thing_projection.rb
         app/models/thing.rb
         db/migrate/create_thing.rb
 
-    This will create if use_domain is true:
-        domain/projection/thing_projection.rb
-        domain/models/thing.rb
+    rails generate drails:model Thing [attr1:type, attr2:type] --domain
+
+    This will create:
+        domain/projections/domain/thing_projection.rb
+        domain/models/domain/thing.rb
         db/migrate_domain/create_thing.rb

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

@@ -1,42 +1,22 @@
+require 'generators/drails/use_domain_option.rb'
+
 module Drails
   module Generators
     class ModelGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
-      argument :use_domain, type: :string, default: 'false'
       argument :attributes, type: :array, default: [], banner: "field[:type] field[:type]"
+      include UseDomainOption
 
       def create_projection_file
-        if domain?
-          generate 'drails:projection', name, 'true'
-        else
-          generate 'drails:projection', name
-        end
+        generate 'drails:projection', name, use_domain_param
       end
 
       def create_model_file
-        if domain?
-          template 'domain_model.rb', File.join('domain', 'models', domain_ns, "#{file_name}.rb")
-        else
-          template 'model.rb', File.join('app', 'models', class_path, "#{file_name}.rb")
-        end
+        template use_domain('model.rb'), use_domain_class_file_path('models', "#{file_name}.rb")
       end
 
       def create_migration
-        generate 'drails:migration', "create_#{table_name}", use_domain, attributes.map { |x| "#{x.name}:#{x.type}" }.join(' ')
-      end
-
-      private
-      def domain?
-        @domain ||= !!(/^(true|t|yes|y|1)$/i).match(use_domain)
-      end
-
-      def domain_ns
-        namespace_path = Array.new class_path
-        if namespace_path.empty?
-          namespace_path[0] = 'domain'
-        else
-          namespace_path[-1] += '_domain'
-        end
+        generate 'drails:migration', "create_#{table_name}", attributes.map { |x| "#{x.name}:#{x.type}" }.join(' '), use_domain_param
       end
     end
   end

data/lib/generators/drails/processor_name.rb

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

data/lib/generators/drails/projection/USAGE

@@ -2,10 +2,12 @@ Description:
     Generates a projection with handlers for the given events.
 
 Example:
-    rails generate drails:projection Thing [use_domain] [event1 event2 ...]
+    rails generate drails:projection Thing [event event]
 
-    This will create if use_domain is false(standard):
+    This will create:
         app/projection/thing_projection.rb
 
-    This will create if use_domain is true:
-        domain/projection/thing_projection.rb
+    rails generate drails:projection Thing [event event] --domain
+
+    This will create:
+        domain/projections/domain/thing_projection.rb

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

@@ -1,38 +1,18 @@
+require 'generators/drails/use_domain_option.rb'
+
 module Drails
   module Generators
     class ProjectionGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
-      argument :use_domain, type: :string, default: 'false'
       argument :events, type: :array, default: [], banner: "event event"
+      include UseDomainOption
 
       def create_projection_file
-        if domain?
-          template 'domain_projection.rb', File.join('domain', 'projections', domain_ns, "#{plural_file_name}_projection.rb")
-        else
-          template 'projection.rb', File.join('app', 'projections', class_path, "#{plural_file_name}_projection.rb")
-        end
+        template use_domain('projection.rb'), use_domain_class_file_path('projections', "#{plural_file_name}_projection.rb")
       end
 
       def create_test_files
-        if domain?
-          template 'domain_projection_test.rb', File.join("test/projections", class_path, "#{plural_file_name}_projection_test.rb")
-        else
-          template 'projection_test.rb', File.join("test/projections", class_path, "#{plural_file_name}_projection_test.rb")
-        end
-      end
-
-      private
-      def domain?
-        @domain ||= !!(/^(true|t|yes|y|1)$/i).match(use_domain)
-      end
-
-      def domain_ns
-        namespace_path = Array.new class_path
-        if namespace_path.empty?
-          namespace_path[0] = 'domain'
-        else
-          namespace_path[-1] += '_domain'
-        end
+        template use_domain('projection_test.rb'), File.join("test/projections", use_domain_class_path, "#{plural_file_name}_projection_test.rb")
       end
     end
   end

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

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

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

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

data/lib/generators/drails/scaffold/USAGE

@@ -6,22 +6,22 @@ Example:
     rails generate drails:scaffold Thing [attr1:type, attr2:type]
 
     This will create:
-        app/commands/thing_create_command.rb
-        app/commands/thing_update_command.rb
-        app/commands/thing_delete_command.rb
         app/controllers/things_controller
-        app/events/thing_create_event.rb
-        app/events/thing_update_event.rb
-        app/events/thing_delete_event.rb
-        app/helpers/thing_helper.rb
+        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/projections/thing_projection.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
-        db/migrate/create_thing.rb
-        db/migrate_domain/create_thing.rb
-        domain/command_processors/thing_processor.rb
         a resource route

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

@@ -1,18 +1,26 @@
+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, 'false', attr_string
+        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 = "#{name}_#{action}"
-          generate 'drails:command', command, attr_arg
+          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
@@ -20,11 +28,19 @@ module Drails
       def add_to_command_processor
         content = "
       command.id = ActiveDomain::UniqueCommandIdRepository.new_for command.class.name"
-        inject_into_file File.join('domain', 'command_processors', domain_ns, "#{file_name}_processor.rb"), content, after: /(\s)*process(\s)*(.)*CreateCommand(.)*/
+        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_route
-        route "resources :#{plural_name}"
+      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
@@ -32,45 +48,40 @@ module Drails
       end
 
       def copy_event_stream_client
-        copy_file '_eventstream.js.erb', File.join('app', 'views', plural_file_name, '_eventstream.js.erb')
+        copy_file '_eventstream.js.erb', File.join('app/views', class_path, plural_file_name, '_eventstream.js.erb')
       end
 
-      def add_event_stram_client_to_views
+      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', plural_file_name, 'index.html.erb'), include_text
-        prepend_to_file File.join('app', 'views', plural_file_name, 'show.html.erb'), include_text
+        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 #{name.underscore}_#{action}_event(event)
+    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/
+        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' => "#{human_name}.create! event.values.merge(id: event.id)",
-            'update' => "#{human_name}.find(event.id).update! event.values",
-            'delete' => "#{human_name}.find(event.id).destroy!",
+            '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 domain_ns
-        namespace_path = Array.new class_path
-        if namespace_path.empty?
-          namespace_path[0] = 'domain'
-        else
-          namespace_path[-1] += '_domain'
-        end
-        namespace_path
+      def add_line_with_indent(target, indent, str)
+        target << "#{"  " * indent}#{str}\n"
       end
     end
   end

data/lib/generators/drails/use_domain_option.rb

@@ -0,0 +1,54 @@
+require 'active_support/concern'
+require 'generators/drails/domain.rb'
+
+module Drails
+  module Generators
+    module UseDomainOption
+      extend ActiveSupport::Concern
+
+      include Domain
+
+      included do
+        class_option :domain, type: :boolean, default: false, desc: "generate for the domain"
+      end
+
+      protected
+
+      def use_domain?
+        options[:domain]
+      end
+
+      def use_domain(file_name)
+        if use_domain?
+          "domain_#{file_name}"
+        else
+          file_name
+        end
+      end
+
+      def use_domain_class_path
+        if use_domain?
+          domain_class_path
+        else
+          class_path
+        end
+      end
+
+      def use_domain_base_path
+        if use_domain?
+          'domain'
+        else
+          'app'
+        end
+      end
+
+      def use_domain_class_file_path(type, file_name)
+        File.join use_domain_base_path, type, use_domain_class_path, file_name
+      end
+
+      def use_domain_param
+        '--domain' if use_domain?
+      end
+    end
+  end
+end

data/lib/rails-disco/railtie.rb

@@ -0,0 +1,8 @@
+require 'rails/railtie'
+module RailsDisco
+  class Railtie < Rails::Railtie
+    rake_tasks do
+      load "tasks/db.rake"
+    end
+  end
+end

data/lib/rails-disco/tasks.rb

@@ -0,0 +1 @@
+require 'rails-disco/railtie' if defined?(Rails)

data/lib/rails-disco/version.rb

@@ -1,7 +1,7 @@
 module RailsDisco
   module VERSION
     MAJOR = 0
-    MINOR = 2
+    MINOR = 3
     TINY  = 0
     PRE   = nil
 

data/lib/tasks/db.rake

@@ -2,108 +2,122 @@ require 'yaml'
 require 'logger'
 require 'active_record'
 
-namespace :db do
-  def create_database config
-    options = {:charset => 'utf8', :collation => 'utf8_unicode_ci'}
-
-    create_db = lambda do |config|
-      ActiveRecord::Base.establish_connection config.merge('database' => nil)
-      ActiveRecord::Base.connection.create_database config['database'], options
-      ActiveRecord::Base.establish_connection config
-    end
+namespace :drails do
+  namespace :db do
+    def create_database(config)
+      options = {:charset => 'utf8', :collation => 'utf8_unicode_ci'}
+
+      create_db = lambda do |config|
+        ActiveRecord::Base.establish_connection config.merge('database' => nil)
+        ActiveRecord::Base.connection.create_database config['database'], options
+        ActiveRecord::Base.establish_connection config
+      end
 
-    begin
-      create_db.call config
-    rescue Mysql::Error => sqlerr
-      if sqlerr.errno == 1405
-        print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
-        root_password = $stdin.gets.strip
+      begin
+        create_db.call config
+      rescue Mysql::Error => sqlerr
+        if sqlerr.errno == 1405
+          print "#{sqlerr.error}. \nPlease provide the root password for your mysql installation\n>"
+          root_password = $stdin.gets.strip
 
-        grant_statement = <<-SQL
+          grant_statement = <<-SQL
           GRANT ALL PRIVILEGES ON #{config['database']}.*
             TO '#{config['username']}'@'localhost'
             IDENTIFIED BY '#{config['password']}' WITH GRANT OPTION;
-        SQL
+          SQL
+
+          create_db.call config.merge('database' => nil, 'username' => 'root', 'password' => root_password)
+        else
+          $stderr.puts sqlerr.error
+          $stderr.puts "Couldn't create database for #{config.inspect}, charset: utf8, collation: utf8_unicode_ci"
+          $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+        end
+      end
+    end
 
-        create_db.call config.merge('database' => nil, 'username' => 'root', 'password' => root_password)
+    task :db_env do
+      DATABASE_ENV = ENV['DATABASE_ENV'] || 'development'
+    end
+
+    task :environment => :db_env do
+      if ENV['ENV'] == 'domain'
+        @migration_dir = ENV['MIGRATIONS_DIR'] || 'db/migrate_domain'
+        @env = 'domain'
       else
-        $stderr.puts sqlerr.error
-        $stderr.puts "Couldn't create database for #{config.inspect}, charset: utf8, collation: utf8_unicode_ci"
-        $stderr.puts "(if you set the charset manually, make sure you have a matching collation)" if config['charset']
+        @migration_dir = ENV['MIGRATIONS_DIR'] || 'db/migrate'
+        @env = 'projection'
       end
     end
-  end
-
-  task :db_env do
-    DATABASE_ENV = ENV['DATABASE_ENV'] || 'development'
-  end
 
-  task :environment, [:file_name] => [:db_env] do |t, args|
-    if args.file_name == 'domain'
-      @migration_dir = ENV['MIGRATIONS_DIR'] || 'db/migrate_domain'
-    else
-      @migration_dir = ENV['MIGRATIONS_DIR'] || 'db/migrate'
+    task :configuration => :environment do
+      @config = YAML.load_file("config/disco.yml")[DATABASE_ENV]["#{@env}_database"]
     end
-  end
 
-  task :configuration, [:file_name] => [:environment] do |t, args|
-    @config = YAML.load_file("config/disco.yml")[DATABASE_ENV]["#{args.file_name}_database"]
-  end
+    task :configure_connection => :configuration do
+      ActiveRecord::Base.establish_connection @config
+      ActiveRecord::Base.logger = Logger.new STDOUT if @config['logger']
+    end
 
-  task :configure_connection => :configuration do
-    ActiveRecord::Base.establish_connection @config
-    ActiveRecord::Base.logger = Logger.new STDOUT if @config['logger']
-  end
+    desc 'Create the database from config/disco.yml for the current DATABASE_ENV (options: ENV=(projection|domain))'
+    task :create => :configure_connection do
+      create_database @config
+    end
 
-  desc 'Create the database from config/disco.yml for the current DATABASE_ENV'
-  task :create => :configure_connection do
-    create_database @config
-  end
+    desc 'Drops the database for the current DATABASE_ENV (options: ENV=(projection|domain))'
+    task :drop => :configure_connection do
+      ActiveRecord::Base.connection.drop_database @config['database']
+    end
 
-  desc 'Drops the database for the current DATABASE_ENV'
-  task :drop => :configure_connection do
-    ActiveRecord::Base.connection.drop_database @config['database']
-  end
+    desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n) (options: ENV=(projection|domain)).'
+    task :rollback => :configure_connection do
+      step = ENV['STEP'] ? ENV['STEP'].to_i : 1
+      ActiveRecord::Migrator.rollback @migration_dir, step
+    end
 
-  desc 'Migrate the database (options: VERSION=x, VERBOSE=false).'
-  task :migrate => :configure_connection do
-    ActiveRecord::Migration.verbose = true
-    ActiveRecord::Migrator.migrate @migration_dir, ENV['VERSION'] ? ENV['VERSION'].to_i : nil
-  end
+    desc 'Retrieves the current schema version number'
+    task :version => :configure_connection do
+      puts "Current version: #{ActiveRecord::Migrator.current_version}"
+    end
 
-  desc 'Rolls the schema back to the previous version (specify steps w/ STEP=n).'
-  task :rollback => :configure_connection do
-    step = ENV['STEP'] ? ENV['STEP'].to_i : 1
-    ActiveRecord::Migrator.rollback @migration_dir, step
-  end
+    desc 'Copys the migrations files from the gems directories (options: ENV=(projection|domain))'
+    task :copy_migrations => :environment do
+      if @env == 'domain'
+        cp_r Gem::Specification.find_by_name('active_event').gem_dir + '/db/migrate/.', @migration_dir
+        cp_r Gem::Specification.find_by_name('active_domain').gem_dir + '/db/migrate/.', @migration_dir
+      else
+        cp_r Gem::Specification.find_by_name('active_projection').gem_dir + '/db/migrate/.', @migration_dir
+      end
+    end
 
-  desc 'Retrieves the current schema version number'
-  task :version => :configure_connection do
-    puts "Current version: #{ActiveRecord::Migrator.current_version}"
-  end
+    desc 'Migrates the database (options: VERSION=x, ENV=(projection|domain))'
+    task :migrate => :configure_connection do
+      ActiveRecord::Migration.verbose = true
+      ActiveRecord::Migrator.migrate @migration_dir, ENV['VERSION'] ? ENV['VERSION'].to_i : nil
+    end
 
-  desc 'Migrates the domain database (for use in multi project setup)'
-  task :setup_domain do
-    Rake::Task[:'db:configuration'].invoke('domain')
-    cp_r Gem::Specification.find_by_name('active_event').gem_dir + '/db/migrate/.', 'db/migrate_domain'
-    cp_r Gem::Specification.find_by_name('active_domain').gem_dir + '/db/migrate/.', 'db/migrate_domain'
-    Rake::Task[:'db:migrate'].invoke
-  end
+    desc 'Copys the domain migrations and migrates the domain database'
+    task :setup_domain do
+      ENV['ENV'] = 'domain'
+      Rake::Task[:'drails:db:copy_migrations'].invoke
+      Rake::Task[:'drails:db:migrate'].invoke
+    end
 
-  desc 'Migrates the projection database (for use in multi project setup)'
-  task :setup_projection do
-    Rake::Task[:'db:configuration'].invoke('projection')
-    cp_r Gem::Specification.find_by_name('active_projection').gem_dir + '/db/migrate/.', 'db/migrate'
-    Rake::Task[:'db:migrate'].invoke
-  end
+    desc 'Copys the projection migrations and migrates the projection database'
+    task :setup_projection do
+      ENV['ENV'] = 'projection'
+      Rake::Task[:'drails:db:copy_migrations'].invoke
+      Rake::Task[:'drails:db:migrate'].invoke
+    end
 
-  desc 'Migrates the domain and the projection database (for use in single project setup)'
-  task :setup do
-    Rake::Task[:'db:setup_domain'].invoke
-    Rake::Task[:'db:environment'].reenable
-    Rake::Task[:'db:configure_connection'].reenable
-    Rake::Task[:'db:configuration'].reenable
-    Rake::Task[:'db:migrate'].reenable
-    Rake::Task[:'db:setup_projection'].invoke
+    desc 'Copys the gem migrations and migrates the domain and the projection database after'
+    task :setup do
+      Rake::Task[:'drails:db:setup_domain'].invoke
+      Rake::Task[:'drails:db:environment'].reenable
+      Rake::Task[:'drails:db:configure_connection'].reenable
+      Rake::Task[:'drails:db:configuration'].reenable
+      Rake::Task[:'drails:db:migrate'].reenable
+      Rake::Task[:'drails:db:copy_migrations'].reenable
+      Rake::Task[:'drails:db:setup_projection'].invoke
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drailties
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Robert Kranz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-15 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.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: active_domain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: active_projection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.0.0
 description: 'Internals: rake tasks, generators, commandline interface'
-email: robert.kranz@hicknhack-software.com
+email: rails-disco@hicknhack-software.com
 executables:
 - drails
 extensions: []
@@ -77,11 +77,9 @@ files:
 - lib/drails/domainserver.rb
 - lib/drails/generate.rb
 - lib/drails/projectionserver.rb
-- lib/drails/rake.rb
 - lib/drails/server/domain_server.rb
 - lib/drails/server/projection_servers.rb
 - lib/drails/server.rb
-- lib/drailties.rb
 - lib/generators/drails/app/app_generator.rb
 - lib/generators/drails/app/templates/build_validations_registry.rb
 - lib/generators/drails/app/templates/create_domain.rb
@@ -99,6 +97,8 @@ files:
 - lib/generators/drails/controller/templates/controller.rb
 - lib/generators/drails/controller/templates/controller_test.rb
 - lib/generators/drails/controller/USAGE
+- lib/generators/drails/domain.rb
+- lib/generators/drails/event_name.rb
 - lib/generators/drails/migration/migration_generator.rb
 - lib/generators/drails/migration/templates/create_table_migration.rb
 - lib/generators/drails/migration/USAGE
@@ -106,6 +106,7 @@ files:
 - lib/generators/drails/model/templates/domain_model.rb
 - lib/generators/drails/model/templates/model.rb
 - lib/generators/drails/model/USAGE
+- lib/generators/drails/processor_name.rb
 - lib/generators/drails/projection/projection_generator.rb
 - lib/generators/drails/projection/templates/domain_projection.rb
 - lib/generators/drails/projection/templates/domain_projection_test.rb
@@ -115,6 +116,9 @@ files:
 - lib/generators/drails/scaffold/scaffold_generator.rb
 - lib/generators/drails/scaffold/templates/_eventstream.js.erb
 - lib/generators/drails/scaffold/USAGE
+- lib/generators/drails/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

data/lib/drails/rake.rb

@@ -1,17 +0,0 @@
-# Run rake tasks from my_gem once it's installed.
-#
-# Example:
-#   my_gem rake some-task
-#   my_gem rake some-task[args]
-#
-# Author:: N David Brown
-gem_dir = File.expand_path("..", File.dirname(__FILE__))
-$LOAD_PATH.unshift gem_dir # Look in gem directory for resources first.
-require 'rake'
-require 'pp'
-pwd = Dir.pwd
-Dir.chdir(gem_dir) # We'll load rakefile from the gem's dir.
-Rake.application.init
-Rake.application.load_rakefile
-Dir.chdir(pwd) # Revert to original pwd for any path args passed to task.
-Rake.application.invoke_task(ARGV.first)

data/lib/drailties.rb

@@ -1,3 +0,0 @@
-module Drailties
-  # Your code goes here...
-end