fiddley 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89adacb7382de9ea109dda5d0a9aa9a0126a3198
-  data.tar.gz: f8e12868b55cddad59d0981a01690d41b23888dc
+  metadata.gz: 40f86cac5170af47851db89e9cf863d1ed2d4cd0
+  data.tar.gz: 03d91eaeb1ca26ebb57e00e7ea22b23e626b50fd
 SHA512:
-  metadata.gz: 1e455169f82ace8c779056efe3c6eda4f88ab6a5d13012a9d3bea5c59246876278e9cabccd73f72dab79e7151687a9af96493f7f97bc55bbcd45d922c8d8b829
-  data.tar.gz: 03bc837b03cf53ccbe543efe6432596a34e158646bf91894ac7282c392cb14401cddc8f7f3c9516ede054a6194891ed3cc7d347bc5f61fc36c503fad30dc034d
+  metadata.gz: d907983cf014b4f1c9d03420232695a2a9dc41e84ad3e3a06b3219d11c5e50b1ca5a64fbfd1d95e03969484df192d378f971f3550a08935f3b4fa8ea03cca29f
+  data.tar.gz: 557d3d89020188e8d53ea4b844297ffe27b1642daa8e605b6c59db2153ea76b2fc5c7e45d05fb03891ec28d386e93240bcb5e037c4f17d4e7dda14a36234b76e

data/Rakefile

@@ -1,10 +1,10 @@
-# -*- Ruby -*-
-require "bundler/gem_tasks"
-require "rake/testtask.rb"
-
-task :default => :test
-
-desc "Run all tests"
-task :test do
-  ruby "-Ilib test/sample.rb"
-end
+# -*- Ruby -*-
+require "bundler/gem_tasks"
+require "rake/testtask"
+
+task :default => :test
+
+desc "Run all tests"
+task :test do
+  ruby "-Ilib test/test_*.rb"
+end

data/lib/fiddley.rb

@@ -1,7 +1,8 @@
 module Fiddley
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end
 
+require "fiddley/enum"
 require "fiddley/function"
 require "fiddley/memory_pointer"
 require "fiddley/library"

data/lib/fiddley/enum.rb

@@ -0,0 +1,46 @@
+module Fiddley
+  class Enum
+    def initialize(*args)
+      info, @tag = *args
+      @map = {}
+      if info
+        last = nil
+        value = 0
+        info.each do |k|
+          if k.is_a?(Symbol)
+            @map[k] = value
+            last = k
+            value += 1
+          elsif k.is_a?(Integer)
+            @map[last] = k
+            value = k + 1
+          else
+            raise RuntimeError, "broken enum"
+          end
+        end
+      end
+      @rmap = @map.invert
+    end
+
+    attr_reader :tag
+
+    def symbols
+      @map.keys
+    end
+
+    def [](k)
+      if k.is_a?(Symbol)
+        @map[k]
+      elsif k.is_a?(Integer)
+        @rmap[k]
+      end
+    end
+    alias find []
+
+    def symbol_map
+      @map
+    end
+    alias to_h symbol_map
+    alias to_hash symbol_map
+  end
+end

data/lib/fiddley/library.rb

@@ -1,4 +1,5 @@
 require "fiddle/import"
+require "fiddley/enum"
 require "fiddley/struct"
 require "fiddley/utils"
 
@@ -71,6 +72,34 @@ module Fiddley
       end
     end
 
+    def enum(*args)
+      if args[1].is_a?(Array)
+        tag = args.shift
+      else
+        tag = nil
+      end
+      if args[0].is_a?(Array)
+        args = args[0]
+      end
+      @enums ||= []
+      @enums << Fiddley::Enum.new(args, tag)
+    end
+
+    def enum_value(key)
+      @enums ||= []
+      enum = @enums.find{|enum| enum[key]}
+      if enum
+        enum[key]
+      else
+        nil
+      end
+    end
+
+    def enum_type(key)
+      @enums ||= []
+      @enums.find{|enum| enum.tag == key}
+    end
+
     case RUBY_PLATFORM
     when /cygwin/
       libprefix = "cyg"

data/lib/fiddley/utils.rb

@@ -181,7 +181,11 @@ module Fiddley
       when :string, :pointer
         "void *"
       else
-        type.to_s
+        if @enums && @enums.find{|e| type == e.tag}
+          "int"
+        else
+          type.to_s
+        end
       end
     end
 

data/test/test_enum.rb

@@ -0,0 +1,68 @@
+require "fiddley"
+require "test/unit"
+
+class TestFiddleyEnum < Test::Unit::TestCase
+  module EnumTest
+    extend Fiddley::Library
+    ffi_lib Fiddley::Library::LIBC
+
+    enum :enum1
+    enum :enum2, :a
+    enum :enum3, [:b]
+    enum :enum4, 123
+    enum :enum5, :c, 456
+    enum :enum6, [:d, 789]
+    enum :enum7, [:e, 0x10, :f, :g, 0x100, :h]
+
+    attach_function :puts, [:enum7], :int
+  end
+
+  test "enum_value" do
+    assert_equal 0, EnumTest.enum_value(:enum1)
+    assert_equal 0, EnumTest.enum_value(:enum2)
+    assert_nil EnumTest.enum_value(:enum3)
+    assert_equal 1, EnumTest.enum_value(:a)
+    assert_equal 0, EnumTest.enum_value(:b)
+    assert_equal 123, EnumTest.enum_value(:enum4)
+    assert_equal 0, EnumTest.enum_value(:enum5)
+    assert_equal 456, EnumTest.enum_value(:c)
+    assert_nil EnumTest.enum_value(:enum6)
+    assert_equal 789, EnumTest.enum_value(:d)
+    assert_nil EnumTest.enum_value(:enum7)
+    assert_equal 0x10, EnumTest.enum_value(:e)
+    assert_equal 0x11, EnumTest.enum_value(:f)
+    assert_equal 0x100, EnumTest.enum_value(:g)
+    assert_equal 0x101, EnumTest.enum_value(:h)
+  end
+
+  test "enum_type" do
+    assert_nil EnumTest.enum_type(:enum1)
+    assert_nil EnumTest.enum_type(:enum2)
+    assert_kind_of Fiddley::Enum, EnumTest.enum_type(:enum3)
+    assert_nil EnumTest.enum_type(:enum4)
+    assert_nil EnumTest.enum_type(:enum5)
+    assert_kind_of Fiddley::Enum, EnumTest.enum_type(:enum6)
+    assert_kind_of Fiddley::Enum, EnumTest.enum_type(:enum7)
+
+    enum = EnumTest.enum_type(:enum3)
+    assert_equal 1, enum.symbols.length
+    assert_equal 0, enum[:b]
+    assert_equal :b, enum[0]
+
+    enum = EnumTest.enum_type(:enum6)
+    assert_equal 1, enum.symbols.length
+    assert_equal 789, enum[:d]
+    assert_equal :d, enum[789]
+
+    enum = EnumTest.enum_type(:enum7)
+    assert_equal 4, enum.symbols.length
+    assert_equal 0x10, enum[:e]
+    assert_equal :e, enum[0x10]
+    assert_equal 0x11, enum[:f]
+    assert_equal :f, enum[0x11]
+    assert_equal 0x100, enum[:g]
+    assert_equal :g, enum[0x100]
+    assert_equal 0x101, enum[:h]
+    assert_equal :h, enum[0x101]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fiddley
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - U.Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies: []
 description: Use Fiddle instead of Ruby-FFI !!!
 email:
@@ -22,6 +22,7 @@ files:
 - fiddley.gemspec
 - lib/ffi.rb
 - lib/fiddley.rb
+- lib/fiddley/enum.rb
 - lib/fiddley/function.rb
 - lib/fiddley/library.rb
 - lib/fiddley/memory_pointer.rb
@@ -29,6 +30,7 @@ files:
 - lib/fiddley/utils.rb
 - test/sample.rb
 - test/sample2.rb
+- test/test_enum.rb
 homepage: https://github.com/unak/fiddley
 licenses:
 - BSD-2-Clause