lib/ffi-icu/lib.rb in ffi-icu-0.0.4 vs lib/ffi-icu/lib.rb in ffi-icu-0.0.5

@@ -8,11 +8,13 @@
   module Lib
     extend FFI::Library
 
     VERSIONS = {
       "42" => "_4_2",
-      "44" => "_44"
+      "44" => "_44",
+      "45" => "_45",
+      "46" => "_46"
     }
 
     # FIXME: this is incredibly ugly, figure out some better way
     def self.find_icu
       suffix = ''
@@ -35,23 +37,25 @@
       case ICU.platform
       when :osx
         ffi_lib "icucore"
       when :linux
         versions = VERSIONS.keys
-        libs = ffi_lib versions.map { |v| "libicui18n.so.#{v}"},
-                       versions.map { |v| "libicutu.so.#{v}"}
+        libs = ffi_lib versions.map { |v| "libicui18n.so.#{v}" },
+                       versions.map { |v| "libicutu.so.#{v}"   }
 
         VERSIONS.find do |so_version, func_version|
           if libs.first.name =~ /#{so_version}$/
             suffix = func_version
           end
         end
       else
-        raise "no idea how to load ICU on #{ICU.platform}, patches appreciated!"
+        raise LoadError
       end
 
       suffix
+    rescue LoadError => ex
+      raise LoadError, "no idea how to load ICU on #{ICU.platform}, patches appreciated! (#{ex.message})"
     end
 
     def self.check_error
       ptr = FFI::MemoryPointer.new(:int)
       ret = yield(ptr)
@@ -90,51 +94,51 @@
     end
 
 
     suffix = find_icu()
 
-    attach_function :u_errorName, "u_errorName#{suffix}", [:int], :string
-    attach_function :uenum_count, "uenum_count#{suffix}", [:pointer, :pointer], :int
-    attach_function :uenum_close, "uenum_close#{suffix}",  [:pointer], :void
-    attach_function :uenum_next, "uenum_next#{suffix}",  [:pointer, :pointer, :pointer], :string
-    attach_function :u_charsToUChars, "u_charsToUChars#{suffix}", [:string, :pointer, :int32_t], :void
-    attach_function :u_UCharsToChars, "u_UCharsToChars#{suffix}", [:pointer, :string, :int32_t], :void
+    attach_function :u_errorName,     "u_errorName#{suffix}",     [:int],      :string
+    attach_function :uenum_count,     "uenum_count#{suffix}",     [:pointer,   :pointer], :int
+    attach_function :uenum_close,     "uenum_close#{suffix}",      [:pointer], :void
+    attach_function :uenum_next,      "uenum_next#{suffix}",       [:pointer,  :pointer,  :pointer], :string
+    attach_function :u_charsToUChars, "u_charsToUChars#{suffix}", [:string,    :pointer,  :int32_t], :void
+    attach_function :u_UCharsToChars, "u_UCharsToChars#{suffix}", [:pointer,   :string,   :int32_t], :void
 
     # CharDet
     #
     # http://icu-project.org/apiref/icu4c/ucsdet_8h.html
     #
 
-    attach_function :ucsdet_open, "ucsdet_open#{suffix}",  [:pointer], :pointer
-    attach_function :ucsdet_close, "ucsdet_close#{suffix}",  [:pointer], :void
-    attach_function :ucsdet_setText, "ucsdet_setText#{suffix}",  [:pointer, :string, :int32_t, :pointer], :void
-    attach_function :ucsdet_setDeclaredEncoding, "ucsdet_setDeclaredEncoding#{suffix}",  [:pointer, :string, :int32_t, :pointer], :void
-    attach_function :ucsdet_detect, "ucsdet_detect#{suffix}",  [:pointer, :pointer], :pointer
-    attach_function :ucsdet_detectAll, "ucsdet_detectAll#{suffix}",  [:pointer, :pointer, :pointer], :pointer
-    attach_function :ucsdet_getName, "ucsdet_getName#{suffix}",  [:pointer, :pointer], :string
-    attach_function :ucsdet_getConfidence, "ucsdet_getConfidence#{suffix}",  [:pointer, :pointer], :int32_t
-    attach_function :ucsdet_getLanguage, "ucsdet_getLanguage#{suffix}",  [:pointer, :pointer], :string
-    attach_function :ucsdet_getAllDetectableCharsets, "ucsdet_getAllDetectableCharsets#{suffix}",  [:pointer, :pointer], :pointer
-    attach_function :ucsdet_isInputFilterEnabled, "ucsdet_isInputFilterEnabled#{suffix}",  [:pointer], :bool
-    attach_function :ucsdet_enableInputFilter, "ucsdet_enableInputFilter#{suffix}",  [:pointer, :bool], :bool
+    attach_function :ucsdet_open,                     "ucsdet_open#{suffix}",                      [:pointer], :pointer
+    attach_function :ucsdet_close,                    "ucsdet_close#{suffix}",                     [:pointer], :void
+    attach_function :ucsdet_setText,                  "ucsdet_setText#{suffix}",                   [:pointer,  :string,   :int32_t,  :pointer], :void
+    attach_function :ucsdet_setDeclaredEncoding,      "ucsdet_setDeclaredEncoding#{suffix}",       [:pointer,  :string,   :int32_t,  :pointer], :void
+    attach_function :ucsdet_detect,                   "ucsdet_detect#{suffix}",                    [:pointer,  :pointer], :pointer
+    attach_function :ucsdet_detectAll,                "ucsdet_detectAll#{suffix}",                 [:pointer,  :pointer,  :pointer], :pointer
+    attach_function :ucsdet_getName,                  "ucsdet_getName#{suffix}",                   [:pointer,  :pointer], :string
+    attach_function :ucsdet_getConfidence,            "ucsdet_getConfidence#{suffix}",             [:pointer,  :pointer], :int32_t
+    attach_function :ucsdet_getLanguage,              "ucsdet_getLanguage#{suffix}",               [:pointer,  :pointer], :string
+    attach_function :ucsdet_getAllDetectableCharsets, "ucsdet_getAllDetectableCharsets#{suffix}",  [:pointer,  :pointer], :pointer
+    attach_function :ucsdet_isInputFilterEnabled,     "ucsdet_isInputFilterEnabled#{suffix}",      [:pointer], :bool
+    attach_function :ucsdet_enableInputFilter,        "ucsdet_enableInputFilter#{suffix}",         [:pointer,  :bool],    :bool
 
     # Collation
     #
     # http://icu-project.org/apiref/icu4c/ucol_8h.html
     #
 
-    attach_function :ucol_open, "ucol_open#{suffix}",  [:string, :pointer], :pointer
-    attach_function :ucol_close, "ucol_close#{suffix}",  [:pointer], :void
-    attach_function :ucol_strcoll, "ucol_strcoll#{suffix}",  [:pointer, :pointer, :int32_t, :pointer, :int32_t], :int
-    attach_function :ucol_getKeywords, "ucol_getKeywords#{suffix}",  [:pointer], :pointer
-    attach_function :ucol_getKeywordValues, "ucol_getKeywordValues#{suffix}",  [:string, :pointer], :pointer
-    attach_function :ucol_getAvailable, "ucol_getAvailable#{suffix}", [:int32_t], :string
-    attach_function :ucol_countAvailable, "ucol_countAvailable#{suffix}", [], :int32_t
-    attach_function :ucol_getLocale, "ucol_getLocale#{suffix}", [:pointer, :int, :pointer], :string
-    attach_function :ucol_greater, "ucol_greater#{suffix}", [:pointer, :pointer, :int32_t, :pointer, :int32_t], :bool
-    attach_function :ucol_greaterOrEqual, "ucol_greaterOrEqual#{suffix}", [:pointer, :pointer, :int32_t, :pointer, :int32_t], :bool
-    attach_function :ucol_equal, "ucol_equal#{suffix}", [:pointer, :pointer, :int32_t, :pointer, :int32_t], :bool
+    attach_function :ucol_open,             "ucol_open#{suffix}",              [:string,   :pointer], :pointer
+    attach_function :ucol_close,            "ucol_close#{suffix}",             [:pointer], :void
+    attach_function :ucol_strcoll,          "ucol_strcoll#{suffix}",           [:pointer,  :pointer,  :int32_t,  :pointer, :int32_t], :int
+    attach_function :ucol_getKeywords,      "ucol_getKeywords#{suffix}",       [:pointer], :pointer
+    attach_function :ucol_getKeywordValues, "ucol_getKeywordValues#{suffix}",  [:string,   :pointer], :pointer
+    attach_function :ucol_getAvailable,     "ucol_getAvailable#{suffix}",     [:int32_t],  :string
+    attach_function :ucol_countAvailable,   "ucol_countAvailable#{suffix}",   [],          :int32_t
+    attach_function :ucol_getLocale,        "ucol_getLocale#{suffix}",        [:pointer,   :int,      :pointer], :string
+    attach_function :ucol_greater,          "ucol_greater#{suffix}",          [:pointer,   :pointer,  :int32_t,  :pointer, :int32_t], :bool
+    attach_function :ucol_greaterOrEqual,   "ucol_greaterOrEqual#{suffix}",   [:pointer,   :pointer,  :int32_t,  :pointer, :int32_t], :bool
+    attach_function :ucol_equal,            "ucol_equal#{suffix}",            [:pointer,   :pointer,  :int32_t,  :pointer, :int32_t], :bool
 
     # Transliteration
     #
     # http://icu-project.org/apiref/icu4c/utrans_8h.html
     #
@@ -158,15 +162,15 @@
 
     end
 
     enum :trans_direction, [:forward, :reverse]
 
-    attach_function :utrans_openIDs, "utrans_openIDs#{suffix}", [:pointer], :pointer
-    attach_function :utrans_openU, "utrans_openU#{suffix}", [:pointer, :int32_t, :trans_direction, :pointer, :int32_t, :pointer, :pointer], :pointer
-    attach_function :utrans_open, "utrans_open#{suffix}", [:string, :trans_direction, :pointer, :int32_t, :pointer, :pointer], :pointer
-    attach_function :utrans_close, "utrans_close#{suffix}", [:pointer], :void
-    attach_function :utrans_transUChars, "utrans_transUChars#{suffix}", [:pointer, :pointer, :pointer, :int32_t, :int32_t, :pointer, :pointer], :void
+    attach_function :utrans_openIDs,     "utrans_openIDs#{suffix}",     [:pointer], :pointer
+    attach_function :utrans_openU,       "utrans_openU#{suffix}",       [:pointer,  :int32_t,         :trans_direction, :pointer, :int32_t, :pointer,  :pointer], :pointer
+    attach_function :utrans_open,        "utrans_open#{suffix}",        [:string,   :trans_direction, :pointer,         :int32_t, :pointer, :pointer], :pointer
+    attach_function :utrans_close,       "utrans_close#{suffix}",       [:pointer], :void
+    attach_function :utrans_transUChars, "utrans_transUChars#{suffix}", [:pointer,  :pointer,         :pointer,         :int32_t, :int32_t, :pointer,  :pointer], :void
 
     # Normalization
     #
     # http://icu-project.org/apiref/icu4c/unorm_8h.html
     #
@@ -197,23 +201,23 @@
                         :kana_limit,   400,
                         :ideo,         400,
                         :ideo_limit,   400
                       ]
 
-    attach_function :ubrk_countAvailable, "ubrk_countAvailable#{suffix}", [], :int32_t
-    attach_function :ubrk_getAvailable, "ubrk_getAvailable#{suffix}", [:int32_t], :string
+    attach_function :ubrk_countAvailable, "ubrk_countAvailable#{suffix}", [],              :int32_t
+    attach_function :ubrk_getAvailable,   "ubrk_getAvailable#{suffix}",   [:int32_t],      :string
 
-    attach_function :ubrk_open, "ubrk_open#{suffix}", [:iterator_type, :string, :pointer, :int32_t, :pointer], :pointer
-    attach_function :ubrk_close, "ubrk_close#{suffix}", [:pointer], :void
-    attach_function :ubrk_setText, "ubrk_setText#{suffix}", [:pointer, :pointer, :int32_t, :pointer], :void
-    attach_function :ubrk_current, "ubrk_current#{suffix}", [:pointer], :int32_t
-    attach_function :ubrk_next, "ubrk_next#{suffix}", [:pointer], :int32_t
-    attach_function :ubrk_previous, "ubrk_previous#{suffix}", [:pointer], :int32_t
-    attach_function :ubrk_first, "ubrk_first#{suffix}", [:pointer], :int32_t
-    attach_function :ubrk_last, "ubrk_last#{suffix}", [:pointer], :int32_t
+    attach_function :ubrk_open,           "ubrk_open#{suffix}",           [:iterator_type, :string,   :pointer, :int32_t,  :pointer], :pointer
+    attach_function :ubrk_close,          "ubrk_close#{suffix}",          [:pointer],      :void
+    attach_function :ubrk_setText,        "ubrk_setText#{suffix}",        [:pointer,       :pointer,  :int32_t, :pointer], :void
+    attach_function :ubrk_current,        "ubrk_current#{suffix}",        [:pointer],      :int32_t
+    attach_function :ubrk_next,           "ubrk_next#{suffix}",           [:pointer],      :int32_t
+    attach_function :ubrk_previous,       "ubrk_previous#{suffix}",       [:pointer],      :int32_t
+    attach_function :ubrk_first,          "ubrk_first#{suffix}",          [:pointer],      :int32_t
+    attach_function :ubrk_last,           "ubrk_last#{suffix}",           [:pointer],      :int32_t
 
-    attach_function :ubrk_preceding, "ubrk_preceding#{suffix}", [:pointer, :int32_t], :int32_t
-    attach_function :ubrk_following, "ubrk_following#{suffix}", [:pointer, :int32_t], :int32_t
-    attach_function :ubrk_isBoundary, "ubrk_isBoundary#{suffix}", [:pointer, :int32_t], :int32_t
+    attach_function :ubrk_preceding,      "ubrk_preceding#{suffix}",      [:pointer,       :int32_t], :int32_t
+    attach_function :ubrk_following,      "ubrk_following#{suffix}",      [:pointer,       :int32_t], :int32_t
+    attach_function :ubrk_isBoundary,     "ubrk_isBoundary#{suffix}",     [:pointer,       :int32_t], :int32_t
 
   end # Lib
 end # ICU