vg-service_object 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0eeb66b9fb55a001812685c7c4c4086cc0f25b563d566855dc24ba8dd5927e
-  data.tar.gz: 3931e0add437744b3f5337527db3cf2ba6c57509e7fb70184031e4d6644c0d31
+  metadata.gz: 333357254e8d4007eecc70d2a82a40a6319652b2f642443eb8b974429b385275
+  data.tar.gz: e66cd3f53fe5e73550f7f3969ab78902e8f84249293955bc5702e11808041785
 SHA512:
-  metadata.gz: 7efebdb2fd03cea0869dbe920d1f26b3ebdc5f2a8cd645fcb43d11c89f6147bcdf4f2ffb1a454d02f9f30ad866b8bf3a2e3d6a493773524a39f8d9e42e163390
-  data.tar.gz: 74adc53e8c0dcc70a3fb713f97f9cf32b828ebba9a87cc774695bc26e2c3e34e9fae7ec5e37112fbe7b21070ad8cd7ce550f21e2e9ddc6099a9d3aa44e85d090
+  metadata.gz: ec889f277f4ffe74f2ea00f74d22158ce173047172e16850e9b5131a20c91d18b468949f43b4325e46d4cd2ae22a402c868fccb404bc2d78cdcbb7cb4f3a08cd
+  data.tar.gz: 64cf84f5785e6d9d65c92aa2a0c70740e14a16448da4b097699c9d7da86bbb4361b57d4535cca39e0f144e26bd00b7d126f62b05fc03d91fb7409500248e0e20

data/lib/vg/service_object/version.rb

@@ -1,5 +1,5 @@
 module VG
   module ServiceObject
-    VERSION = "0.5.0"
+    VERSION = "0.6.0"
   end
 end

data/lib/vg/service_object.rb

@@ -3,41 +3,43 @@
 module VG
   module ServiceObject
 
-    module ClassSingletonMethods
+    module CommonSingletonMethods
       def call(...)
         callable.call(...)
       end
     
+      def as_method(name = nil)
+        ::VG::SO::GenerateIncludableModule.call(self.name, as: name)
+      end
+
+      alias_method :as_so, :as_method
+    end
+
+    module ClassSingletonMethods
+
       def callable
         self.new
       end
 
-      def as_so(method_name = nil)
-        ::VG::SO::GenerateIncludableModule.call(self.name, as: method_name)
-      end
     end
 
     module ModuleSingletonMethods
-      def call(...)
-        callable.call(...)
-      end
-    
+      
       def callable
         self::Action.new
       end
 
-      def as_so(method_name = nil)
-        ::VG::SO::GenerateIncludableModule.call(self.name, as: method_name)
-      end
     end
 
     def self.included(so)
-      methods = so.is_a?(Class) ? ClassSingletonMethods : ModuleSingletonMethods
-      return if so.singleton_class.included_modules.include?(methods)
-      so.extend methods
+      so.singleton_class.included_modules.tap do |included|
+        [CommonSingletonMethods, so.is_a?(Class) ? ClassSingletonMethods : ModuleSingletonMethods].each do |methods|
+          so.extend methods unless included.include?(methods)
+        end
+      end
       
       so.singleton_class.instance_eval do
-        define_method(:included) { |_base| raise "Can't be included. Use #as_so method instead" }
+        define_method(:included) { |_base| raise "Can't be included. Use #as_method method instead" }
       end if so.instance_of?(Module)
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vg-service_object
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Vladimir Gorodulin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-01 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec