gir_ffi 0.6.2 → 0.6.3

data/History.txt

@@ -1,3 +1,8 @@
+== 0.6.3 / 2013-06-15
+
+* Make use of enums as element type for GHashTable and other containers
+  work
+
 == 0.6.2 / 2013-06-14
 
 * Handle introspectable types with introspectable parent types

data/lib/gir_ffi/builder/type/enum.rb

@@ -25,7 +25,18 @@ module GirFFI
           @klass = optionally_define_constant namespace_module, @classname do
             lib.enum(enum_sym, value_spec)
           end
-          setup_gtype_getter unless already_set_up
+          unless already_set_up
+            setup_gtype_getter
+            setup_inspect
+          end
+        end
+
+        def setup_inspect
+          @klass.instance_eval <<-EOS
+            def self.inspect
+              "#{@namespace}::#{@classname}"
+            end
+          EOS
         end
 
         def already_set_up

data/lib/gir_ffi/in_pointer.rb

@@ -24,6 +24,8 @@ module GirFFI
         from_utf8 val
       when :gint32, :gint8
         self.new val
+      when FFI::Enum
+        self.new type[val]
       when :void
         ArgHelper.object_to_inptr val
       else

data/lib/gir_ffi/version.rb

@@ -1,3 +1,3 @@
 module GirFFI
-  VERSION = "0.6.2"
+  VERSION = "0.6.3"
 end

data/test/gir_ffi/builder/type/enum_test.rb

@@ -1,5 +1,21 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builder::Type::Enum do
+  describe "creating Regress::TestEnum" do
+    before do
+      save_module :Regress
+    end
+
+    it "makes the created type know its proper name" do
+      info = get_introspection_data 'Regress', 'TestEnum'
+      builder = GirFFI::Builder::Type::Enum.new info
+      enum = builder.build_class
+      enum.inspect.must_equal "Regress::TestEnum"
+    end
+
+    after do
+      restore_module :Regress
+    end
+  end
 end
 

data/test/gir_ffi/in_pointer_test.rb

@@ -95,6 +95,12 @@ describe GirFFI::InPointer do
       result = GirFFI::InPointer.from :gint8, 23
       assert_equal 23, result.address
     end
+
+    it "handles enum types" do
+      e = FFI::Enum.new [:foo, :bar, :baz]
+      ptr = GirFFI::InPointer.from e, :bar
+      ptr.address.must_equal 1
+    end
   end
 end
 

data/test/integration/generated_secret_test.rb

@@ -0,0 +1,14 @@
+require 'gir_ffi_test_helper'
+
+describe "The generated Secret module" do
+  describe "Secret::Schema" do
+    it "has a working constructor" do
+      begin
+        GirFFI.setup :Secret
+      rescue
+        skip "No GIR data for Secret available"
+      end
+      Secret::Schema.new("foo", :none, "bar" => :string)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-14 00:00:00.000000000 Z
+date: 2013-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -234,6 +234,7 @@ files:
 - test/integration/generated_gimarshallingtests_test.rb
 - test/integration/generated_gio_test.rb
 - 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
@@ -403,6 +404,7 @@ test_files:
 - 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/method_lookup_test.rb
 - test/introspection_test_helper.rb
 - test/lib/Makefile.am