command_service_object 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36d2b1f785b76803f0333bb3747c5e0fe01f6670573afb93305df3136f00ab46
-  data.tar.gz: e37a9faf02baef49903868a63a0fe5912f8a6e3b01272ccdd90d51d3826b2ec7
+  metadata.gz: e58280d4d7d95c07974d99a7a0b9fdee2ba1b0dff5e3c757c82082a0be4d0384
+  data.tar.gz: 71d0e82c16cca76ed43149651c638cba4952ac4aa8265fd989f469c9920bee35
 SHA512:
-  metadata.gz: 0ea1e2f5b1ea28fdf19f63a6f3ed068d7f6eeb193c0dd3e815af26181740462aae1310ae3d472a161ebf737c02980e9b255c68d323bb08e56c28df797610fb2e
-  data.tar.gz: 8188249f9cfcff0deb07d00bc46da92b7afa5fbc6f2108927f2573fd0a9fda7f67d9988f75757a84a47150d22306dab2fd673642b70123c83c8a6914669621f2
+  metadata.gz: d97e57b73f54c8d9b759f8917693d8b96cc22aec18f93d6f19f4e05cc0e5d8145d56ae180a6381ec3343c87ea6e14ad0d1d131e1277c3188a107ef6025113b5a
+  data.tar.gz: 5c2aff6a34ea6fdc6e42670afaba56096189fc968e2a8f2a20a131a98039792d4751480ba704d5bb3b15b00e209e7ee203616fe9abc4c912a7f77efd06a450e6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    command_service_object (1.1.0)
+    command_service_object (1.4.1)
       hutch (~> 1.0)
       virtus (~> 1.0, >= 1.0.5)
 
@@ -79,7 +79,7 @@ GEM
     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)

data/lib/command_service_object/version.rb

@@ -1,3 +1,3 @@
 module CommandServiceObject
-  VERSION = '1.4.0'.freeze
+  VERSION = '1.4.1'.freeze
 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/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/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/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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: command_service_object
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Adham EL-Deeb
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2021-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -187,9 +187,11 @@ files:
 - 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
@@ -230,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.