gir_ffi 0.15.3 → 0.15.4

data/lib/gir_ffi/unintrospectable_type_info.rb

@@ -56,7 +56,7 @@ module GirFFI
 
     # TODO: Create custom class that includes the interfaces instead
     def class_struct
-      parent.class_struct
+      nil
     end
   end
 end

data/lib/gir_ffi/union_base.rb

@@ -4,14 +4,6 @@ require "gir_ffi/boxed_base"
 
 module GirFFI
   # Base class for generated classes representing GLib unions.
-  class UnionBase < ClassBase
-    extend FFI::DataConverter
-    include GirFFI::StructLikeBase
-
-    def initialize
-      @struct = self.class::Struct.new
-      @struct.owned = true
-      @struct.to_ptr.autorelease = false
-    end
+  class UnionBase < StructLikeBase
   end
 end

data/lib/gir_ffi/user_defined_object_info.rb

@@ -13,6 +13,8 @@ module GirFFI
       @klass = klass
       @properties = []
       @vfunc_implementations = []
+
+      # FIXME: Limit access to only install_property and install_vfunc_implementation.
       yield self if block_given?
     end
 
@@ -25,7 +27,6 @@ module GirFFI
     end
 
     def install_vfunc_implementation(name, implementation = nil)
-      implementation ||= ->(obj, *args) { obj.public_send name, *args }
       @vfunc_implementations << VFuncImplementation.new(name, implementation)
     end
 
@@ -51,7 +52,7 @@ module GirFFI
 
     # TODO: Create custom class that includes the interfaces instead
     def class_struct
-      parent.class_struct
+      nil
     end
 
     def interfaces

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = "0.15.3"
+  VERSION = "0.15.4"
 end

data/lib/gir_ffi/vfunc_implementation.rb

@@ -6,6 +6,7 @@ module GirFFI
     attr_reader :name, :implementation
 
     def initialize(name, implementation)
+      implementation ||= ->(obj, *args) { obj.public_send name, *args }
       @name = name
       @implementation = implementation
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.15.3
+  version: 0.15.4
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-06-14 00:00:00.000000000 Z
+date: 2020-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rake-manifest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
@@ -108,25 +122,81 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.1
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.18.0
-description: |2
-      GirFFI creates bindings for GObject-based libraries at runtime based on introspection
-      data provided by the GObject Introspection Repository (GIR) system. Bindings are created
-      at runtime and use FFI to interface with the C libraries. In cases where the GIR does not
-      provide enough or correct information to create sane bindings, overrides may be created.
+        version: 0.19.0
+description: |
+  GirFFI creates bindings for GObject-based libraries at runtime based on introspection
+  data provided by the GObject Introspection Repository (GIR) system. Bindings are created
+  at runtime and use FFI to interface with the C libraries. In cases where the GIR does not
+  provide enough or correct information to create sane bindings, overrides may be created.
 email:
 - matijs@matijs.net
 executables: []
@@ -140,10 +210,10 @@ files:
 - COPYING.LIB
 - Changelog.md
 - DESIGN.md
-- Gemfile
 - README.md
-- Rakefile
 - TODO.md
+- docs/Documentation.md
+- docs/Subclassing.md
 - examples/clutter.rb
 - examples/main_loop.rb
 - lib/ffi-glib.rb
@@ -216,6 +286,7 @@ files:
 - lib/gir_ffi/builders/callback_argument_builder.rb
 - lib/gir_ffi/builders/callback_builder.rb
 - lib/gir_ffi/builders/callback_return_value_builder.rb
+- lib/gir_ffi/builders/class_struct_builder.rb
 - lib/gir_ffi/builders/closure_argument_builder.rb
 - lib/gir_ffi/builders/closure_convertor.rb
 - lib/gir_ffi/builders/closure_return_value_builder.rb
@@ -319,134 +390,13 @@ files:
 - lib/gir_ffi/version.rb
 - lib/gir_ffi/vfunc_implementation.rb
 - lib/gir_ffi/zero_terminated.rb
-- tasks/test.rake
-- test/base_test_helper.rb
-- test/ffi-glib/array_test.rb
-- test/ffi-glib/byte_array_test.rb
-- test/ffi-glib/bytes_test.rb
-- test/ffi-glib/closure_test.rb
-- test/ffi-glib/destroy_notify_test.rb
-- test/ffi-glib/hash_table_test.rb
-- test/ffi-glib/list_test.rb
-- test/ffi-glib/main_loop_test.rb
-- test/ffi-glib/ptr_array_test.rb
-- test/ffi-glib/ruby_closure_test.rb
-- test/ffi-glib/s_list_test.rb
-- test/ffi-glib/strv_test.rb
-- test/ffi-glib/variant_test.rb
-- test/ffi-gobject/gobject_test.rb
-- test/ffi-gobject/object_class_test.rb
-- test/ffi-gobject/object_test.rb
-- test/ffi-gobject/param_spec_test.rb
-- test/ffi-gobject/value_test.rb
-- test/ffi-gobject_introspection/gobject_type_init_test.rb
-- test/ffi-gobject_introspection/i_base_info_test.rb
-- test/ffi-gobject_introspection/i_constant_info_test.rb
-- test/ffi-gobject_introspection/i_enum_info_test.rb
-- test/ffi-gobject_introspection/i_function_info_test.rb
-- test/ffi-gobject_introspection/i_interface_info_test.rb
-- test/ffi-gobject_introspection/i_object_info_test.rb
-- test/ffi-gobject_introspection/i_property_info_test.rb
-- test/ffi-gobject_introspection/i_registered_type_info_test.rb
-- test/ffi-gobject_introspection/i_repository_test.rb
-- test/ffi-gobject_introspection/i_struct_info_test.rb
-- test/ffi-gobject_introspection/i_type_info_test.rb
-- test/ffi-gobject_introspection/i_union_info_test.rb
-- test/ffi-gobject_introspection/i_vfunc_info_test.rb
-- test/ffi-gobject_introspection/lib_test.rb
-- test/ffi-gobject_introspection/strv_test.rb
-- test/ffi-gobject_test.rb
-- test/gir_ffi/allocation_helper_test.rb
-- test/gir_ffi/arg_helper_test.rb
-- test/gir_ffi/boolean_test.rb
-- test/gir_ffi/boxed_base_test.rb
-- test/gir_ffi/builder_test.rb
-- test/gir_ffi/builders/argument_builder_test.rb
-- test/gir_ffi/builders/base_argument_builder_test.rb
-- test/gir_ffi/builders/callback_argument_builder_test.rb
-- test/gir_ffi/builders/callback_builder_test.rb
-- test/gir_ffi/builders/callback_return_value_builder_test.rb
-- test/gir_ffi/builders/constant_builder_test.rb
-- test/gir_ffi/builders/constructor_builder_test.rb
-- test/gir_ffi/builders/enum_builder_test.rb
-- test/gir_ffi/builders/field_builder_test.rb
-- test/gir_ffi/builders/function_builder_test.rb
-- test/gir_ffi/builders/initializer_builder_test.rb
-- test/gir_ffi/builders/interface_builder_test.rb
-- test/gir_ffi/builders/module_builder_test.rb
-- test/gir_ffi/builders/object_builder_test.rb
-- test/gir_ffi/builders/property_builder_test.rb
-- test/gir_ffi/builders/registered_type_builder_test.rb
-- test/gir_ffi/builders/return_value_builder_test.rb
-- test/gir_ffi/builders/signal_closure_builder_test.rb
-- test/gir_ffi/builders/struct_builder_test.rb
-- test/gir_ffi/builders/unintrospectable_boxed_builder_test.rb
-- test/gir_ffi/builders/unintrospectable_builder_test.rb
-- test/gir_ffi/builders/union_builder_test.rb
-- test/gir_ffi/builders/user_defined_builder_test.rb
-- test/gir_ffi/builders/vfunc_argument_builder_test.rb
-- test/gir_ffi/builders/vfunc_builder_test.rb
-- test/gir_ffi/callback_base_test.rb
-- test/gir_ffi/class_base_test.rb
-- test/gir_ffi/core_test.rb
-- test/gir_ffi/enum_base_test.rb
-- test/gir_ffi/error_type_info_test.rb
-- test/gir_ffi/ffi_ext/pointer_test.rb
-- test/gir_ffi/g_type_test.rb
-- test/gir_ffi/in_pointer_test.rb
-- test/gir_ffi/info_ext/i_callable_info_test.rb
-- test/gir_ffi/info_ext/i_callback_info_test.rb
-- test/gir_ffi/info_ext/i_field_info_test.rb
-- test/gir_ffi/info_ext/i_function_info_test.rb
-- test/gir_ffi/info_ext/i_signal_info_test.rb
-- test/gir_ffi/info_ext/i_type_info_test.rb
-- test/gir_ffi/info_ext/i_unresolved_info_test.rb
-- test/gir_ffi/info_ext/safe_constant_name_test.rb
-- test/gir_ffi/info_ext/safe_function_name_test.rb
-- test/gir_ffi/interface_base_test.rb
-- test/gir_ffi/method_stubber_test.rb
-- test/gir_ffi/object_base_test.rb
-- test/gir_ffi/object_store_test.rb
-- test/gir_ffi/receiver_argument_info_test.rb
-- test/gir_ffi/sized_array_test.rb
-- test/gir_ffi/struct_base_test.rb
-- test/gir_ffi/struct_like_base_test.rb
-- test/gir_ffi/type_map_test.rb
-- test/gir_ffi/unintrospectable_type_info_test.rb
-- test/gir_ffi/union_base_test.rb
-- test/gir_ffi/user_defined_object_info_test.rb
-- test/gir_ffi/user_defined_property_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_helper.rb
-- test/integration/callback_exceptions_test.rb
-- test/integration/derived_classes_test.rb
-- test/integration/generated_everything_test.rb
-- test/integration/generated_gimarshallingtests_test.rb
-- test/integration/generated_gio_test.rb
-- test/integration/generated_glib_test.rb
-- test/integration/generated_gobject_test.rb
-- test/integration/generated_gst_test.rb
-- test/integration/generated_gtk_source_test.rb
-- test/integration/generated_gtop_test.rb
-- test/integration/generated_pango_ft2_test.rb
-- test/integration/generated_pango_test.rb
-- test/integration/generated_regress_test.rb
-- test/integration/generated_secret_test.rb
-- test/integration/generated_utility_test.rb
-- test/integration/generated_warnlib_test.rb
-- test/integration/method_lookup_test.rb
-- test/introspection_test_helper.rb
-- test/lib/Makefile.am
-- test/lib/autogen.sh
-- test/lib/configure.ac
-- test/lib/m4/jhflags.m4
-- test/minitest/stats_plugin.rb
 homepage: http://www.github.com/mvz/ruby-gir-ffi
 licenses:
 - LGPL-2.1+
-metadata: {}
+metadata:
+  homepage_uri: http://www.github.com/mvz/ruby-gir-ffi
+  source_code_uri: https://github.com/mvz/gir_ffi
+  changelog_uri: https://github.com/mvz/gir_ffi/blob/master/Changelog.md
 post_install_message: 
 rdoc_options:
 - "--main"

data/Gemfile

@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# The gem's dependencies are specified in gir_ffi.gemspec
-gemspec
-
-gem "pry", "~> 0.13.0"
-gem "ruby-prof", platform: :mri
-gem "test-prof", platform: :mri
-
-if ENV["CI"]
-  gem "coveralls", group: :development if ENV["TRAVIS_RUBY_VERSION"] == "2.4"
-end

data/Rakefile

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-require "rake/clean"
-require "bundler/gem_tasks"
-
-load "tasks/test.rake"
-
-task default: "test:all"
-task default: "test:features"

data/tasks/test.rake

@@ -1,204 +0,0 @@
-# frozen_string_literal: true
-
-require 'rake/testtask'
-require 'cucumber/rake/task'
-
-require 'rexml/document'
-require 'rexml/streamlistener'
-
-# Listener class used to process GIR xml data, for creating test stubs.
-class Listener
-  include REXML::StreamListener
-
-  def initialize
-    @inside_class = false
-    @stack = []
-    @skip_state = []
-  end
-
-  attr_accessor :result
-  attr_accessor :namespace
-
-  def tag_start(name, attrs)
-    @stack.push [name, attrs]
-    if @skip_state.last || skippable?(attrs)
-      @skip_state.push true
-      return
-    else
-      @skip_state.push false
-    end
-
-    obj_name = attrs['name']
-    case name
-    when 'constant'
-      result.puts "  it 'has the constant #{obj_name}' do"
-    when 'record', 'class', 'enumeration', 'bitfield', 'interface', 'union'
-      result.puts "  describe '#{namespace}::#{obj_name}' do"
-      @inside_class = name
-    when 'constructor'
-      result.puts "    it 'creates an instance using ##{obj_name}' do"
-    when 'field'
-      if @inside_class != 'class'
-        if attrs['private'] == '1'
-          result.puts "    it 'has a private field #{obj_name}' do"
-        elsif attrs['writable'] == '1'
-          result.puts "    it 'has a writable field #{obj_name}' do"
-        else
-          result.puts "    it 'has a read-only field #{obj_name}' do"
-        end
-      end
-    when 'function', 'method'
-      spaces = @inside_class ? '  ' : ''
-      result.puts "  #{spaces}it 'has a working #{name} ##{obj_name}' do"
-    when 'member'
-      result.puts "    it 'has the member :#{obj_name}' do"
-    when 'namespace'
-      result.puts "describe #{obj_name} do"
-    when 'property'
-      accessor_name = obj_name.tr('-', '_')
-      result.puts "    describe \"its '#{obj_name}' property\" do"
-      result.puts "      it 'can be retrieved with #get_property' do"
-      result.puts '      end'
-      result.puts "      it 'can be retrieved with ##{accessor_name}' do"
-      result.puts '      end'
-      if attrs['writable'] == '1'
-        result.puts "      it 'can be set with #set_property' do"
-        result.puts '      end'
-        result.puts "      it 'can be set with ##{accessor_name}=' do"
-        result.puts '      end'
-      end
-    when 'glib:signal'
-      result.puts "    it \"handles the '#{obj_name}' signal\" do"
-    when 'type', 'alias', 'return-value', 'parameters',
-      'instance-parameter', 'parameter', 'doc', 'array',
-      'repository', 'include', 'package', 'source-position'
-      # Not printed"
-    else
-      puts "Skipping #{name}: #{attrs}"
-    end
-  end
-
-  def tag_end(name)
-    org_name, = *@stack.pop
-    skipping = @skip_state.pop
-    raise "Expected #{org_name}, got #{name}" if org_name != name
-    return if skipping
-
-    case name
-    when 'constant'
-      result.puts '  end'
-    when 'record', 'class', 'enumeration', 'bitfield',
-      'interface', 'union'
-      result.puts '  end'
-      @inside_class = false
-    when 'function', 'method'
-      if @inside_class
-        result.puts '    end'
-      else
-        result.puts '  end'
-      end
-    when 'constructor', 'member', 'property', 'glib:signal'
-      result.puts '    end'
-    when 'field'
-      result.puts '    end' if @inside_class != 'class'
-    when 'namespace'
-      result.puts 'end'
-    end
-  end
-
-  def skippable?(attrs)
-    return true if attrs['disguised'] == '1'
-    return true if attrs['introspectable'] == '0'
-    return true if attrs['glib:is-gtype-struct-for']
-
-    false
-  end
-end
-
-namespace :test do
-  def define_test_task(name)
-    Rake::TestTask.new(name) do |t|
-      t.libs = ['lib']
-      t.ruby_opts += ['-w -Itest']
-      yield t
-    end
-  end
-
-  define_test_task(:base) do |t|
-    t.test_files = FileList['test/gir_ffi-base/**/*_test.rb']
-  end
-
-  define_test_task(:introspection) do |t|
-    t.test_files = FileList['test/ffi-gobject_introspection/**/*_test.rb']
-  end
-
-  define_test_task(:main) do |t|
-    t.test_files = FileList['test/gir_ffi/**/*_test.rb']
-  end
-
-  define_test_task(:overrides) do |t|
-    t.test_files = FileList['test/ffi-gobject_test.rb',
-                            'test/ffi-glib/**/*_test.rb',
-                            'test/ffi-gobject/**/*_test.rb']
-  end
-
-  define_test_task(:integration) do |t|
-    t.test_files = FileList['test/integration/**/*_test.rb']
-  end
-
-  desc 'Build test libraries and typelibs'
-  task lib: 'test/lib/Makefile' do
-    sh %(cd test/lib && make)
-  end
-
-  task introspection: :lib
-  task main: :lib
-  task overrides: :lib
-  task integration: :lib
-
-  desc 'Run the entire test suite as one with simplecov activated'
-  define_test_task(:all) do |t|
-    t.test_files = FileList['test/**/*_test.rb']
-    t.ruby_opts += ['-rbundler/setup -rsimplecov -w -Itest']
-  end
-
-  task all: :lib
-
-  desc 'Run all individual test suites separately'
-  task suites: [:base,
-                :introspection,
-                :main,
-                :overrides,
-                :integration]
-
-  def make_stub_file(libname)
-    file = File.new "test/lib/#{libname}-1.0.gir"
-    listener = Listener.new
-    listener.result = File.open("tmp/#{libname.downcase}_lines.rb", 'w')
-    listener.namespace = libname
-    REXML::Document.parse_stream file, listener
-  end
-
-  desc 'Create stubs for integration tests'
-  task stub: :lib do
-    make_stub_file 'Everything'
-    make_stub_file 'GIMarshallingTests'
-    make_stub_file 'Regress'
-    make_stub_file 'Utility'
-    make_stub_file 'WarnLib'
-  end
-
-  Cucumber::Rake::Task.new(:features) do |t|
-    t.cucumber_opts = 'features --format pretty'
-  end
-end
-
-file 'test/lib/Makefile' => 'test/lib/configure' do
-  sh %(cd test/lib && ./configure --enable-maintainer-mode)
-end
-
-file 'test/lib/configure' => ['test/lib/autogen.sh', 'test/lib/configure.ac'] do
-  sh %(cd test/lib && ./autogen.sh)
-end
-
-task test: 'test:all'