gir_ffi 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2772619a7c65c8eb17f50aa252f89620d8965474b8c6d27717187cbfc003201a
-  data.tar.gz: 317b202f4b97d93b4c12fa21ce22e7d1971e34ba10fd434ec9b6dcc4bf4bd214
+  metadata.gz: 9c2f74f548641ffd8518e7be3b8de0be2d09543f6a7267e796084567972d6c72
+  data.tar.gz: c1f84384a10427655b5907fc342c1690079acae27b076a118d743bb203b3f51c
 SHA512:
-  metadata.gz: 8bef86f44195465dae96b1b3adb36e21c92c88be7555732624c4819f3b99a48b2837fabcfec786f525d6dbf12694d76005a2ead9f4d350e5c84ac1e94374bc6d
-  data.tar.gz: bfdcfda1e4c237289887289dc51355ec1bce224ae126ec7b665e10c98dc18547a89e488c807025197291d8d76cd099d3c609872679ff74c6243f1e32a5881991
+  metadata.gz: e86e854c330672615eba303d0a34ce912d3766d74d7805a7e872dd5c7f0ddb13288ebb9be3b6293dbfc264d0c4d3013a0e2485aba3656511755e51f6bf5d1240
+  data.tar.gz: 6722a19e4232c8ace606d2dc86fec59d5a8c4a3cdec88ea1bf86884897e514cade46b71b04cfc66ee19f901c36e08515288fa56becd6dbd720c5e51dccba8093

data/Changelog.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.13.1 / 2018-09-24
+
+* Silence some warnings.
+* Allow overrides to be applied using `Module#prepend`, as an alternative to
+  alias chaining.
+* Make `ZeroTerminated` array work with enum elements.
+* Various refactorings.
+* Improve consistency of conversion between symbols and integers for enum
+  types.
+
 ## 0.13.0 / 2018-09-08
 
 * Drop support for Ruby 2.1

data/lib/ffi-glib/array.rb

@@ -46,7 +46,7 @@ module GLib
     end
 
     def length
-      @struct[:len]
+      struct[:len]
     end
 
     def get_element_size
@@ -73,7 +73,7 @@ module GLib
     private
 
     def data_ptr
-      @struct[:data]
+      struct[:data]
     end
 
     def calculated_element_size

data/lib/ffi-glib/array_methods.rb

@@ -8,6 +8,7 @@ module GLib
       unless (0...length).cover? idx
         raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
       end
+
       ptr = GirFFI::InOutPointer.new element_type, data_ptr + idx * element_size
       ptr.to_ruby_value
     end

data/lib/ffi-glib/list_methods.rb

@@ -36,11 +36,11 @@ module GLib
     end
 
     def tail
-      self.class.wrap(element_type, @struct[:next])
+      self.class.wrap(element_type, struct[:next])
     end
 
     def head
-      GirFFI::ArgHelper.cast_from_pointer(element_type, @struct[:data])
+      GirFFI::ArgHelper.cast_from_pointer(element_type, struct[:data])
     end
 
     def reset_typespec(typespec)
@@ -60,6 +60,7 @@ module GLib
 
     def next_element
       return unless @current
+
       element = @current.head
       @current = @current.tail
       element

data/lib/ffi-glib/main_loop.rb

@@ -46,12 +46,14 @@ module GLib
       exception = EXCEPTIONS.shift
       RUNNING_LOOPS.pop
       raise exception if exception
+
       result
     end
 
     def self.handle_exception(exception)
       current_loop = RUNNING_LOOPS.last
       raise exception unless current_loop
+
       EXCEPTIONS << exception
       current_loop.quit
     end

data/lib/ffi-glib/ptr_array.rb

@@ -50,7 +50,7 @@ module GLib
     end
 
     def data_ptr
-      @struct[:pdata]
+      struct[:pdata]
     end
 
     def element_size
@@ -64,7 +64,7 @@ module GLib
     end
 
     def length
-      @struct[:len]
+      struct[:len]
     end
 
     def ==(other)

data/lib/ffi-gobject.rb

@@ -18,6 +18,7 @@ require 'gir_ffi/signal_not_found_error'
 module GObject
   def self.type_from_instance_pointer(inst_ptr)
     return nil if inst_ptr.null?
+
     klsptr = inst_ptr.get_pointer 0
     klsptr.get_gtype 0
   end
@@ -36,6 +37,7 @@ module GObject
 
   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
@@ -62,6 +64,7 @@ module GObject
 
   def self.signal_connect(object, detailed_signal, data = nil, after = false, &block)
     raise ArgumentError, 'Block needed' unless block_given?
+
     signal_name, = detailed_signal.split('::')
     sig_info = object.class.find_signal signal_name
 
@@ -87,17 +90,11 @@ module GObject
     attach_function :g_object_ref_sink, [:pointer], :pointer
     attach_function :g_object_ref, [:pointer], :pointer
     attach_function :g_object_unref, [:pointer], :pointer
-    attach_function :g_object_new, [:size_t, :pointer], :pointer
 
     attach_function :g_value_copy, [:pointer, :pointer], :void
     attach_function :g_value_init, [:pointer, :size_t], :pointer
     attach_function :g_value_unset, [:pointer], :pointer
 
-    attach_function :g_array_get_type, [], :size_t
-    attach_function :g_byte_array_get_type, [], :size_t
-    attach_function :g_hash_table_get_type, [], :size_t
-    attach_function :g_strv_get_type, [], :size_t
-
     attach_function :g_signal_connect_data,
                     [:pointer, :string, Callback, :pointer, ClosureNotify, ConnectFlags],
                     :ulong
@@ -112,9 +109,4 @@ module GObject
 
     attach_function :g_type_class_ref, [:size_t], :pointer
   end
-
-  TYPE_ARRAY = Lib.g_array_get_type
-  TYPE_BYTE_ARRAY = Lib.g_byte_array_get_type
-  TYPE_HASH_TABLE = Lib.g_hash_table_get_type
-  TYPE_STRV = Lib.g_strv_get_type
 end

data/lib/ffi-gobject/closure.rb

@@ -9,6 +9,7 @@ module GObject
   class Closure
     setup_method! :new_simple
     setup_instance_method! :invoke
+    remove_method :invoke
 
     # @override
     #

data/lib/ffi-gobject/object.rb

@@ -12,36 +12,37 @@ module GObject
                                    [:size_t, :uint32, :pointer, :pointer],
                                    :pointer)
 
-      def self.new(*args, &block)
+      def self.new_with_properties(*args, &block)
         obj = allocate
-        obj.__send__ :initialize, *args, &block
+        obj.__send__ :initialize_with_properties, *args, &block
         obj
       end
 
       # Starting with GLib 2.54.0, use g_object_new_with_properties, which
       # takes an array of names and an array of values.
-      def initialize(properties = {})
-        names = []
-        values = []
-        properties.each do |name, value|
-          name = name.to_s
-          gvalue = gvalue_for_property(name)
-          gvalue.set_value value
-
-          names << name
-          values << gvalue
-        end
+      def initialize_with_properties(properties = {})
+        names, gvalues = names_and_gvalues_for_properties(properties)
 
         n_properties = names.length
         names_arr = GirFFI::SizedArray.from(:utf8, -1, names)
-        values_arr = GirFFI::SizedArray.from(GObject::Value, -1, values)
+        gvalues_arr = GirFFI::SizedArray.from(GObject::Value, -1, gvalues)
 
         ptr = GObject::Lib.g_object_new_with_properties(self.class.gtype,
                                                         n_properties,
                                                         names_arr,
-                                                        values_arr)
+                                                        gvalues_arr)
         store_pointer ptr
       end
+
+      alias old_initialze initialize
+      alias initialize initialize_with_properties
+      remove_method :old_initialze
+
+      def self.new(*args, &block)
+        obj = allocate
+        obj.__send__ :initialize, *args, &block
+        obj
+      end
     else
       setup_method! 'new'
 
@@ -81,7 +82,7 @@ module GObject
     def self.make_finalizer(ptr)
       proc do
         rc = GObject::Object::Struct.new(ptr)[:ref_count]
-        if rc.zero?
+        if rc == 0
           warn "not unreffing #{name}:#{ptr} (#{rc})"
         else
           GObject::Lib.g_object_unref ptr
@@ -93,6 +94,7 @@ module GObject
     def method_missing(method, *args)
       getter_name = "get_#{method}"
       return send(getter_name, *args) if respond_to?(getter_name)
+
       if method.to_s =~ /(.*)=$/
         setter_name = "set_#{Regexp.last_match[1]}"
         return send(setter_name, *args) if respond_to?(setter_name)
@@ -150,6 +152,18 @@ module GObject
 
     private
 
+    def names_and_gvalues_for_properties(properties)
+      return [], [] unless properties.any?
+
+      properties.map do |name, value|
+        name = name.to_s
+        gvalue = gvalue_for_property(name)
+        gvalue.set_value value
+
+        [name, gvalue]
+      end.transpose
+    end
+
     def get_property_type(property_name)
       prop = self.class.find_property(property_name)
       prop.property_type

data/lib/ffi-gobject/object_class.rb

@@ -6,11 +6,11 @@ module GObject
   # Overrides for GObjectClass, a struct containing GObject's class data
   class ObjectClass
     def set_property=(callback)
-      @struct[:set_property] = GObject::ObjectSetPropertyFunc.from callback
+      struct[:set_property] = GObject::ObjectSetPropertyFunc.from callback
     end
 
     def get_property=(callback)
-      @struct[:get_property] = GObject::ObjectGetPropertyFunc.from callback
+      struct[:get_property] = GObject::ObjectGetPropertyFunc.from callback
     end
 
     def gtype

data/lib/ffi-gobject/ruby_closure.rb

@@ -51,11 +51,11 @@ module GObject
     def block=(block)
       id = block.object_id
       BLOCK_STORE[id] = block
-      @struct[:block_id] = id
+      struct[:block_id] = id
     end
 
     def block
-      BLOCK_STORE[@struct[:block_id]]
+      BLOCK_STORE[struct[:block_id]]
     end
   end
 end

data/lib/ffi-gobject/value.rb

@@ -61,7 +61,7 @@ module GObject
     alias value= set_value
 
     def current_gtype
-      @struct[:g_type]
+      struct[:g_type]
     end
 
     def current_fundamental_type
@@ -140,6 +140,7 @@ module GObject
 
     def init_for_ruby_value(val)
       return init val.class.gtype if val.class.respond_to? :gtype
+
       CLASS_TO_GTYPE_MAP.each do |klass, type|
         return init type if val.is_a? klass
       end

data/lib/ffi-gobject_introspection/i_arg_info.rb

@@ -6,47 +6,47 @@ module GObjectIntrospection
   # Represents an argument.
   class IArgInfo < IBaseInfo
     def direction
-      Lib.g_arg_info_get_direction @gobj
+      Lib.g_arg_info_get_direction self
     end
 
     def return_value?
-      Lib.g_arg_info_is_return_value @gobj
+      Lib.g_arg_info_is_return_value self
     end
 
     def optional?
-      Lib.g_arg_info_is_optional @gobj
+      Lib.g_arg_info_is_optional self
     end
 
     def caller_allocates?
-      Lib.g_arg_info_is_caller_allocates @gobj
+      Lib.g_arg_info_is_caller_allocates self
     end
 
     def may_be_null?
-      Lib.g_arg_info_may_be_null @gobj
+      Lib.g_arg_info_may_be_null self
     end
 
     def skip?
-      Lib.g_arg_info_is_skip @gobj
+      Lib.g_arg_info_is_skip self
     end
 
     def ownership_transfer
-      Lib.g_arg_info_get_ownership_transfer @gobj
+      Lib.g_arg_info_get_ownership_transfer self
     end
 
     def scope
-      Lib.g_arg_info_get_scope @gobj
+      Lib.g_arg_info_get_scope self
     end
 
     def closure
-      Lib.g_arg_info_get_closure @gobj
+      Lib.g_arg_info_get_closure self
     end
 
     def destroy
-      Lib.g_arg_info_get_destroy @gobj
+      Lib.g_arg_info_get_destroy self
     end
 
     def argument_type
-      ITypeInfo.wrap Lib.g_arg_info_get_type(@gobj)
+      ITypeInfo.wrap Lib.g_arg_info_get_type(self)
     end
   end
 end

data/lib/ffi-gobject_introspection/i_base_info.rb

@@ -9,16 +9,18 @@ module GObjectIntrospection
 
       ObjectSpace.define_finalizer self, self.class.make_finalizer(lib, ptr)
 
-      @gobj = ptr
+      @pointer = ptr
       @lib = lib
     end
 
+    attr_reader :pointer
+
     def self.make_finalizer(lib, ptr)
       proc { lib.g_base_info_unref ptr }
     end
 
     def to_ptr
-      @gobj
+      @pointer
     end
 
     # This is a helper method to construct a method returning an array, out
@@ -38,7 +40,7 @@ module GObjectIntrospection
     #
     def self.build_array_method(method, single = nil)
       method = method.to_s
-      single ||= method.to_s[0..-2]
+      single ||= method[0..-2]
       count = method.sub(/^(get_)?/, '\\1n_')
       class_eval <<-CODE, __FILE__, __LINE__ + 1
         def #{method}
@@ -83,15 +85,15 @@ module GObjectIntrospection
     end
 
     def name
-      Lib.g_base_info_get_name @gobj
+      Lib.g_base_info_get_name self
     end
 
     def info_type
-      Lib.g_base_info_get_type @gobj
+      Lib.g_base_info_get_type self
     end
 
     def namespace
-      Lib.g_base_info_get_namespace @gobj
+      Lib.g_base_info_get_namespace self
     end
 
     def safe_namespace
@@ -99,17 +101,17 @@ module GObjectIntrospection
     end
 
     def container
-      ptr = Lib.g_base_info_get_container @gobj
+      ptr = Lib.g_base_info_get_container self
       Lib.g_base_info_ref ptr
       IRepository.wrap_ibaseinfo_pointer ptr
     end
 
     def deprecated?
-      Lib.g_base_info_is_deprecated @gobj
+      Lib.g_base_info_is_deprecated self
     end
 
     def attribute(name)
-      Lib.g_base_info_get_attribute @gobj, name
+      Lib.g_base_info_get_attribute self, name
     end
 
     def self.wrap(ptr)
@@ -117,7 +119,7 @@ module GObjectIntrospection
     end
 
     def ==(other)
-      other.is_a?(IBaseInfo) && Lib.g_base_info_equal(@gobj, other)
+      other.is_a?(IBaseInfo) && Lib.g_base_info_equal(self, other)
     end
   end
 end