command_service_object 1.1.1 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f443a5cc09eca1c23b649f3662cf4fa1ee4ee3203f8b5869fddb0847ebc5c090
-  data.tar.gz: 0e2188106ea26d10dada611fb620a113147d598ef8775abce191a7c2cc6df2b9
+  metadata.gz: f6713525d2c5f070d0e1f852b675d9a3afd12470cf124c151a816894c7f5328e
+  data.tar.gz: f76c2b168cac3af6d0fbb12cf07371168efa6b9a1c45fb2efa181cbf435af21f
 SHA512:
-  metadata.gz: 5f9cb881156fcf6fd2393bdc5fd76399aa0d7b61d6c330c587c79ac22acb390f8ff1b07fbc79a73408edbd2f370306191420ebf29e8e35b0b90991530599805c
-  data.tar.gz: d742ef303630b50c26c07498d2557af1a593e20690544a617df4f416390cebbdb9fef6e8d2be5d0de94e51f6467a30e13a6bfa2ec35f7fb179cfb2750d034d6e
+  metadata.gz: 17b03115466551f6c9bdca3f16a92d9d15c25072d8f9dd401442ff3d8fa3f4ed190365c5bd47ff6d6cd2ac5c88fd2fd9dc300e7991230fe9440297360d683831
+  data.tar.gz: 7a829d7e6b32e37f9a162a6946170bb8437657bbbe03dfbb1fce8a969330555756186fff62969e49167f760eb6cdd63d776a0c3c1e52906c9bade6fc55f2b6c5

data/lib/command_service_object/version.rb

@@ -1,3 +1,3 @@
 module CommandServiceObject
-  VERSION = '1.1.1'.freeze
+  VERSION = '1.2.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
@@ -23,17 +24,25 @@ module Service
       private
 
       def create_main(m)
-        path = "app/services/#{service_name}/commands/#{m.underscore}.rb"
+        path = "#{service_path}/commands/#{m.underscore}.rb"
         template 'command.rb.erb', path unless options.skip_command?
       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
@@ -15,7 +16,7 @@ module Service
         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 +24,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
@@ -20,17 +21,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/listener/listener_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -15,7 +16,7 @@ module Service
         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 +24,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
@@ -15,7 +16,7 @@ module Service
         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 +24,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
@@ -15,7 +16,7 @@ module Service
         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 +24,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,6 +6,7 @@ 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
@@ -39,6 +40,20 @@ module Service
 
         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/usecase_generator.rb

@@ -1,4 +1,5 @@
 require_relative '../setup/setup_generator.rb'
+require_relative '../helper'
 
 module Service
   module Generators
@@ -20,17 +21,25 @@ module Service
       private
 
       def create_main(m)
-        path = "app/services/#{service_name}/usecases/#{m.underscore}.rb"
+        path = "#{service_path}/usecases/#{m.underscore}.rb"
         template 'usecase.rb.erb', path unless options.skip_command?
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_service_object
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.1
 platform: ruby
 authors:
 - Adham EL-Deeb
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-07 00:00:00.000000000 Z
+date: 2020-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -181,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

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