gir_ffi 0.7.10 → 0.8.0

data/lib/gir_ffi/core.rb

@@ -20,12 +20,12 @@ require 'gir_ffi/version'
 # Main module containing classes and modules needed for generating GLib and
 # GObject bindings.
 module GirFFI
-  def self.setup module_name, version = nil
+  def self.setup(module_name, version = nil)
     module_name = module_name.to_s
     GirFFI::Builder.build_module module_name, version
   end
 
-  def self.define_type klass, &block
+  def self.define_type(klass, &block)
     info = UserDefinedTypeInfo.new(klass, &block)
     Builders::UserDefinedBuilder.new(info).build_class
 

data/lib/gir_ffi/enum_base.rb

@@ -10,35 +10,35 @@ module GirFFI
       self::Enum.native_type
     end
 
-    def to_native *args
+    def to_native(*args)
       self::Enum.to_native(*args)
     end
 
-    def from_native *args
+    def from_native(*args)
       self::Enum.from_native(*args)
     end
 
-    def [] arg
+    def [](arg)
       self::Enum[arg]
     end
 
-    def wrap arg
+    def wrap(arg)
       self[arg]
     end
 
-    def from arg
+    def from(arg)
       self[arg]
     end
 
-    def copy_value_to_pointer value, pointer
+    def copy_value_to_pointer(value, pointer)
       pointer.put_int32 0, to_native(value, nil)
     end
 
-    def get_value_from_pointer pointer
+    def get_value_from_pointer(pointer)
       from_native pointer.get_int32(0), nil
     end
 
-    def setup_and_call method, arguments, &block
+    def setup_and_call(method, arguments, &block)
       result = setup_method method.to_s
 
       unless result
@@ -48,16 +48,11 @@ module GirFFI
       send method, *arguments, &block
     end
 
-    # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-    def to_ffitype
-      to_ffi_type
-    end
-
     def to_ffi_type
       self
     end
 
-    def setup_method name
+    def setup_method(name)
       gir_ffi_builder.setup_method name
     end
   end

data/lib/gir_ffi/field_argument_info.rb

@@ -5,7 +5,7 @@ module GirFFI
   class FieldArgumentInfo
     attr_reader :name, :argument_type
 
-    def initialize name, type
+    def initialize(name, type)
       @name = name
       @argument_type = type
     end

data/lib/gir_ffi/g_type.rb

@@ -2,7 +2,7 @@ module GirFFI
   # Wrapper class providing extended functionality for a GType, which is
   # normally just a kind of integer
   class GType
-    def initialize gtype
+    def initialize(gtype)
       @gtype = gtype
     end
 

data/lib/gir_ffi/glib_error.rb

@@ -5,7 +5,7 @@ module GirFFI
     attr_reader :domain_quark
     attr_reader :code
 
-    def initialize g_error
+    def initialize(g_error)
       @domain_quark = g_error.domain
       @code = g_error.code
       super g_error.message

data/lib/gir_ffi/in_out_pointer.rb

@@ -6,7 +6,7 @@ module GirFFI
   class InOutPointer < FFI::Pointer
     attr_reader :value_type
 
-    def initialize type, ptr = nil
+    def initialize(type, ptr = nil)
       @value_type = type
 
       ptr ||= AllocationHelper.safe_malloc(value_type_size)
@@ -40,7 +40,7 @@ module GirFFI
       end
     end
 
-    def set_value value
+    def set_value(value)
       case value_ffi_type
       when Module
         value_ffi_type.copy_value_to_pointer(value, self)
@@ -55,11 +55,11 @@ module GirFFI
       set_value nil_value
     end
 
-    def self.for type
+    def self.for(type)
       new(type).tap(&:clear)
     end
 
-    def self.from type, value
+    def self.from(type, value)
       new(type).tap { |ptr| ptr.set_value value }
     end
 

data/lib/gir_ffi/in_pointer.rb

@@ -3,7 +3,7 @@ module GirFFI
   # arguments with direction :in. This is used for arguments that are
   # arrays, strings, or interfaces.
   class InPointer < FFI::Pointer
-    def self.from_array type, ary
+    def self.from_array(type, ary)
       return unless ary
       case type
       when :utf8, :filename
@@ -29,7 +29,7 @@ module GirFFI
       end
     end
 
-    def self.from type, val
+    def self.from(type, val)
       return unless val
       case type
       when :utf8, :filename
@@ -46,7 +46,7 @@ module GirFFI
     end
 
     class << self
-      def from_closure_data obj
+      def from_closure_data(obj)
         FFI::Pointer.new(obj.object_id).tap do |ptr|
           ArgHelper::OBJECT_STORE.store(ptr, obj)
         end
@@ -54,19 +54,19 @@ module GirFFI
 
       private
 
-      def from_utf8_array ary
+      def from_utf8_array(ary)
         from_basic_type_array :pointer, ary.map { |str| from_utf8 str }
       end
 
-      def from_boolean_array ary
+      def from_boolean_array(ary)
         from_basic_type_array :int, ary.map { |val| val ? 1 : 0 }
       end
 
-      def from_pointer_array type, ary
+      def from_pointer_array(type, ary)
         from_basic_type_array :pointer, ary.map { |elem| from type, elem }
       end
 
-      def from_gvalue_array type, ary
+      def from_gvalue_array(type, ary)
         ary = ary.map do |it|
           if it.is_a? GObject::Value
             it
@@ -77,7 +77,7 @@ module GirFFI
         from_struct_array type, ary
       end
 
-      def from_struct_array type, ary
+      def from_struct_array(type, ary)
         ffi_type = TypeMap.type_specification_to_ffi_type type
         type_size = FFI.type_size(ffi_type)
         length = ary.length
@@ -90,17 +90,17 @@ module GirFFI
         new ptr
       end
 
-      def from_enum_array type, ary
+      def from_enum_array(type, ary)
         from_basic_type_array :int32, ary.map { |sym| type.to_native sym, nil }
       end
 
-      def from_utf8 str
+      def from_utf8(str)
         len = str.bytesize
         ptr = AllocationHelper.safe_malloc(len + 1).write_string(str).put_char(len, 0)
         new ptr
       end
 
-      def from_basic_type_array type, ary
+      def from_basic_type_array(type, ary)
         ffi_type = TypeMap.type_specification_to_ffi_type type
         ary = ary.dup << null_value(ffi_type)
         type_size = FFI.type_size(ffi_type)
@@ -109,7 +109,7 @@ module GirFFI
         new block
       end
 
-      def null_value ffi_type
+      def null_value(ffi_type)
         ffi_type == :pointer ? nil : 0
       end
     end

data/lib/gir_ffi/info_ext/i_arg_info.rb

@@ -2,21 +2,11 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IArgInfo needed by GirFFI
     module IArgInfo
-      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-      def to_ffitype
-        to_ffi_type
-      end
-
       def to_ffi_type
         return :pointer if direction != :in
         argument_type.to_ffi_type
       end
 
-      # @deprecated Use #to_callback_ffi_type instead. Will be removed in 0.8.0.
-      def to_callback_ffitype
-        to_callback_ffi_type
-      end
-
       def to_callback_ffi_type
         return :pointer if direction != :in
         argument_type.to_callback_ffi_type

data/lib/gir_ffi/info_ext/i_callback_info.rb

@@ -2,11 +2,6 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::ICallbackInfo needed by GirFFI
     module ICallbackInfo
-      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-      def to_ffitype
-        to_ffi_type
-      end
-
       def to_ffi_type
         Builder.build_class(self)
       end

data/lib/gir_ffi/info_ext/i_property_info.rb

@@ -3,7 +3,7 @@ module GirFFI
     # Extensions for GObjectIntrospection::IPropertyInfo needed by GirFFI
     module IPropertyInfo
       def getter_name
-        name.gsub(/-/, '_')
+        name.tr('-', '_')
       end
 
       def setter_name

data/lib/gir_ffi/info_ext/i_registered_type_info.rb

@@ -4,11 +4,6 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IRegisteredTypeInfo needed by GirFFI
     module IRegisteredTypeInfo
-      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-      def to_ffitype
-        to_ffi_type
-      end
-
       def to_ffi_type
         to_type.to_ffi_type
       end
@@ -17,7 +12,7 @@ module GirFFI
         Builder.build_class self
       end
 
-      def find_instance_method method
+      def find_instance_method(method)
         info = find_method method
         return info if info && info.method?
       end

data/lib/gir_ffi/info_ext/i_signal_info.rb

@@ -9,12 +9,12 @@ module GirFFI
       #
       # @return [GObject::RubyClosure]  The signal handler closure, ready to be
       #                                 passed as a GClosure to C.
-      def wrap_in_closure &block
+      def wrap_in_closure(&block)
         bldr = Builders::SignalClosureBuilder.new(self)
         bldr.build_class.new(&block)
       end
 
-      def arguments_to_gvalues instance, arguments
+      def arguments_to_gvalues(instance, arguments)
         arg_g_values = args.map { |info| info.argument_type.make_g_value }
         arg_g_values.zip(arguments).each do |g_value, arg|
           g_value.set_value arg

data/lib/gir_ffi/info_ext/i_type_info.rb

@@ -19,11 +19,6 @@ module GirFFI
         }
       end
 
-      # @deprecated Use #gtype instead. Will be removed in 0.8.0.
-      def g_type
-        gtype
-      end
-
       def gtype
         if tag == :interface
           return interface.gtype
@@ -102,11 +97,6 @@ module GirFFI
         end
       end
 
-      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-      def to_ffitype
-        to_ffi_type
-      end
-
       def to_ffi_type
         return :pointer if pointer?
 
@@ -120,11 +110,6 @@ module GirFFI
         end
       end
 
-      # @deprecated Use #to_callback_ffi_type instead. Will be removed in 0.8.0.
-      def to_callback_ffitype
-        to_callback_ffi_type
-      end
-
       def to_callback_ffi_type
         return :pointer if pointer?
 
@@ -193,7 +178,7 @@ module GirFFI
 
       private
 
-      def subtype_tag_or_class index
+      def subtype_tag_or_class(index)
         param_type(index).tag_or_class
       end
 
@@ -205,7 +190,7 @@ module GirFFI
         subtype_tag_or_class 0
       end
 
-      def subtype_ffi_type index
+      def subtype_ffi_type(index)
         subtype = param_type(index).to_ffi_type
         if subtype == :pointer
           # NOTE: Don't use pointer directly to appease JRuby.

data/lib/gir_ffi/info_ext/i_unresolved_info.rb

@@ -2,11 +2,6 @@ module GirFFI
   module InfoExt
     # Extensions for GObjectIntrospection::IUnresolvedInfo needed by GirFFI
     module IUnresolvedInfo
-      # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-      def to_ffitype
-        to_ffi_type
-      end
-
       def to_ffi_type
         :pointer
       end

data/lib/gir_ffi/info_ext/i_vfunc_info.rb

@@ -4,13 +4,13 @@ module GirFFI
     # TODO: Merge implementation with ICallbackInfo and ISignalInfo extensions.
     module IVFuncInfo
       def argument_ffi_types
-        args.map(&:to_callback_ffitype).tap do |types|
+        args.map(&:to_callback_ffi_type).tap do |types|
           types << :pointer if throws?
         end
       end
 
       def return_ffi_type
-        return_type.to_callback_ffitype
+        return_type.to_callback_ffi_type
       end
     end
   end

data/lib/gir_ffi/interface_base.rb

@@ -5,19 +5,14 @@ module GirFFI
   module InterfaceBase
     include RegisteredTypeBase
 
-    def setup_instance_method name
+    def setup_instance_method(name)
       gir_ffi_builder.setup_instance_method name
     end
 
-    def wrap ptr
+    def wrap(ptr)
       ptr.to_object
     end
 
-    # @deprecated Use #to_ffi_type instead. Will be removed in 0.8.0.
-    def to_ffitype
-      to_ffi_type
-    end
-
     def to_ffi_type
       :pointer
     end

data/lib/gir_ffi/method_stubber.rb

@@ -2,7 +2,7 @@ module GirFFI
   # Generates method stubs that will replace themselves with the real
   # method upon being called.
   class MethodStubber
-    def initialize method_info
+    def initialize(method_info)
       @info = method_info
     end
 

data/lib/gir_ffi/module_base.rb

@@ -1,28 +1,25 @@
 module GirFFI
   # Base module for modules representing GLib namespaces.
   module ModuleBase
-    def method_missing method, *arguments, &block
+    def method_missing(method, *arguments, &block)
       result = setup_method method.to_s
       return super unless result
       send method, *arguments, &block
     end
 
-    def const_missing classname
+    def const_missing(classname)
       load_class(classname)
     end
 
-    # @deprecated The load_class method should always be used. Remove in 0.8.0
-    def setup_class classname
+    def load_class(classname)
       gir_ffi_builder.build_namespaced_class classname.to_s
     end
 
-    alias_method :load_class, :setup_class
-
     def gir_ffi_builder
       self::GIR_FFI_BUILDER
     end
 
-    def setup_method name
+    def setup_method(name)
       gir_ffi_builder.setup_method name
     end
   end