command_service_object 1.0.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f7f0b0d9360f1cd9db2ce8bbab1f35f44f0d4d631f7ff356607509237807dbc
-  data.tar.gz: badfbd6e44876729b1dde74a4dabedd77e11a0b8e0decc333fbe4b43ab9a3e2f
+  metadata.gz: 36d2b1f785b76803f0333bb3747c5e0fe01f6670573afb93305df3136f00ab46
+  data.tar.gz: e37a9faf02baef49903868a63a0fe5912f8a6e3b01272ccdd90d51d3826b2ec7
 SHA512:
-  metadata.gz: e65c2c56b4d32992a78753248012787b888aeaf099d5d8a4bf93e4a1b1efbb0a6c271ed83b79785a66748e0606175231c02ecef3bb1b267da9fee1d8f4cb4c69
-  data.tar.gz: 9c93b24c8f6831dab02c1a603474821ae37de77b5f3ede2ca3bdb8f91a48a2c68228285ca0fb1b8cae624658d7256827e31439b49e8d92a15501f221786491e8
+  metadata.gz: 0ea1e2f5b1ea28fdf19f63a6f3ed068d7f6eeb193c0dd3e815af26181740462aae1310ae3d472a161ebf737c02980e9b255c68d323bb08e56c28df797610fb2e
+  data.tar.gz: 8188249f9cfcff0deb07d00bc46da92b7afa5fbc6f2108927f2573fd0a9fda7f67d9988f75757a84a47150d22306dab2fd673642b70123c83c8a6914669621f2

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    command_service_object (0.6.5)
-      hutch (= 1.0)
+    command_service_object (1.1.0)
+      hutch (~> 1.0)
       virtus (~> 1.0, >= 1.0.5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.4.4)
+      actionpack (= 5.2.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    actionmailer (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      rack (~> 2.0)
+    actionpack (5.2.4.4)
+      actionview (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
+      rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.3)
-      activesupport (= 5.2.3)
+    actionview (5.2.4.4)
+      activesupport (= 5.2.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.4.4)
+      activesupport (= 5.2.4.4)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    activemodel (5.2.4.4)
+      activesupport (= 5.2.4.4)
+    activerecord (5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -55,7 +55,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    builder (3.2.3)
+    builder (3.2.4)
     bunny (2.15.0)
       amq-protocol (~> 2.3, >= 2.3.1)
     byebug (9.0.6)
@@ -63,12 +63,12 @@ GEM
       json
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
-    concurrent-ruby (1.1.5)
-    crass (1.0.4)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     equalizer (0.0.11)
-    erubi (1.8.0)
+    erubi (1.9.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hutch (1.0.0)
@@ -76,73 +76,73 @@ GEM
       bunny (>= 2.15, < 2.16)
       carrot-top (~> 0.0.7)
       multi_json (~> 1.14)
-    i18n (1.6.0)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
     ice_nine (0.11.2)
     json (2.3.1)
-    loofah (2.2.3)
+    loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.3)
-    mini_mime (1.0.1)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
     mini_portile2 (2.4.0)
-    minitest (5.11.3)
+    minitest (5.14.2)
     multi_json (1.15.0)
-    nio4r (2.3.1)
-    nokogiri (1.10.4)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
-    rack (2.0.7)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails (5.2.4.4)
+      actioncable (= 5.2.4.4)
+      actionmailer (= 5.2.4.4)
+      actionpack (= 5.2.4.4)
+      actionview (= 5.2.4.4)
+      activejob (= 5.2.4.4)
+      activemodel (= 5.2.4.4)
+      activerecord (= 5.2.4.4)
+      activestorage (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       bundler (>= 1.3.0)
-      railties (= 5.2.3)
+      railties (= 5.2.4.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (5.2.4.4)
+      actionpack (= 5.2.4.4)
+      activesupport (= 5.2.4.4)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
-    rake (10.5.0)
-    sprockets (3.7.2)
+    rake (13.0.1)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     thor (0.20.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
     virtus (1.0.5)
       axiom-types (~> 0.1)
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
@@ -153,7 +153,7 @@ DEPENDENCIES
   command_service_object!
   minitest (~> 5.11, >= 5.11.3)
   rails (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   thor (~> 0.20.3)
 
 BUNDLED WITH

data/README.md

@@ -18,13 +18,14 @@ Service consists of several objects { `Command Object` `Usecase Object` And `Err
 - **Listeners:** An event listener that waits for an event outside the service to occur.
 - **Entities:** Many objects are not fundamentally defined by their attributes, but rather by a thread of continuity and identity.
 
-#### Result Object
+### Result Object
 
 In case of successful or failure `ApplicationService` the responsible object for all services will return `service_result` object this object contain `value!` method containing successful call result, and `errors` method containing failure `errors` objects.
 
-#### Business Logic Failures
+### Helpers:
 
-To raise bussiness logic failures you can use `fail!` helper method with `message: String, extra_data: Hash` arguments.
+- Fail: You can use `fail!` helper to raise business logic failures, ex: `fail!('user should not have any active cards')`.
+- Check: To do business logic validations you can use `check!` helper ex: `check!('user should not have any active cards') { user.active_cards.empty? }`, if the given block returns false then it will raise fail! with the given message.
 
 > You can check if the result successful or not by using `ok?` method.
 

data/command_service_object.gemspec

@@ -36,9 +36,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'byebug', '~> 9.0.6'
   spec.add_development_dependency 'minitest', '~> 5.11', '>= 5.11.3'
   spec.add_development_dependency 'rails', '~> 5.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'thor', '~> 0.20.3'
 
   spec.add_dependency 'virtus', '~> 1.0', '>= 1.0.5'
-  spec.add_dependency 'hutch', '1.0'
+  spec.add_dependency 'hutch', '~> 1.0'
 end

data/lib/command_service_object.rb

@@ -4,6 +4,7 @@ require 'command_service_object/failure'
 require 'command_service_object/helpers/model_helper'
 require 'command_service_object/helpers/controller_helper'
 require 'command_service_object/helpers/failure_helper'
+require 'command_service_object/helpers/check_helper'
 require 'command_service_object/hooks'
 require 'virtus'
 

data/lib/command_service_object/helpers/check_helper.rb

@@ -0,0 +1,9 @@
+module CommandServiceObject
+  module CheckHelper
+    def check!(message, &block)
+      raise "No block given" unless block_given?
+
+      fail!(message) if block.call
+    end
+  end
+end

data/lib/command_service_object/hooks.rb

@@ -55,10 +55,12 @@ module CommandServiceObject
       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

data/lib/command_service_object/version.rb

@@ -1,3 +1,3 @@
 module CommandServiceObject
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.4.0'.freeze
 end

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

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -10,7 +11,6 @@ module Service
       argument :commands, type: :array, default: [], banner: 'command command'
 
       def call
-        invoke Service::Generators::SetupGenerator, [name]
         @model_attributes = model_attributes
 
         commands.each do |c|
@@ -23,17 +23,25 @@ module Service
       private
 
       def create_main(m)
-        path = "app/services/#{service_name}/commands/#{m.underscore}.rb"
-        template 'command.rb.erb', path unless options.skip_command?
+        path = "#{service_path}/commands/#{m.underscore}.rb"
+        template 'command.rb.erb', path
       end
 
       def create_test(m)
-        path = "spec/services/#{service_name}/commands/#{m.underscore}_spec.rb"
+        path = "#{spec_path}/commands/#{m.underscore}_spec.rb"
         template 'command_spec.rb.erb', path
       end
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/entity/entity_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -7,15 +8,11 @@ module Service
 
       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
 
-          path = "app/services/#{service_name}/entities/#{m.underscore}.rb"
+          path = "#{service_path}/entities/#{m.underscore}.rb"
           template 'entity.rb.erb', path
         end
       end
@@ -23,7 +20,15 @@ module Service
       private
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/external/external_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -8,8 +9,6 @@ module Service
       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)
@@ -20,17 +19,25 @@ module Service
       private
 
       def create_main(m)
-        path = "app/services/#{service_name}/externals/#{m.underscore}.rb"
+        path = "#{service_path}/externals/#{m.underscore}.rb"
         template 'external.rb.erb', path
       end
 
       def create_test(m)
-        path = "spec/services/#{service_name}/externals/#{m.underscore}_spec.rb"
+        path = "#{spec_path}/externals/#{m.underscore}_spec.rb"
         template 'external_spec.rb.erb', path
       end
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/helper.rb

@@ -0,0 +1,23 @@
+module Service
+  module Helper
+    extend self
+
+    def service_name(arg)
+      if arg.include? "/"
+        root = arg.split("/").first
+        sub_domain = arg.split("/").last
+        "#{root.underscore}_service/#{sub_domain}"
+      else
+        "#{arg.underscore}_service"
+      end
+    end
+
+    def service_path(arg)
+      "app/services/#{service_name(arg)}"
+    end
+
+    def spec_path(arg)
+      "spec/services/#{service_name(arg)}"
+    end
+  end
+end

data/lib/generators/service/install/templates/services/application_service.rb

@@ -17,12 +17,10 @@ class ApplicationService
         rollback if result.error.present?
       end
 
+      log_command
       result
     rescue StandardError => e
-      log_errors(e)
-      ServiceResult.new { raise e }
-    ensure
-      log_command
+      ServiceResult.new { raise e }      
     end
 
     def rollback
@@ -33,26 +31,38 @@ class ApplicationService
 
     private
 
-    def log_errors(err)
-      return if err.class.is_a?(CommandServiceObject::Failure)
-      # Add your logging logic
-      # ex:
-      #   Rollbar.error(err)
-    end
-
     def log_command
-      service_logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(Rails.root.join('log', 'services.log').to_s))
-      status = result.ok? ? 'success' : 'faild'
+      service_logger = ActiveSupport::Logger.new(Rails.root.join('log', 'services.log').to_s)
+      service_logger.formatter = proc do |severity, datetime, progname, msg|
+        "[#{msg['usecase']}] [#{msg['status']}] [#{datetime.to_s(:db)} ##{Process.pid}] -- #{msg['body']}\n"
+      end
+      log_body = result.ok? ? success_log : failure_log
 
-      service_logger.tagged(service_name, usecase_name, status) do
-        service_logger.info(
-          {
+      service_logger.info(log_body)
+    end
+
+    def success_log
+      {
+        usecase: "#{service_name}::#{usecase_name}",
+        status: 'success',
+        body: {
             cmd: cmd.as_json,
             result: result.value!.as_json,
             benchmark: bm.as_json
-          }.as_json
-        )
-      end
+          }
+      }.as_json
+    end
+
+    def failure_log
+      {
+        usecase: "#{service_name}::#{usecase_name}",
+        status: 'faild',
+        body: {
+          cmd: cmd.as_json,
+          error: result.error.to_s,
+          benchmark: bm.as_json
+        }
+      }.as_json
     end
 
     def usecase_class

data/lib/generators/service/install/templates/services/case_base.rb

@@ -5,6 +5,7 @@ require 'hutch'
 class CaseBase
   include CommandServiceObject::Hooks
   include CommandServiceObject::FailureHelper
+  include CommandServiceObject::CheckHelper
 
   attr_reader :cmd, :issuer, :right_name
   alias_attribute :payload, :cmd

data/lib/generators/service/install/templates/services/value_object_base.rb

@@ -0,0 +1,4 @@
+class ValueObjectBase
+  include ActiveModel::Validations
+  include Virtus.value_object
+end

data/lib/generators/service/listener/listener_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -7,15 +8,11 @@ module Service
 
       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
 
-          path = "app/services/#{service_name}/listeners/#{m.underscore}.rb"
+          path = "#{service_path}/listeners/#{m.underscore}.rb"
           template 'listener.rb.erb', path
         end
       end
@@ -23,7 +20,15 @@ module Service
       private
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/micro/micro_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -7,15 +8,11 @@ module Service
 
       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
 
-          path = "app/services/#{service_name}/usecases/micros/#{m.underscore}.rb"
+          path = "#{service_path}/usecases/micros/#{m.underscore}.rb"
           template 'micro.rb.erb', path
         end
       end
@@ -23,7 +20,15 @@ module Service
       private
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/query/query_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -7,15 +8,11 @@ module Service
 
       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
 
-          path = "app/services/#{service_name}/queries/#{m.underscore}.rb"
+          path = "#{service_path}/queries/#{m.underscore}.rb"
           template 'query.rb.erb', path
         end
       end
@@ -23,7 +20,15 @@ module Service
       private
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/service_generator.rb

@@ -6,18 +6,13 @@ require_relative './usecase/usecase_generator.rb'
 require_relative './command/command_generator.rb'
 require 'rails/generators'
 require 'rails/generators/model_helpers'
+require_relative './helper.rb'
 
 module Service
   module Generators
     class ServiceGenerator < Rails::Generators::NamedBase
       argument :usecases, type: :array, default: [], banner: 'usecase usecase'
 
-      # Skiping options
-      class_option :skip_usecase, type: :boolean, default: false, aliases: '-U'
-      class_option :skip_command, type: :boolean, default: false, aliases: '-C'
-      class_option :skip_entity,  type: :boolean, default: false, aliases: '-E'
-      class_option :skip_test,    type: :boolean, default: false, aliases: '-T'
-
       def install_if_not
         return if File.exist?('app/services')
 
@@ -29,16 +24,26 @@ module Service
       end
 
       def generate_usecases
-        return if options.skip_usecase?
-
         invoke Service::Generators::UsecaseGenerator, [name, usecases]
       end
 
       def generate_commands
-        return if options.skip_command?
-
         invoke Service::Generators::CommandGenerator, [name, usecases]
       end
+
+      private
+
+      def service_name
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
+      end
     end
   end
 end

data/lib/generators/service/setup/setup_generator.rb

@@ -1,29 +1,33 @@
+require_relative '../helper'
+
 module Service
   module Generators
     class SetupGenerator < Rails::Generators::Base
       source_root File.expand_path('templates', __dir__)
 
+      DIRS = %w(listeners jobs externals queries usecases commands entities usecases/micros)
+
       def setup
-        return if File.exist?("app/services/#{service_name}")
-
-        empty_directory("app/services/#{service_name}")
-        empty_directory("app/services/#{service_name}/listeners")
-        empty_directory("app/services/#{service_name}/jobs")
-        empty_directory("app/services/#{service_name}/externals")
-        empty_directory("app/services/#{service_name}/queries")
-        empty_directory("app/services/#{service_name}/usecases")
-        empty_directory("app/services/#{service_name}/commands")
-        empty_directory("app/services/#{service_name}/entities")
-        empty_directory("app/services/#{service_name}/usecases/micros")
-
-        path = "app/services/#{service_name}/doc.md"
+        DIRS.each do |dir|
+          empty_directory("#{service_path}/#{dir}")
+        end
+
+        path = "#{service_path}/doc.md"
         template 'doc.md.erb', path unless File.exist?(path)
       end
 
       private
 
       def service_name
-        "#{args.first.underscore}_service"
+        Service::Helper.service_name(args.first)
+      end
+
+      def service_path
+        Service::Helper.service_path(args.first)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(args.first)
       end
     end
   end

data/lib/generators/service/usecase/templates/usecase.rb.erb

@@ -7,6 +7,10 @@ module <%= service_name.classify %>::Usecases
     # methods for Business logic.
     #
     def call
+      # Use check! for business logic validation,
+      # If the given block returns false then it will raise a business logic failure with the given message.
+      # Ex: check!("user should not have any active cards") { cmd.issuer.active_cards.empty? }
+
       replace_me
 
       output
@@ -31,7 +35,7 @@ module <%= service_name.classify %>::Usecases
     end
 
     def broadcast
-      Hutch.publish('<%= "#{service_name}_#{@usecase.underscore}" %>', subject: {}, action: '<%= "#{@usecase.underscore}" %>')
+      Hutch.publish('<%= service_name %>', action: '<%= "#{@usecase.underscore}" %>', subject: {})
     end
 
     private

data/lib/generators/service/usecase/usecase_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -8,8 +9,6 @@ module Service
       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)
@@ -20,17 +19,25 @@ module Service
       private
 
       def create_main(m)
-        path = "app/services/#{service_name}/usecases/#{m.underscore}.rb"
-        template 'usecase.rb.erb', path unless options.skip_command?
+        path = "#{service_path}/usecases/#{m.underscore}.rb"
+        template 'usecase.rb.erb', path
       end
 
       def create_test(m)
-        path = "spec/services/#{service_name}/usecases/#{m.underscore}_spec.rb"
+        path = "#{spec_path}/usecases/#{m.underscore}_spec.rb"
         template 'usecase_spec.rb.erb', path
       end
 
       def service_name
-        "#{name.underscore}_service"
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
       end
     end
   end

data/lib/generators/service/value_object/templates/value_object.rb.erb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module <%= service_name.classify %>::ValueObjects
+  class <%= @value_object %> < ValueObjectBase
+    # You can read Virtus gem doc for more info.
+    # https://github.com/solnic/virtus
+
+    # Attributes
+    # values do
+    #   attribute :latitude,  Float
+    #   attribute :longitude, Float
+    # end
+
+    # Validations
+    # validates :REPLACE_ME, presence: true
+  end
+end

data/lib/generators/service/value_object/value_object_generator.rb

@@ -0,0 +1,38 @@
+require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
+
+module Service
+  module Generators
+    class ValueObjectGenerator < Rails::Generators::NamedBase
+      source_root File.expand_path('templates', __dir__)
+
+      argument :value_objects, type: :array, default: [], banner: 'value_object value_object'
+
+      def call
+        value_objects.each do |u|
+          @value_object = u.classify
+          create_main(u)
+        end
+      end
+
+      private
+
+      def create_main(m)
+        path = "#{service_path}/value_objects/#{m.underscore}.rb"
+        template 'value_object.rb.erb', path
+      end
+
+      def service_name
+        Service::Helper.service_name(name)
+      end
+
+      def service_path
+        Service::Helper.service_path(name)
+      end
+
+      def spec_path
+        Service::Helper.spec_path(name)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_service_object
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Adham EL-Deeb
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-09-23 00:00:00.000000000 Z
+date: 2020-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,14 +79,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -125,14 +125,14 @@ dependencies:
   name: hutch
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 description: command_service_object gem helps you to generate service and command
@@ -162,6 +162,7 @@ files:
 - lib/command_service_object.rb
 - lib/command_service_object/configuration.rb
 - lib/command_service_object/failure.rb
+- lib/command_service_object/helpers/check_helper.rb
 - lib/command_service_object/helpers/controller_helper.rb
 - lib/command_service_object/helpers/failure_helper.rb
 - lib/command_service_object/helpers/model_helper.rb
@@ -180,8 +181,7 @@ files:
 - lib/generators/service/external/templates/external.rb.erb
 - lib/generators/service/external/templates/external_spec.rb.erb
 - lib/generators/service/external/templates/external_test.rb.erb
-- lib/generators/service/getter/getter_generator.rb
-- lib/generators/service/getter/templates/getter.rb.erb
+- lib/generators/service/helper.rb
 - lib/generators/service/install/install_generator.rb
 - lib/generators/service/install/templates/initializer.rb
 - lib/generators/service/install/templates/services/application_service.rb
@@ -190,6 +190,7 @@ files:
 - lib/generators/service/install/templates/services/listener_base.rb
 - lib/generators/service/install/templates/services/query_base.rb
 - lib/generators/service/install/templates/services/service_result.rb
+- lib/generators/service/install/templates/services/value_object_base.rb
 - lib/generators/service/listener/listener_generator.rb
 - lib/generators/service/listener/templates/listener.rb.erb
 - lib/generators/service/micro/micro_generator.rb
@@ -204,6 +205,8 @@ files:
 - lib/generators/service/usecase/templates/usecase.rb.erb
 - lib/generators/service/usecase/templates/usecase_spec.rb.erb
 - lib/generators/service/usecase/usecase_generator.rb
+- lib/generators/service/value_object/templates/value_object.rb.erb
+- lib/generators/service/value_object/value_object_generator.rb
 homepage: https://github.com/adham90/command_service_object
 licenses:
 - MIT

data/lib/generators/service/getter/getter_generator.rb

@@ -1,30 +0,0 @@
-require_relative '../setup/setup_generator.rb'
-
-module Service
-  module Generators
-    class GetterGenerator < Rails::Generators::NamedBase
-      source_root File.expand_path('templates', __dir__)
-
-      argument :getters, type: :array, default: [], banner: 'getter getter'
-
-      def setup
-        invoke Service::Generators::SetupGenerator, [name]
-      end
-
-      def create_getters
-        getters.each do |g|
-          @getter = g.classify
-
-          path = "app/services/#{service_name}/usecases/getters/#{g.underscore}.rb"
-          template 'getter.rb.erb', path
-        end
-      end
-
-      private
-
-      def service_name
-        "#{name.underscore}_service"
-      end
-    end
-  end
-end

data/lib/generators/service/getter/templates/getter.rb.erb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-module <%= service_name.classify %>::Usecases::Getters
-  class <%= @getter %>
-    def call(*args)
-    end
-  end
-end