gir_ffi 0.7.7 → 0.7.8

data/lib/gir_ffi/builders/marshalling_method_builder.rb

@@ -31,7 +31,7 @@ module GirFFI
       end
 
       def method_name
-        "marshaller"
+        'marshaller'
       end
 
       def method_arguments
@@ -42,7 +42,7 @@ module GirFFI
         if param_names.size == 1
           ["#{param_names.first} = param_values.first.get_value_plain"]
         else
-          ["#{param_names.join(", ")} = param_values.map(&:get_value_plain)"]
+          ["#{param_names.join(', ')} = param_values.map(&:get_value_plain)"]
         end
       end
 

data/lib/gir_ffi/builders/method_template.rb

@@ -66,7 +66,7 @@ module GirFFI
 
       def result_name_list
         @result_name_list ||=
-          @argument_builder_collection.capture_variable_names.join(", ")
+          @argument_builder_collection.capture_variable_names.join(', ')
       end
 
       def capturing_invocation

data/lib/gir_ffi/builders/null_convertor.rb

@@ -1,10 +1,14 @@
-# Argument convertor that does nothing
-class GirFFI::Builders::NullConvertor
-  def initialize argument_name
-    @argument_name = argument_name
-  end
+module GirFFI
+  module Builders
+    # Argument convertor that does nothing
+    class NullConvertor
+      def initialize argument_name
+        @argument_name = argument_name
+      end
 
-  def conversion
-    @argument_name
+      def conversion
+        @argument_name
+      end
+    end
   end
 end

data/lib/gir_ffi/builders/property_builder.rb

@@ -109,7 +109,7 @@ module GirFFI
       end
 
       def argument_info
-        @argument_info ||= FieldArgumentInfo.new("value", type_info)
+        @argument_info ||= FieldArgumentInfo.new('value', type_info)
       end
 
       def container_class

data/lib/gir_ffi/builders/ruby_to_c_convertor.rb

@@ -1,17 +1,21 @@
-# Builder that generates code to convert values from Ruby to C. Used by
-# argument builders.
-class GirFFI::Builders::RubyToCConvertor
-  def initialize type_info, argument_name
-    @type_info = type_info
-    @argument_name = argument_name
-  end
+module GirFFI
+  module Builders
+    # Builder that generates code to convert values from Ruby to C. Used by
+    # argument builders.
+    class RubyToCConvertor
+      def initialize type_info, argument_name
+        @type_info = type_info
+        @argument_name = argument_name
+      end
 
-  def conversion
-    args = conversion_arguments @argument_name
-    "#{@type_info.argument_class_name}.from(#{args})"
-  end
+      def conversion
+        args = conversion_arguments @argument_name
+        "#{@type_info.argument_class_name}.from(#{args})"
+      end
 
-  def conversion_arguments name
-    @type_info.extra_conversion_arguments.map(&:inspect).push(name).join(", ")
+      def conversion_arguments name
+        @type_info.extra_conversion_arguments.map(&:inspect).push(name).join(', ')
+      end
+    end
   end
 end

data/lib/gir_ffi/error_argument_info.rb

@@ -16,7 +16,7 @@ module GirFFI
     end
 
     def name
-      "_error"
+      '_error'
     end
 
     def closure

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -21,7 +21,7 @@ module GirFFI
       end
 
       def to_utf8
-        null? ? nil : read_string.force_encoding("utf-8")
+        null? ? nil : read_string.force_encoding('utf-8')
       end
     end
   end

data/lib/gir_ffi/info_ext/i_unresolved_info.rb

@@ -0,0 +1,12 @@
+module GirFFI
+  module InfoExt
+    # Extensions for GObjectIntrospection::IUnresolvedInfo needed by GirFFI
+    module IUnresolvedInfo
+      def to_ffitype
+        :pointer
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IUnresolvedInfo.send :include, GirFFI::InfoExt::IUnresolvedInfo

data/lib/gir_ffi/info_ext/safe_constant_name.rb

@@ -5,8 +5,8 @@ module GirFFI
       def safe_name
         name.tr('-', '_').gsub(/^./) do |char|
           case char
-          when "_"
-            "Private___"
+          when '_'
+            'Private___'
           else
             char.upcase
           end

data/lib/gir_ffi/info_ext/safe_function_name.rb

@@ -4,7 +4,7 @@ module GirFFI
     module SafeFunctionName
       def safe_name
         name = self.name
-        return "_" if name.empty?
+        return '_' if name.empty?
         name
       end
     end

data/lib/gir_ffi/info_ext.rb

@@ -8,6 +8,7 @@ require 'gir_ffi/info_ext/i_property_info'
 require 'gir_ffi/info_ext/i_registered_type_info'
 require 'gir_ffi/info_ext/i_signal_info'
 require 'gir_ffi/info_ext/i_type_info'
+require 'gir_ffi/info_ext/i_unresolved_info'
 require 'gir_ffi/info_ext/i_vfunc_info'
 require 'gir_ffi/info_ext/safe_constant_name'
 require 'gir_ffi/info_ext/safe_function_name'

data/lib/gir_ffi/module_base.rb

@@ -8,7 +8,7 @@ module GirFFI
     end
 
     def const_missing classname
-      load_class(classname) || super
+      load_class(classname)
     end
 
     # @deprecated The load_class method should always be used. Remove in 0.8.0

data/lib/gir_ffi/receiver_argument_info.rb

@@ -1,17 +1,20 @@
-# Class to represent the info for the receiver argument of a callback or signal
-# handler. Implements the necessary parts of IArgumentInfo's interface.
-class GirFFI::ReceiverArgumentInfo
-  attr_reader :argument_type
+module GirFFI
+  # Class to represent the info for the receiver argument of a callback or
+  # signal handler. Implements the necessary parts of IArgumentInfo's
+  # interface.
+  class ReceiverArgumentInfo
+    attr_reader :argument_type
 
-  def initialize type
-    @argument_type = type
-  end
+    def initialize type
+      @argument_type = type
+    end
 
-  def direction
-    :in
-  end
+    def direction
+      :in
+    end
 
-  def name
-    "_instance"
+    def name
+      '_instance'
+    end
   end
 end

data/lib/gir_ffi/user_data_argument_info.rb

@@ -1,21 +1,23 @@
-# Class to represent the info for the user data argument of a signal handler.
-# Implements the necessary parts of IArgumentInfo's interface.
-class GirFFI::UserDataArgumentInfo
-  attr_reader :argument_type
+module GirFFI
+  # Class to represent the info for the user data argument of a signal handler.
+  # Implements the necessary parts of IArgumentInfo's interface.
+  class UserDataArgumentInfo
+    attr_reader :argument_type
 
-  def initialize type
-    @argument_type = type
-  end
+    def initialize type
+      @argument_type = type
+    end
 
-  def direction
-    :in
-  end
+    def direction
+      :in
+    end
 
-  def skip?
-    false
-  end
+    def skip?
+      false
+    end
 
-  def name
-    "_user_data"
+    def name
+      '_user_data'
+    end
   end
 end

data/lib/gir_ffi/user_data_type_info.rb

@@ -1,19 +1,21 @@
 require 'gir_ffi/info_ext/i_type_info'
 
-# Represents the type of the user data (closure argument) of a signal or vfunc,
-# conforming, as needed, to the interface of GObjectIntrospection::ITypeInfo.
-class GirFFI::UserDataTypeInfo
-  include GirFFI::InfoExt::ITypeInfo
+module GirFFI
+  # Represents the type of the user data (closure argument) of a signal or vfunc,
+  # conforming, as needed, to the interface of GObjectIntrospection::ITypeInfo.
+  class UserDataTypeInfo
+    include InfoExt::ITypeInfo
 
-  def tag
-    :void
-  end
+    def tag
+      :void
+    end
 
-  def pointer?
-    true
-  end
+    def pointer?
+      true
+    end
 
-  def array_length
-    -1
+    def array_length
+      -1
+    end
   end
 end

data/lib/gir_ffi/version.rb

@@ -1,4 +1,4 @@
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.7.7"
+  VERSION = '0.7.8'
 end

data/lib/gir_ffi-base/gobject/lib.rb

@@ -2,7 +2,7 @@ module GObject
   # Module for attaching functions from the gobject library
   module Lib
     extend FFI::Library
-    ffi_lib "gobject-2.0"
+    ffi_lib 'gobject-2.0'
     attach_function :g_type_init, [], :void
   end
 end

data/test/base_test_helper.rb

@@ -1,11 +1,9 @@
-if RUBY_PLATFORM == 'java'
-  require 'rubygems'
-end
+require 'rubygems' if RUBY_PLATFORM == 'java'
 
 begin
   require 'simplecov'
   SimpleCov.start do
-    add_filter "/test/"
+    add_filter '/test/'
   end
 rescue LoadError
 end
@@ -28,28 +26,28 @@ module GObjectIntrospection
   class IRepository
     def shared_library_with_regress namespace
       case namespace
-      when "Regress"
+      when 'Regress'
         return File.join(File.dirname(__FILE__), 'lib', 'libregress.so')
-      when "GIMarshallingTests"
+      when 'GIMarshallingTests'
         return File.join(File.dirname(__FILE__), 'lib', 'libgimarshallingtests.so')
       else
         return shared_library_without_regress namespace
       end
     end
 
-    alias shared_library_without_regress shared_library
-    alias shared_library shared_library_with_regress
+    alias_method :shared_library_without_regress, :shared_library
+    alias_method :shared_library, :shared_library_with_regress
   end
 end
 
 Thread.abort_on_exception = true
 
-class Minitest::Test
+module BaseTestExtensions
   def assert_defines_singleton_method klass, method, msg = nil
     method = method.to_sym
-    methods = klass.singleton_methods(false).map { |name| name.to_sym }
+    methods = klass.singleton_methods(false).map(&:to_sym)
     msg = message(msg) {
-      "Expected #{mu_pp(klass)} to define singleton method #{mu_pp(method)}, " +
+      "Expected #{mu_pp(klass)} to define singleton method #{mu_pp(method)}, " \
         "but only found #{mu_pp(methods)}"
     }
     assert_includes methods, method, msg
@@ -57,7 +55,7 @@ class Minitest::Test
 
   def refute_defines_singleton_method klass, method, msg = nil
     method = method.to_sym
-    methods = klass.singleton_methods(false).map { |name| name.to_sym }
+    methods = klass.singleton_methods(false).map(&:to_sym)
     msg = message(msg) {
       "Expected #{mu_pp(klass)} not to define singleton method #{mu_pp(method)}"
     }
@@ -66,9 +64,9 @@ class Minitest::Test
 
   def assert_defines_instance_method klass, method, msg = nil
     method = method.to_sym
-    methods = klass.instance_methods(false).map { |name| name.to_sym }
+    methods = klass.instance_methods(false).map(&:to_sym)
     msg = message(msg) {
-      "Expected #{mu_pp(klass)} to define instance method #{mu_pp(method)}, " +
+      "Expected #{mu_pp(klass)} to define instance method #{mu_pp(method)}, " \
         "but only found #{mu_pp(methods)}"
     }
     assert_includes methods, method, msg
@@ -76,10 +74,12 @@ class Minitest::Test
 
   def refute_defines_instance_method klass, method, msg = nil
     method = method.to_sym
-    methods = klass.instance_methods(false).map { |name| name.to_sym }
+    methods = klass.instance_methods(false).map(&:to_sym)
     msg = message(msg) {
       "Expected #{mu_pp(klass)} not to define instance method #{mu_pp(method)}"
     }
     refute_includes methods, method, msg
   end
 end
+
+Minitest::Test.send :include, BaseTestExtensions

data/test/ffi-glib/array_test.rb

@@ -1,41 +1,41 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::Array do
-  it "knows its element type" do
+  it 'knows its element type' do
     arr = GLib::Array.new :gint32
     assert_equal :gint32, arr.element_type
   end
 
-  describe "#append_vals" do
+  describe '#append_vals' do
     before do
       @arr = GLib::Array.new :gint32
       @result = @arr.append_vals [1, 2, 3]
     end
 
-    it "appends values" do
+    it 'appends values' do
       assert_equal 3, @arr.len
     end
 
-    it "returns self" do
+    it 'returns self' do
       assert_equal @result, @arr
     end
   end
 
-  describe "#each" do
+  describe '#each' do
     before do
       @arr = GLib::Array.new(:gint32).append_vals [1, 2, 3]
     end
 
-    it "iterates over the values" do
+    it 'iterates over the values' do
       a = []
-      @arr.each {|v| a << v }
+      @arr.each { |v| a << v }
 
       assert_equal [1, 2, 3], a
     end
   end
 
-  describe "::wrap" do
-    it "wraps a pointer, taking the element type as the first argument" do
+  describe '::wrap' do
+    it 'wraps a pointer, taking the element type as the first argument' do
       arr = GLib::Array.new :gint32
       arr.append_vals [1, 2, 3]
       arr2 = GLib::Array.wrap :gint32, arr.to_ptr
@@ -48,8 +48,8 @@ describe GLib::Array do
       proc { GLib::Array.wrap :gint8, arr.to_ptr }.must_output nil, /sizes do not match/
     end
 
-    it "handles a struct as the element type" do
-      vals = [1, 2, 3].map {|i| GObject::EnumValue.new.tap {|ev| ev.value = i} }
+    it 'handles a struct as the element type' do
+      vals = [1, 2, 3].map { |i| GObject::EnumValue.new.tap { |ev| ev.value = i } }
       arr = GLib::Array.new GObject::EnumValue
       arr.append_vals vals
       arr2 = GLib::Array.wrap GObject::EnumValue, arr.to_ptr
@@ -57,35 +57,35 @@ describe GLib::Array do
     end
   end
 
-  it "includes Enumerable" do
+  it 'includes Enumerable' do
     GLib::Array.must_include Enumerable
   end
 
-  it "has a working #to_a method" do
+  it 'has a working #to_a method' do
     arr = GLib::Array.new :gint32
     arr.append_vals [1, 2, 3]
     assert_equal [1, 2, 3], arr.to_a
   end
 
-  describe ".from" do
-    it "creates a GArray from an array of :gint32" do
+  describe '.from' do
+    it 'creates a GArray from an array of :gint32' do
       arr = GLib::Array.from :gint32, [3, 2, 1]
       arr.data_ptr.read_array_of_int32(3).must_equal [3, 2, 1]
     end
 
-    it "creates a GArray from an array of :gboolean" do
+    it 'creates a GArray from an array of :gboolean' do
       arr = GLib::Array.from :gboolean, [true, false, true]
       arr.data_ptr.read_array_of_int(3).must_equal [1, 0, 1]
     end
 
-    it "return its argument if given a GArray" do
+    it 'return its argument if given a GArray' do
       arr = GLib::Array.new :gint32
       arr.append_vals [3, 2, 1]
       arr2 = GLib::Array.from :gint32, arr
       assert arr2.equal? arr
     end
 
-    it "wraps its argument if given a pointer" do
+    it 'wraps its argument if given a pointer' do
       arr = GLib::Array.new :gint32
       arr.append_vals [3, 2, 1]
       pointer = arr.to_ptr
@@ -97,27 +97,27 @@ describe GLib::Array do
     end
   end
 
-  describe "#==" do
-    it "returns true when comparing to an array with the same elements" do
+  describe '#==' do
+    it 'returns true when comparing to an array with the same elements' do
       arr = GLib::Array.from :gint32, [1, 2, 3]
 
       arr.must_be :==, [1, 2, 3]
     end
 
-    it "returns false when comparing to an array with different elements" do
+    it 'returns false when comparing to an array with different elements' do
       arr = GLib::Array.from :gint32, [1, 2, 3]
 
       arr.wont_be :==, [1, 2]
     end
 
-    it "returns true when comparing to a GArray with the same elements" do
+    it 'returns true when comparing to a GArray with the same elements' do
       arr = GLib::Array.from :gint32, [1, 2, 3]
       other = GLib::Array.from :gint32, [1, 2, 3]
 
       arr.must_be :==, other
     end
 
-    it "returns false when comparing to a GArray with different elements" do
+    it 'returns false when comparing to a GArray with different elements' do
       arr = GLib::Array.from :gint32, [1, 2, 3]
       other = GLib::Array.from :gint32, [1, 2]
 
@@ -125,56 +125,56 @@ describe GLib::Array do
     end
   end
 
-  describe "#index" do
-    it "returns the proper element for an array of :gint32" do
+  describe '#index' do
+    it 'returns the proper element for an array of :gint32' do
       arr = GLib::Array.from :gint32, [1, 2, 3]
       arr.index(2).must_equal 3
     end
 
-    it "returns the proper element for an array of :utf8" do
-      arr = GLib::Array.from :utf8, ["a", "b", "c"]
-      arr.index(1).must_equal "b"
+    it 'returns the proper element for an array of :utf8' do
+      arr = GLib::Array.from :utf8, %w(a b c)
+      arr.index(1).must_equal 'b'
     end
 
-    it "returns the proper element for an array of :gboolean" do
+    it 'returns the proper element for an array of :gboolean' do
       arr = GLib::Array.from :gboolean, [true, false, true]
       arr.index(1).must_equal false
     end
 
-    it "returns the proper element for an array of struct" do
-      vals = [1, 2, 3].map {|i| GObject::EnumValue.new.tap {|ev| ev.value = i} }
+    it 'returns the proper element for an array of struct' do
+      vals = [1, 2, 3].map { |i| GObject::EnumValue.new.tap { |ev| ev.value = i } }
       arr = GLib::Array.from GObject::EnumValue, vals
       arr.index(1).value.must_equal 2
     end
 
-    it "raises an error if the index is out of bounds" do
+    it 'raises an error if the index is out of bounds' do
       arr = GLib::Array.from :gint32, [1, 2, 3]
       proc { arr.index(16) }.must_raise IndexError
       proc { arr.index(-1) }.must_raise IndexError
     end
   end
 
-  describe "#reset_typespec" do
-    describe "when it needs to guess the type" do
-      it "guesses :uint8 for size 1" do
+  describe '#reset_typespec' do
+    describe 'when it needs to guess the type' do
+      it 'guesses :uint8 for size 1' do
         arr = GLib::Array.from :int8, [1, 2, 3]
         arr.reset_typespec
         arr.element_type.must_equal :uint8
       end
 
-      it "guesses :uint16 for size 2" do
+      it 'guesses :uint16 for size 2' do
         arr = GLib::Array.from :int16, [1, 2, 3]
         arr.reset_typespec
         arr.element_type.must_equal :uint16
       end
 
-      it "guesses :uint32 for size 4" do
+      it 'guesses :uint32 for size 4' do
         arr = GLib::Array.from :int32, [1, 2, 3]
         arr.reset_typespec
         arr.element_type.must_equal :uint32
       end
 
-      it "guesses :uint64 for size 8" do
+      it 'guesses :uint64 for size 8' do
         arr = GLib::Array.from :int64, [1, 2, 3]
         arr.reset_typespec
         arr.element_type.must_equal :uint64

data/test/ffi-glib/byte_array_test.rb

@@ -1,21 +1,20 @@
 require 'gir_ffi_test_helper'
 
 describe GLib::ByteArray do
-  it "can succesfully be created with GLib::ByteArray.new" do
+  it 'can succesfully be created with GLib::ByteArray.new' do
     ba = GLib::ByteArray.new
     assert_instance_of GLib::ByteArray, ba
   end
 
-  it "allows strings to be appended to it" do
+  it 'allows strings to be appended to it' do
     ba = GLib::ByteArray.new
-    ba.append "abdc"
+    ba.append 'abdc'
     pass
   end
 
-  it "has a working #to_string method" do
+  it 'has a working #to_string method' do
     ba = GLib::ByteArray.new
-    ba = ba.append "abdc"
-    assert_equal "abdc", ba.to_string
+    ba = ba.append 'abdc'
+    assert_equal 'abdc', ba.to_string
   end
 end
-