evt-virtual 2.0.1.2 → 2.1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219f86d85d6b5e37dfe30afc0819efada92c06b61fd066d59cf4c1a3eb9cb54a
-  data.tar.gz: acf22bd74e7778178a48ddf5ba898568cceb6a4c3d9fc4a37e5c2a10edc704eb
+  metadata.gz: 6b99fa347649061dabcb64bea008a1d50ca99c018bcc26dc1bb95dcb3e7983fe
+  data.tar.gz: 78cfbfb5718dd2b60cff7011521c37bc8dab18a90d433ffd65e367d51be58c47
 SHA512:
-  metadata.gz: af2ba6bc1fe4644ef4a2ec9b962c02f565d9c6356d2c99eb94dc0223e7bd626b156b6cbbc13c413605c2a7748746dab383703ee18437307cd2a065765b43de53
-  data.tar.gz: a2ecc3775fc56e33a142add7e7561d60dd2e955ecb7f5236b09b68d0b3a67aa2a846ac887808e127107fd632f88c5b9a9821f1e14ab654783c60d40e22921bb6
+  metadata.gz: 18bb8c29bff1bfeef525735b2369250c3c177219d63aaac860aaa9debfa69c25aa43f8abe53c6dddf3e19a1a8bc8d79dd1b868bf2fc424404a4e011c772e15f5
+  data.tar.gz: e723b840b59c4065fcf05757b3adfcf6626b05c44fd81258a99b7ac64637585fa34f293c0f55946ce044c8527d40011e05e8c6a65f3e6e90771ac98c05172c94

data/lib/virtual/activate.rb

@@ -12,9 +12,13 @@ module Virtual
 
     subject = subject_class(target_class)
 
-    ['virtual', 'pure_virtual', 'abstract'].each do |mthd|
-      fail mthd unless subject.respond_to?(mthd)
+    Macro.macro_methods.each do |mthd|
+      if not subject.respond_to?(mthd)
+        return false
+      end
     end
+
+    true
   end
 
   def self.subject_class(subject)

data/lib/virtual/controls/abstract_method.rb

@@ -1,15 +1,15 @@
 module Virtual
   module Controls
     module AbstractMethod
+      def self.example
+        Example.new
+      end
+
       class Example
         include Virtual
 
         pure_virtual :some_pure_virtual_method
       end
-
-      def self.example
-        Example.new
-      end
     end
   end
 end

data/lib/virtual/controls/extended.rb

@@ -1,13 +1,13 @@
 module Virtual
   module Controls
     module Extended
-      class Example
-        extend Virtual
-      end
-
       def self.example
         Example.new
       end
+
+      class Example
+        extend Virtual
+      end
     end
   end
 end

data/lib/virtual/controls/included.rb

@@ -1,13 +1,13 @@
 module Virtual
   module Controls
     module Included
-      class Example
-        include Virtual
-      end
-
       def self.example
         Example.new
       end
+
+      class Example
+        include Virtual
+      end
     end
   end
 end

data/lib/virtual/controls/protocol_method.rb

@@ -0,0 +1,40 @@
+module Virtual
+  module Controls
+    module ProtocolMethod
+      def self.example
+        Example.new
+      end
+
+      class Example
+        include Virtual
+
+        protocol :some_protocol_method
+      end
+
+      module Implemented
+        def self.example
+          Implementer.new
+        end
+
+        class Implementer < Example
+          def some_protocol_method
+          end
+        end
+      end
+
+      module Override
+        def self.example
+          Class.new do
+            include Virtual
+
+            def some_protocol_method
+            end
+
+            protocol :some_protocol_method
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/virtual/controls/pure_virtual_method.rb

@@ -1,24 +1,37 @@
 module Virtual
   module Controls
     module PureVirtualMethod
+      def self.example
+        Example.new
+      end
+
       class Example
         include Virtual
 
         pure_virtual :some_pure_virtual_method
       end
 
-      def self.example
-        Example.new
-      end
-
       module Implemented
+        def self.example
+          Implementer.new
+        end
+
         class Implementer < Example
           def some_pure_virtual_method
           end
         end
+      end
 
+      module Override
         def self.example
-          Implementer.new
+          Class.new do
+            include Virtual
+
+            def some_pure_virtual_method
+            end
+
+            pure_virtual :some_pure_virtual_method
+          end
         end
       end
     end

data/lib/virtual/controls/virtual_method.rb

@@ -1,17 +1,21 @@
 module Virtual
   module Controls
     module VirtualMethod
+      def self.example
+        Example.new
+      end
+
       class Example
         include Virtual
 
         virtual :some_virtual_method
       end
 
-      def self.example
-        Example.new
-      end
-
       module Body
+        def self.example
+          Example.new
+        end
+
         class Example
           include Virtual
 
@@ -19,9 +23,18 @@ module Virtual
             :something
           end
         end
+      end
 
+      module Override
         def self.example
-          Example.new
+          Class.new do
+            include Virtual
+
+            def some_virtual_method
+            end
+
+            virtual :some_virtual_method
+          end
         end
       end
     end

data/lib/virtual/controls.rb

@@ -4,3 +4,4 @@ require 'virtual/controls/extended'
 require 'virtual/controls/virtual_method'
 require 'virtual/controls/pure_virtual_method'
 require 'virtual/controls/abstract_method'
+require 'virtual/controls/protocol_method'

data/lib/virtual/macro.rb

@@ -1,19 +1,28 @@
 module Virtual
   module Macro
     def virtual_macro(method_name, &blk)
-      Virtual::Method.define self, method_name, &blk
+      Virtual::VirtualMethod.define(self, method_name, &blk)
     end
     alias :virtual :virtual_macro
 
     def pure_macro(method_name)
-      Virtual::PureMethod.define self, method_name
+      Virtual::PureMethod.define(self, method_name)
     end
     alias :pure_virtual :pure_macro
     alias :abstract :pure_macro
 
     def protocol_macro(method_name)
-      Virtual::ProtocolMethod.define self, method_name
+      Virtual::ProtocolMethod.define(self, method_name)
     end
     alias :protocol :protocol_macro
+
+    def self.macro_methods
+      [
+        'virtual',
+        'pure_virtual',
+        'abstract',
+        'protocol'
+      ]
+    end
   end
 end

data/lib/virtual/protocol_method.rb

@@ -1,18 +1,14 @@
 module Virtual
   module ProtocolMethod
-    class Error < RuntimeError
-      def initialize(message)
-        super("Pure virtual (abstract) protocol method #{message} must be implemented")
-      end
-    end
+    Error = Class.new(RuntimeError)
 
     def self.define(target_class, method_name)
       method_defined = target_class.method_defined?(method_name, true) ||
         target_class.private_method_defined?(method_name, true)
 
       if not method_defined
-        target_class.send :define_method, method_name do |*args|
-          raise Error, "\"#{method_name}\" of #{self.class.name}"
+        target_class.send(:define_method, method_name) do |*args|
+          raise Error, "Pure virtual (abstract) protocol method #{method_name} of #{self.class.name} must be implemented"
         end
       end
     end

data/lib/virtual/pure_method.rb

@@ -1,14 +1,14 @@
 module Virtual
   module PureMethod
-    class Error < RuntimeError
-      def initialize(message)
-        super("Pure virtual (abstract) method #{message} must be implemented")
-      end
-    end
+    Error = Class.new(RuntimeError)
 
     def self.define(target_class, method_name)
-      target_class.send :define_method, method_name do |*args|
-        raise Error, "\"#{method_name}\" of #{self.class.name}"
+      if target_class.method_defined?(method_name)
+        raise Error, "#{target_class} already has an implementation of the #{method_name} method"
+      end
+
+      target_class.send(:define_method, method_name) do |*args|
+        raise Error, "Pure virtual (abstract) method #{method_name} of #{self.class.name} must be implemented"
       end
     end
   end

data/lib/virtual/virtual_method.rb

@@ -0,0 +1,16 @@
+module Virtual
+  module VirtualMethod
+    Error = Class.new(RuntimeError)
+
+    def self.define(target_class, method_name, &blk)
+      if target_class.method_defined?(method_name)
+        raise Error, "#{target_class} already has an implementation of the #{method_name} method"
+      end
+
+      blk ||= proc do |*|
+      end
+
+      target_class.send(:define_method, method_name, &blk)
+    end
+  end
+end

data/lib/virtual.rb

@@ -1,4 +1,4 @@
-require 'virtual/method'
+require 'virtual/virtual_method'
 require 'virtual/pure_method'
 require 'virtual/protocol_method'
 require 'virtual/macro'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evt-virtual
 version: !ruby/object:Gem::Version
-  version: 2.0.1.2
+  version: 2.1.0.0
 platform: ruby
 authors:
 - The Eventide Project
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-06 00:00:00.000000000 Z
+date: 2023-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench
@@ -37,13 +37,14 @@ files:
 - lib/virtual/controls/clean.rb
 - lib/virtual/controls/extended.rb
 - lib/virtual/controls/included.rb
+- lib/virtual/controls/protocol_method.rb
 - lib/virtual/controls/pure_virtual_method.rb
 - lib/virtual/controls/virtual_method.rb
 - lib/virtual/macro.rb
-- lib/virtual/method.rb
 - lib/virtual/protocol_method.rb
 - lib/virtual/pure_method.rb
 - lib/virtual/virtual.rb
+- lib/virtual/virtual_method.rb
 homepage: https://github.com/eventide-project/virtual
 licenses:
 - MIT

data/lib/virtual/method.rb

@@ -1,10 +0,0 @@
-module Virtual
-  module Method
-    def self.define(target_class, method_name, &blk)
-      blk ||= proc do |*|
-      end
-
-      target_class.send :define_method, method_name, &blk
-    end
-  end
-end