gir_ffi 0.7.10 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c78011dfb34b7799b25df253c661de0b9bce5115
-  data.tar.gz: d83510e42c93f89563af82eb7e4d4316def805f5
+  metadata.gz: 3de30b661f43f74216127542e5c68adc520c2fae
+  data.tar.gz: d517d1dd678fa2e4c5fb13547c6a225286afce44
 SHA512:
-  metadata.gz: bd02e60de28ecdeff0b15eed790feed6c2e744df44bd473b10914573acced71c6c6613e55cf7f5bfbd62e21501fa6322274bc341be2a1de943ea574fdee82409
-  data.tar.gz: de8a61b783c0f46e9b83acb5157a3305bb66abda3e201f930021acf78786ea12b9d743e3c6783015df5b7663c5bb4c0c7ff430ff57cb64c6b5bed3b9fcc9c0ff
+  metadata.gz: 66971838b0f54a2d34b24ac782564a09cfd675236520a4212ec41af35acea4fa3ab212daab633b29b8af83d3af0a12b736656d4a50f032cd432d4dca831a4bba
+  data.tar.gz: 3a419c93f07af1e2781fb2afc2d6e4a057bbbd0802acd99d0a9ce3afea146520050615e826d38778a6e07b5edc494e792568b61f06d970caadcff4599e2d8f09

data/Changelog.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.8.0 / 2015-09-18
+
+* Drop official support for CRuby 1.9.3
+* Officially support JRuby 9.0.0.0
+* Change handling of initializers in custom subclasses
+
 ## 0.7.10 / 2015-09-16
 
 * Allow ffi-gobject and ffi-glib to be required directly

data/Gemfile

@@ -4,7 +4,9 @@ source 'https://rubygems.org'
 gemspec
 
 if ENV['CI']
-  gem 'coveralls', type: :development, platform: :mri
+  if ENV['TRAVIS_RUBY_VERSION'] == '2.2'
+    gem 'coveralls', type: :development
+  end
 else
   gem 'simplecov', '~> 0.10.0', type: :development, platform: :mri
   gem 'pry', '~> 0.10.0', type: :development

data/README.md

@@ -40,14 +40,17 @@ Ruby bindings for GNOME using the GObject Introspection Repository.
     # Call a function in the namespace
     Gio.dbus_is_name "foo"   # => false
 
+See the [documentation](docs/Documentation.md) for more usage information.
+
 ## Install
 
     gem install gir_ffi
 
 ## Requirements
 
-GirFFI should work on CRuby 1.9.3, 2.0, 2.1 and 2.2, JRuby in 1.9 or 2.0 mode,
-and on Rubinius.
+GirFFI should work on CRuby 2.0.0, 2.1 and 2.2, JRuby 1.7.x in 1.9 or 2.0 mode,
+JRuby 9.0.0.0, and on Rubinius. If you need support for CRuby 1.9.3, use
+version 0.7.10.
 
 You will also need gobject-introspection installed with some
 introspection data.

data/lib/ffi-glib.rb

@@ -48,5 +48,6 @@ module GLib
     attach_function :g_ptr_array_foreach, [:pointer, Func, :pointer], :pointer
 
     attach_function :g_iconv_open, [:pointer, :pointer], :pointer
+    attach_function :g_variant_ref_sink, [:pointer], :pointer
   end
 end

data/lib/ffi-glib/array.rb

@@ -15,24 +15,24 @@ module GLib
 
     class << self; undef :new; end
 
-    def self.new type
+    def self.new(type)
       ptr = Lib.g_array_new(0, 0, calculated_element_size(type))
       wrap type, ptr
     end
 
     # @api private
-    def self.from_enumerable elmtype, it
+    def self.from_enumerable(elmtype, it)
       new(elmtype).tap { |arr| arr.append_vals it }
     end
 
     # @api private
-    def self.calculated_element_size type
+    def self.calculated_element_size(type)
       ffi_type = GirFFI::TypeMap.type_specification_to_ffi_type(type)
       FFI.type_size(ffi_type)
     end
 
     # @override
-    def append_vals ary
+    def append_vals(ary)
       bytes = GirFFI::InPointer.from_array element_type, ary
       Lib.g_array_append_vals(self, bytes, ary.length)
       self
@@ -54,12 +54,12 @@ module GLib
 
     alias_method :element_size, :get_element_size
 
-    def == other
+    def ==(other)
       to_a == other.to_a
     end
 
     # @api private
-    def reset_typespec typespec = nil
+    def reset_typespec(typespec = nil)
       if typespec
         @element_type = typespec
         check_element_size_match

data/lib/ffi-glib/array_methods.rb

@@ -2,7 +2,7 @@ module GLib
   # Common methods for GLib::Array and GLib::PtrArray
   module ArrayMethods
     # Re-implementation of the g_array_index and g_ptr_array_index macros
-    def index idx
+    def index(idx)
       if idx >= length || idx < 0
         raise IndexError, "Index #{idx} outside of bounds 0..#{length - 1}"
       end

data/lib/ffi-glib/byte_array.rb

@@ -7,7 +7,7 @@ module GLib
       GirFFI::ArgHelper.ptr_to_utf8_length @struct[:data], @struct[:len]
     end
 
-    def append data
+    def append(data)
       bytes = GirFFI::InPointer.from :utf8, data
       len = data.bytesize
       self.class.wrap(Lib.g_byte_array_append to_ptr, bytes, len)

data/lib/ffi-glib/bytes.rb

@@ -17,11 +17,11 @@ module GLib
       GirFFI::SizedArray.wrap(:guint8, length, data_ptr)
     end
 
-    def each &block
+    def each(&block)
       data.each(&block)
     end
 
-    def self.from it
+    def self.from(it)
       case it
       when self
         it
@@ -36,7 +36,7 @@ module GLib
       undef new
     end
 
-    def self.new arr
+    def self.new(arr)
       data = GirFFI::SizedArray.from :guint8, arr.size, arr
       wrap Lib.g_bytes_new data.to_ptr, data.size
     end

data/lib/ffi-glib/container_class_methods.rb

@@ -2,13 +2,13 @@ module GLib
   # Common methods for container classes: Array, PtrArray, List, SList and
   # HashTable.
   module ContainerClassMethods
-    def wrap typespec, ptr
+    def wrap(typespec, ptr)
       super(ptr).tap do |container|
         container.reset_typespec typespec if container
       end
     end
 
-    def from typespec = :void, it
+    def from(typespec = :void, it)
       case it
       when nil
         nil

data/lib/ffi-glib/error.rb

@@ -5,11 +5,11 @@ module GLib
   class Error
     GIR_FFI_DOMAIN = GLib.quark_from_string('gir_ffi')
 
-    def self.from_exception ex
+    def self.from_exception(ex)
       new_literal GIR_FFI_DOMAIN, 0, ex.message
     end
 
-    def self.from it
+    def self.from(it)
       from_exception it
     end
   end

data/lib/ffi-glib/hash_table.rb

@@ -13,13 +13,13 @@ module GLib
 
     class << self; remove_method :new; end
 
-    def self.new keytype, valtype
+    def self.new(keytype, valtype)
       wrap [keytype, valtype], Lib.g_hash_table_new(
         hash_function_for(keytype), equality_function_for(keytype))
     end
 
     # @api private
-    def self.from_enumerable typespec, hash
+    def self.from_enumerable(typespec, hash)
       ghash = new(*typespec)
       hash.each do |key, val|
         ghash.insert key, val
@@ -28,7 +28,7 @@ module GLib
     end
 
     # @api private
-    def self.hash_function_for keytype
+    def self.hash_function_for(keytype)
       case keytype
       when :utf8
         FFI::Function.new(:uint,
@@ -38,7 +38,7 @@ module GLib
     end
 
     # @api private
-    def self.equality_function_for keytype
+    def self.equality_function_for(keytype)
       case keytype
       when :utf8
         FFI::Function.new(:int,
@@ -48,17 +48,17 @@ module GLib
     end
 
     # @api private
-    def self.find_support_function name
+    def self.find_support_function(name)
       lib = ::GLib::Lib.ffi_libraries.first
       lib.find_function(name)
     end
 
     def each
-      prc = proc {|keyptr, valptr, _userdata|
+      prc = proc do|keyptr, valptr, _userdata|
         key = GirFFI::ArgHelper.cast_from_pointer key_type, keyptr
         val = GirFFI::ArgHelper.cast_from_pointer value_type, valptr
         yield key, val
-      }
+      end
       callback = GLib::HFunc.from prc
       ::GLib::Lib.g_hash_table_foreach to_ptr, callback, nil
     end
@@ -68,14 +68,14 @@ module GLib
     end
 
     # @override
-    def insert key, value
+    def insert(key, value)
       keyptr = GirFFI::InPointer.from key_type, key
       valptr = GirFFI::InPointer.from value_type, value
       ::GLib::Lib.g_hash_table_insert to_ptr, keyptr, valptr
     end
 
     # @api private
-    def reset_typespec typespec
+    def reset_typespec(typespec)
       @key_type, @value_type = *typespec
       self
     end

data/lib/ffi-glib/iconv.rb

@@ -3,7 +3,7 @@ GLib.load_class :IConv
 module GLib
   # Overrides for IConv
   class IConv
-    def self.open to_codeset, from_codeset
+    def self.open(to_codeset, from_codeset)
       to_ptr = GirFFI::InPointer.from(:utf8, to_codeset)
       from_ptr = GirFFI::InPointer.from(:utf8, from_codeset)
       result_ptr = Lib.g_iconv_open(to_ptr, from_ptr)

data/lib/ffi-glib/list.rb

@@ -7,11 +7,11 @@ module GLib
   class List
     include ListMethods
 
-    def self.from_enumerable type, arr
+    def self.from_enumerable(type, arr)
       arr.reduce(new type) { |lst, val| lst.append val }
     end
 
-    def append data
+    def append(data)
       self.class.wrap(element_type,
                       Lib.g_list_append(self, element_ptr_for(data)))
     end

data/lib/ffi-glib/list_methods.rb

@@ -6,7 +6,7 @@ module GLib
     include Enumerable
     attr_reader :element_type
 
-    def self.included base
+    def self.included(base)
       # Override default field accessors.
       replace_method base, :next, :tail
       replace_method base, :data, :head
@@ -17,7 +17,7 @@ module GLib
       base.extend ContainerClassMethods
     end
 
-    def self.replace_method base, old, new
+    def self.replace_method(base, old, new)
       base.class_eval do
         remove_method old
         alias_method old, new
@@ -39,12 +39,12 @@ module GLib
       GirFFI::ArgHelper.cast_from_pointer(element_type, @struct[:data])
     end
 
-    def reset_typespec typespec
+    def reset_typespec(typespec)
       @element_type = typespec
       self
     end
 
-    def == other
+    def ==(other)
       to_a == other.to_a
     end
 
@@ -61,14 +61,15 @@ module GLib
       element
     end
 
-    def element_ptr_for data
+    def element_ptr_for(data)
       GirFFI::InPointer.from(element_type, data)
     end
 
     # Common class methods for List and SList
     module ListClassMethods
-      def new type
-        _real_new.tap do |it|
+      # TODO: Make this behave more like a real .new method
+      def new(type)
+        allocate.tap do |it|
           struct = self::Struct.new(FFI::Pointer.new(0))
           it.instance_variable_set :@struct, struct
           it.instance_variable_set :@element_type, type

data/lib/ffi-glib/main_loop.rb

@@ -13,7 +13,7 @@ module GLib
       FRAMERATE = 25
       DEFAULT_TIMEOUT = 1000 / FRAMERATE
 
-      def initialize timeout = DEFAULT_TIMEOUT
+      def initialize(timeout = DEFAULT_TIMEOUT)
         @timeout = timeout
       end
 

data/lib/ffi-glib/ptr_array.rb

@@ -21,29 +21,29 @@ module GLib
       remove_method :add if method_defined? :add
     end
 
-    def self.new type
+    def self.new(type)
       wrap(type, Lib.g_ptr_array_new)
     end
 
-    def self.from_enumerable type, it
+    def self.from_enumerable(type, it)
       new(type).tap { |arr| arr.add_array it }
     end
 
-    def self.add array, data
+    def self.add(array, data)
       array.add data
     end
 
-    def reset_typespec typespec
+    def reset_typespec(typespec)
       @element_type = typespec
       self
     end
 
-    def add data
+    def add(data)
       ptr = GirFFI::InPointer.from element_type, data
       Lib.g_ptr_array_add self, ptr
     end
 
-    def add_array ary
+    def add_array(ary)
       ary.each { |item| add item }
     end
 
@@ -65,7 +65,7 @@ module GLib
       @struct[:len]
     end
 
-    def == other
+    def ==(other)
       to_a == other.to_a
     end
   end

data/lib/ffi-glib/s_list.rb

@@ -7,11 +7,11 @@ module GLib
   class SList
     include ListMethods
 
-    def self.from_enumerable type, arr
+    def self.from_enumerable(type, arr)
       arr.reverse.reduce(new type) { |lst, val| lst.prepend val }
     end
 
-    def prepend data
+    def prepend(data)
       self.class.wrap(element_type,
                       Lib.g_slist_prepend(self, element_ptr_for(data)))
     end

data/lib/ffi-glib/strv.rb

@@ -1,11 +1,11 @@
 module GLib
   # Extra methods for GLib::Strv. The bulk is defined in `gir_ffi-base/glib/strv.rb`
   class Strv
-    def == other
+    def ==(other)
       to_a == other.to_a
     end
 
-    def self.from it
+    def self.from(it)
       case it
       when nil
         nil
@@ -18,7 +18,7 @@ module GLib
       end
     end
 
-    def self.from_enumerable enum
+    def self.from_enumerable(enum)
       wrap GirFFI::InPointer.from_array :utf8, enum
     end
   end

data/lib/ffi-glib/variant.rb

@@ -9,8 +9,15 @@ module GLib
       get_string_without_override.first
     end
 
-    def self.constructor_wrap ptr
-      super.tap(&:ref)
+    # 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.
+    def store_pointer(ptr)
+      super
+      ::GLib::Lib.g_variant_ref_sink ptr
     end
 
     alias_method :get_string_without_override, :get_string

data/lib/ffi-gobject.rb

@@ -14,31 +14,31 @@ require 'gir_ffi/builders/user_defined_builder'
 
 # Module representing GLib's GObject namespace.
 module GObject
-  def self.type_from_instance_pointer inst_ptr
+  def self.type_from_instance_pointer(inst_ptr)
     return nil if inst_ptr.null?
     klsptr = inst_ptr.get_pointer 0
     GirFFI::InOutPointer.new(:GType, klsptr).to_value
   end
 
-  def self.type_from_instance instance
+  def self.type_from_instance(instance)
     type_from_instance_pointer instance.to_ptr
   end
 
-  def self.object_class_from_instance instance
+  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
+  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
+  def self.signal_lookup_from_instance(signal, object)
     signal_lookup signal, type_from_instance(object)
   end
 
-  def self.signal_emit object, detailed_signal, *args
+  def self.signal_emit(object, detailed_signal, *args)
     signal, detail = detailed_signal.split('::')
     signal_id = signal_lookup_from_instance signal, object
     detail_quark = GLib.quark_from_string(detail)
@@ -52,9 +52,9 @@ module GObject
     return_gvalue
   end
 
-  def self.signal_connect object, detailed_signal, data = nil, after = false, &block
+  def self.signal_connect(object, detailed_signal, data = nil, after = false, &block)
     raise ArgumentError, 'Block needed' unless block_given?
-    signal_name, _ = detailed_signal.split('::')
+    signal_name, = detailed_signal.split('::')
     sig_info = object.class.find_signal signal_name
 
     closure = sig_info.wrap_in_closure { |*args| block.call(*args << data) }
@@ -62,13 +62,13 @@ module GObject
     signal_connect_closure object, detailed_signal, closure, after
   end
 
-  def self.signal_connect_after object, detailed_signal, data = nil, &block
+  def self.signal_connect_after(object, detailed_signal, data = nil, &block)
     signal_connect object, detailed_signal, data, true, &block
   end
 
   # Smells of :reek:LongParameterList: due to the C interface.
   # rubocop:disable Metrics/ParameterLists
-  def self.param_spec_int name, nick, blurb, minimum, maximum, default_value, flags
+  def self.param_spec_int(name, nick, blurb, minimum, maximum, default_value, flags)
     ptr = Lib.g_param_spec_int(name, nick, blurb, minimum, maximum,
                                default_value, flags)
     ParamSpecInt.wrap(ptr)