ffi-icu 0.0.8 → 0.0.9

data/lib/ffi-icu/lib.rb

@@ -52,7 +52,6 @@ module ICU
         raise LoadError, "no idea how to load ICU on #{ICU.platform.inspect}, patches appreciated! (#{ex.message})"
       end
 
-      # And last figure out the version we just loaded
       icu_version(libs)
     end
 
@@ -73,6 +72,38 @@ module ICU
       version
     end
 
+    def self.figure_suffix(version)
+      # For some reason libicu prepends its exported functions with version information,
+      # which differs across all platforms.  Some examples:
+      #
+      # OSX:
+      #   u_errorName
+      #
+      # CentOS 5
+      #   u_errorName_3_6
+      #
+      # Fedora 14 and Windows (using mingw)
+      #   u_errorName_44
+      #
+      # So we need to figure out which one it is.
+
+      # Here are the possible suffixes
+      suffixes = [""]
+      if version
+        suffixes << "_#{version}" << "_#{version[0].chr}_#{version[1].chr}"
+      end
+
+      # Try to find the u_errorName function using the possible suffixes
+      suffixes.find do |suffix|
+        function_name = "u_errorName#{suffix}"
+        function_names(function_name, nil).find do |fname|
+          ffi_libraries.find do |lib|
+            lib.find_function(fname)
+          end
+        end
+      end
+    end
+
     def self.check_error
       ptr = FFI::MemoryPointer.new(:int)
       ret = yield(ptr)
@@ -111,7 +142,7 @@ module ICU
     end
 
     version = load_icu
-    suffix = version ? "_#{version}" : ""
+    suffix = figure_suffix(version)
 
     attach_function :u_errorName,     "u_errorName#{suffix}",     [:int],      :string
     attach_function :uenum_count,     "uenum_count#{suffix}",     [:pointer,   :pointer], :int

data/lib/ffi-icu/version.rb

@@ -1,3 +1,3 @@
 module ICU
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-icu
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -117,7 +117,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Simple Ruby FFI wrappers for things I need from ICU.