disco-railties 0.5.0.rc1 → 0.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62f23a6b10dcf4e0713820c095a72ad018b0bc8b
-  data.tar.gz: 9f180b0beec4b72601f52654452f4bcb00fd8915
+  metadata.gz: ab1a0792baad4ead40b4de0f071a96a60cc86bc1
+  data.tar.gz: b245a7e68dc7176fb0c22d17272990804311ca91
 SHA512:
-  metadata.gz: fea79118ee04f8ec04c221d8fde4e40eeab7c2ba3a9b720ac0b09f4773c9a62d0f1b6d025ba081b8bc31aa31eb7101155ea8f58a2118e497cb9e37ddb3b631f2
-  data.tar.gz: 775eae3ebb53b9502f7e07df793c3b7e73db01c896ae3151bc878ae2c36c4161049c8d9213cf2205580c88dac6ba5e368079c3c591f1898b2b7115b0bfdd995d
+  metadata.gz: 1a0cd16c7353a74797cde9590e04eae2a513a824bfe2bc8a7f3f73af3fe4c73cd5aba20ea4ccad969e7a28dd9743059263fb0c9572c3c722fa3b3ae4d7435ee8
+  data.tar.gz: 9fc865c07e9028491fdcf826f87d6c88a5aa5049e3df08c6efa0f247fe17ca67b3057033af86d05d933eb3d36a15301db4dd25e9f91d09ac066635af15f1a872

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

@@ -7,6 +7,7 @@ module Disco
     class CommandGenerator < Rails::Generators::NamedBase
       source_root File.expand_path('../templates', __FILE__)
       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'
       class_option :persisted, type: :boolean, default: false, desc: 'Does the command update an existing model'
@@ -20,7 +21,6 @@ module Disco
 
       def create_related_event_file
         return if skip_event?
-        raise 'do not use id as attribute, this is reserved for the event id itself' if attributes_names.include? 'id'
         template 'event.rb.erb', File.join('app/events', event_class_path, "#{event_file_name}_event.rb")
       end
 
@@ -35,17 +35,29 @@ module Disco
 
       def add_to_command_processor
         return if skip_processor? || (behavior == :revoke)
-        content = "
+        extra, merge = '', ''
+        if unique_id?
+          extra = "\n        id = ActiveDomain::UniqueCommandIdRepository.new_for command.class.name"
+          merge = '.merge(id: id)'
+        end
+        content = <<-EOF
 
     process #{class_name}Command do |command|
-      command.is_valid_do { event #{event_class_name}Event.new command.to_hash }
-    end"
+      command.is_valid_do do#{extra}
+        command.is_valid_do { event #{event_class_name}Event.new command.to_hash#{merge} }
+      end
+    end
+        EOF
         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/
+        inject_into_file file, content, after: /\s*include\s+ActiveDomain::CommandProcessor/
       end
 
       protected
 
+      def unique_id?
+        options[:unique_id]
+      end
+
       def skip_model?
         options[:skip_model]
       end
@@ -58,6 +70,14 @@ module Disco
         options[:persisted]
       end
 
+      def event_attributes_names
+        @event_attribute_names ||= if unique_id?
+                                     attributes_names.dup.unshift 'id'
+                                   else
+                                     attributes_names
+                                   end
+      end
+
       private
 
       # allow this generator to be called multiple times

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

@@ -4,18 +4,10 @@ class <%= class_name %>Command
   include ActiveModel::Model
   <%- end -%>
   include ActiveEvent::Command
-  attributes <%= (['id'] + attributes_names).map{|x| ":#{x}"}.join(', ') %>
   <%- if !model_name.blank? && !skip_model? -%>
-
-  def self.model_name
-    @_model_name ||= begin
-      namespace = self.parents.detect do |n|
-        n.respond_to?(:use_relative_model_naming?) && n.use_relative_model_naming?
-      end
-      ActiveModel::Name.new(self, namespace, <%= model_name.inspect %>)
-    end
-  end
+  form_name '<%= model_name %>'
   <%- end -%>
+  attributes <%= attributes_names.map{|x| ":#{x}"}.join(', ') %>
   <%- if persisted? && ! skip_model? -%>
 
   def persisted?; true end

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

@@ -1,10 +1,14 @@
 <% module_namespacing do -%>
 class <%= event_class_name %>Event
   include ActiveEvent::EventType
-  attributes <%= (['id'] + attributes_names).map{|x| ":#{x}"}.join(', ') %>
-  <%- unless attributes_names.empty? -%>
+  attributes <%= event_attributes_names.map{|x| ":#{x}"}.join(', ') %>
+  <%- unless attributes_names == ['id'] -%>
   def values
+    <%- if event_attributes_names.include?('id') -%>
     attributes_except :id
+    <%- else -%>
+    attributes
+    <%- end -%>
   end
   <%- end -%>
 end

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

@@ -8,7 +8,7 @@ module Disco
       hide!
 
       def create_command_processor_file
-        template 'command_processor.rb', File.join('domain/command_processors', domain_class_path, "#{file_name}_processor.rb")
+        template 'command_processor.rb.erb', File.join('domain/command_processors', domain_class_path, "#{file_name}_processor.rb")
       end
 
       private

data/lib/generators/disco/event_name.rb

@@ -6,8 +6,8 @@ module Disco
       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"
+        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)

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

@@ -12,7 +12,7 @@ module Disco
       end
 
       def create_model_file
-        template use_domain('model.rb'), use_domain_class_file_path('models', "#{file_name}.rb")
+        template use_domain('model.rb.erb'), use_domain_class_file_path('models', "#{file_name}.rb")
       end
 
       hook_for :migration, require: true do |hook|

data/lib/generators/disco/model/templates/{domain_model.rb → domain_model.rb.erb}

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

data/lib/generators/disco/model/templates/{model.rb → model.rb.erb}

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

data/lib/generators/disco/processor_name.rb

@@ -6,8 +6,8 @@ module Disco
       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"
+        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)

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

@@ -12,18 +12,20 @@ module Disco
       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 << '--skip_model' if action == 'delete'
           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
           add_to_projections(action)
         end
-        add_to_command_processor
       end
 
       def add_routes
@@ -57,12 +59,6 @@ module Disco
         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"]) * '__'
@@ -77,7 +73,7 @@ module Disco
 
       def method_bodies
         @method_bodies ||= {
-            create: "#{class_name}.create! event.values.merge(id: event.id)",
+            create: "#{class_name}.create! event.to_hash",
             update: "#{class_name}.find(event.id).update! event.values",
             delete: "#{class_name}.find(event.id).destroy!",
         }

data/lib/generators/disco/use_domain_option.rb

@@ -9,7 +9,7 @@ module Disco
       include Domain
 
       included do
-        class_option :domain, type: :boolean, default: false, desc: "generate for the domain"
+        class_option :domain, type: :boolean, default: false, desc: 'generate for the domain'
       end
 
       protected

data/lib/rails-disco/version.rb

@@ -3,7 +3,7 @@ module RailsDisco
     MAJOR = 0
     MINOR = 5
     TINY  = 0
-    PRE   = "rc1"
+    PRE   = "rc2"
 
     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.rc1
+  version: 0.5.0.rc2
 platform: ruby
 authors:
 - HicknHack Software
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-23 00:00:00.000000000 Z
+date: 2014-03-24 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.rc1
+        version: 0.5.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc1
+        version: 0.5.0.rc2
 - !ruby/object:Gem::Dependency
   name: active_domain
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc1
+        version: 0.5.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc1
+        version: 0.5.0.rc2
 - !ruby/object:Gem::Dependency
   name: active_projection
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc1
+        version: 0.5.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.0.rc1
+        version: 0.5.0.rc2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -99,7 +99,7 @@ files:
 - lib/generators/disco/command/templates/event.rb.erb
 - lib/generators/disco/command/USAGE
 - lib/generators/disco/command_processor/command_processor_generator.rb
-- lib/generators/disco/command_processor/templates/command_processor.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
@@ -107,8 +107,8 @@ files:
 - lib/generators/disco/migration/templates/create_table_migration.rb
 - lib/generators/disco/migration/USAGE
 - lib/generators/disco/model/model_generator.rb
-- lib/generators/disco/model/templates/domain_model.rb
-- lib/generators/disco/model/templates/model.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/projection_generator.rb