Skip to content

Commit

Permalink
fix issues
Browse files Browse the repository at this point in the history
  • Loading branch information
adham90 committed Oct 24, 2020
1 parent 7524dfc commit d2d34c2
Show file tree
Hide file tree
Showing 10 changed files with 5 additions and 26 deletions.
2 changes: 1 addition & 1 deletion lib/command_service_object/helpers/check_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module CheckHelper
def check!(message, &block)
raise "No block given" unless block_given?

fail!(message) unless block.call
fail!(message) if block.call
end
end
end
6 changes: 4 additions & 2 deletions lib/command_service_object/hooks.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,12 @@ def _micros
end

def micros(*names)
service = to_s.split('::').first
service = to_s.split('::')
service.pop

names.each do |name|
obj = "#{service}/Usecases/Micros/#{name}".camelize.constantize
obj = "#{service.join('/')}/micros/#{name}".camelize.constantize

_micros.add(obj)
end
end
Expand Down
1 change: 0 additions & 1 deletion lib/generators/service/command/command_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ class CommandGenerator < Rails::Generators::NamedBase
argument :commands, type: :array, default: [], banner: 'command command'

def call
invoke Service::Generators::SetupGenerator, [name]
@model_attributes = model_attributes

commands.each do |c|
Expand Down
4 changes: 0 additions & 4 deletions lib/generators/service/entity/entity_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ class EntityGenerator < Rails::Generators::NamedBase

argument :entities, type: :array, default: [], banner: 'entities entities'

def setup
invoke Service::Generators::SetupGenerator, [name]
end

def create_micros
entities.each do |m|
@entity = m.classify
Expand Down
2 changes: 0 additions & 2 deletions lib/generators/service/external/external_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ class ExternalGenerator < Rails::Generators::NamedBase
argument :externals, type: :array, default: [], banner: 'external external'

def create_externals
invoke Service::Generators::SetupGenerator, [name]

externals.each do |m|
@external = m.classify
create_main(m)
Expand Down
4 changes: 0 additions & 4 deletions lib/generators/service/listener/listener_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ class ListenerGenerator < Rails::Generators::NamedBase

argument :listeners, type: :array, default: [], banner: 'Listener Listener'

def setup
invoke Service::Generators::SetupGenerator, [name]
end

def create_micros
listeners.each do |m|
@listener = m.classify
Expand Down
4 changes: 0 additions & 4 deletions lib/generators/service/micro/micro_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ class MicroGenerator < Rails::Generators::NamedBase

argument :micros, type: :array, default: [], banner: 'micros micros'

def setup
invoke Service::Generators::SetupGenerator, [name]
end

def create_micros
micros.each do |m|
@micro = m.classify
Expand Down
4 changes: 0 additions & 4 deletions lib/generators/service/query/query_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,6 @@ class QueryGenerator < Rails::Generators::NamedBase

argument :queries, type: :array, default: [], banner: 'query query'

def setup
invoke Service::Generators::SetupGenerator, [name]
end

def create_queries
queries.each do |m|
@query = m.classify
Expand Down
2 changes: 0 additions & 2 deletions lib/generators/service/usecase/usecase_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ class UsecaseGenerator < Rails::Generators::NamedBase
argument :usecases, type: :array, default: [], banner: 'usecase usecase'

def call
invoke Service::Generators::SetupGenerator, [name]

usecases.each do |u|
@usecase = u.classify
create_main(u)
Expand Down
2 changes: 0 additions & 2 deletions lib/generators/service/value_object/value_object_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ class ValueObjectGenerator < Rails::Generators::NamedBase
argument :value_objects, type: :array, default: [], banner: 'value_object value_object'

def call
invoke Service::Generators::SetupGenerator, [name]

value_objects.each do |u|
@value_object = u.classify
create_main(u)
Expand Down

0 comments on commit d2d34c2

Please sign in to comment.