gir_ffi 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fc709e79ed9d8d423b39d2793e648a3d4cf62603496f5398fe80515a756fe96
-  data.tar.gz: 2ca46650022b545f0dff670fc8bbaa27c159ed43c101fde1d674ab064b4dec36
+  metadata.gz: c32084045b640a22901bdd0d256ce8b8df1ace345930d3e4fccfd0e598b82b19
+  data.tar.gz: 5ac1e06a4dd28b4589ca93e30c48218a4cffb40f18d9f8c87859fdd76460fc8c
 SHA512:
-  metadata.gz: ad913da79bffc07e693e94aa2e56aa0b425c48999b84ffcee0a92a06439b75a46cd7db04f19cb5bc87b8869c541b7b374538c9aea300c2ffbf973d50f8b8bc5c
-  data.tar.gz: d661d30631b2470b85f9ff59abf36e2c63f380ba94f40a5b98eb0e5fd1ebb0943b94c5b6dff2cb6737bc264746c014f5c24e080fceea13b7eb20a2de8077f54e
+  metadata.gz: f70592c52c01f747ca9370007783231007ef535a0039337aaf42e46a17acbf2a54178b33c591ca8658e040496bb66a34ffd1f8126b2b323470783b97418418ae
+  data.tar.gz: fd92518d3541a1c46ebfe4758af76e8f746cf7ae355797a7f5736cdb4bc4b8444f6e9b4be7bf08712155759b11e5d697c2bdb522f3a4241337446204e5fb13c3

data/Changelog.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.14.1 / 2018-09-27
+
+* Add enum values as constants in the generated module.
+
 ## 0.14.0 / 2018-09-25
 
 * Do not generate field accessors for Object types. Object data should normally

data/lib/gir_ffi/builders/enum_builder.rb

@@ -26,6 +26,7 @@ module GirFFI
         setup_ffi_type
         klass.extend superclass
         setup_constants
+        setup_value_constants
         stub_methods
         setup_inspect
       end
@@ -40,6 +41,14 @@ module GirFFI
         end
       end
 
+      def setup_value_constants
+        info.values.each do |vinfo|
+          optionally_define_constant klass, vinfo.constant_name do
+            vinfo.value
+          end
+        end
+      end
+
       def setup_inspect
         klass.instance_eval <<-RUBY, __FILE__, __LINE__ + 1
           def self.inspect

data/lib/gir_ffi/info_ext.rb

@@ -11,6 +11,7 @@ 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_value_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/info_ext/i_value_info.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module GirFFI
+  module InfoExt
+    # Extensions for GObjectIntrospection::IValueInfo needed by GirFFI
+    module IValueInfo
+      def constant_name
+        upcased_name = name.upcase
+        if upcased_name =~ /^[0-9]/
+          "VALUE_#{upcased_name}"
+        else
+          upcased_name
+        end
+      end
+
+      def to_callback_ffi_type
+        return :pointer if direction != :in
+
+        argument_type.to_callback_ffi_type
+      end
+    end
+  end
+end
+
+GObjectIntrospection::IValueInfo.send :include, GirFFI::InfoExt::IValueInfo

data/lib/gir_ffi/version.rb

@@ -2,5 +2,5 @@
 
 # Current GirFFI version
 module GirFFI
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.14.1'.freeze
 end

data/test/gir_ffi/builders/enum_builder_test.rb

@@ -3,20 +3,21 @@
 require 'gir_ffi_test_helper'
 
 describe GirFFI::Builders::EnumBuilder do
-  describe 'creating Regress::TestEnum' do
-    before do
-      save_module :Regress
-    end
+  describe '#build_class' do
+    let(:info) { get_introspection_data 'Regress', 'TestEnum' }
+    let(:builder) { GirFFI::Builders::EnumBuilder.new info }
 
     it 'makes the created type know its proper name' do
-      info = get_introspection_data 'Regress', 'TestEnum'
-      builder = GirFFI::Builders::EnumBuilder.new info
       enum = builder.build_class
       enum.inspect.must_equal 'Regress::TestEnum'
     end
 
-    after do
-      restore_module :Regress
+    it 'adds constants for the values' do
+      enum = builder.build_class
+      enum::VALUE1.must_equal enum[:value1]
+      enum::VALUE2.must_equal enum[:value2]
+      enum::VALUE3.must_equal enum[:value3]
+      enum::VALUE4.must_equal enum[:value4]
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gir_ffi
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Matijs van Zuijlen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-25 00:00:00.000000000 Z
+date: 2018-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -284,6 +284,7 @@ files:
 - lib/gir_ffi/info_ext/i_signal_info.rb
 - lib/gir_ffi/info_ext/i_type_info.rb
 - lib/gir_ffi/info_ext/i_unresolved_info.rb
+- lib/gir_ffi/info_ext/i_value_info.rb
 - lib/gir_ffi/info_ext/i_vfunc_info.rb
 - lib/gir_ffi/info_ext/safe_constant_name.rb
 - lib/gir_ffi/info_ext/safe_function_name.rb