gir_ffi 0.6.6 → 0.6.7

data/test/integration/generated_secret_test.rb

@@ -8,7 +8,8 @@ describe "The generated Secret module" do
       rescue
         skip "No GIR data for Secret available"
       end
-      Secret::Schema.new("foo", :none, "bar" => :string)
+      instance = Secret::Schema.new("foo", :none, "bar" => :string)
+      instance.must_be_instance_of Secret::Schema
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-05 00:00:00.000000000 Z
+date: 2013-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 10.0.3
+        version: '10.1'
 description: 
 email:
 - matijs@matijs.net
@@ -106,49 +106,56 @@ files:
 - lib/ffi-gobject_introspection.rb
 - lib/gir_ffi.rb
 - lib/gir_ffi/lib_c.rb
-- lib/gir_ffi/builder/type/constant.rb
-- lib/gir_ffi/builder/type/union.rb
-- lib/gir_ffi/builder/type/base.rb
-- lib/gir_ffi/builder/type/callback.rb
-- lib/gir_ffi/builder/type/user_defined.rb
-- lib/gir_ffi/builder/type/unintrospectable.rb
-- lib/gir_ffi/builder/type/object.rb
-- lib/gir_ffi/builder/type/with_methods.rb
-- lib/gir_ffi/builder/type/with_layout.rb
-- lib/gir_ffi/builder/type/enum.rb
-- lib/gir_ffi/builder/type/interface.rb
-- lib/gir_ffi/builder/type/registered_type.rb
-- lib/gir_ffi/builder/type/struct.rb
-- lib/gir_ffi/builder/field.rb
-- lib/gir_ffi/builder/type.rb
-- lib/gir_ffi/builder/module.rb
-- lib/gir_ffi/builder/property.rb
 - lib/gir_ffi/method_stubber.rb
 - lib/gir_ffi/arg_helper.rb
 - lib/gir_ffi/info_ext.rb
+- lib/gir_ffi/struct_base.rb
 - lib/gir_ffi/allocation_helper.rb
 - lib/gir_ffi/ffi_ext.rb
 - lib/gir_ffi/type_map.rb
+- lib/gir_ffi/signal_base.rb
 - lib/gir_ffi/zero_terminated.rb
 - lib/gir_ffi/unintrospectable_type_info.rb
-- lib/gir_ffi/callback.rb
+- lib/gir_ffi/builders/enum_builder.rb
+- lib/gir_ffi/builders/registered_type_builder.rb
+- lib/gir_ffi/builders/constant_builder.rb
+- lib/gir_ffi/builders/mapping_method_builder.rb
+- lib/gir_ffi/builders/struct_builder.rb
+- lib/gir_ffi/builders/argument_builder.rb
+- lib/gir_ffi/builders/error_argument_builder.rb
+- lib/gir_ffi/builders/signal_builder.rb
+- lib/gir_ffi/builders/type_builder.rb
+- lib/gir_ffi/builders/union_builder.rb
+- lib/gir_ffi/builders/return_value_builder.rb
+- lib/gir_ffi/builders/property_builder.rb
+- lib/gir_ffi/builders/unintrospectable_builder.rb
+- lib/gir_ffi/builders/interface_builder.rb
+- lib/gir_ffi/builders/with_methods.rb
+- lib/gir_ffi/builders/with_layout.rb
+- lib/gir_ffi/builders/callback_builder.rb
+- lib/gir_ffi/builders/null_argument_builder.rb
+- lib/gir_ffi/builders/user_defined_builder.rb
+- lib/gir_ffi/builders/null_builder.rb
+- lib/gir_ffi/builders/field_builder.rb
+- lib/gir_ffi/builders/module_builder.rb
+- lib/gir_ffi/builders/base_argument_builder.rb
+- lib/gir_ffi/builders/base_type_builder.rb
+- lib/gir_ffi/builders/object_builder.rb
+- lib/gir_ffi/builders/function_builder.rb
 - lib/gir_ffi/user_defined_property_info.rb
-- lib/gir_ffi/argument_builder.rb
-- lib/gir_ffi/error_argument_builder.rb
 - lib/gir_ffi/ffi_ext/pointer.rb
 - lib/gir_ffi/setter_argument_info.rb
 - lib/gir_ffi/builder_helper.rb
 - lib/gir_ffi/variable_name_generator.rb
 - lib/gir_ffi/in_pointer.rb
 - lib/gir_ffi/enum_base.rb
-- lib/gir_ffi/return_value_builder.rb
+- lib/gir_ffi/callback_base.rb
+- lib/gir_ffi/type_base.rb
+- lib/gir_ffi/union_base.rb
 - lib/gir_ffi/in_out_pointer.rb
 - lib/gir_ffi/version.rb
-- lib/gir_ffi/null_argument_builder.rb
-- lib/gir_ffi/callback_helper.rb
 - lib/gir_ffi/builder.rb
 - lib/gir_ffi/interface_base.rb
-- lib/gir_ffi/info_ext/i_struct_info.rb
 - lib/gir_ffi/info_ext/i_arg_info.rb
 - lib/gir_ffi/info_ext/i_type_info.rb
 - lib/gir_ffi/info_ext/i_function_info.rb
@@ -156,23 +163,19 @@ files:
 - lib/gir_ffi/info_ext/i_field_info.rb
 - lib/gir_ffi/info_ext/safe_constant_name.rb
 - lib/gir_ffi/info_ext/i_property_info.rb
-- lib/gir_ffi/info_ext/i_enum_info.rb
 - lib/gir_ffi/info_ext/i_signal_info.rb
 - lib/gir_ffi/info_ext/safe_function_name.rb
-- lib/gir_ffi/info_ext/i_union_info.rb
-- lib/gir_ffi/info_ext/i_object_info.rb
 - lib/gir_ffi/info_ext/i_registered_type_info.rb
 - lib/gir_ffi/module_base.rb
-- lib/gir_ffi/base_argument_builder.rb
 - lib/gir_ffi/user_defined_type_info.rb
 - lib/gir_ffi/class_base.rb
 - lib/gir_ffi/object_base.rb
-- lib/gir_ffi/function_builder.rb
 - lib/gir_ffi-base/gir_ffi/library.rb
+- lib/gir_ffi-base/gir_ffi/struct.rb
 - lib/gir_ffi-base/gobject/lib.rb
+- lib/gir_ffi-base/gobject.rb
 - lib/gir_ffi-base/glib/boolean.rb
 - lib/gir_ffi-base/glib/strv.rb
-- lib/ffi-gobject/ruby_style.rb
 - lib/ffi-gobject/ruby_closure.rb
 - lib/ffi-gobject/base.rb
 - lib/ffi-gobject/object.rb
@@ -229,16 +232,7 @@ files:
 - test/integration/generated_pango_test.rb
 - test/integration/generated_secret_test.rb
 - test/integration/generated_gobject_test.rb
-- test/gir_ffi/builder/type/user_defined_test.rb
-- test/gir_ffi/builder/type/enum_test.rb
-- test/gir_ffi/builder/type/constant_test.rb
-- test/gir_ffi/builder/type/object_test.rb
-- test/gir_ffi/builder/type/struct_test.rb
-- test/gir_ffi/builder/type/callback_test.rb
-- test/gir_ffi/builder/type/union_test.rb
-- test/gir_ffi/builder/type/unintrospectable_test.rb
-- test/gir_ffi/builder/type/interface_test.rb
-- test/gir_ffi/builder/module_test.rb
+- test/gir_ffi/callback_base_test.rb
 - test/gir_ffi/user_defined_property_info_test.rb
 - test/gir_ffi/zero_terminated_test.rb
 - test/gir_ffi/object_base_test.rb
@@ -246,24 +240,33 @@ files:
 - test/gir_ffi/in_pointer_test.rb
 - test/gir_ffi/in_out_pointer_test.rb
 - test/gir_ffi/arg_helper_test.rb
-- test/gir_ffi/function_builder_test.rb
+- test/gir_ffi/builders/field_builder_test.rb
+- test/gir_ffi/builders/signal_builder_test.rb
+- test/gir_ffi/builders/enum_builder_test.rb
+- test/gir_ffi/builders/constant_builder_test.rb
+- test/gir_ffi/builders/unintrospectable_builder_test.rb
+- test/gir_ffi/builders/function_builder_test.rb
+- test/gir_ffi/builders/base_argument_builder_test.rb
+- test/gir_ffi/builders/struct_builder_test.rb
+- test/gir_ffi/builders/union_builder_test.rb
+- test/gir_ffi/builders/callback_builder_test.rb
+- test/gir_ffi/builders/argument_builder_test.rb
+- test/gir_ffi/builders/return_value_builder_test.rb
+- test/gir_ffi/builders/interface_builder_test.rb
+- test/gir_ffi/builders/object_builder_test.rb
+- test/gir_ffi/builders/module_builder_test.rb
+- test/gir_ffi/builders/user_defined_builder_test.rb
 - test/gir_ffi/variable_name_generator_test.rb
-- test/gir_ffi/callback_helper_test.rb
-- test/gir_ffi/callback_test.rb
-- test/gir_ffi/base_argument_builder_test.rb
+- test/gir_ffi/ffi_ext/pointer_test.rb
 - test/gir_ffi/class_base_test.rb
 - test/gir_ffi/type_map_test.rb
-- test/gir_ffi/argument_builder_test.rb
-- test/gir_ffi/return_value_builder_test.rb
 - test/gir_ffi/user_defined_type_info_test.rb
 - test/gir_ffi/unintrospectable_type_info_test.rb
 - test/gir_ffi/info_ext/i_callable_info_test.rb
 - test/gir_ffi/info_ext/i_type_info_test.rb
-- test/gir_ffi/info_ext/i_arg_info_test.rb
 - test/gir_ffi/info_ext/i_signal_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/info_ext/i_object_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/interface_base_test.rb
@@ -273,7 +276,6 @@ files:
 - test/ffi-gobject/object_test.rb
 - test/ffi-gobject/gobject_test.rb
 - test/ffi-gobject/value_test.rb
-- test/ffi-gobject/ruby_style_test.rb
 - test/base_test_helper.rb
 - test/ffi-glib/s_list_test.rb
 - test/ffi-glib/hash_table_test.rb
@@ -350,7 +352,6 @@ test_files:
 - test/ffi-gobject/gobject_test.rb
 - test/ffi-gobject/object_class_test.rb
 - test/ffi-gobject/object_test.rb
-- test/ffi-gobject/ruby_style_test.rb
 - test/ffi-gobject/value_test.rb
 - test/ffi-gobject_introspection/i_base_info_test.rb
 - test/ffi-gobject_introspection/i_constant_info_test.rb
@@ -363,37 +364,37 @@ test_files:
 - test/gir_ffi-base/glib/boolean_test.rb
 - test/gir_ffi-base/glib/strv_test.rb
 - test/gir_ffi/arg_helper_test.rb
-- test/gir_ffi/argument_builder_test.rb
-- test/gir_ffi/base_argument_builder_test.rb
-- test/gir_ffi/builder/module_test.rb
-- test/gir_ffi/builder/type/callback_test.rb
-- test/gir_ffi/builder/type/constant_test.rb
-- test/gir_ffi/builder/type/enum_test.rb
-- test/gir_ffi/builder/type/interface_test.rb
-- test/gir_ffi/builder/type/object_test.rb
-- test/gir_ffi/builder/type/struct_test.rb
-- test/gir_ffi/builder/type/unintrospectable_test.rb
-- test/gir_ffi/builder/type/union_test.rb
-- test/gir_ffi/builder/type/user_defined_test.rb
 - test/gir_ffi/builder_test.rb
-- test/gir_ffi/callback_helper_test.rb
-- test/gir_ffi/callback_test.rb
+- test/gir_ffi/builders/argument_builder_test.rb
+- test/gir_ffi/builders/base_argument_builder_test.rb
+- test/gir_ffi/builders/callback_builder_test.rb
+- test/gir_ffi/builders/constant_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/interface_builder_test.rb
+- test/gir_ffi/builders/module_builder_test.rb
+- test/gir_ffi/builders/object_builder_test.rb
+- test/gir_ffi/builders/return_value_builder_test.rb
+- test/gir_ffi/builders/signal_builder_test.rb
+- test/gir_ffi/builders/struct_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/callback_base_test.rb
 - test/gir_ffi/class_base_test.rb
-- test/gir_ffi/function_builder_test.rb
+- test/gir_ffi/ffi_ext/pointer_test.rb
 - test/gir_ffi/in_out_pointer_test.rb
 - test/gir_ffi/in_pointer_test.rb
-- test/gir_ffi/info_ext/i_arg_info_test.rb
 - test/gir_ffi/info_ext/i_callable_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_object_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/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/object_base_test.rb
-- test/gir_ffi/return_value_builder_test.rb
 - test/gir_ffi/type_map_test.rb
 - test/gir_ffi/unintrospectable_type_info_test.rb
 - test/gir_ffi/user_defined_property_info_test.rb

data/lib/ffi-gobject/ruby_style.rb

@@ -1,23 +0,0 @@
-module GObject
-
-  module RubyStyle
-
-    # TODO: Generate accessor methods from GIR at class definition time
-    def method_missing(method, *args)
-      if respond_to?("get_#{method}")
-        return send("get_#{method}", *args)
-      end
-      if method.to_s =~ /(.*)=$/ && respond_to?("set_#{$1}")
-        return send("set_#{$1}", *args)
-      end
-      super
-    end
-
-    # TODO: Move to definition of GObject::Object
-    def signal_connect(event, &block)
-      GObject.signal_connect(self, event, &block)
-    end
-
-  end
-
-end

data/lib/gir_ffi/argument_builder.rb

@@ -1,154 +0,0 @@
-require 'gir_ffi/base_argument_builder'
-
-module GirFFI
-  # Implements building pre- and post-processing statements for arguments.
-  class ArgumentBuilder < BaseArgumentBuilder
-    def initialize var_gen, arginfo
-      super var_gen, arginfo.name, arginfo.argument_type, arginfo.direction
-      @arginfo = arginfo
-    end
-
-    def inarg
-      if has_input_value?
-        @array_arg.nil? ? @name : nil
-      end
-    end
-
-    def retname
-      if has_output_value?
-        @retname ||= @var_gen.new_var
-      end
-    end
-
-    def pre
-      pr = []
-      if has_input_value?
-        pr << fixed_array_size_check if needs_size_check?
-        pr << array_length_assignment if is_array_length_parameter?
-      end
-      pr << set_function_call_argument
-      pr
-    end
-
-    def post
-      if has_output_value?
-        value = output_value
-        ["#{retname} = #{value}"]
-      else
-        []
-      end
-    end
-
-    private
-
-    def output_value
-      if is_caller_allocated_object?
-        callarg
-      elsif needs_outgoing_parameter_conversion?
-        case specialized_type_tag
-        when :enum, :flags
-          "#{argument_class_name}[#{output_conversion_arguments}]"
-        when :utf8
-          "ArgHelper.ptr_to_utf8 #{callarg}.to_value"
-        else
-          "#{argument_class_name}.wrap(#{output_conversion_arguments})"
-        end
-      else
-        "#{callarg}.to_value"
-      end
-    end
-
-    def is_array_length_parameter?
-      @array_arg
-    end
-
-    def needs_size_check?
-      specialized_type_tag == :c && type_info.array_fixed_size > -1
-    end
-
-    def fixed_array_size_check
-      size = type_info.array_fixed_size
-      "GirFFI::ArgHelper.check_fixed_array_size #{size}, #{@name}, \"#{@name}\""
-    end
-
-    def has_output_value?
-      @direction == :inout || @direction == :out
-    end
-
-    def has_input_value?
-      @direction == :inout || @direction == :in
-    end
-
-    def array_length_assignment
-      arrname = @array_arg.name
-      "#{@name} = #{arrname}.nil? ? 0 : #{arrname}.length"
-    end
-
-    def set_function_call_argument
-      value = if @direction == :out
-                if is_caller_allocated_object?
-                  if specialized_type_tag == :array
-                    "#{argument_class_name}.new #{elm_t}"
-                  else
-                    "#{argument_class_name}.new"
-                  end
-                else
-                  "GirFFI::InOutPointer.for #{specialized_type_tag.inspect}"
-                end
-              else
-                if needs_ingoing_parameter_conversion?
-                  ingoing_parameter_conversion
-                else
-                  @name
-                end
-              end
-      "#{callarg} = #{value}"
-    end
-
-    def is_caller_allocated_object?
-      [ :struct, :array ].include?(specialized_type_tag) &&
-        @arginfo.caller_allocates?
-    end
-
-    def needs_outgoing_parameter_conversion?
-      [ :array, :c, :enum, :error, :flags, :ghash, :glist, :gslist, :object,
-        :ptr_array, :struct, :strv, :utf8 ].include?(specialized_type_tag)
-    end
-
-    def needs_ingoing_parameter_conversion?
-      @direction == :inout ||
-        [ :array, :c, :callback, :ghash, :glist, :gslist, :object, :ptr_array,
-          :struct, :strv, :utf8, :void, :zero_terminated ].include?(specialized_type_tag)
-    end
-
-    def ingoing_parameter_conversion
-      case specialized_type_tag
-      when :enum, :flags
-        base = "#{argument_class_name}[#{parameter_conversion_arguments}]"
-      when :array, :c, :callback, :ghash, :glist, :gslist, :object, :ptr_array,
-        :struct, :strv, :utf8, :void, :zero_terminated
-        base = "#{argument_class_name}.from(#{parameter_conversion_arguments})"
-      else
-        base = "#{parameter_conversion_arguments}"
-      end
-
-      if has_output_value?
-        "GirFFI::InOutPointer.from #{specialized_type_tag.inspect}, #{base}"
-      else
-        base
-      end
-    end
-
-    def output_conversion_arguments
-      if specialized_type_tag == :c
-        "#{subtype_tag_or_class_name}, #{array_size}, #{callarg}.to_value"
-      else
-        conversion_arguments "#{callarg}.to_value"
-      end
-    end
-
-    def parameter_conversion_arguments
-      conversion_arguments @name
-    end
-  end
-end