gir_ffi 0.15.9 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240502b5086fedd9c4f52a114faf67c5021f03c4fedc10dd6fbfabd064a64aca
-  data.tar.gz: b89d501796ee980af6d731758f144a9eba21472353bae02029548f6541787db4
+  metadata.gz: bfd3130c297141938f61b59a4e4be4ec2e76832cf38341533f18a5598ac6cd30
+  data.tar.gz: 2e94de2c70d365baa1fc1fd506e5cadbaf5d3b9aaa36dbde69e7813f742ce357
 SHA512:
-  metadata.gz: a6f7df11953d3b1a88c3fa515207d3f15883e79de7114fb6ad55bf1545e1e023a6b1b7b83199fd3ef0a45ab762d240a9b59eec8c4aac660b1d8d83363de51c0a
-  data.tar.gz: 18ca30c7f7f54daeff80c3045d24e1231d0a927e68f0ae8877a548b95cdc8602298b602925e3ad20e6b26049b62a7541b85d7f2d56b328594d22ca39b960146c
+  metadata.gz: 94de6fa54920e6c878d271f57c9c737aa5b6ca6025fe5d1d395e26e146208e8dafb9c43dc679984dcaa4216d373f658f25e8cdd676f96724cd7d8cbf7aae6012
+  data.tar.gz: d4f06ba95a49d8ad6476cda459dc93d3630533b9dc48f1fc48917c86d7124965700771a71084925f5382836352fe9b203536c0df686fb2a554530fb27e203cbb

data/Changelog.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.16.0 / 2022-05-21
+
+* Support Ruby 3.1
+* Rename `#object_class` to `#class_struct`
+* Remove `GObject.object_class_from_instance`
+* Limit public interface of `BaseMethodBuilder`
+* Remove deprecated methods from `GObject::Object`
+* Stop accepting blocks when defining a type
+* Check parameter direction in signal argument conversion
+* Drop support for JRuby
+* Drop support for Ruby 2.6
+
 ## 0.15.9 / 2021-12-05
 
 * Skip setting destroy notifier state if types don't make sense
@@ -144,8 +156,8 @@
   changed.
 * Make `Strv#each` thread-safe.
 * Drop support for CRuby 2.0.
-* Move `::type_init` and base `Strv` implementation into `GObjectIntrospection`, making
-  it stand-alone.
+* Move `::type_init` and base `Strv` implementation into `GObjectIntrospection`,
+  making it stand-alone.
 * Move `GLib::Boolean` to `GirFFI::Boolean`.
 * Guard against instantiating abstract classes using the default constructor.
 * Handle user-defined properties containing dashes
@@ -166,7 +178,7 @@
     actual effect even on CRuby.
   - Immediately free string pointers whose ownership is transfered. Again, the
     #autorelease technique doesn't work on JRuby.
-  - Fix handling of callee-allocated out parameters in vfuncs. The put_pointer
+  - Fix handling of callee-allocated out parameters in vfuncs. The `put_pointer`
     method was wrongly called, and JRuby is more picky about what types that
     method expects, exposing the bug.
 
@@ -185,7 +197,8 @@
 
 ## 0.9.5 / 2016-03-05
 
-* Abort if modules were defined earlier, e.g., through the gems from the ruby-gnome family.
+* Abort if modules were defined earlier, e.g., through the gems from the
+  ruby-gnome family.
 * Extend integration testing with GObjectIntrospection's test libraries.
 * Find signals on user-defined types.
 * Allow getting and setting of properties with a callback value.
@@ -500,7 +513,7 @@
 ## 0.4.2 / 2012-09-22
 
 * Make objects and interfaces wrap poiners in the class that matches
-their GType.
+  their GType.
 
 ## 0.4.1 / 2012-09-18
 
@@ -516,7 +529,7 @@ their GType.
 ## 0.3.2 / 2012-08-24
 
 * Correctly set FFI return type when callbacks that return GObjects have
-incomplete type specification.
+  incomplete type specification.
 
 ## 0.3.1 / 2012-05-13
 
@@ -544,15 +557,15 @@ incomplete type specification.
 
 ## 0.2.2 / 2011-12-07
 
-* Fix issue #19: Check if a GLib::PtrArray.add method was generated
-before attempting to remove it.
+* Fix issue #19: Check if a GLib::PtrArray.add method was generated before
+  attempting to remove it.
 * Fix two issues with pretty printing that made output for GLib have syntax
-errors.
+  errors.
 
 ## 0.2.1 / 2011-11-20
 
-* Fix handling of output parameters that are arrays of pointers to
-structures (i.e., of type `Foo***`).
+* Fix handling of output parameters that are arrays of pointers to structures
+  (i.e., of type `Foo***`).
 
 ## 0.2.0 / 2011-11-19
 
@@ -562,9 +575,9 @@ structures (i.e., of type `Foo***`).
   - Get rid of `#[]` and `#[]=`.
 * Explicitely load `libgirepository` with ABI version 1.
 * Improve implementation of GLib container classes (GList etc.):
-- Real constructors.
-- `#append` and friends are instance methods now.
-- Conversion methods to cast Ruby containers to GLib containers.
+  - Real constructors.
+  - `#append` and friends are instance methods now.
+  - Conversion methods to cast Ruby containers to GLib containers.
 * Start implementing pretty printing.
 * Various refactorings.
 
@@ -577,10 +590,10 @@ structures (i.e., of type `Foo***`).
 ## 0.0.14 / 2011-10-28
 
 * Support GObject Introspection version 1.30:
-- Add support for layouts with fixed-length arrays.
-- Handle type names starting with underscores.
-- Call `g_signal_emitv` directly to avoid conflict in introspection info
-  with earlier versions of GObject Introspection.
+  - Add support for layouts with fixed-length arrays.
+  - Handle type names starting with underscores.
+  - Call `g_signal_emitv` directly to avoid conflict in introspection info
+    with earlier versions of GObject Introspection.
 
 ## 0.0.13 / 2011-09-09
 

data/README.md

@@ -51,7 +51,7 @@ examples can be found in `gir_ffi-gtk` and `gir_ffi-gst`.
 
 ## Requirements
 
-GirFFI is supported on CRuby 2.6, 2.7 and 3.0, and JRuby 9.3.
+GirFFI is supported on CRuby 2.6, 2.7, 3.0 and 3.1.
 
 You will also need gobject-introspection installed with some
 introspection data.

data/lib/ffi-glib/bytes.rb

@@ -7,18 +7,6 @@ module GLib
   class Bytes
     include Enumerable
 
-    remove_method :get_data if method_defined? :get_data
-
-    # @override
-    # NOTE: Needed due to mis-identification of the element-type of the
-    # resulting sized array for the default binding.
-    def get_data
-      length_ptr = FFI::MemoryPointer.new :size_t
-      data_ptr = Lib.g_bytes_get_data self, length_ptr
-      length = length_ptr.get_size_t(0)
-      GirFFI::SizedArray.wrap(:guint8, length, data_ptr)
-    end
-
     def each(&block)
       data.each(&block)
     end

data/lib/ffi-glib/main_loop.rb

@@ -40,7 +40,7 @@ module GLib
     setup_instance_method! :run
 
     def run_with_thread_enabler
-      ThreadEnabler.instance.setup_idle_handler if RUBY_ENGINE == "ruby"
+      ThreadEnabler.instance.setup_idle_handler
       RUNNING_LOOPS << self
       result = run_without_thread_enabler
       exception = EXCEPTIONS.shift

data/lib/ffi-glib/ptr_array.rb

@@ -50,21 +50,7 @@ module GLib
 
     # Re-implementation of the g_ptrarray_index macro
     def index(idx)
-      unless (0...length).cover? idx
-        raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
-      end
-
-      item_ptr = data_ptr + idx * element_size
-
-      convert_element_type = case element_type
-                             when :utf8
-                               :utf8
-                             when GirFFI::ObjectBase
-                               element_type
-                             else
-                               [:pointer, element_type]
-                             end
-
+      item_ptr = item_pointer(idx)
       convertor = GirFFI::ArrayElementConvertor.new convert_element_type, item_ptr
       convertor.to_ruby_value
     end
@@ -85,6 +71,29 @@ module GLib
 
     private
 
+    def item_pointer(idx)
+      check_bounds(idx)
+
+      data_ptr + idx * element_size
+    end
+
+    def check_bounds(idx)
+      unless (0...length).cover? idx
+        raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
+      end
+    end
+
+    def convert_element_type
+      case element_type
+      when :utf8
+        :utf8
+      when GirFFI::ObjectBase
+        element_type
+      else
+        [:pointer, element_type]
+      end
+    end
+
     def element_size
       POINTER_SIZE
     end

data/lib/ffi-glib/variant.rb

@@ -14,13 +14,11 @@ module GLib
     alias get_string_without_override get_string
     alias get_string get_string_with_override
 
-    # Initializing method used in constructors. For Variant, this needs to sink
-    # the variant's floating reference.
-    #
-    # NOTE: This is very hard to test since it is not possible to get the
-    # variant's ref count directely. However, there is an error when running
-    # the tests on 32-bit systems.
+    # Initializing method used in constructors. For Variant the constructing
+    # functions all return floating references, so this is need to take full
+    # ownership.
     #
+    # Also see the documentation for g_variant_ref_sink.
     def store_pointer(ptr)
       Lib.g_variant_ref_sink ptr
       super

data/lib/ffi-gobject/object.rb

@@ -117,17 +117,12 @@ module GObject
     end
 
     def property_param_spec(property_name)
-      object_class.find_property property_name or
+      class_struct.find_property property_name or
         raise GirFFI::PropertyNotFoundError.new(property_name, self.class)
     end
 
     # Overrides for GObject, GObject's generic base class.
     module Overrides
-      # @deprecated
-      def get_property_extended(property_name)
-        get_property(property_name)
-      end
-
       def get_property(property_name)
         gvalue = gvalue_for_property property_name
         super property_name, gvalue
@@ -139,11 +134,6 @@ module GObject
         value
       end
 
-      # @deprecated
-      def set_property_extended(property_name, value)
-        set_property property_name, value
-      end
-
       def set_property(property_name, value)
         type_info = get_property_type property_name
         value = property_value_pre_conversion(value, type_info) if type_info

data/lib/ffi-gobject/object_class.rb

@@ -1,18 +1,10 @@
 # frozen_string_literal: true
 
-GObject::Object.object_class
+GObject::Object.class_struct
 
 module GObject
-  # Overrides for GObjectClass, a struct containing GObject's class data
+  # Overrides for GObjectClass, the class struct for GObject::Object
   class ObjectClass
-    def set_property=(callback)
-      struct[:set_property] = GObject::ObjectSetPropertyFunc.from callback
-    end
-
-    def get_property=(callback)
-      struct[:get_property] = GObject::ObjectGetPropertyFunc.from callback
-    end
-
     def gtype
       to_ptr.get_gtype 0
     end

data/lib/ffi-gobject/value.rb

@@ -8,29 +8,29 @@ module GObject
     setup_instance_method! :init
 
     METHOD_MAP = {
-      TYPE_INVALID   => [:get_none,           :set_none],
+      TYPE_INVALID => [:get_none, :set_none],
       # TYPE_NONE is skipped
-      TYPE_INTERFACE => [:get_object,         :set_instance_enhanced],
-      TYPE_CHAR      => [:get_schar,          :set_schar],
-      TYPE_UCHAR     => [:get_uchar,          :set_uchar],
-      TYPE_BOOLEAN   => [:get_boolean,        :set_boolean],
-      TYPE_INT       => [:get_int,            :set_int],
-      TYPE_UINT      => [:get_uint,           :set_uint],
-      TYPE_LONG      => [:get_long,           :set_long],
-      TYPE_ULONG     => [:get_ulong,          :set_ulong],
-      TYPE_INT64     => [:get_int64,          :set_int64],
-      TYPE_UINT64    => [:get_uint64,         :set_uint64],
-      TYPE_ENUM      => [:get_enum_enhanced,  :set_enum_enhanced],
-      TYPE_FLAGS     => [:get_flags_enhanced, :set_flags_enhanced],
-      TYPE_FLOAT     => [:get_float,          :set_float],
-      TYPE_DOUBLE    => [:get_double,         :set_double],
-      TYPE_STRING    => [:get_string,         :set_string],
-      TYPE_POINTER   => [:get_pointer,        :set_pointer],
-      TYPE_BOXED     => [:get_boxed,          :set_boxed],
-      TYPE_PARAM     => [:get_param,          :set_param],
-      TYPE_OBJECT    => [:get_object,         :set_instance_enhanced],
-      TYPE_GTYPE     => [:get_gtype,          :set_gtype],
-      TYPE_VARIANT   => [:get_variant,        :set_variant]
+      TYPE_INTERFACE => [:get_object, :set_instance_enhanced],
+      TYPE_CHAR => [:get_schar, :set_schar],
+      TYPE_UCHAR => [:get_uchar, :set_uchar],
+      TYPE_BOOLEAN => [:get_boolean, :set_boolean],
+      TYPE_INT => [:get_int, :set_int],
+      TYPE_UINT => [:get_uint,           :set_uint],
+      TYPE_LONG => [:get_long,           :set_long],
+      TYPE_ULONG => [:get_ulong,          :set_ulong],
+      TYPE_INT64 => [:get_int64,          :set_int64],
+      TYPE_UINT64 => [:get_uint64, :set_uint64],
+      TYPE_ENUM => [:get_enum_enhanced, :set_enum_enhanced],
+      TYPE_FLAGS => [:get_flags_enhanced, :set_flags_enhanced],
+      TYPE_FLOAT => [:get_float,          :set_float],
+      TYPE_DOUBLE => [:get_double,         :set_double],
+      TYPE_STRING => [:get_string,         :set_string],
+      TYPE_POINTER => [:get_pointer, :set_pointer],
+      TYPE_BOXED => [:get_boxed,          :set_boxed],
+      TYPE_PARAM => [:get_param,          :set_param],
+      TYPE_OBJECT => [:get_object, :set_instance_enhanced],
+      TYPE_GTYPE => [:get_gtype, :set_gtype],
+      TYPE_VARIANT => [:get_variant, :set_variant]
     }.freeze
 
     # TODO: Give more generic name
@@ -68,11 +68,11 @@ module GObject
     end
 
     CLASS_TO_GTYPE_MAP = {
-      NilClass   => TYPE_INVALID,
-      TrueClass  => TYPE_BOOLEAN,
+      NilClass => TYPE_INVALID,
+      TrueClass => TYPE_BOOLEAN,
       FalseClass => TYPE_BOOLEAN,
-      Integer    => TYPE_INT,
-      String     => TYPE_STRING
+      Integer => TYPE_INT,
+      String => TYPE_STRING
     }.freeze
 
     # Overrides for existing Value methods

data/lib/ffi-gobject.rb

@@ -31,17 +31,6 @@ module GObject
     type_name type_from_instance instance
   end
 
-  def self.object_class_from_instance(instance)
-    object_class_from_instance_pointer instance.to_ptr
-  end
-
-  def self.object_class_from_instance_pointer(inst_ptr)
-    return nil if inst_ptr.null?
-
-    klsptr = inst_ptr.get_pointer 0
-    ObjectClass.wrap klsptr
-  end
-
   def self.signal_lookup_from_instance(signal, object)
     signal_lookup signal, type_from_instance(object)
   end
@@ -55,11 +44,7 @@ module GObject
     argument_gvalues = sig_info.arguments_to_gvalues object, args
     return_gvalue = sig_info.gvalue_for_return_value
 
-    result = signal_emitv argument_gvalues, signal_id, detail_quark, return_gvalue
-    # NOTE: Depending on the version of GObjectIntrospection, the result will
-    # be stored in result or return_gvalue. This was changed between versions
-    # 1.44 and 1.46.
-    result || return_gvalue.get_value
+    signal_emitv argument_gvalues, signal_id, detail_quark, return_gvalue
   end
 
   def self.signal_connect(object, detailed_signal, data = nil, after = false, &block)
@@ -85,7 +70,8 @@ module GObject
   load_class :ClosureMarshal
   load_class :ParamFlags
 
-  # NOTE: This Lib module is set up in `gir_ffi-base/gobject/lib.rb`.
+  # Attach some needed functions to the GObject Lib, which was set up in
+  # `gir_ffi-base/gobject/lib.rb`.
   Lib.class_eval do
     attach_function :g_object_ref_sink, [:pointer], :pointer
     attach_function :g_object_ref, [:pointer], :pointer

data/lib/ffi-gobject_introspection/i_constant_info.rb

@@ -5,16 +5,16 @@ module GObjectIntrospection
   class IConstantInfo < IBaseInfo
     TYPE_TAG_TO_UNION_MEMBER = {
       gboolean: :v_boolean,
-      gint8:    :v_int8,
-      gint16:   :v_int16,
-      gint32:   :v_int32,
-      gint64:   :v_int64,
-      guint8:   :v_uint8,
-      guint16:  :v_uint16,
-      guint32:  :v_uint32,
-      guint64:  :v_uint64,
-      gdouble:  :v_double,
-      utf8:     :v_string
+      gint8: :v_int8,
+      gint16: :v_int16,
+      gint32: :v_int32,
+      gint64: :v_int64,
+      guint8: :v_uint8,
+      guint16: :v_uint16,
+      guint32: :v_uint32,
+      guint64: :v_uint64,
+      gdouble: :v_double,
+      utf8: :v_string
     }.freeze
 
     def value

data/lib/ffi-gobject_introspection/lib.rb

@@ -63,12 +63,12 @@ module GObjectIntrospection
 
     # IFunctionInfo
     bit_mask :IFunctionInfoFlags,
-             is_method:      (1 << 0),
+             is_method: (1 << 0),
              is_constructor: (1 << 1),
-             is_getter:      (1 << 2),
-             is_setter:      (1 << 3),
-             wraps_vfunc:    (1 << 4),
-             throws:         (1 << 5)
+             is_getter: (1 << 2),
+             is_setter: (1 << 3),
+             wraps_vfunc: (1 << 4),
+             throws: (1 << 5)
 
     attach_function :g_function_info_get_symbol, [:pointer], :string
     attach_function :g_function_info_get_flags, [:pointer], :IFunctionInfoFlags
@@ -231,10 +231,10 @@ module GObjectIntrospection
 
     # IVFuncInfo
     bit_mask :IVFuncInfoFlags,
-             must_chain_up:     (1 << 0),
-             must_override:     (1 << 1),
+             must_chain_up: (1 << 0),
+             must_override: (1 << 1),
              must_not_override: (1 << 2),
-             throws:            (1 << 3)
+             throws: (1 << 3)
 
     attach_function :g_vfunc_info_get_flags, [:pointer], :IVFuncInfoFlags
     attach_function :g_vfunc_info_get_invoker, [:pointer], :pointer
@@ -294,9 +294,9 @@ module GObjectIntrospection
 
     # NOTE: This type has more values, but these are the ones used
     bit_mask :ParamFlags,
-             readable:       (1 << 0),
-             writable:       (1 << 1),
-             construct:      (1 << 2),
+             readable: (1 << 0),
+             writable: (1 << 1),
+             construct: (1 << 2),
              construct_only: (1 << 3)
 
     attach_function :g_property_info_get_flags, [:pointer], :ParamFlags

data/lib/ffi-gobject_introspection.rb

@@ -25,27 +25,27 @@ require "ffi-gobject_introspection/i_unresolved_info"
 module GObjectIntrospection
   # Map info type to class. Default is IBaseInfo.
   TYPEMAP = {
-    invalid:                  IBaseInfo,
-    function:                 IFunctionInfo,
-    callback:                 ICallbackInfo,
-    struct:                   IStructInfo,
+    invalid: IBaseInfo,
+    function: IFunctionInfo,
+    callback: ICallbackInfo,
+    struct: IStructInfo,
     # TODO: There's no GIBoxedInfo, so what does :boxed mean?
-    boxed:                    IBaseInfo,
-    enum:                     IEnumInfo,
-    flags:                    IFlagsInfo,
-    object:                   IObjectInfo,
-    interface:                IInterfaceInfo,
-    constant:                 IConstantInfo,
+    boxed: IBaseInfo,
+    enum: IEnumInfo,
+    flags: IFlagsInfo,
+    object: IObjectInfo,
+    interface: IInterfaceInfo,
+    constant: IConstantInfo,
     invalid_was_error_domain: IBaseInfo,
-    union:                    IUnionInfo,
-    value:                    IValueInfo,
-    signal:                   ISignalInfo,
-    vfunc:                    IVFuncInfo,
-    property:                 IPropertyInfo,
-    field:                    IFieldInfo,
-    arg:                      IArgInfo,
-    type:                     ITypeInfo,
-    unresolved:               IUnresolvedInfo
+    union: IUnionInfo,
+    value: IValueInfo,
+    signal: ISignalInfo,
+    vfunc: IVFuncInfo,
+    property: IPropertyInfo,
+    field: IFieldInfo,
+    arg: IArgInfo,
+    type: ITypeInfo,
+    unresolved: IUnresolvedInfo
   }.freeze
 end
 

data/lib/gir_ffi/builder.rb

@@ -46,7 +46,7 @@ module GirFFI
       end
       Builders::ModuleBuilder.new(module_name,
                                   namespace: namespace,
-                                  version:   version).generate
+                                  version: version).generate
     end
 
     # TODO: Move elsewhere, perhaps to FunctionBuilder.

data/lib/gir_ffi/builders/argument_builder_collection.rb

@@ -28,11 +28,11 @@ module GirFFI
 
       def capture_variable_names
         @capture_variable_names ||=
-          all_builders.map(&:capture_variable_name).compact
+          all_builders.filter_map(&:capture_variable_name)
       end
 
       def call_argument_names
-        @call_argument_names ||= argument_builders.map(&:call_argument_name).compact
+        @call_argument_names ||= argument_builders.filter_map(&:call_argument_name)
       end
 
       def method_argument_names
@@ -50,7 +50,7 @@ module GirFFI
       end
 
       def return_value_names
-        @return_value_names ||= all_builders.map(&:return_value_name).compact
+        @return_value_names ||= all_builders.filter_map(&:return_value_name)
       end
 
       def has_return_values?
@@ -149,7 +149,7 @@ module GirFFI
 
       def base_argument_names(arguments)
         required_found = false
-        arguments.reverse.map do |it|
+        arguments.reverse.filter_map do |it|
           name = it.method_argument_name
           if it.allow_none? && !required_found
             "#{name} = nil"
@@ -157,7 +157,7 @@ module GirFFI
             required_found = true
             name
           end
-        end.compact.reverse
+        end.reverse
       end
     end
   end

data/lib/gir_ffi/builders/base_argument_builder.rb

@@ -6,13 +6,13 @@ module GirFFI
     # classes are used by FunctionBuilder to create the code that
     # processes each argument before and after the actual function call.
     class BaseArgumentBuilder
-      KEYWORDS = %w(
+      KEYWORDS = %w[
         alias and begin break case class def do
         else elsif end ensure false for if in
         module next nil not or redo rescue retry
         return self super then true undef unless
         until when while yield
-      ).freeze
+      ].freeze
 
       attr_reader :arginfo, :related_callback_builder
 

data/lib/gir_ffi/builders/base_method_builder.rb

@@ -21,14 +21,30 @@ module GirFFI
         @receiver_info = receiver_info
       end
 
-      def variable_generator
-        @variable_generator ||= VariableNameGenerator.new
-      end
-
       def method_definition
         template.method_definition
       end
 
+      # Methods used by MethodTemplate
+
+      def invocation
+        "#{lib_name}.#{@info.symbol} #{function_call_arguments.join(', ')}".strip
+      end
+
+      def method_arguments
+        argument_builder_collection.method_argument_names
+      end
+
+      def preparation
+        []
+      end
+
+      private
+
+      def variable_generator
+        @variable_generator ||= VariableNameGenerator.new
+      end
+
       def template
         @template ||= MethodTemplate.new(self, argument_builder_collection)
       end
@@ -47,8 +63,8 @@ module GirFFI
       end
 
       def return_value_builder
-        @return_value_builder = @return_value_builder_class.new(variable_generator,
-                                                                return_value_info)
+        @return_value_builder ||= @return_value_builder_class.new(variable_generator,
+                                                                  return_value_info)
       end
 
       def receiver_builder
@@ -59,7 +75,7 @@ module GirFFI
         @argument_builder_collection ||=
           ArgumentBuilderCollection.new(return_value_builder, argument_builders,
                                         error_argument_builder: error_argument,
-                                        receiver_builder:       receiver_builder)
+                                        receiver_builder: receiver_builder)
       end
 
       def error_argument
@@ -71,22 +87,6 @@ module GirFFI
           end
       end
 
-      # Methods used by MethodTemplate
-
-      def invocation
-        "#{lib_name}.#{@info.symbol} #{function_call_arguments.join(', ')}".strip
-      end
-
-      def method_arguments
-        argument_builder_collection.method_argument_names
-      end
-
-      def preparation
-        []
-      end
-
-      private
-
       def lib_name
         "#{@info.safe_namespace}::Lib"
       end