evt-template_method 2.0.0.0 → 2.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7df86eec2be2b5378f682b6c8b32b5f80c41d20b28ce0f99559e5c584d047b68
-  data.tar.gz: bdc177a975ef3948d23d1593247066c3e5bcaefbc52ab482333ffa62b77e9e65
+  metadata.gz: db75f4fd8781df4281c127d328cedd7a880a864fb90ccf63a54c75381f826ff9
+  data.tar.gz: 142d04dfdb9132755df14728cdd2bcb404af679ca084421331409516cdcecc9f
 SHA512:
-  metadata.gz: 3f29692f4c50d16bcbaeb1d717ad40a578be5506281d99e462efc3902e52482ae6fa2230022778288b803a0d92da8ae2d07363c49680af7cf94705f4b0b34070
-  data.tar.gz: 9cdee8a69ff9a491c3de205413911fd0803670dd5018177fda206fc479bc487e891eca785cf9f04ad70a30e65230842403e5824f08e9b7d3df40ca8776cad8df
+  metadata.gz: 5ae9b6a20a68658cd36e82aefe2ae1101c931acef52fc33a0298e0b5b5f0a8eee95b0b4c10df54f72df45a87bb8803caec8a19e8a9b7120664d7b4e445cfbeef
+  data.tar.gz: '09066d162ea998a369f922045c10a5cd9be4e013b6e283dfa3df12be62228280902e20cc086454d102266c9aecf93435c49cb07a3ad5237fafaf882441f66fbf'

data/lib/template_method/activate.rb

@@ -1,9 +1,6 @@
 module TemplateMethod
   def self.activate(target_class=nil)
     target_class ||= Object
-
-    return if target_class.ancestors.include?(TemplateMethod::Macro)
-
     target_class.extend(TemplateMethod::Macro)
   end
 
@@ -22,10 +19,11 @@ module TemplateMethod
   end
 
   def self.subject_class(subject)
-    if [Module, Class].include?(subject)
-      return subject
+    case subject
+    when Module, Class
+      subject
     else
-      return subject.class
+      subject.class
     end
   end
 end

data/lib/template_method/controls/template_method/body.rb

@@ -0,0 +1,18 @@
+module TemplateMethod
+  module Controls
+    module TemplateMethod
+      module Body
+        def self.example
+          Example.new
+        end
+
+        class Example
+          include ::TemplateMethod
+          template_method :some_method do |*|
+            :something
+          end
+        end
+      end
+    end
+  end
+end

data/lib/template_method/controls/template_method/implemented.rb

@@ -0,0 +1,84 @@
+module TemplateMethod
+  module Controls
+    module TemplateMethod
+      module Implemented
+        def self.example
+          Example.new
+        end
+
+        class Example
+          include ::TemplateMethod
+          template_method :some_method
+
+          def some_method
+            'some value'
+          end
+        end
+
+        module Prior
+          def self.example
+            Example.new
+          end
+
+          class Example
+            def some_method
+              'some value'
+            end
+
+            include ::TemplateMethod
+            template_method :some_method
+          end
+        end
+
+        module Module
+          def self.example
+            Example.new
+          end
+
+          class Example
+            include ::TemplateMethod
+            template_method :some_method
+
+            module SomeModule
+              def some_method
+                'some value'
+              end
+            end
+            include SomeModule
+          end
+        end
+
+        module PrependedModule
+          def self.example
+            Example.new
+          end
+
+          class Example
+            module PrependedModule
+              def self.included(cls)
+                cls.class_exec do
+                  include ::TemplateMethod
+
+                  prepend SomeMethod
+
+                  template_method :some_method do
+                    'some value'
+                  end
+                end
+              end
+
+              module SomeMethod
+                def some_method
+                  return super
+                rescue NoMethodError
+                  return nil
+                end
+              end
+            end
+            include PrependedModule
+          end
+        end
+      end
+    end
+  end
+end

data/lib/template_method/controls/template_method/variant.rb

@@ -0,0 +1,31 @@
+module TemplateMethod
+  module Controls
+    module TemplateMethod
+      module Variant
+        def self.example
+          Example.new
+        end
+
+        class Example
+          include ::TemplateMethod
+          template_method! :some_method
+        end
+
+        module Implemented
+          def self.example
+            Example.new
+          end
+
+          class Example
+            include ::TemplateMethod
+            template_method! :some_method
+
+            def some_method
+              'some value'
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/template_method/controls/template_method.rb

@@ -9,93 +9,6 @@ module TemplateMethod
         include ::TemplateMethod
         template_method :some_method
       end
-
-      module Body
-        def self.example
-          Example.new
-        end
-
-        class Example
-          include ::TemplateMethod
-          template_method :some_method do |*|
-            :something
-          end
-        end
-      end
-
-      module Implemented
-        def self.example
-          Example.new
-        end
-
-        class Example
-          include ::TemplateMethod
-          template_method :some_method
-
-          def some_method
-            "some concrete result"
-          end
-        end
-
-        module AlreadyImplemented
-          def self.example
-            Example.new
-          end
-
-          class Example
-            def some_method
-              "some concrete result"
-            end
-
-            include ::TemplateMethod
-            template_method :some_method
-          end
-        end
-
-        module Module
-          def self.example
-            Example.new
-          end
-
-          class Example
-            include ::TemplateMethod
-            template_method :some_method
-
-            module SomeModule
-              def some_method
-                "some module concrete result"
-              end
-            end
-            include SomeModule
-          end
-        end
-      end
-
-      module Variant
-        def self.example
-          Example.new
-        end
-
-        class Example
-          include ::TemplateMethod
-          template_method! :some_method
-
-          def some_method
-            'some concrete result'
-          end
-        end
-
-        module NotImplemented
-          def self.example
-            Example.new
-          end
-
-          class Example
-            include ::TemplateMethod
-            template_method! :some_method
-          end
-        end
-      end
     end
   end
 end

data/lib/template_method/controls.rb

@@ -1,4 +1,8 @@
 require 'template_method/controls/template_method'
+require 'template_method/controls/template_method/body'
+require 'template_method/controls/template_method/implemented'
+require 'template_method/controls/template_method/variant'
+
 require 'template_method/controls/clean'
 require 'template_method/controls/extended'
 require 'template_method/controls/included'

data/lib/template_method/macro.rb

@@ -13,8 +13,15 @@ module TemplateMethod
     def template_method_macro(method_name, &implementation)
       implementation ||= proc { |*| nil }
 
-      inherit = true
-      concrete_implementation_exists = method_defined?(method_name, inherit)
+      ancestors_without_prepended_modules = ancestors.drop_while do |ancestor|
+        ancestor != self
+      end
+
+      concrete_implementation_exists = ancestors_without_prepended_modules.any? do |ancestor|
+        ancestor.method_defined?(method_name, false) ||
+          ancestor.private_method_defined?(method_name, false)
+      end
+
       if concrete_implementation_exists
         return
       end
@@ -24,7 +31,7 @@ module TemplateMethod
     alias :template_method :template_method_macro
 
     def template_method_variant_macro(method_name)
-      template_method_macro(method_name) do
+      template_method_macro(method_name) do |*|
         raise TemplateMethod::Error, "Implementation is required (Method name: #{method_name})"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-template_method
 version: !ruby/object:Gem::Version
-  version: 2.0.0.0
+  version: 2.1.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-14 00:00:00.000000000 Z
+date: 2024-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench
@@ -37,6 +37,9 @@ files:
 - lib/template_method/controls/extended.rb
 - lib/template_method/controls/included.rb
 - lib/template_method/controls/template_method.rb
+- lib/template_method/controls/template_method/body.rb
+- lib/template_method/controls/template_method/implemented.rb
+- lib/template_method/controls/template_method/variant.rb
 - lib/template_method/error.rb
 - lib/template_method/macro.rb
 - lib/template_method/template_method.rb
@@ -59,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Template method declaration