ffi_wide_char 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ea5bca08a9aa708e93c1e38fdd49fa85c99f01aaf54a9fec633a44ffa4633d2
-  data.tar.gz: ab99fb610d9c01eb3f4603555cd9b2bd5a3a8e18ce4656b9109c6241cf98aef3
+  metadata.gz: 19b32012cde9e95923464d15b12c156176c51c97e02a9d4d8aeed19d6a886839
+  data.tar.gz: '0772497956c010ad1be1d6cea9eaa586de0256f1c6b7bf303ea5ff13095f2dbc'
 SHA512:
-  metadata.gz: 7a724a1aa2185034e7a7f59eaf12d1042c3bd51fe111c83ea60a721799d78aa8544db05a2dfb3880f964fa940a72b49dfcfd0ba00b2f8b9870331124b4b93437
-  data.tar.gz: 26c7db5ccb23763bee14ece607b6b4a76b7f989623e46cc7a799ae829350e605fa9ffcef0ca312ec2649c4aea74e26aed9fdbba06b5d4d98122ad59d0a74d242
+  metadata.gz: ecd7aa2746e6ba7e3ae41d13c0237971a15aa156f2ad2489c6e2fd2bc9366195c2a4f0cbfdb18e536e828b85ff6bdfbacfa5511ae3032720265cdbadd77600d7
+  data.tar.gz: bafdddf658523047680c82d129fead2899cfcc1d3b98bb8e4f9c877cd8b8de8f89b74fc87c4c67ab50df78379330088fe688d1694f43337b5fcf20a981913a41

data/lib/ffi_wide_char/api.rb

@@ -7,6 +7,6 @@ module FfiWideChar
 
     # Converts a string of multibyte characters to a wide character array
     # size_t mbstowcs (wchar_t *wstring, const char *string, size_t size)
-    attach_function :mbstowcs, %i[pointer string size_t], :size_t
+    attach_function :mbstowcs, [:pointer, :string, :size_t], :size_t
   end
 end

data/lib/ffi_wide_char/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FfiWideChar
-  VERSION = '1.0.1'
+  VERSION = '1.0.2'
 end

data/lib/ffi_wide_char.rb

@@ -21,49 +21,71 @@ module FfiWideChar
   W_CHAR_SIZE = 2
   W_CHAR_FUNC = :get_uint16
 
-  # Detect `wchar_t` encoding.
-  # @return [String] Name of the wide-string encoding.
-  def self.detect_encoding
-    return W_CHAR_ENC if W_CHAR_ENC
-
-    ptr = FFI::MemoryPointer.new(:uint8, 6)
-    ret = LibC.mbstowcs(ptr, '!@', 3)
-    raise InvalidMultibyteCharError if ret.negative?
-
-    enc = ENCODINGS[str = ptr.get_bytes(0, 6)]
-    raise UnsupportedWCharEncodingError, str.inspect unless enc
-
-    redefine_const(:W_CHAR_ENC, enc)
-    redefine_const(:W_CHAR_SIZE, enc.include?('32') ? 4 : 2)
-    redefine_const(:W_CHAR_FUNC, W_CHAR_SIZE == 4 ? :get_int32 : :get_uint16)
-
-    enc
+  # All methods in this block are static
+  class << self
+    # Detect `wchar_t` encoding.
+    # @return [String] Name of the wide-string encoding.
+    def detect_encoding
+      return W_CHAR_ENC if W_CHAR_ENC
+
+      ptr = FFI::MemoryPointer.new(:uint8, 6)
+      ret = LibC.mbstowcs(ptr, '!@', 3)
+      raise InvalidMultibyteCharError unless ret.is_a?(Numeric) && ret >= 0
+
+      enc = ENCODINGS[str = ptr.get_bytes(0, 6)]
+      raise UnsupportedWCharEncodingError, str.inspect unless enc
+
+      redefine_consts enc
+    end
+
+    # Look for a null terminating characters; if found, read up to that null (exclusive)
+    # @param ptr [Pointer] A wide-string pointer.
+    # @return [String] Decoded wide-string.
+    def read_wide_string(ptr)
+      return nil unless ptr && (get_object_attr(ptr, :address) || 0) != 0
+
+      len = get_wide_string_len ptr
+      ptr.get_bytes(0, len).force_encoding(W_CHAR_ENC || DEFAULT_ENC)
+    end
+
+    # Convert a Ruby string into a C native wide-string.
+    # @param str [String] A Ruby string.
+    # @return [String] C native wide-string.
+    def to_wide_string(str)
+      str ? str.encode(W_CHAR_ENC || DEFAULT_ENC) : str
+    end
+
+    private
+
+    # @param enc [String]
+    # @return [String]
+    def redefine_consts(enc)
+      [:W_CHAR_ENC, :W_CHAR_SIZE, :W_CHAR_FUNC].each { |name| send :remove_const, name }
+
+      const_set :W_CHAR_ENC, enc
+      const_set :W_CHAR_SIZE, enc.include?('32') ? 4 : 2
+      const_set :W_CHAR_FUNC, W_CHAR_SIZE == 4 ? :get_int32 : :get_uint16
+
+      enc
+    end
+
+    # @param obj [Object]
+    # @param name [Symbol]
+    # @return [Object]
+    def get_object_attr(obj, name)
+      obj.respond_to?(name) ? obj.send(name) : nil
+    end
+
+    # @param ptr [Pointer]
+    # @return [Integer]
+    def get_wide_string_len(ptr)
+      sz = get_object_attr(ptr, :size)
+      sz -= W_CHAR_SIZE if sz
+
+      len = 0
+      len += W_CHAR_SIZE while (!sz || len < sz) && ptr.send(W_CHAR_FUNC, len) != 0
+
+      len
+    end
   end
-
-  # Look for a null terminating characters; if found, read up to that null (exclusive)
-  # @param ptr [Pointer] A wide-string pointer.
-  # @return [String] Decoded wide-string.
-  def self.read_wide_string(ptr)
-    return nil unless ptr&.respond_to?(:address) && ptr.address.nonzero?
-
-    sz = (ptr.size || 0) - W_CHAR_SIZE
-    len = 0
-    len += W_CHAR_SIZE while (sz.negative? || len < sz) && ptr.send(W_CHAR_FUNC, len) != 0
-
-    ptr.get_bytes(0, len).force_encoding(W_CHAR_ENC || DEFAULT_ENC)
-  end
-
-  # Convert a Ruby string into a C native wide-string.
-  # @param str [String] A Ruby string.
-  # @return [String] C native wide-string.
-  def self.to_wide_string(str)
-    str&.encode(W_CHAR_ENC || DEFAULT_ENC)
-  end
-
-  def self.redefine_const(name, value)
-    send(:remove_const, name) if const_defined?(name)
-    const_set name, value
-  end
-
-  private_class_method :redefine_const
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ffi_wide_char
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Thach Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-04 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.9'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.41'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.64'
+        version: '0.41'
 description: Convert from/to C native `wchar_t` string to used for FFI binding libraries.
 email:
 - nthachus@gmail.com
@@ -94,10 +94,7 @@ files:
 homepage: https://github.com/nthachus/ffi_wide_char
 licenses:
 - MIT
-metadata:
-  homepage_uri: https://github.com/nthachus/ffi_wide_char
-  source_code_uri: https://github.com/nthachus/ffi_wide_char
-  changelog_uri: https://github.com/nthachus/ffi_wide_char
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -106,7 +103,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="