disco-railties 0.5.0.rc2 → 0.5.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab1a0792baad4ead40b4de0f071a96a60cc86bc1
-  data.tar.gz: b245a7e68dc7176fb0c22d17272990804311ca91
+  metadata.gz: 0bd165f0944683d0c5b4de539f11bea205e7444e
+  data.tar.gz: 6b02ed63e4f88f0eb0814d69a908fa5f2b582177
 SHA512:
-  metadata.gz: 1a0cd16c7353a74797cde9590e04eae2a513a824bfe2bc8a7f3f73af3fe4c73cd5aba20ea4ccad969e7a28dd9743059263fb0c9572c3c722fa3b3ae4d7435ee8
-  data.tar.gz: 9fc865c07e9028491fdcf826f87d6c88a5aa5049e3df08c6efa0f247fe17ca67b3057033af86d05d933eb3d36a15301db4dd25e9f91d09ac066635af15f1a872
+  metadata.gz: 3a782de11c12f863ce01b8d00c0553c4ce53c0fca2922147602b64ae21e713c4e4f3df28db37a2d1ac34274daa86f311ee8ab5704a12caa78e96c2a619e4b8c9
+  data.tar.gz: 85a24c8d0f675affd054749e9024b456579abd2729f80f96a55b73453a9bbbeeec1292408bedf45e15fbb1d979990f51fa3d03211c31dba0a0b78bb9e0e9e9fa

data/lib/disco/commands.rb

@@ -5,6 +5,7 @@ aliases = {
     's' => 'server',
     'ps' => 'projectionserver',
     'g' => 'generate',
+    'd' => 'destroy',
     '-h' => '--help',
     '-v' => '--version',
 }

data/lib/generators/disco/command/USAGE

@@ -2,10 +2,10 @@ 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=Things
+    rails generate disco:command CreateThing [attr1, attr2] --event=CreatedThing --processor=Thing
 
     This will create:
         app/commands/create_thing_command.rb
         app/events/created_thing_event.rb
-        domain/command_processors/things_processor.rb unless it exists
+        domain/command_processors/thing_processor.rb unless it exists
         Adds a command handler to this or an existing processor

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

@@ -44,7 +44,7 @@ module Disco
 
     process #{class_name}Command do |command|
       command.is_valid_do do#{extra}
-        command.is_valid_do { event #{event_class_name}Event.new command.to_hash#{merge} }
+        event #{event_class_name}Event.new command.to_hash#{merge}
       end
     end
         EOF

data/lib/generators/disco/command/templates/event.rb.erb

@@ -7,7 +7,7 @@ class <%= event_class_name %>Event
     <%- if event_attributes_names.include?('id') -%>
     attributes_except :id
     <%- else -%>
-    attributes
+    to_hash
     <%- end -%>
   end
   <%- end -%>

data/lib/generators/disco/event_name.rb

@@ -6,7 +6,7 @@ module Disco
       extend ActiveSupport::Concern
 
       included do
-        class_option :event, type: :string, default: nil, desc: 'name of the event (defaults to NAME)'
+        class_option :event, type: :string, default: nil, desc: 'class_name of the event (defaults to NAME)'
         class_option :skip_event, type: :boolean, default: false, desc: 'skip event generation'
       end
 

data/lib/generators/disco/processor_name.rb

@@ -12,7 +12,7 @@ module Disco
 
       def initialize(args, *options)
         super
-        assign_processor_names!(processor_name)
+        assign_processor_name!(processor_name)
       end      
 
       protected
@@ -38,7 +38,7 @@ module Disco
 
       private
 
-      def assign_processor_names!(processor_name)
+      def assign_processor_name!(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

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

@@ -9,21 +9,14 @@ module Disco
       include ProcessorName
       include Domain
 
+      ACTIONS = %w(create update delete)
+
       hook_for :model, in: :disco, require: true
 
       hook_for :command, in: :disco, require: true do |hook|
         raise 'do not use id as scaffolding attribute! This is reserved for the model id' if attributes_names.include? 'id'
-        %w(create update delete).each do |action|
-          args = [(class_path + ["#{action}_#{file_name}"]) * '/']
-          args << 'id' unless action == 'create'
-          args += attributes_names unless action == 'delete'
-          opts = ["--event=#{(class_path + ["#{action}d_#{file_name}"]) * '/'}"]
-          opts << "--processor=#{processor_name}" unless skip_processor?
-          opts << "--model_name=#{class_name}"
-          opts << '--unique_id' if action == 'create'
-          opts << '--persisted' if action == 'update'
-          opts << '--skip_model' if action == 'delete'
-          invoke hook, args, opts
+        ACTIONS.each do |action|
+          invoke hook, args_for_command_action(action), opts_for_command_action(action)
           add_to_projections(action)
         end
       end
@@ -52,6 +45,23 @@ module Disco
 
       protected
 
+      def args_for_command_action(action)
+        args = [command_name_for_action(action)]
+        args << 'id' unless action == 'create'
+        args += attributes_names unless action == 'delete'
+        args
+      end
+
+      def opts_for_command_action(action)
+        opts = ["--event=#{event_name_for_action(action)}"]
+        opts << "--processor=#{processor_name}" unless skip_processor?
+        opts << "--model_name=#{class_name}"
+        opts << '--unique_id' if action == 'create'
+        opts << '--persisted' if action == 'update'
+        opts << '--skip_model' if action == 'delete'
+        opts
+      end
+
       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} %>'
@@ -61,22 +71,38 @@ module Disco
 
       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.to_sym]}
+  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/
       end
 
-      def method_bodies
-        @method_bodies ||= {
-            create: "#{class_name}.create! event.to_hash",
-            update: "#{class_name}.find(event.id).update! event.values",
-            delete: "#{class_name}.find(event.id).destroy!",
-        }
+      def command_name_for_action(action)
+        (class_path + ["#{action}_#{file_name}"]) * '/'
+      end
+
+      def event_name_for_action(action)
+        (class_path + ["#{action}d_#{file_name}"]) * '/'
+      end
+
+      def projection_name_for_action(action)
+        (event_name_for_action(action) + '_event').gsub('/', '__')
+      end
+
+      def projection_body_for_action(action)
+        case action
+        when 'create'
+          "#{class_name}.create! event.to_hash"
+        when 'update'
+          "#{class_name}.find(event.id).update! event.values"
+        when 'delete'
+          "#{class_name}.find(event.id).destroy!"
+        else
+          raise 'unknown action'
+        end
       end
 
       def add_line_with_indent(target, indent, str)

data/lib/rails-disco/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: disco-railties
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc2
+  version: 0.5.0.rc3
 platform: ruby
 authors:
 - HicknHack Software
@@ -16,42 +16,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc2
+        version: 0.5.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc2
+        version: 0.5.0.rc3
 - !ruby/object:Gem::Dependency
   name: active_domain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc2
+        version: 0.5.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc2
+        version: 0.5.0.rc3
 - !ruby/object:Gem::Dependency
   name: active_projection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc2
+        version: 0.5.0.rc3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc2
+        version: 0.5.0.rc3
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement