command_service_object 1.1.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378dc78b1fdeb1e415506b8edacb761ee0a0d78c90b5b1cf90c081a506cf6183
-  data.tar.gz: 26395c6559e2f8124583c5002a519f39f32b781dfee944218a894bd6570f1715
+  metadata.gz: e58280d4d7d95c07974d99a7a0b9fdee2ba1b0dff5e3c757c82082a0be4d0384
+  data.tar.gz: 71d0e82c16cca76ed43149651c638cba4952ac4aa8265fd989f469c9920bee35
 SHA512:
-  metadata.gz: 446882a4a2a56924868783acffa56fdf54b0f61eedb48e1c58846f3de7795f32d7afde0b74fb02425530590324bc240eaf9befedc8b0cb306f52f1cb75e1cde4
-  data.tar.gz: 49e3cb994a9304e5b34d88d5abef25e4c79cbb751c1f466b8d232735534205e6092bb74219f4b05e4a46ec8e8cc295730c29b8b656e3ebcef612b98a9a0996f5
+  metadata.gz: d97e57b73f54c8d9b759f8917693d8b96cc22aec18f93d6f19f4e05cc0e5d8145d56ae180a6381ec3343c87ea6e14ad0d1d131e1277c3188a107ef6025113b5a
+  data.tar.gz: 5c2aff6a34ea6fdc6e42670afaba56096189fc968e2a8f2a20a131a98039792d4751480ba704d5bb3b15b00e209e7ee203616fe9abc4c912a7f77efd06a450e6

data/Gemfile.lock

@@ -1,50 +1,50 @@
 PATH
   remote: .
   specs:
-    command_service_object (0.6.5)
-      hutch (= 1.0)
+    command_service_object (1.4.1)
+      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)
+    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,10 +76,10 @@ 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)
+    json (2.5.1)
     loofah (2.7.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -87,60 +87,60 @@ GEM
       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)
+    nio4r (2.5.4)
     nokogiri (1.10.10)
       mini_portile2 (~> 2.4.0)
     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 (13.0.1)
-    sprockets (3.7.2)
+    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.5)
 

data/command_service_object.gemspec

@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   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/helpers/check_helper.rb

@@ -3,7 +3,7 @@ module CommandServiceObject
     def check!(message, &block)
       raise "No block given" unless block_given?
 
-      fail!(message) unless block.call
+      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.1.0'.freeze
+  VERSION = '1.4.1'.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/command/templates/command_spec.rb.erb

@@ -2,12 +2,12 @@
 
 require 'rails_helper'
 
-describe <%= service_name.classify %>::Commands::<%= @test %>, type: :model do
+describe <%= service_name.classify %>::Commands::<%= @command %>, type: :model do
   describe 'attrubites' do
-    it { expect(subject).to respond_to(:EX) }
+    <%# it { expect(subject).to respond_to(:EX) } %>
   end
 
   describe 'validatios' do
-    it { should validate_presence_of(:EX) }
+    <%# it { should validate_presence_of(:EX) } %>
   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/external/templates/external_spec.rb.erb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe <%= service_name.classify %>::Externals::<%= @external %> do
   # Example
-  # context "when success" do
+  # context 'when success' do
   #   it 'should be okay?' do
   #     expect(subject.[method_name]).to eql([result])
   #   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

@@ -7,33 +7,37 @@ class ApplicationService
     def call(cmd)
       @cmd = cmd
       @bm = Benchmark.measure do
-        raise Errors::InvalidCommand, cmd.class if cmd.invalid?
+        raise Errors::InvalidCommand if cmd.invalid?
 
         @usecase = usecase_class.new(cmd)
-        raise Errors::NotAuthorizedError, cmd.class unless usecase.allowed?
+
+        raise Errors::NotAuthorizedError unless usecase.allowed?
 
         @result = ServiceResult.new { usecase.call }
 
         rollback if result.error.present?
+        usecase.broadcast if result.ok?
       end
 
       log_command
       result
     rescue StandardError => e
-      ServiceResult.new { raise e }      
+      ServiceResult.new { raise e }
     end
 
     def rollback
       usecase.rollback_micros
       usecase.rollback
-      log_errors(result.error)
     end
 
     private
 
     def log_command
-      service_logger = ActiveSupport::Logger.new(Rails.root.join('log', 'services.log').to_s)
-      service_logger.formatter = proc do |severity, datetime, progname, msg|
+      FileUtils.mkdir_p 'log/services'
+      service_logger = ActiveSupport::Logger.new(
+        Rails.root.join('log', 'services', "#{service_name.underscore}.log").to_s, 'daily'
+      )
+      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
@@ -46,10 +50,10 @@ class ApplicationService
         usecase: "#{service_name}::#{usecase_name}",
         status: 'success',
         body: {
-            cmd: cmd.as_json,
-            result: result.value!.as_json,
-            benchmark: bm.as_json
-          }
+          cmd: cmd.as_json,
+          result: result.value!.as_json,
+          benchmark: bm.as_json
+        }
       }.as_json
     end
 
@@ -78,3 +82,13 @@ class ApplicationService
     end
   end
 end
+
+module Errors
+  class NotAuthorizedError < StandardError
+    def initialize(msg: 'not allowd')
+      super(msg)
+    end
+  end
+
+  class InvalidCommand < StandardError; end
+end

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

@@ -2,10 +2,10 @@
 
 class CommandBase
   include ActiveModel::Validations
-  include Virtus.model(nullify_blank: true)
+  include Virtus.model
 
   # if you need to enable policies add issuer attribute
-  attribute :issuer, Object, default: :default_issuer
+  attribute :issuer, Issuer, default: :default_issuer
 
   private
 

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

@@ -0,0 +1,10 @@
+class Issuer
+  include ActiveModel::Validations
+  include Virtus.model
+
+  attribute :id, String
+  attribute :type, String
+  attribute :scope, Array[String], default: []
+
+  validates :id, :type, presence: true
+end

data/lib/generators/service/install/templates/services/util/json.rb

@@ -0,0 +1,7 @@
+require 'json'
+
+class Util::Json < Virtus::Attribute
+  def coerce(value)
+    value.is_a?(::Hash) ? value : JSON.parse(value)
+  end
+end

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_spec.rb.erb

@@ -2,12 +2,12 @@
 
 require 'rails_helper'
 
-describe <%= service_name.classify %>::Usecases::<%= @test %> do
-  let(:cmd) { <%= service_name.classify %>::Commands::<%= @test %>.new(cmd_params) }
+describe <%= service_name.classify %>::Usecases::<%= @usecase %> do
+  let(:cmd) { <%= service_name.classify %>::Commands::<%= @usecase %>.new(cmd_params) }
   let(:cmd_default_params) {{ name: 'test_name' }}
 
-  context "when success" do
-    let(:cmd_params) { cmd_default_params.merge!({ name: 'valid_name' }) }
+  context 'when success' do
+    let(:cmd_params) { cmd_default_params }
     let!(:result) { ApplicationService.call(cmd) }
 
     it 'should be okay?' do

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.1.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Adham EL-Deeb
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -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
@@ -181,16 +181,18 @@ 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
 - lib/generators/service/install/templates/services/case_base.rb
 - lib/generators/service/install/templates/services/command_base.rb
+- lib/generators/service/install/templates/services/issuer.rb
 - 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/util/json.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
@@ -205,6 +207,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
@@ -228,7 +232,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Rails Generator for command service object.

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