vg-service_object 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e1fea1a0c6d0cf6f8804325d01e1d29f0569db7090b659eeaceb5ee00f83cf
-  data.tar.gz: d428f22186c6d9130ee76245efc58181c708656ef0e7f8e265ba0d817357e9b1
+  metadata.gz: 333357254e8d4007eecc70d2a82a40a6319652b2f642443eb8b974429b385275
+  data.tar.gz: e66cd3f53fe5e73550f7f3969ab78902e8f84249293955bc5702e11808041785
 SHA512:
-  metadata.gz: 23103f62225bff2207d1d3a15a06d1da1b64c82491ba0c97c85f72b8ef62c547d83cc817cc6db0a2014b9835e0de94eb73e2d58f8314bf4949b3ece650ee1a8e
-  data.tar.gz: 7f962005ba8ce5d78304726bfd7ec8c8d8fa28f36fe2363f6246785d44a21fe794322c6c3a62d53901720e85c9066c2165ec6b7c7e0fe7dce278a5774ff03139
+  metadata.gz: ec889f277f4ffe74f2ea00f74d22158ce173047172e16850e9b5131a20c91d18b468949f43b4325e46d4cd2ae22a402c868fccb404bc2d78cdcbb7cb4f3a08cd
+  data.tar.gz: 64cf84f5785e6d9d65c92aa2a0c70740e14a16448da4b097699c9d7da86bbb4361b57d4535cca39e0f144e26bd00b7d126f62b05fc03d91fb7409500248e0e20

data/CHANGELOG.md

@@ -0,0 +1,13 @@
+# CHANGELOG
+
+## 0.4.0 - 2021-08-22
+
+Add bang! methods that suppress tuples
+
+## 0.2.0 - 2021-08-13
+
+Autogenerated includable modules got unique names.
+
+## 0.1.0 - 2021-08-01
+
+Initial implementation

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vg-service_object (0.1.0)
+    vg-service_object (0.5.0)
 
 GEM
   remote: https://rubygems.org/

data/Guardfile

@@ -5,7 +5,7 @@ directories %w(lib config spec)
 
 guard :rspec, cmd: "rspec --format d" do
   watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})            { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(%r{^lib/(.+)\.rb$})            { |m| "spec/#{m[1]}_spec.rb" }
   watch("spec/spec_helper.rb")         { "spec" }
   watch("spec/dummy_objects.rb")       { "spec" }
   watch("spec/shared_examples.rb")     { "spec" }

data/README.md

@@ -5,7 +5,7 @@
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'vg-service_object'
+gem "vg-service_object"
 ```
 
 And then execute:

data/lib/vg/s_o/generate_camelized_name.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module VG
+  module SO
+    module GenerateCamelizedName
+
+      def self.call(string)
+        string.to_s.gsub(/(?:_|(^))([a-z\d]*)/) { "#{$1}#{$2.capitalize}" }
+      end
+
+    end # ... GenerateCamelizedName
+  end # ... SO
+end # ... VG

data/lib/vg/s_o/generate_includable_module.rb

@@ -4,30 +4,78 @@ module VG
   module SO
     module GenerateIncludableModule
 
-      def self.call(so_module_name, as: nil)
-        method_name = as || GenerateSlugFromModuleName.call(so_module_name)
-        Module.new do
-          class_eval <<~RUBY
-            def self.included(base)
-              InjectRegistrationMethods.call(base)
-              base.register_service_object(:#{method_name}, ::#{so_module_name})
-            end
+      def self.call(...)
+        self::Action.new.call(...)
+      end
 
-            def #{method_name}_fn
-              self.class.registered_service_objects[:#{method_name}].callable
-            end
+      class Action
+      
+        def call(so_module_name, as: nil)
+          self.desired_method_name = as
+          self.so_module_name = so_module_name
+          find_or_define_module
+        end
 
-            def #{method_name}(...)
-              send("#{method_name}_fn").call(...)
-            end
+        private
+
+        attr_accessor :so_module_name
+        attr_reader :desired_method_name
+
+        def desired_method_name=(name)
+          # TODO: ensure name is a string in snake case; no bangs; 
+          @desired_method_name = name.nil? ? nil : name.to_s
+        end
+
+        def find_or_define_module 
+          return Object.const_get(module_name) if Object.const_defined?(module_name)
+
+          define_module
+        end
+
+        def define_module
+          instance_eval <<~RUBY
+            module #{module_name}
+              def self.included(base)
+                InjectRegistrationMethods.call(base)
+                base.register_service_object(:#{method_name}, ::#{so_module_name})
+              end
+
+              def #{method_name}_fn
+                self.class.registered_service_objects[:#{method_name}]
+              end
+
+              def #{method_name}(...)
+                send("#{method_name}_fn").call(...)
+              end
+
+              def #{method_name}!(...)
+                result = send("#{method_name}_fn").call(...)
+                return result unless result.respond_to?(:error) && result.respond_to?(:value)
+                raise result.error if result.error
+                result.value
+              end
 
-            def self.extended(_base)
-              raise "Do not extend ::#{so_module_name}, use include!"
+              def self.extended(_base)
+                raise "Do not extend ::#{so_module_name}, use include!"
+              end
             end
           RUBY
+          Object.const_get(module_name)
+        end
+
+        def method_name
+          @method_name ||= desired_method_name || GenerateSlugFromModuleName.call(so_module_name)
+        end
+
+        def module_name
+          "::#{so_module_name}::IncludableAs%sMethod" % (
+            desired_method_name \
+              ? GenerateCamelizedName.call(desired_method_name)
+              : GetModuleNameWithoutNamespace.call(so_module_name)
+          )
         end
-      end
 
+      end # ... Action
     end # ... GenerateIncludableModule
   end # ... SO
 end # ... VG

data/lib/vg/s_o/generate_slug_from_module_name.rb

@@ -5,10 +5,9 @@ module VG
     module GenerateSlugFromModuleName
 
       def self.call(module_name)
-        regex = /(?:::)*([A-Za-z0-9]+)$/
-        module_name.match(regex)[1]
-          .gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
-          .gsub(/([a-z\d])([A-Z])/,'\1_\2')
+        GetModuleNameWithoutNamespace.call(module_name)
+          .gsub(/([A-Z]+)([A-Z][a-z])/, '\1_\2')
+          .gsub(/([a-z\d])([A-Z])/, '\1_\2')
           .downcase.to_sym
       end
 

data/lib/vg/s_o/get_module_name_without_namespace.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module VG
+  module SO
+    module GetModuleNameWithoutNamespace
+
+      def self.call(string)
+        string.match(/(?:::)*([A-Za-z0-9]+)$/)[1]
+      end
+
+    end # ... GetModuleNameWithoutNamespace
+  end # ... SO
+end # ... VG

data/lib/vg/s_o/service_object_module_inheritance.rb

@@ -6,7 +6,7 @@ module VG
 
       module ClassMethods
         def included(base)
-          puts "-- #{self.name}#included call (including into #{base})"
+          # puts "-- #{self.name}#included call (including into #{base})"
           InjectRegistrationMethods.call(base)
           base.register_service_objects(registered_service_objects)
           
@@ -18,7 +18,7 @@ module VG
         return unless base.instance_of?(Module)
         return if base.singleton_class.included_modules.include?(ClassMethods)
 
-        puts "-- prepend #{base.name}#included with ServiceObjectModuleInheritance#included"
+        # puts "-- prepend #{base.name}#included with ServiceObjectModuleInheritance#included"
         base.singleton_class.prepend ClassMethods
       end
 

data/lib/vg/s_o/service_object_registration_methods.rb

@@ -18,7 +18,7 @@ module VG
             raise "#{so} clashes with #{registered_so} in #{self}" if so != registered_so
           end
           
-          puts "--- register #{self.name}##{name} => #{so}#call"
+          # puts "--- register #{self.name}##{name} => #{so}#call"
           registered_service_objects[name.to_sym] = so
         end
       end
@@ -26,7 +26,7 @@ module VG
       def self.included(base)
         return if base.singleton_class.included_modules.include?(ClassMethods)
 
-        puts "-- #{base.name}: extend with ServiceObjectRegistrationMethods"
+        # puts "-- #{base.name}: extend with ServiceObjectRegistrationMethods"
         base.extend ClassMethods
       end
 

data/lib/vg/s_o.rb

@@ -2,10 +2,12 @@
 
 module VG
   module SO
-    autoload(:GenerateIncludableModule,   'vg/s_o/generate_includable_module')
-    autoload(:GenerateSlugFromModuleName, 'vg/s_o/generate_slug_from_module_name')
-    autoload(:InjectRegistrationMethods,  'vg/s_o/inject_registration_methods')
-    autoload(:ServiceObjectModuleInheritance,   'vg/s_o/service_object_module_inheritance')
-    autoload(:ServiceObjectRegistrationMethods, 'vg/s_o/service_object_registration_methods')
+    autoload(:GenerateCamelizedName,            "vg/s_o/generate_camelized_name")
+    autoload(:GenerateIncludableModule,         "vg/s_o/generate_includable_module")
+    autoload(:GenerateSlugFromModuleName,       "vg/s_o/generate_slug_from_module_name")
+    autoload(:GetModuleNameWithoutNamespace,    "vg/s_o/get_module_name_without_namespace")
+    autoload(:InjectRegistrationMethods,        "vg/s_o/inject_registration_methods")
+    autoload(:ServiceObjectModuleInheritance,   "vg/s_o/service_object_module_inheritance")
+    autoload(:ServiceObjectRegistrationMethods, "vg/s_o/service_object_registration_methods")
   end
 end

data/lib/vg/service_object/version.rb

@@ -1,5 +1,5 @@
 module VG
   module ServiceObject
-    VERSION = "0.1.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 callable
-        @callable ||= self.new
+      def as_method(name = nil)
+        ::VG::SO::GenerateIncludableModule.call(self.name, as: name)
       end
 
-      def as_so(method_name = nil)
-        ::VG::SO::GenerateIncludableModule.call(self.name, as: method_name)
+      alias_method :as_so, :as_method
+    end
+
+    module ClassSingletonMethods
+
+      def callable
+        self.new
       end
+
     end
 
     module ModuleSingletonMethods
-      def call(...)
-        callable.call(...)
-      end
-    
+      
       def callable
-        @callable ||= self::Action.new
+        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
 

data/lib/vg.rb

@@ -3,6 +3,4 @@
 module VG
   require_relative "vg/service_object"
   require_relative "vg/s_o"
-  #autoload(:ServiceObject, 'v_g/service_object')
-  #autoload(:SO, 'v_g/s_o')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vg-service_object
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Vladimir Gorodulin
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-04 00:00:00.000000000 Z
+date: 2021-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -71,8 +71,10 @@ files:
 - Rakefile
 - lib/vg.rb
 - lib/vg/s_o.rb
+- lib/vg/s_o/generate_camelized_name.rb
 - lib/vg/s_o/generate_includable_module.rb
 - lib/vg/s_o/generate_slug_from_module_name.rb
+- lib/vg/s_o/get_module_name_without_namespace.rb
 - lib/vg/s_o/inject_registration_methods.rb
 - lib/vg/s_o/service_object_module_inheritance.rb
 - lib/vg/s_o/service_object_registration_methods.rb