gir_ffi 0.7.2 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad910cc6ba5f72dc4dbec829707d52c1ed3a0a17
-  data.tar.gz: b6635852aa08e28b1a7a51c84932fe9aac0baa1c
+  metadata.gz: 22d6bb7bfc0aa7590953b8286894e4d0e814d70c
+  data.tar.gz: 76f360c36de64f4ec95614b1d80fce35620841eb
 SHA512:
-  metadata.gz: 5cc6818faedb14eb6ef3d63f43bb10b5380ff4816359ec15c72a71644ee28bf979a20db5da557fff2daa09ba2431b1b6dad3b34810512573bf678b6e2dcdb161
-  data.tar.gz: 2c51998f1f4b676337e4210fdd5931ded7ab8ffe228c1ca4b00b86f7b6089fbb3a56f94572388a6d47a8b90ad7c4a12251e0bd43520fcfbe7edf4d7be86ae104
+  metadata.gz: b850a1fbc54e68271fbd7928a42cd657743d6e95c28dfecc85851f4ad26247b80c06aacac8a1339e3b6988d2d3fd8a72f32dc4c660ccf9c1cdcac862034d2f47
+  data.tar.gz: 712bd571f53ccf66ef8f26b85b66ccc979a9f65733c2197f0dd982fe0d2d3509c8f0bef48dd2cf289ca85632537e6ebde25828aafc55571e7d01d5f2ce1c72e6

data/Changelog.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.7.3 / 2014-03-23
+
+* Restore proper handling of enums in callback arguments
+* Simplify Rake configuration
+* Various small fixes
+* Remove remaining Ruby 1.8 version checks
+
 ## 0.7.2 / 2014-01-18
 
 * Officially drop Ruby 1.8 compatibility.

data/DESIGN.md

@@ -61,3 +61,28 @@ introspectable. The interface is specified in terms of structs and
 functions rather than objects and methods. For now, the hard-coded Ruby
 bindings for this don't follow the introspected specification: Gir-FFI
 cannot bootstrap itself.
+
+## Object initialization
+
+An attempt at making Thing.new less hacky.
+
+Goals:
+
+* No aliasing of Ruby's new. Overriding is possible with super being called.
+* #initialize should behave as expected. We may enforce use of super in Ruby
+  subclasses.
+
+Schematic depiction of what happens (can happen):
+
+```ruby
+class GObject::Object
+  def self.new *args
+    # Stage A
+    super(*other_args)
+    # Stage C
+  end
+
+  def initialize *other_args
+    # Stage B
+  end
+end

data/README.md

@@ -6,10 +6,18 @@ by Matijs van Zuijlen
 
 Ruby bindings for GNOME using the GObject Introspection Repository.
 
-## Features/Notes
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/gir_ffi.png)](http://badge.fury.io/rb/gir_ffi)
+[![Dependency Status](https://gemnasium.com/mvz/ruby-gir-ffi.png)](https://gemnasium.com/mvz/ruby-gir-ffi)
+[![Build Status](https://travis-ci.org/mvz/ruby-gir-ffi.png?branch=master)](https://travis-ci.org/mvz/ruby-gir-ffi)
+[![Code Climate](https://codeclimate.com/github/mvz/ruby-gir-ffi.png)](https://codeclimate.com/github/mvz/ruby-gir-ffi)
+[![Coverage Status](https://coveralls.io/repos/mvz/ruby-gir-ffi/badge.png)](https://coveralls.io/r/mvz/ruby-gir-ffi)
+
+## Features
 
 * Create bindings to any GObject-based library.
-* Bindings generated at runtime.
+* Bindings are generated at runtime.
 * Provides overridden bindings for selected methods.
 * Install `gir_ffi-gtk` and require `gir_ffi-gtk2` or `gir_ffi-gtk3` to
   load overrides for Gtk2 or Gtk3.

data/Rakefile

@@ -1,3 +1,14 @@
-load 'tasks/setup.rb'
+require 'rake/clean'
+require 'bundler/gem_tasks'
+
+begin
+  require 'repl_rake'
+  ReplRake.setup
+rescue LoadError
+end
+
+load 'tasks/test.rake'
+load 'tasks/valgrind.rake'
+load 'tasks/yard.rake'
 
 task :default => 'test:all'

data/lib/ffi-glib/array.rb

@@ -13,12 +13,11 @@ module GLib
 
     attr_reader :element_type
 
-    class << self
-      undef :new
-      def new type
-        ptr = Lib.g_array_new(0, 0, calculated_element_size(type))
-        wrap type, ptr
-      end
+    class << self; undef :new; end
+
+    def self.new type
+      ptr = Lib.g_array_new(0, 0, calculated_element_size(type))
+      wrap type, ptr
     end
 
     def append_vals ary

data/lib/ffi-glib/byte_array.rb

@@ -13,11 +13,10 @@ module GLib
       self.class.wrap(Lib.g_byte_array_append self.to_ptr, bytes, len)
     end
 
-    class << self
-      undef :new
-      def new
-        wrap(Lib.g_byte_array_new)
-      end
+    class << self; undef :new; end
+
+    def self.new
+      wrap(Lib.g_byte_array_new)
     end
   end
 end

data/lib/ffi-glib/hash_table.rb

@@ -31,9 +31,7 @@ module GLib
       ::GLib::Lib.g_hash_table_insert self.to_ptr, keyptr, valptr
     end
 
-    class << self
-      remove_method :new
-    end
+    class << self; remove_method :new; end
 
     def self.new keytype, valtype
       wrap [keytype, valtype], Lib.g_hash_table_new(

data/lib/ffi-gobject/value.rb

@@ -12,26 +12,27 @@ module GObject
       set_value val
     end
 
-    TYPE_TO_SET_METHOD_MAP = {
-      TYPE_BOOLEAN => :set_boolean,
-      TYPE_BOXED => :set_boxed,
-      TYPE_CHAR => :set_char,
-      TYPE_DOUBLE => :set_double,
-      TYPE_ENUM => :set_enum,
-      TYPE_FLOAT => :set_float,
-      TYPE_GTYPE => :set_gtype,
-      TYPE_INT64 => :set_int64,
-      TYPE_INT => :set_int,
-      TYPE_LONG => :set_long,
-      TYPE_OBJECT => :set_instance_enhanced,
-      TYPE_PARAM => :set_param,
-      TYPE_POINTER => :set_pointer,
-      TYPE_STRING => :set_string,
-      TYPE_UCHAR => :set_uchar,
-      TYPE_UINT => :set_uint,
-      TYPE_UINT64 => :set_uint64,
-      TYPE_ULONG => :set_ulong,
-      TYPE_VARIANT => :set_variant,
+    METHOD_MAP = {
+      TYPE_BOOLEAN => [:get_boolean,       :set_boolean],
+      TYPE_BOXED   => [:get_boxed,         :set_boxed],
+      TYPE_CHAR    => [:get_char,          :set_char],
+      TYPE_DOUBLE  => [:get_double,        :set_double],
+      TYPE_ENUM    => [:get_enum_enhanced, :set_enum],
+      TYPE_FLAGS   => [:get_flags,         :set_flags],
+      TYPE_FLOAT   => [:get_float,         :set_float],
+      TYPE_GTYPE   => [:get_gtype,         :set_gtype],
+      TYPE_INT     => [:get_int,           :set_int],
+      TYPE_INT64   => [:get_int64,         :set_int64],
+      TYPE_LONG    => [:get_long,          :set_long],
+      TYPE_OBJECT  => [:get_object,        :set_instance_enhanced],
+      TYPE_PARAM   => [:get_param,         :set_param],
+      TYPE_POINTER => [:get_pointer,       :set_pointer],
+      TYPE_STRING  => [:get_string,        :set_string],
+      TYPE_UCHAR   => [:get_uchar,         :set_uchar],
+      TYPE_UINT    => [:get_uint,          :set_uint],
+      TYPE_UINT64  => [:get_uint64,        :set_uint64],
+      TYPE_ULONG   => [:get_ulong,         :set_ulong],
+      TYPE_VARIANT => [:get_variant,       :set_variant]
     }
 
     def value= val
@@ -72,28 +73,6 @@ module GObject
       GObject.type_name current_gtype
     end
 
-    TYPE_TO_GET_METHOD_MAP = {
-      TYPE_BOOLEAN => :get_boolean,
-      TYPE_BOXED => :get_boxed,
-      TYPE_CHAR => :get_char,
-      TYPE_DOUBLE => :get_double,
-      TYPE_ENUM => :get_enum_enhanced,
-      TYPE_FLAGS => :get_flags,
-      TYPE_FLOAT => :get_float,
-      TYPE_GTYPE => :get_gtype,
-      TYPE_INT64 => :get_int64,
-      TYPE_INT => :get_int,
-      TYPE_LONG => :get_long,
-      TYPE_OBJECT => :get_object,
-      TYPE_POINTER => :get_pointer,
-      TYPE_STRING => :get_string,
-      TYPE_UCHAR => :get_uchar,
-      TYPE_UINT => :get_uint,
-      TYPE_UINT64 => :get_uint64,
-      TYPE_ULONG => :get_ulong,
-      TYPE_VARIANT => :get_variant,
-    }
-
     def get_value
       value = get_value_plain
       if current_fundamental_type == TYPE_BOXED
@@ -107,27 +86,25 @@ module GObject
       send get_method
     end
 
-    class << self
-      # TODO: Give more generic name
-      def wrap_ruby_value val
-        self.new.set_ruby_value val
-      end
+    # TODO: Give more generic name
+    def self.wrap_ruby_value val
+      self.new.set_ruby_value val
+    end
 
-      def from val
-        case val
-        when self
-          val
-        when nil
-          nil
-        else
-          wrap_ruby_value val
-        end
+    def self.from val
+      case val
+      when self
+        val
+      when nil
+        nil
+      else
+        wrap_ruby_value val
       end
+    end
 
-      def for_g_type g_type
-        return nil if g_type == TYPE_NONE
-        self.new.tap {|it| it.init g_type }
-      end
+    def self.for_g_type g_type
+      return nil if g_type == TYPE_NONE
+      self.new.tap {|it| it.init g_type }
     end
 
     # TODO: Combine with wrap_ruby_value
@@ -168,15 +145,16 @@ module GObject
     end
 
     def get_method
-      TYPE_TO_GET_METHOD_MAP[current_gtype] or
-        TYPE_TO_GET_METHOD_MAP[current_fundamental_type] or
-        raise "Can't find method to get #{current_gtype_name}"
+      method_map_entry.first
     end
 
     def set_method
-      TYPE_TO_SET_METHOD_MAP[current_gtype] or
-        TYPE_TO_SET_METHOD_MAP[current_fundamental_type] or
-        raise "Can't find method to set #{current_gtype_name}"
+      method_map_entry.last
+    end
+
+    def method_map_entry
+      METHOD_MAP[current_gtype] || METHOD_MAP[current_fundamental_type] ||
+        fail("No method map entry for #{current_gtype_name}")
     end
   end
 end

data/lib/ffi-gobject_introspection/i_constant_info.rb

@@ -23,7 +23,7 @@ module GObjectIntrospection
     def value
       tag = constant_type.tag
       val = value_union[TYPE_TAG_TO_UNION_MEMBER[tag]]
-      if RUBY_VERSION >= "1.9" and tag == :utf8
+      if tag == :utf8
         val.force_encoding("utf-8")
       else
         val

data/lib/gir_ffi/builder_helper.rb

@@ -1,15 +1,7 @@
 module GirFFI
   module BuilderHelper
-    def const_defined_for parent, name
-      if RUBY_VERSION < "1.9"
-        parent.const_defined? name
-      else
-        parent.const_defined? name, false
-      end
-    end
-
     def optionally_define_constant parent, name
-      if const_defined_for parent, name
+      if parent.const_defined? name, false
         parent.const_get name
       else
         parent.const_set name, yield

data/lib/gir_ffi/builders/base_type_builder.rb

@@ -37,7 +37,7 @@ module GirFFI
     end
 
     def already_set_up
-      const_defined_for klass, :GIR_FFI_BUILDER
+      klass.const_defined? :GIR_FFI_BUILDER, false
     end
 
     def gir

data/lib/gir_ffi/builders/callback_builder.rb

@@ -20,7 +20,7 @@ module GirFFI
 
       def setup_callback
         optionally_define_constant klass, :Callback do
-          lib.callback callback_sym, argument_types, return_type
+          lib.callback callback_sym, argument_ffi_types, return_ffi_type
         end
       end
 
@@ -36,12 +36,12 @@ module GirFFI
         @classname.to_sym
       end
 
-      def argument_types
-        @argument_types ||= @info.argument_ffi_types
+      def argument_ffi_types
+        @argument_ffi_types ||= @info.argument_ffi_types
       end
 
-      def return_type
-        @return_type ||= @info.return_ffi_type
+      def return_ffi_type
+        @return_ffi_type ||= @info.return_ffi_type
       end
     end
   end

data/lib/gir_ffi/builders/mapping_method_builder.rb

@@ -100,8 +100,8 @@ module GirFFI
       end
 
       def parameter_preparation
-        argument_builders.sort_by {|arg|
-          arg.type_info.array_length}.map(&:pre_conversion).flatten
+        argument_builders.sort_by.with_index {|arg, i|
+          [arg.type_info.array_length, i] }.map(&:pre_conversion).flatten
       end
 
       def capture

data/lib/gir_ffi/builders/vfunc_builder.rb

@@ -45,12 +45,12 @@ module GirFFI
         @container_info ||= info.container
       end
 
-      def argument_types
-        @argument_types ||= info.argument_ffi_types.unshift(receiver_type_info.to_ffitype)
+      def argument_ffi_types
+        @argument_ffi_types ||= info.argument_ffi_types.unshift(receiver_type_info.to_ffitype)
       end
 
-      def return_type
-        @return_type ||= info.return_ffi_type
+      def return_ffi_type
+        @return_ffi_type ||= info.return_ffi_type
       end
     end
   end

data/lib/gir_ffi/callback_base.rb

@@ -12,7 +12,8 @@ module GirFFI
 
     def self.from_native(value, _context)
       return nil if !value || value.null?
-      FFI::Function.new gir_ffi_builder.return_type, gir_ffi_builder.argument_types, value
+      FFI::Function.new(gir_ffi_builder.return_ffi_type,
+                        gir_ffi_builder.argument_ffi_types, value)
     end
 
     def self.to_native(value, _context)
@@ -50,7 +51,8 @@ module GirFFI
     def to_native
       @to_native ||= begin
                        builder = self.class.gir_ffi_builder
-                       FFI::Function.new builder.return_type, builder.argument_types, self
+                       FFI::Function.new(builder.return_ffi_type,
+                                         builder.argument_ffi_types, self)
                      end
     end
 

data/lib/gir_ffi/ffi_ext/pointer.rb

@@ -20,14 +20,8 @@ module GirFFI
         klass.direct_wrap self
       end
 
-      if RUBY_VERSION < "1.9"
-        def to_utf8
-          null? ? nil : read_string
-        end
-      else
-        def to_utf8
-          null? ? nil : read_string.force_encoding("utf-8")
-        end
+      def to_utf8
+        null? ? nil : read_string.force_encoding("utf-8")
       end
     end
   end

data/lib/gir_ffi/info_ext/i_arg_info.rb

@@ -6,6 +6,11 @@ module GirFFI
         return :pointer if direction != :in
         return argument_type.to_ffitype
       end
+
+      def to_callback_ffitype
+        return :pointer if direction != :in
+        return argument_type.to_callback_ffitype
+      end
     end
   end
 end

data/lib/gir_ffi/info_ext/i_callback_info.rb

@@ -6,8 +6,18 @@ module GirFFI
         Builder.build_class(self)
       end
 
+      def argument_ffi_types
+        args.map { |arg| arg.to_callback_ffitype }
+      end
+
       def return_ffi_type
-        return_type.to_callback_ffitype
+        result = return_type.to_callback_ffitype
+        # FIXME: Should this be in ITypeInfo#to_callback_ffitype?
+        if result == GLib::Boolean
+          :bool
+        else
+          result
+        end
       end
     end
   end

data/lib/gir_ffi/info_ext/i_signal_info.rb

@@ -16,6 +16,7 @@ module GirFFI
         # from that, instead of vice versa.
         bldr = Builders::SignalBuilder.new(self)
         wrapped = bldr.build_class.from(block)
+        # FIXME: Logically, this should use CallbackBase#to_native
         FFI::Function.new return_ffi_type, ffi_callback_argument_types, &wrapped
       end
 
@@ -44,7 +45,7 @@ module GirFFI
       # types as well?
       def ffi_callback_argument_types
         types = args.map do |arg|
-          arg.argument_type.to_callback_ffitype
+          arg.to_callback_ffitype
         end
         types.unshift(:pointer).push(:pointer)
       end

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 end

data/lib/gir_ffi.rb

@@ -15,6 +15,7 @@ require 'gir_ffi/zero_terminated'
 require 'gir_ffi/arg_helper'
 require 'gir_ffi/user_defined_type_info'
 require 'gir_ffi/builder'
+require 'gir_ffi/version'
 
 module GirFFI
   def self.setup module_name, version=nil

data/tasks/yard.rake

@@ -0,0 +1,6 @@
+begin
+  require 'yard'
+
+  YARD::Rake::YardocTask.new
+rescue LoadError
+end

data/test/base_test_helper.rb

@@ -10,6 +10,12 @@ begin
 rescue LoadError
 end
 
+begin
+  require 'coveralls'
+  Coveralls.wear!
+rescue LoadError
+end
+
 require 'minitest/autorun'
 require 'rr'
 

data/test/gir_ffi/builders/signal_builder_test.rb

@@ -70,10 +70,10 @@ describe GirFFI::Builders::SignalBuilder do
         expected = <<-CODE.reset_indentation
         def self.call_with_argument_mapping(_proc, _instance, arr, len, _user_data)
           _v1 = Regress::TestObj.wrap(_instance)
-          _v2 = GirFFI::ArgHelper::OBJECT_STORE[_user_data.address]
-          _v3 = len
-          _v4 = GirFFI::SizedArray.wrap(:guint32, _v3, arr)
-          _proc.call(_v1, _v4, _v2)
+          _v2 = len
+          _v3 = GirFFI::ArgHelper::OBJECT_STORE[_user_data.address]
+          _v4 = GirFFI::SizedArray.wrap(:guint32, _v2, arr)
+          _proc.call(_v1, _v4, _v3)
         end
         CODE
 

data/test/gir_ffi/version_test.rb

@@ -0,0 +1,7 @@
+require 'gir_ffi_test_helper'
+
+describe GirFFI::VERSION do
+  it "is set to a valid version number" do
+    GirFFI::VERSION.must_match(/\d\.\d\.\d/)
+  end
+end

data/test/integration/generated_gio_test.rb

@@ -92,5 +92,11 @@ describe "The generated Gio module" do
       pass
     end
   end
+
+  describe "the SocketSourceFunc callback" do
+    it "can be cast to a native function" do
+      Gio::SocketSourceFunc.new {|*args| p args}.to_native
+    end
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-18 00:00:00.000000000 Z
+date: 2014-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: 5.2.3
 - !ruby/object:Gem::Dependency
   name: rr
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +278,7 @@ files:
 - test/gir_ffi/builders/user_defined_builder_test.rb
 - test/gir_ffi/method_stubber_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
+- test/gir_ffi/version_test.rb
 - test/gir_ffi/ffi_ext/pointer_test.rb
 - test/gir_ffi/class_base_test.rb
 - test/gir_ffi/type_map_test.rb
@@ -319,7 +320,7 @@ files:
 - test/ffi-gobject_introspection/i_enum_info_test.rb
 - test/gir_ffi_test.rb
 - test/introspection_test_helper.rb
-- tasks/setup.rb
+- tasks/yard.rake
 - tasks/valgrind.rake
 - tasks/test.rake
 - examples/demo_ffi_nested_struct.rb
@@ -430,6 +431,7 @@ test_files:
 - test/gir_ffi/user_defined_property_info_test.rb
 - test/gir_ffi/user_defined_type_info_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
+- test/gir_ffi/version_test.rb
 - test/gir_ffi/zero_terminated_test.rb
 - test/gir_ffi_test.rb
 - test/gir_ffi_test_helper.rb

data/tasks/setup.rb

@@ -1,6 +0,0 @@
-require 'rake/clean'
-
-# Load the other rake files in the tasks folder
-tasks_dir = File.expand_path(File.dirname(__FILE__))
-rakefiles = Dir.glob(File.join(tasks_dir, '*.rake')).sort
-import(*rakefiles)